caren-api 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/caren-api.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{caren-api}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]
@@ -26,8 +26,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "caren-api.gemspec",
     "certs/caren-api.pub",
-    "certs/example",
-    "certs/example.pub",
     "init.rb",
     "lib/caren-api.rb",
     "lib/caren/base.rb",

data/init.rb

@@ -1,5 +1,4 @@
 require "lib/caren.rb"
 
 Caren::Api.url = "https://www.carenzorgt.nl"
-Caren::Api.caren_public_key_path = "certs/caren-api.pub"
-Caren::Api.private_key_path = ""
+Caren::Api.caren_public_key = Caren::Api.key_from_path("certs/caren-api.pub")

data/lib/caren/caren.rb

@@ -19,25 +19,43 @@ module Caren
   end
 
   class Api
-    class << self      
-      # The public key file path used to verify request coming from Caren
-      attr_accessor :caren_public_key_path
-      
-      # The private key file path used to sign requests coming from you
-      attr_accessor :private_key_path
-      
-      # The care provider url provided by Caren. i.e. https://example.caren-cares.com
-      attr_accessor :url
+    
+    def self.url= url
+      Thread.current[:url] = url
+    end
+    
+    def self.url
+      Thread.current[:url]
+    end
+        
+    def self.caren_public_key= key
+      Thread.current[:caren_public_key] = key
     end
     
     # The public key file used to verify request coming from Caren
     def self.caren_public_key
-      @caren_public_key ||= OpenSSL::PKey::RSA.new(File.read(self.caren_public_key_path))
+      Thread.current[:caren_public_key]
+    end
+
+    def self.private_key= key
+      Thread.current[:private_key] = key
     end
     
     # The private key file used to sign requests coming from you
     def self.private_key
-      @private_key ||= OpenSSL::PKey::RSA.new(File.read(self.private_key_path))
+      Thread.current[:private_key]
+    end
+    
+    def self.key_from_string string
+      OpenSSL::PKey::RSA.new(string)
+    end
+    
+    def self.key_from_path path
+      self.key_from_string( File.read(path) )
+    end
+    
+    def self.generate_private_key
+      OpenSSL::PKey::RSA.generate( 1024 )
     end
     
     def self.put url, xml

data/spec/spec_helper.rb

@@ -5,8 +5,10 @@ require 'fakeweb'
 require 'capybara'
 
 # For the tests we need to know both the public and private key, so we share them here.
-Caren::Api.caren_public_key_path = "certs/example.pub"
-Caren::Api.private_key_path = "certs/example"
+new_private_key = Caren::Api.generate_private_key
+
+Caren::Api.caren_public_key = new_private_key.public_key
+Caren::Api.private_key = new_private_key
 Caren::Api.url = "http://example.com"
 
 FakeWeb.allow_net_connect = false

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
+  - 5
   segments_generated: true
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Andre Foeken
@@ -167,8 +167,6 @@ files:
 - VERSION
 - caren-api.gemspec
 - certs/caren-api.pub
-- certs/example
-- certs/example.pub
 - init.rb
 - lib/caren-api.rb
 - lib/caren/base.rb

data/certs/example

@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDCbPwFkQhkA21mF96N0LSK0YtlyyCnkRcXMRgj9cxGZ88c5qti
-VTD5As6YdEn4GHaHfEr/dMlJpT8eTYHmy4eb35gw+jiGYm24LqJqsQFK7rAJ1I0b
-iE356NF8YaEOKP327K0QzTnftHijTrzDVm/6cHkXQxzAEpPaofU4TW0ljwIDAQAB
-AoGBALoQDkdNepgr53/yi9tvxbervRmXgRKbeVuKci3HxswCAGUKIy2hlZJYK1oe
-v8MbtiMGwcci/pbp+zOGvTAfyw+lZRP2aYIedRnRRLlmNtSYqD9BiD+F+ZfHUsHY
-kFGZdQIF8FPs6utjdbqqfi3YnAkyYvEC/1ecoGb8JkqIkwRxAkEA93/E+CaXxure
-/AteMIbm7CxEzasCPCvK7JQjRGgJbdRg5geB2Tjs6GjsCB1QI93KE0ZnK4M4bevI
-gxzJaffIpQJBAMkajAs5OI+cpOBGZg1KMJ1GgLL21HH/47rt40KWJbZxAsbOd2Vy
-4rBdu/X40JGYT/adVJh76Pw11P1gwMolKyMCQDCK+OELAL3dFzssJ58w9l3gGOaV
-4exXUoewTnJ+TUsjWpYDZu5qAd1bpt+4kB1YxOee6WFZbVnx4vQEU2TbWpkCQQCe
-sK8f0Ch80swcGhE/nXKdONwn3LSpvJX0lPGHQrpBrA3X2WbIDA8rwtumbpAOw9Ud
-surlZKnmE4id5LJdEVVnAkAsUiPowyInJKUNEN6PbvyVsjkgZq6ykDTyTJdWcR2o
-cT4sb4UzePHAAeh8g6VZeipCmO4SaugphkrPYvifWd7l
------END RSA PRIVATE KEY-----

data/certs/example.pub

@@ -1,6 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCbPwFkQhkA21mF96N0LSK0Ytl
-yyCnkRcXMRgj9cxGZ88c5qtiVTD5As6YdEn4GHaHfEr/dMlJpT8eTYHmy4eb35gw
-+jiGYm24LqJqsQFK7rAJ1I0biE356NF8YaEOKP327K0QzTnftHijTrzDVm/6cHkX
-QxzAEpPaofU4TW0ljwIDAQAB
------END PUBLIC KEY-----