caren-api 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/caren-api.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{caren-api}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]
@@ -26,6 +26,8 @@ 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/certs/example

@@ -0,0 +1,9 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIBOwIBAAJBAK1Ya72vzsFU0UWVx815q2SU4AUVG8MFYomzp23wJp4fplvGOMPA
+eZpFgAcO+3xAsI8zj/RObU5mj66styu55X0CAwEAAQJAT8y2vLokekfrlxcexe7P
+AhyvDGftQdhGxpGX8Dpv7LZvREAl6T8/8V3MYCyPSHM30pF4asSTSKhXCwTIDrDY
+AQIhANdqIAJAsk3B62uNVSi51wiCV7+SVQeFZ2ToBx9JuHB9AiEAzgE3V+GN4ZO1
+WXpP2Nw4eT9VvRop4cLbS0NQSlleWQECIBoRirwbDjjgvdevK94Y10/9Thct40Jc
+v41zkuETb9GVAiEAllrq4th8bq0ZSqJsDtLE4THpySiEcwN+fRM3UdyicQECIQCT
+PTGO73T/BixmylPe3vO/D4fF+bF6TSUqHXX75y33wg==
+-----END RSA PRIVATE KEY-----

data/certs/example.pub

@@ -0,0 +1,4 @@
+-----BEGIN RSA PUBLIC KEY-----
+MEgCQQCtWGu9r87BVNFFlcfNeatklOAFFRvDBWKJs6dt8CaeH6ZbxjjDwHmaRYAH
+Dvt8QLCPM4/0Tm1OZo+urLcrueV9AgMBAAE=
+-----END RSA PUBLIC KEY-----

data/lib/caren/care_provider.rb

@@ -20,7 +20,7 @@ class Caren::CareProvider < Caren::Base
       :min_start,                   # String (07:00)
       :show_employee_name_as_title, # Boolean
       :communication,               # Boolean
-      :push_hook_url,               # String (Optional url to push api acceptor)
+      :api_push_support,            # Boolean
       :api_url                      # String (Required url to api resources)
     ]
   end
@@ -55,7 +55,9 @@ class Caren::CareProvider < Caren::Base
       :max_start => self.max_start,
       :show_employee_name_as_title => self.show_employee_name_as_title,
       :show_employee_names => self.show_employee_names,
-      :communication => self.communication }
+      :communication => self.communication,
+      :api_push_support => self.api_push_support,
+      :api_url => self.api_url }
   end
   
   def to_logo_xml logo_hash_or_path

data/lib/caren/caren.rb

@@ -118,8 +118,8 @@ module Caren
     
     # Sign your string and timestamp using private key
     # Timestamp is UNIX timestamp seconds since 1970
-    def sign timestamp, string=nil
-      encrypted_digest = self.private_key.sign( "sha1", string.to_s + timestamp.to_s )
+    def sign timestamp, string=nil, private_key=self.private_key
+      encrypted_digest = private_key.sign( "sha1", string.to_s + timestamp.to_s )
       signature = CGI.escape(Base64.encode64(encrypted_digest))
       return signature
     end
@@ -131,9 +131,9 @@ module Caren
     end
     
     # Verify the signature using the caren public key
-    def verify_signature signature, timestamp, string=nil
-      signature = Base64.decode64(CGI.unescape(signature))
-      self.caren_public_key.verify( "sha1", signature, string.to_s + timestamp.to_s )
+    def verify_signature signature, timestamp, string=nil, public_key=self.caren_public_key
+      signature = Base64.decode64(CGI.unescape(signature.to_s))
+      public_key.verify( "sha1", signature, string.to_s + timestamp.to_s )
     end
         
     private
@@ -150,6 +150,7 @@ module Caren
           errors << Caren::Error.new( error.attributes["category"], error.text.strip )
         end
       end        
+      y errors
       raise Caren::Exceptions::ServerSideError.new(errors)
     end
     

metadata

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