From 754d048d4b927fc569721d5fe238b23285841804 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Thu, 3 Jan 2013 10:34:56 +0100
Subject: using leap_ca for cert model, removing empty dirs

---
 certs/app/assets/images/leap_web_certs/.gitkeep    |  0
 .../app/assets/javascripts/leap_web_certs/.gitkeep |  0
 .../app/assets/stylesheets/leap_web_certs/.gitkeep |  0
 certs/app/helpers/.gitkeep                         |  0
 certs/app/helpers/certs_helper.rb                  |  2 -
 certs/app/mailers/.gitkeep                         |  0
 certs/app/models/.gitkeep                          |  0
 certs/app/models/leap_ca/cert.rb                   | 56 ----------------------
 certs/app/views/.gitkeep                           |  0
 certs/leap_web_certs.gemspec                       |  1 +
 certs/lib/leap_web_certs/engine.rb                 |  1 +
 11 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 certs/app/assets/images/leap_web_certs/.gitkeep
 delete mode 100644 certs/app/assets/javascripts/leap_web_certs/.gitkeep
 delete mode 100644 certs/app/assets/stylesheets/leap_web_certs/.gitkeep
 delete mode 100644 certs/app/helpers/.gitkeep
 delete mode 100644 certs/app/helpers/certs_helper.rb
 delete mode 100644 certs/app/mailers/.gitkeep
 delete mode 100644 certs/app/models/.gitkeep
 delete mode 100644 certs/app/models/leap_ca/cert.rb
 delete mode 100644 certs/app/views/.gitkeep

(limited to 'certs')

diff --git a/certs/app/assets/images/leap_web_certs/.gitkeep b/certs/app/assets/images/leap_web_certs/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/certs/app/assets/javascripts/leap_web_certs/.gitkeep b/certs/app/assets/javascripts/leap_web_certs/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/certs/app/assets/stylesheets/leap_web_certs/.gitkeep b/certs/app/assets/stylesheets/leap_web_certs/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/certs/app/helpers/.gitkeep b/certs/app/helpers/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/certs/app/helpers/certs_helper.rb b/certs/app/helpers/certs_helper.rb
deleted file mode 100644
index 94e76b8..0000000
--- a/certs/app/helpers/certs_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module CertsHelper
-end
diff --git a/certs/app/mailers/.gitkeep b/certs/app/mailers/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/certs/app/models/.gitkeep b/certs/app/models/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/certs/app/models/leap_ca/cert.rb b/certs/app/models/leap_ca/cert.rb
deleted file mode 100644
index 9d4f15e..0000000
--- a/certs/app/models/leap_ca/cert.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Model for certificates stored in CouchDB.
-#
-# This file must be loaded after Config has been loaded.
-#
-
-module LeapCA
-  class Cert < CouchRest::Model::Base
-
-# No config yet.    use_database LeapCA::Config.db_name
-    use_database 'client_certificates'
-
-    timestamps!
-
-    property :key, String                          # the client private RSA key
-    property :cert, String                         # the client x509 certificate, signed by the CA
-    property :valid_until, Time                    # expiration time of the client certificate
-    property :random, Float, :accessible => false  # used to help pick a random cert by the webapp
-
-    before_validation :set_random, :on => :create
-
-    validates :key, :presence => true
-    validates :cert, :presence => true
-    validates :random, :presence => true
-    validates :random, :numericality => {:greater_than => 0, :less_than => 1}
-
-    design do
-      view :by_random
-    end
-
-    def set_random
-      self.random = rand
-    end
-
-    class << self
-      def sample
-        self.by_random.startkey(rand).first || self.by_random.first
-      end
-
-      def pick_from_pool
-        cert = self.sample
-        raise RECORD_NOT_FOUND unless cert
-        cert.destroy
-        return cert
-      rescue RESOURCE_NOT_FOUND
-        retry if self.by_random.count > 0
-        raise RECORD_NOT_FOUND
-      end
-
-      def valid_attributes_hash
-        {:key => "ABCD", :cert => "A123"}
-      end
-    end
-
-  end
-end
diff --git a/certs/app/views/.gitkeep b/certs/app/views/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/certs/leap_web_certs.gemspec b/certs/leap_web_certs.gemspec
index 15a45be..81bc042 100644
--- a/certs/leap_web_certs.gemspec
+++ b/certs/leap_web_certs.gemspec
@@ -16,5 +16,6 @@ Gem::Specification.new do |s|
   s.test_files = Dir["test/**/*"]
 
   s.add_dependency "leap_web_core", LeapWeb::VERSION
+  s.add_dependency "leap_ca", '~> 0.2.0'
 
 end
diff --git a/certs/lib/leap_web_certs/engine.rb b/certs/lib/leap_web_certs/engine.rb
index 3c8948a..118aee0 100644
--- a/certs/lib/leap_web_certs/engine.rb
+++ b/certs/lib/leap_web_certs/engine.rb
@@ -1,4 +1,5 @@
 require "leap_web_core"
+require "leap_ca"
 
 module LeapWebCerts
   class Engine < ::Rails::Engine
-- 
cgit v1.2.3