caren-api 0.4.12 → 0.4.13

data/VERSION

@@ -1 +1 @@
-0.4.12
+0.4.13

data/caren-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{caren-api}
-  s.version = "0.4.12"
+  s.version = "0.4.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]
-  s.date = %q{2011-11-16}
+  s.date = %q{2011-11-17}
   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.extra_rdoc_files = [

data/lib/caren/base.rb

@@ -65,7 +65,7 @@ class Caren::Base
   
   # The absolute (constructed url) to the resource.
   def self.resource_url id=nil
-    "#{self.resource_location}#{id}"
+    [self.resource_location,id].compact.join("/")
   end
   
   def self.search_url key, value

data/lib/caren/care_provider.rb

@@ -73,7 +73,7 @@ class Caren::CareProvider < Caren::Base
   end
     
   def self.resource_location
-    "/api/pro/care_providers/"
+    "/api/pro/care_providers"
   end
   
   def self.array_root

data/lib/caren/caren.rb

@@ -59,7 +59,7 @@ module Caren
     def put path, xml
       begin
         timestamp = DateTime.now.to_i
-        response = RestClient.put url_for(path), xml, :content_type => :xml, :accept => :xml, :timestamp => timestamp, :signature => sign(timestamp,xml)
+        response = RestClient.put url_for(path), xml, :content_type => :xml, :accept => :xml, :timestamp => timestamp, :signature => sign(timestamp,path,xml)
         return check_signature(response)
       rescue RestClient::Exception => e
         handle_error(e.response)
@@ -69,7 +69,7 @@ module Caren
     def post path, xml
       begin
         timestamp = DateTime.now.to_i
-        response = RestClient.post url_for(path), xml, :content_type => :xml, :accept => :xml, :timestamp => timestamp, :signature => sign(timestamp,xml)
+        response = RestClient.post url_for(path), xml, :content_type => :xml, :accept => :xml, :timestamp => timestamp, :signature => sign(timestamp,path,xml)
         return check_signature(response)
       rescue RestClient::Exception => e
         handle_error(e.response)
@@ -79,7 +79,7 @@ module Caren
     def delete path
       begin
         timestamp = DateTime.now.to_i
-        response = RestClient.delete url_for(path), :content_type => :xml, :accept => :xml, :timestamp => timestamp, :signature => sign(timestamp)
+        response = RestClient.delete url_for(path), :content_type => :xml, :accept => :xml, :timestamp => timestamp, :signature => sign(timestamp,path)
         return check_signature(response)
       rescue RestClient::Exception => e
         handle_error(e.response)
@@ -89,7 +89,7 @@ module Caren
     def get path
       begin
         timestamp = DateTime.now.to_i
-        response = RestClient.get url_for(path), :content_type => :xml, :accept => :xml, :timestamp => timestamp, :signature => sign(timestamp)
+        response = RestClient.get url_for(path), :content_type => :xml, :accept => :xml, :timestamp => timestamp, :signature => sign(timestamp,path)
         return check_signature(response)
       rescue RestClient::Exception => e
         handle_error(e.response)
@@ -147,11 +147,11 @@ module Caren
       end
     end
 
-    
     # Sign your string and timestamp using private key
     # Timestamp is UNIX timestamp seconds since 1970
-    def sign timestamp, string=nil, private_key=self.private_key
-      encrypted_digest = private_key.sign( "sha1", string.to_s + timestamp.to_s )
+    def sign timestamp, path, string=nil, private_key=self.private_key
+      path = URI.parse(path).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
     end

data/lib/caren/external_message.rb

@@ -47,7 +47,7 @@ class Caren::ExternalMessage < Caren::Base
   end
   
   def self.resource_location
-    "/api/pro/people/%i/external_messages/"
+    "/api/pro/people/%i/external_messages"
   end
       
   private

data/lib/caren/link.rb

@@ -43,7 +43,7 @@ class Caren::Link < Caren::Base
   end
   
   def self.resource_location
-    "/api/pro/links/"
+    "/api/pro/links"
   end
         
 end

data/lib/caren/product.rb

@@ -77,7 +77,7 @@ class Caren::Product < Caren::Base
   end
   
   def self.resource_location
-    "/api/pro/store/products/"
+    "/api/pro/store/products"
   end
   
 end

data/lib/caren/product_category.rb

@@ -30,7 +30,7 @@ class Caren::ProductCategory < Caren::Base
   end
   
   def self.resource_location
-    "/api/pro/store/product_categories/"
+    "/api/pro/store/product_categories"
   end
   
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 12
+  - 13
   segments_generated: true
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors: 
 - Andre Foeken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 +01:00
+date: 2011-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency