caren-api 0.4.19 → 0.4.20

data/VERSION

@@ -1 +1 @@
-0.4.19
+0.4.20

data/caren-api.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{caren-api}
-  s.version = "0.4.19"
+  s.name = "caren-api"
+  s.version = "0.4.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]
-  s.date = %q{2011-11-18}
-  s.description = %q{You can use this gem as inspiration of the base of your connections with Caren.}
-  s.email = %q{andre.foeken@nedap.com}
+  s.date = "2012-01-23"
+  s.description = "You can use this gem as inspiration of the base of your connections with Caren."
+  s.email = "andre.foeken@nedap.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -71,17 +71,16 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/foeken/caren-api}
+  s.homepage = "http://github.com/foeken/caren-api"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Reference implementation of Caren CareProvider API}
+  s.rubygems_version = "1.8.15"
+  s.summary = "Reference implementation of Caren CareProvider API"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<builder>, [">= 0"])

data/lib/caren/base.rb

@@ -42,6 +42,7 @@ class Caren::Base
   
   # Convert a XML string to a single object or an array of objects
   def self.from_xml xml
+    return nil if xml == ''
     hash = xml.is_a?(Hash) ? xml : Hash.from_xml(xml)
     raise Caren::Exceptions::InvalidXmlResponse unless hash
     if hash.has_key?(self.array_root.to_s)

data/lib/caren/caren.rb

@@ -166,8 +166,8 @@ module Caren
 
     # Sign your string and timestamp using private key
     # Timestamp is UNIX timestamp seconds since 1970
-    def sign timestamp, path, string=nil, private_key=self.private_key
-      path = URI.parse(path).path
+    def sign timestamp, path=nil, string=nil, private_key=self.private_key
+      path = URI.parse(path).path if path
       encrypted_digest = private_key.sign( "sha1", path.to_s + string.to_s + timestamp.to_s )
       signature = CGI.escape(Base64.encode64(encrypted_digest))
       return signature
@@ -175,15 +175,15 @@ module Caren
         
     # Check the signature of the response from rest-client
     def check_signature response
-      return response if self.verify_signature( response.headers[:signature], response.headers[:timestamp], response )
+      return response if self.verify_signature( response.headers[:signature], response.headers[:timestamp], nil, response )
       raise Caren::Exceptions::SignatureMismatch.new
     end
     
     # Verify the signature using the caren public key
-    def verify_signature signature, timestamp, string=nil, public_key=self.caren_public_key
+    def verify_signature signature, timestamp, path, string=nil, public_key=self.caren_public_key
       return false unless public_key
       signature = Base64.decode64(CGI.unescape(signature.to_s))
-      public_key.verify( "sha1", signature, string.to_s + timestamp.to_s )
+      public_key.verify( "sha1", signature, path.to_s + string.to_s + timestamp.to_s )
     end
         
     def create_photo_signature url_shortcut, external_or_caren_id, private_key=self.private_key

data/lib/caren-api.rb

@@ -4,8 +4,8 @@ rescue LoadError
 end
 
 require "active_support"
-require "active_support/secure_random"
 require "active_support/core_ext"
+require "active_support/secure_random" rescue
 require "builder"
 require "rest_client"
 require "rexml/document"

data/spec/care_provider_spec.rb

@@ -81,9 +81,9 @@ describe "CareProvider", "REST methods" do
     timestamp = DateTime.now.to_i
     
     FakeWeb.register_uri(:put, care_provider_url, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp) )    
-    FakeWeb.register_uri(:get, care_provider_url, :body => care_provider, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,care_provider) )
-    FakeWeb.register_uri(:get, care_providers_url, :body => care_providers, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,care_providers) )
-    FakeWeb.register_uri(:get, search_url, :body => care_providers_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,care_providers_search) )
+    FakeWeb.register_uri(:get, care_provider_url, :body => care_provider, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,care_provider) )
+    FakeWeb.register_uri(:get, care_providers_url, :body => care_providers, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,care_providers) )
+    FakeWeb.register_uri(:get, search_url, :body => care_providers_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,care_providers_search) )
   end
   
   it "should be able to update a care provider" do

data/spec/caren_spec.rb

@@ -74,7 +74,7 @@ describe "Caren", "signature checks" do
   it "should be able to handle incoming xml from caren" do
     incoming = File.read "spec/fixtures/incoming.xml"
     timestamp = DateTime.now.to_i
-    results  = Caren::Api.session.incoming(incoming, Caren::Api.session.sign(timestamp, incoming), timestamp )
+    results  = Caren::Api.session.incoming(incoming, Caren::Api.session.sign(timestamp, nil, incoming), timestamp )
     results.should have(4).things    
     external_messages = results.select{ |x| x.is_a?(Caren::ExternalMessage) }
     external_messages.first.id.should == 1    

data/spec/external_message_spec.rb

@@ -36,8 +36,8 @@ describe "ExternalMessage", "REST methods" do
     message_url = Caren::Api.session.url_for( Caren::ExternalMessage.resource_url(1,1) )    
     timestamp = DateTime.now.to_i
     
-    FakeWeb.register_uri(:get, messages_url, :body => messages, :signature => Caren::Api.session.sign(timestamp,messages), :timestamp => timestamp )
-    FakeWeb.register_uri(:get, message_url, :body => message, :signature => Caren::Api.session.sign(timestamp,message), :timestamp => timestamp )
+    FakeWeb.register_uri(:get, messages_url, :body => messages, :signature => Caren::Api.session.sign(timestamp,nil,messages), :timestamp => timestamp )
+    FakeWeb.register_uri(:get, message_url, :body => message, :signature => Caren::Api.session.sign(timestamp,nil,message), :timestamp => timestamp )
     FakeWeb.register_uri(:post, messages_url, :status => 201, :signature => Caren::Api.session.sign(timestamp), :timestamp => timestamp )
     FakeWeb.register_uri(:delete, message_url, :signature => Caren::Api.session.sign(timestamp), :timestamp => timestamp )
   end

data/spec/link_spec.rb

@@ -30,9 +30,9 @@ describe "Link", "REST methods" do
     
     timestamp = DateTime.now.to_i
     
-    FakeWeb.register_uri(:get, link_url, :body => link, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,link) )
-    FakeWeb.register_uri(:get, links_url, :body => links, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,links) )
-    FakeWeb.register_uri(:get, search_url, :body => search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,search) )
+    FakeWeb.register_uri(:get, link_url, :body => link, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,link) )
+    FakeWeb.register_uri(:get, links_url, :body => links, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,links) )
+    FakeWeb.register_uri(:get, search_url, :body => search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,search) )
     FakeWeb.register_uri(:post, links_url, :status => 201, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp) )
   end
   

data/spec/product_category_spec.rb

@@ -30,9 +30,9 @@ describe "ProductCategory", "REST methods" do
     
     timestamp = DateTime.now.to_i
     
-    FakeWeb.register_uri(:get, product_categories_url, :body => product_categories, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product_categories) )  
-    FakeWeb.register_uri(:get, product_category_url, :body => product_category, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product_category) )                                                           
-    FakeWeb.register_uri(:get, search_url, :body => product_categories_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product_categories_search) )
+    FakeWeb.register_uri(:get, product_categories_url, :body => product_categories, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,product_categories) )  
+    FakeWeb.register_uri(:get, product_category_url, :body => product_category, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,product_category) )                                                           
+    FakeWeb.register_uri(:get, search_url, :body => product_categories_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,product_categories_search) )
   end
     
   it "should be able to search for a specific product category" do

data/spec/product_spec.rb

@@ -29,12 +29,12 @@ describe "Product", "REST methods" do
     search_url = Caren::Api.session.url_for( "#{Caren::Product.resource_url}?key=name&value=bedpan" )
     
     timestamp = DateTime.now.to_i
-    
+
     FakeWeb.register_uri(:post, products_url, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp) )
     FakeWeb.register_uri(:put, product_url, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp) )
-    FakeWeb.register_uri(:get, products_url, :body => products, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,products) )   
-    FakeWeb.register_uri(:get, product_url, :body => product, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product) )                                                                                                                       
-    FakeWeb.register_uri(:get, search_url, :body => product_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product_search) )
+    FakeWeb.register_uri(:get, products_url, :body => products, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,products) )   
+    FakeWeb.register_uri(:get, product_url, :body => product, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,product) )                                                                                                                       
+    FakeWeb.register_uri(:get, search_url, :body => product_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,product_search) )
   end
   
   it "should be able to update a product" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caren-api
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 39
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 19
-  segments_generated: true
-  version: 0.4.19
+  - 20
+  version: 0.4.20
 platform: ruby
 authors: 
 - Andre Foeken
@@ -15,141 +15,150 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 +01:00
-default_executable: 
+date: 2012-01-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: i18n
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id001
+  version_requirements: *id001
+  name: i18n
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: activesupport
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id002
+  version_requirements: *id002
+  name: activesupport
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: builder
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id003
+  version_requirements: *id003
+  name: builder
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: rest-client
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 6
         - 7
-        segments_generated: true
         version: 1.6.7
-  requirement: *id004
+  version_requirements: *id004
+  name: rest-client
   prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
-  name: bundler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id005
+  version_requirements: *id005
+  name: bundler
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: rcov
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id006
+  version_requirements: *id006
+  name: rcov
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: capybara
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id007
+  version_requirements: *id007
+  name: capybara
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: rspec
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id008
+  version_requirements: *id008
+  name: rspec
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: fakeweb
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id009
+  version_requirements: *id009
+  name: fakeweb
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: jeweler
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id010
+  version_requirements: *id010
+  name: jeweler
   prerelease: false
+  type: :development
 description: You can use this gem as inspiration of the base of your connections with Caren.
 email: andre.foeken@nedap.com
 executables: []
@@ -213,7 +222,6 @@ files:
 - spec/product_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/foeken/caren-api
 licenses: 
 - MIT
@@ -223,25 +231,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Reference implementation of Caren CareProvider API