caren-api 0.4.30 → 0.4.31

data/VERSION

@@ -1 +1 @@
-0.4.30
+0.4.31

data/caren-api.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "caren-api"
-  s.version = "0.4.30"
+  s.version = "0.4.31"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]

data/lib/caren/billable_category.rb

@@ -1,5 +1,5 @@
 class Caren::BillableCategory < Caren::Base
-    
+
   def self.keys
     [ :id,                    # Integer (Id of this category in Caren)
       :name,                  # String
@@ -8,29 +8,29 @@ class Caren::BillableCategory < Caren::Base
       :billable_category_id    # Integer (Parent category; Caren id; Nil for root node)
     ] + super
   end
-  
+
   def self.search key, value, session
     from_xml session.get( self.search_url(key,value) )
   end
-  
+
   def self.find id, session
     from_xml session.get(self.resource_url(id))
   end
-  
+
   def self.all session
     from_xml session.get(self.resource_url)
   end
-    
+
   def self.array_root
     :billable_categories
   end
-  
+
   def self.node_root
     :billable_category
   end
-  
+
   def self.resource_location
     "/api/pro/store/billable_categories"
   end
-  
-end
+
+end

data/lib/caren/care_provider.rb

@@ -3,7 +3,7 @@
 # * Get a list of care providers
 # * Search for a specific care provider based on key/value
 class Caren::CareProvider < Caren::Base
-      
+
   def self.keys
     [ :id,                          # Integer (The id of this CP inside Caren)
       :name,                        # String
@@ -28,30 +28,30 @@ class Caren::CareProvider < Caren::Base
       :closed_beta,                 # Boolean
       :locale,                      # String
       :lat,
-      :lng       
+      :lng
     ] + super
   end
-    
+
   def self.search key, value, session
     from_xml session.get( self.search_url(key,value) )
   end
-  
+
   def self.find id, session
     from_xml session.get(self.resource_url(id))
   end
-  
+
   def self.all session
     from_xml session.get(self.resource_url)
   end
-  
+
   def update session
     self.class.from_xml session.put(self.resource_url(self.id), self.to_xml)
   end
-  
+
   def update_logo logo_hash_or_path, session
     self.class.from_xml session.put(self.resource_url(self.id), self.to_logo_xml(logo_hash_or_path))
   end
-    
+
   def as_xml
     { :name => self.name,
       :telephone => self.telephone,
@@ -76,7 +76,7 @@ class Caren::CareProvider < Caren::Base
       :lng => self.lng
     }
   end
-  
+
   def to_logo_xml logo_hash_or_path
     builder = Builder::XmlMarkup.new
     logo = self.class.hash_from_image(logo_hash_or_path)
@@ -84,17 +84,17 @@ class Caren::CareProvider < Caren::Base
       care_provider.tag!("logo", logo[:content], "name" => logo[:name], "content-type" => logo[:content_type] ) if logo
     end
   end
-    
+
   def self.resource_location
     "/api/pro/care_providers"
   end
-  
+
   def self.array_root
     :care_providers
   end
-  
+
   def self.node_root
     :care_provider
   end
-    
-end
+
+end

data/lib/caren/caren.rb

@@ -1,34 +1,34 @@
 module Caren
-  
+
   module Exceptions
-    
+
     class StandardError < ::StandardError ; end
-    
+
     class SignatureMismatch < Caren::Exceptions::StandardError ; end
-    
+
     class InvalidXmlResponse < Caren::Exceptions::StandardError ; end
-    
+
     class ServerSideError < Caren::Exceptions::StandardError
-      
+
       attr_accessor :errors
-      
+
       def initialize errors=[]
         self.errors = errors
       end
-      
+
     end
-    
+
   end
 
   class Api
-    
+
     class << self
       attr_accessor :session
     end
-        
+
     # The user_agent is an optional identifier
     attr_accessor :url, :caren_public_key, :private_key, :user_agent
-    
+
     # Initialize new API session. Specify your private key to sign outgoing messages and your care provider url.
     # Optionally you can pass the caren public key used to verify incoming requests.
     def initialize private_key, url, caren_public_key=nil
@@ -36,33 +36,33 @@ module Caren
       self.private_key = private_key.is_a?(String) ? Caren::Api.key_from_string(private_key) : private_key
       self.caren_public_key = caren_public_key || Caren::Api.key_from_path("#{File.dirname(__FILE__)}/../../certs/caren-api.pub")
     end
-    
+
     # Create key from string
     def self.key_from_string string
       OpenSSL::PKey::RSA.new(string)
     end
-    
+
     # Read a file and create key from string
     def self.key_from_path path
       self.key_from_string( File.read(path) )
     end
-    
+
     # Generate a new private key
     def self.generate_private_key size=2048
       OpenSSL::PKey::RSA.generate( size )
     end
-    
+
     # URL from path using session base url
     def url_for path
       "#{self.url}#{path}"
     end
-    
+
     def put path, xml
       begin
         timestamp = DateTime.now.to_i
-        response = RestClient.put url_for(path), xml, :content_type => :xml, 
-                                                      :accept => :xml, 
-                                                      :timestamp => timestamp, 
+        response = RestClient.put url_for(path), xml, :content_type => :xml,
+                                                      :accept => :xml,
+                                                      :timestamp => timestamp,
                                                       :signature => sign(timestamp,path,xml),
                                                       :user_agent => user_agent
         return check_signature(response)
@@ -70,13 +70,13 @@ module Caren
         handle_error(e.response)
       end
     end
-    
+
     def post path, xml
       begin
         timestamp = DateTime.now.to_i
-        response = RestClient.post url_for(path), xml, :content_type => :xml, 
-                                                       :accept => :xml, 
-                                                       :timestamp => timestamp, 
+        response = RestClient.post url_for(path), xml, :content_type => :xml,
+                                                       :accept => :xml,
+                                                       :timestamp => timestamp,
                                                        :signature => sign(timestamp,path,xml),
                                                        :user_agent => user_agent
         return check_signature(response)
@@ -84,13 +84,13 @@ module Caren
         handle_error(e.response)
       end
     end
-    
+
     def delete path
       begin
         timestamp = DateTime.now.to_i
-        response = RestClient.delete url_for(path), :content_type => :xml, 
-                                                    :accept => :xml, 
-                                                    :timestamp => timestamp, 
+        response = RestClient.delete url_for(path), :content_type => :xml,
+                                                    :accept => :xml,
+                                                    :timestamp => timestamp,
                                                     :signature => sign(timestamp,path),
                                                     :user_agent => user_agent
         return check_signature(response)
@@ -98,13 +98,13 @@ module Caren
         handle_error(e.response)
       end
     end
-    
+
     def get path
       begin
         timestamp = DateTime.now.to_i
-        response = RestClient.get url_for(path), :content_type => :xml, 
-                                                 :accept => :xml, 
-                                                 :timestamp => timestamp, 
+        response = RestClient.get url_for(path), :content_type => :xml,
+                                                 :accept => :xml,
+                                                 :timestamp => timestamp,
                                                  :signature => sign(timestamp,path),
                                                  :user_agent => user_agent
         return check_signature(response)
@@ -112,17 +112,17 @@ module Caren
         handle_error(e.response)
       end
     end
-    
+
     # These types of Caren objects are supported by the Caren::Api.incoming method
     def self.supported_incoming_objects
-      { :links => Caren::Link, 
-        :external_messages => Caren::ExternalMessage, 
+      { :links => Caren::Link,
+        :external_messages => Caren::ExternalMessage,
         :care_providers => Caren::CareProvider,
         :billable_categories => Caren::BillableCategory,
         :billables => Caren::Billable
       }
     end
-    
+
     # These types of Caren objects are supported by the Caren::Api.incoming method
     def self.supported_incoming_single_objects
       singles = {}
@@ -131,7 +131,7 @@ module Caren
       end
       return singles
     end
-    
+
     # Pass an XML string to be handled. Only a valid caren_objects xml hash will be parsed.
     def incoming xml, signature, timestamp
       if self.verify_signature(signature,timestamp, xml)
@@ -140,22 +140,22 @@ module Caren
         raise Caren::Exceptions::SignatureMismatch.new
       end
     end
-    
+
     def parse xml
       objects = []
       hash   = Hash.from_xml(xml)
       if hash["caren_objects"]
         hash = hash["caren_objects"]
-      end            
+      end
       Caren::Api.supported_incoming_objects.each do |key,klass|
         objects << (hash[key]||hash[key.to_s]||[]).map{ |h| klass.new(h) }
       end
       return objects.flatten
     end
-    
+
     def parse_object xml
       hash = Hash.from_xml(xml)
-      #todo: rewrite so we lookup the xml tag in the supported_incoming_single_objects hash, faster :)                  
+      #todo: rewrite so we lookup the xml tag in the supported_incoming_single_objects hash, faster :)
       Caren::Api.supported_incoming_single_objects.each do |key, klass|
         object = hash[key] || hash[key.to_s]
         if object
@@ -172,34 +172,34 @@ module Caren
       signature = CGI.escape(Base64.encode64(encrypted_digest))
       return signature
     end
-        
+
     # 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], nil, response )
       raise Caren::Exceptions::SignatureMismatch.new
     end
-    
+
     # Verify the signature using the 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( OpenSSL::Digest::SHA1.new, 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
       digest = OpenSSL::PKey::RSA.new(private_key).sign( OpenSSL::Digest::SHA1.new, url_shortcut.to_s + external_or_caren_id.to_s )
       return CGI.escape(Base64.encode64(digest))
     end
-    
+
     # Verify photo url signature using the caren public key
     def verify_photo_signature signature, url_shortcut, external_id, public_key=self.caren_public_key
       return false unless public_key
       signature = Base64.decode64(CGI.unescape(signature.to_s))
       public_key.verify( OpenSSL::Digest::SHA1.new, signature, url_shortcut.to_s + external_id.to_s )
     end
-        
+
     private
-                
+
     # Raise a Caren exception on errors
     def handle_error response
       errors = []
@@ -214,7 +214,7 @@ module Caren
       end
       raise Caren::Exceptions::ServerSideError.new(errors)
     end
-    
+
   end
 
 end

data/lib/caren/client.rb

@@ -1,5 +1,5 @@
 class Caren::Client < Caren::Base
-    
+
   def self.keys
     [ :external_id,     # String (Your client id)
       :uid,             # String (Customer unique code)
@@ -13,13 +13,13 @@ class Caren::Client < Caren::Base
       :address_country  # String
     ] + super
   end
-    
+
   def self.array_root
     :clients
   end
-  
+
   def self.node_root
     :client
   end
-  
-end
+
+end

data/lib/caren/error.rb

@@ -1,24 +1,24 @@
 # This class provides a wrapper for caren's server side errors.
-class Caren::Error  
-  
+class Caren::Error
+
   attr_accessor :category, :message, :attributes
-  
+
   def initialize category, message="", attributes={}
     self.category = category
     self.message = message
     self.attributes = attributes
   end
-  
+
 end
 
 class Caren::ValidationError < Caren::Error
-  
+
   def field
     attributes[:on]
   end
-  
+
   def to_s
     "`#{field}` #{message}"
   end
-  
-end
+
+end

data/lib/caren/event.rb

@@ -1,7 +1,7 @@
-# This class is just an intermediate for exporting events to Caren. 
-# It has the correct format for exports. 
+# This class is just an intermediate for exporting events to Caren.
+# It has the correct format for exports.
 class Caren::Event < Caren::Base
-      
+
   def self.keys
     [ :external_id,       # String Unique identifying string (Your event id)
       :name,              # String
@@ -17,7 +17,7 @@ class Caren::Event < Caren::Base
       :source             # String (remote_schedule,remote_realisation)
     ] + super
   end
-  
+
   def self.array_root
    :events
   end
@@ -25,5 +25,5 @@ class Caren::Event < Caren::Base
   def self.node_root
    :event
   end
-    
-end
+
+end

data/lib/caren/event_slot.rb

@@ -5,7 +5,7 @@ class Caren::EventSlot < Caren::Base
     [ :date,              # Date
       :start,             # String
       :duration,          # Integer
-    ] + super
+    ]
   end
 
   def self.array_root

data/lib/caren/external_message.rb

@@ -1,10 +1,10 @@
 class Caren::ExternalMessage < Caren::Base
-      
+
   def self.keys
-    [ :id,                  # Integer (Caren message id) 
+    [ :id,                  # Integer (Caren message id)
       :person_name,         # String (Andre Foeken)
-      :person_id,           # Integer (Caren person id) 
-      :external_person_id,  # String (Your person id)      
+      :person_id,           # Integer (Caren person id)
+      :external_person_id,  # String (Your person id)
       :care_provider_id,    # Integer (Caren CP id)
       :body,                # Text
       :external_id,         # String (Your message id)
@@ -13,31 +13,31 @@ class Caren::ExternalMessage < Caren::Base
       :subject_id           # Integer (Caren person id)
     ] + super
   end
-  
+
   def self.all subject_id, session
     from_xml session.get(self.resource_url(subject_id))
   end
-  
+
   def self.find subject_id, id, session
     from_xml session.get(self.resource_url(subject_id,id))
   end
-  
+
   def create session
     self.class.from_xml session.post self.class.resource_url(self.subject_id), self.to_xml
   end
-  
+
   def delete session
     session.delete self.class.resource_url(self.subject_id,self.id)
   end
-  
+
   def self.array_root
     :external_messages
   end
-  
+
   def self.node_root
     :external_message
   end
-  
+
   def as_xml
     { :person_name => self.person_name,
       :external_person_id => self.external_person_id,
@@ -45,19 +45,19 @@ class Caren::ExternalMessage < Caren::Base
       :external_id => self.external_id,
       :in_reply_to_id => self.in_reply_to_id }
   end
-  
+
   def self.resource_location
     "/api/pro/people/%i/external_messages"
   end
-      
+
   private
 
   def resource_url subject_id, id=nil
     self.class.resource_url(subject_id,id)
   end
-  
+
   def self.resource_url subject_id, id=nil
     "#{self.resource_location % subject_id}#{id}"
   end
-    
-end
+
+end

data/lib/caren-api.rb

@@ -6,14 +6,14 @@ require "rest_client"
 require "rexml/document"
 require "base64"
 
-require "caren/caren.rb"
-require "caren/error.rb"
-require "caren/base.rb"
-require "caren/event.rb"
-require "caren/event_slot.rb"
-require "caren/client.rb"
-require "caren/care_provider.rb"
-require "caren/external_message.rb"
-require "caren/link.rb"
-require "caren/billable.rb"
-require "caren/billable_category.rb"
+require "caren/caren"
+require "caren/error"
+require "caren/base"
+require "caren/event"
+require "caren/event_slot"
+require "caren/client"
+require "caren/care_provider"
+require "caren/external_message"
+require "caren/link"
+require "caren/billable"
+require "caren/billable_category"

data/spec/billable_category_spec.rb

@@ -1,40 +1,40 @@
 require 'spec_helper'
 
 describe "BillableCategory", "converting to xml" do
-    
+
   before do
     @billable_category_a = Caren::BillableCategory.new( :name => "Services" )
     @billable_category_b = Caren::BillableCategory.new( :name => "Products" )
   end
-  
+
   it "should be able to convert a product to valid xml" do
     @billable_category_a.should convert_to_valid_caren_xml
   end
-  
+
   it "should be able to convert an array of products to valid xml" do
     [@billable_category_a,@billable_category_b].should convert_to_valid_caren_array_xml
   end
-  
+
 end
 
 describe "BillableCategory", "REST methods" do
-  
+
   before do
     billable_category = File.read("spec/fixtures/caren_billable_category.xml")
     billable_categories = File.read("spec/fixtures/caren_billable_categories.xml")
     billable_categories_search = File.read("spec/fixtures/caren_billable_categories_search.xml")
-    
+
     billable_category_url = Caren::Api.session.url_for( Caren::BillableCategory.resource_url(1) )
     billable_categories_url = Caren::Api.session.url_for( Caren::BillableCategory.resource_url )
     search_url = Caren::Api.session.url_for( "#{Caren::BillableCategory.resource_url}?key=name&value=billables" )
-    
+
     timestamp = DateTime.now.to_i
-    
-    FakeWeb.register_uri(:get, billable_categories_url, :body => billable_categories, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,billable_categories) )  
-    FakeWeb.register_uri(:get, billable_category_url, :body => billable_category, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,billable_category) )                                                           
+
+    FakeWeb.register_uri(:get, billable_categories_url, :body => billable_categories, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,billable_categories) )
+    FakeWeb.register_uri(:get, billable_category_url, :body => billable_category, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,billable_category) )
     FakeWeb.register_uri(:get, search_url, :body => billable_categories_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,billable_categories_search) )
   end
-    
+
   it "should be able to search for a specific billable category" do
     billable_categories = Caren::BillableCategory.search :name, "billables", Caren::Api.session
     billable_categories.should have(1).things
@@ -45,11 +45,11 @@ describe "BillableCategory", "REST methods" do
     billable_category = Caren::BillableCategory.find 1, Caren::Api.session
     billable_category.name.should == "Billables"
   end
-  
+
   it "should be able to find all billable category" do
     billable_categories = Caren::BillableCategory.all Caren::Api.session
     billable_categories.should have(2).things
     billable_categories.first.name.should == "Products"
   end
-    
-end
+
+end

data/spec/billable_spec.rb

@@ -1,46 +1,46 @@
 require 'spec_helper'
 
 describe "Billable", "converting to xml" do
-    
+
   before do
     @billable_a = Caren::Billable.new( :name => "Washing", :price => 100.euros, :in_store => true, :type => "Product" )
     @billable_b = Caren::Billable.new( :name => "Bedpan", :price => 100.euros, :in_store => false, :type => "Product" )
   end
-  
+
   it "should be able to convert a billable to valid xml" do
     @billable_a.should convert_to_valid_caren_xml
   end
-  
+
   it "should be able to convert an array of billables to valid xml" do
     [@billable_a,@billable_b].should convert_to_valid_caren_array_xml
   end
-  
+
 end
 
 describe "Billable", "REST methods" do
-  
+
   before do
     billable = File.read("spec/fixtures/caren_billable.xml")
     billables = File.read("spec/fixtures/caren_billables.xml")
     billable_search = File.read("spec/fixtures/caren_billables_search.xml")
-    
-    billable_url = Caren::Api.session.url_for( Caren::Billable.resource_url(1) )    
+
+    billable_url = Caren::Api.session.url_for( Caren::Billable.resource_url(1) )
     billables_url = Caren::Api.session.url_for( Caren::Billable.resource_url )
     search_url = Caren::Api.session.url_for( "#{Caren::Billable.resource_url}?key=name&value=bedpan" )
-    
+
     timestamp = DateTime.now.to_i
 
     FakeWeb.register_uri(:post, billables_url, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp) )
     FakeWeb.register_uri(:put, billable_url, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp) )
-    FakeWeb.register_uri(:get, billables_url, :body => billables, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,billables) )   
-    FakeWeb.register_uri(:get, billable_url, :body => billable, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,billable) )                                                                                                                       
+    FakeWeb.register_uri(:get, billables_url, :body => billables, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,billables) )
+    FakeWeb.register_uri(:get, billable_url, :body => billable, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,billable) )
     FakeWeb.register_uri(:get, search_url, :body => billable_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,nil,billable_search) )
   end
-  
+
   it "should be able to update a billable" do
     lambda{ Caren::Billable.new( :id => 1, :name => "Bedpan" ).update( Caren::Api.session ) }.should_not raise_error
   end
-  
+
   it "should be able to update the photo for a product" do
     lambda{ Caren::Billable.new( :id => 1 ).update_photo( "spec/fixtures/bacon.jpg", Caren::Api.session ) }.should_not raise_error
   end
@@ -49,17 +49,17 @@ describe "Billable", "REST methods" do
     billable = Caren::Billable.find 1, Caren::Api.session
     billable.name.should == "Dishwashing"
   end
-  
+
   it "should be able to search for a specific product" do
     billables = Caren::Billable.search :name, "bedpan", Caren::Api.session
     billables.should have(1).things
     billables.first.name.should == "bedpan"
   end
-  
+
   it "should be able to find all billables" do
     billables = Caren::Billable.all Caren::Api.session
     billables.should have(2).things
     billables.first.name.should == "Dishwashing"
   end
-  
-end
+
+end

data/spec/care_provider_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "CareProvider", "converting to xml" do
-    
+
   before do
     @care_provider_a = Caren::CareProvider.new( :name => "Zuwe",
       :telephone => "112",
@@ -17,7 +17,7 @@ describe "CareProvider", "converting to xml" do
       :show_employee_name_as_title => true,
       :show_employee_names => true,
       :communication => true )
-    
+
     @care_provider_b = Caren::CareProvider.new( :name => "Aveant",
       :telephone => "112",
       :website => "http://www.aveant.nl",
@@ -31,17 +31,17 @@ describe "CareProvider", "converting to xml" do
       :max_start => "00:00",
       :show_employee_name_as_title => true,
       :show_employee_names => true,
-      :communication => true )    
+      :communication => true )
   end
-  
+
   it "should be able to convert a person to valid xml" do
     @care_provider_a.should convert_to_valid_caren_xml
   end
-  
+
   it "should be able to convert an array of people to valid xml" do
     [@care_provider_a,@care_provider_b].should convert_to_valid_caren_array_xml
   end
-  
+
   it "should be able to generate a proper xml file to update the logo" do
     filename = "spec/fixtures/bacon.jpg"
     xml = @care_provider_a.to_logo_xml filename
@@ -52,11 +52,11 @@ describe "CareProvider", "converting to xml" do
       cp.text.should == Base64.encode64(File.open(filename).read)
     end
   end
-  
+
 end
 
 describe "CareProvider" do
-  
+
   it "should be able to convert a image file path to a hash suited for xml conversion" do
     filename = "spec/fixtures/bacon.jpg"
     logo = Caren::CareProvider.hash_from_image( filename )
@@ -64,53 +64,53 @@ describe "CareProvider" do
     logo[:name].should == "bacon.jpg"
     logo[:content].should == Base64.encode64(File.open(filename).read)
   end
-    
+
 end
 
 describe "CareProvider", "REST methods" do
-  
+
   before do
     care_provider = File.read("spec/fixtures/caren_care_provider.xml")
     care_providers = File.read("spec/fixtures/caren_care_providers.xml")
     care_providers_search = File.read("spec/fixtures/caren_care_providers_search.xml")
 
-    care_provider_url = Caren::Api.session.url_for( Caren::CareProvider.resource_url(1) )    
+    care_provider_url = Caren::Api.session.url_for( Caren::CareProvider.resource_url(1) )
     care_providers_url = Caren::Api.session.url_for( Caren::CareProvider.resource_url )
     search_url = Caren::Api.session.url_for( "#{Caren::CareProvider.resource_url}?key=url-shortcut&value=pantein" )
-    
+
     timestamp = DateTime.now.to_i
-    
-    FakeWeb.register_uri(:put, care_provider_url, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp) )    
+
+    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,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
     lambda{ Caren::CareProvider.new( :id => 1, :name => "Test" ).update( Caren::Api.session ) }.should_not raise_error
   end
-  
+
   it "should be able to update the logo for a care provider" do
     lambda{ Caren::CareProvider.new( :id => 1 ).update_logo( "spec/fixtures/bacon.jpg", Caren::Api.session ) }.should_not raise_error
   end
-  
+
   it "should be able to search for a specific care provider" do
     care_providers = Caren::CareProvider.search :url_shortcut, "pantein", Caren::Api.session
     care_providers.should have(1).things
     care_providers.first.name.should == "Pantein"
     care_providers.first.url_shortcut.should == "pantein"
   end
-  
+
   it "should be able to find all care providers" do
     care_providers = Caren::CareProvider.all Caren::Api.session
     care_providers.should have(2).things
     care_providers.first.name.should == "Demo"
     care_providers.first.url_shortcut.should == "demo"
   end
-  
+
   it "should be able to find one care providers" do
     care_provider = Caren::CareProvider.find 1, Caren::Api.session
     care_provider.name.should == "Demo"
   end
-    
-end
+
+end

data/spec/caren_spec.rb

@@ -1,53 +1,53 @@
 require 'spec_helper'
 
 describe "Caren", "signature checks" do
-  
+
   before do
     @incorrect_url = "/test_with_incorrect_signature"
     @correct_url   = "/test_with_correct_signature"
     @error_url     = "/test_with_errors"
-    
+
     FakeWeb.register_uri(:get, Caren::Api.session.url_for(@incorrect_url), :body => "TEST", :signature => "[INCORRECT]" )
     FakeWeb.register_uri(:post, Caren::Api.session.url_for(@incorrect_url), :body => "TEST", :signature => "[INCORRECT]" )
     FakeWeb.register_uri(:put, Caren::Api.session.url_for(@incorrect_url), :body => "TEST", :signature => "[INCORRECT]" )
     FakeWeb.register_uri(:delete, Caren::Api.session.url_for(@incorrect_url), :body => "TEST", :signature => "[INCORRECT]" )
-    
+
     FakeWeb.register_uri(:get, Caren::Api.session.url_for(@correct_url), :body => "TEST", :signature => Caren::Api.session.sign("TEST") )
     FakeWeb.register_uri(:post, Caren::Api.session.url_for(@correct_url), :body => "TEST", :signature => Caren::Api.session.sign("TEST") )
     FakeWeb.register_uri(:put, Caren::Api.session.url_for(@correct_url), :body => "TEST", :signature => Caren::Api.session.sign("TEST") )
     FakeWeb.register_uri(:delete, Caren::Api.session.url_for(@correct_url), :body => "TEST", :signature => Caren::Api.session.sign("TEST") )
-    
+
     errors = File.read "spec/fixtures/caren_care_provider_validation.xml"
-    unauth = File.read "spec/fixtures/caren_unauthorized.xml"  
+    unauth = File.read "spec/fixtures/caren_unauthorized.xml"
     FakeWeb.register_uri(:get, Caren::Api.session.url_for(@error_url), :status => 406, :body => errors, :signature => Caren::Api.session.sign(errors) )
     FakeWeb.register_uri(:post, Caren::Api.session.url_for(@error_url), :status => 406, :body => errors, :signature => Caren::Api.session.sign(errors) )
     FakeWeb.register_uri(:put, Caren::Api.session.url_for(@error_url), :status => 406, :body => errors, :signature => Caren::Api.session.sign(errors) )
     FakeWeb.register_uri(:delete, Caren::Api.session.url_for(@error_url), :status => 403, :body => unauth, :signature => Caren::Api.session.sign(unauth) )
   end
-    
+
   it "should not accept result swith an incorrect signature" do
     lambda{ Caren::Api.session.get @incorrect_url }.should raise_error
     lambda{ Caren::Api.session.post @incorrect_url, "" }.should raise_error
     lambda{ Caren::Api.session.put @incorrect_url, "" }.should raise_error
     lambda{ Caren::Api.session.delete @incorrect_url }.should raise_error
   end
-  
+
   it "should accept results with a correct signature" do
     lambda{ Caren::Api.session.get @correct_url }.should_not raise_error
     lambda{ Caren::Api.session.post @correct_url, "" }.should_not raise_error
     lambda{ Caren::Api.session.put @correct_url, "" }.should_not raise_error
     lambda{ Caren::Api.session.delete @correct_url }.should_not raise_error
   end
-  
+
   it "should be able to handle server side errors" do
-    
+
     lambda{ Caren::Api.session.get @error_url }.should raise_error(Caren::Exceptions::ServerSideError)
     lambda{ Caren::Api.session.put @error_url, "" }.should raise_error(Caren::Exceptions::ServerSideError)
     lambda{ Caren::Api.session.post @error_url, "" }.should raise_error(Caren::Exceptions::ServerSideError)
     lambda{ Caren::Api.session.delete @error_url }.should raise_error(Caren::Exceptions::ServerSideError)
-      
+
   end
-  
+
   it "should be able to handle authorization errors" do
     begin
       Caren::Api.session.delete @error_url
@@ -56,9 +56,9 @@ describe "Caren", "signature checks" do
       e.errors.first.class.should == Caren::Error
       e.errors.first.category.should == "unauthorized"
       e.errors.first.message.should == "You are not allowed to perform this action."
-    end  
+    end
   end
-  
+
   it "should be able to handle validation errors" do
     begin
       Caren::Api.session.get @error_url
@@ -68,25 +68,25 @@ describe "Caren", "signature checks" do
       e.errors.first.message.should == "has already been taken"
       e.errors.first.field.should == :url_shortcut
       e.errors.first.to_s.should == "`url_shortcut` has already been taken"
-    end  
+    end
   end
-  
+
   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, nil, incoming), timestamp )
-    results.should have(4).things    
+    results.should have(4).things
     external_messages = results.select{ |x| x.is_a?(Caren::ExternalMessage) }
-    external_messages.first.id.should == 1    
+    external_messages.first.id.should == 1
     links = results.select{ |x| x.is_a?(Caren::Link) }
     links.last.id.should == 3
   end
-  
+
   it "should be able to parse just one incoming object from xml from caren" do
     incoming = File.read "spec/fixtures/incoming_single_object.xml"
-    object = Caren::Api.session.parse_object(incoming)    
-    object.body.should == 'Expecting this to work somehow ...'   
+    object = Caren::Api.session.parse_object(incoming)
+    object.body.should == 'Expecting this to work somehow ...'
     object.id.should == 1
   end
-  
-end
+
+end

data/spec/client_spec.rb

@@ -1,37 +1,37 @@
 require 'spec_helper'
 
 describe "Client", "converting to xml" do
-    
+
   before do
-    @client_a = Caren::Client.new( :external_id => 1, 
-                                   :uid => "ABC123", 
-                                   :first_name => "Andre", 
-                                   :last_name => "Foeken", 
-                                   :male => true, 
+    @client_a = Caren::Client.new( :external_id => 1,
+                                   :uid => "ABC123",
+                                   :first_name => "Andre",
+                                   :last_name => "Foeken",
+                                   :male => true,
                                    :date_of_birth => 80.years.ago.to_date,
-                                   :address_street => "Sesamestreet 1", 
-                                   :address_zipcode => "7500AA", 
-                                   :address_city => "Groenlo", 
+                                   :address_street => "Sesamestreet 1",
+                                   :address_zipcode => "7500AA",
+                                   :address_city => "Groenlo",
                                    :address_country => "The Netherlands" )
-    
-    @client_b = Caren::Client.new( :external_id => 2, 
-                                   :uid => "ABC456", 
-                                   :first_name => "Oscar", 
-                                   :last_name => "Foeken", 
-                                   :male => true, 
+
+    @client_b = Caren::Client.new( :external_id => 2,
+                                   :uid => "ABC456",
+                                   :first_name => "Oscar",
+                                   :last_name => "Foeken",
+                                   :male => true,
                                    :date_of_birth => 80.years.ago.to_date,
-                                   :address_street => "Sesamestreet 1", 
-                                   :address_zipcode => "7500AA", 
-                                   :address_city => "Groenlo", 
+                                   :address_street => "Sesamestreet 1",
+                                   :address_zipcode => "7500AA",
+                                   :address_city => "Groenlo",
                                    :address_country => "The Netherlands" )
   end
-  
+
   it "should be able to convert a client to valid xml" do
     @client_a.should convert_to_valid_caren_xml
   end
-  
+
   it "should be able to convert an array of people to valid xml" do
     [@client_a,@client_b].should convert_to_valid_caren_array_xml
   end
-  
-end
+
+end

data/spec/external_message_spec.rb

@@ -1,68 +1,68 @@
 require 'spec_helper'
 
 describe "ExternalMessage", "converting to xml" do
-    
+
   before do
     @external_message_a = Caren::ExternalMessage.new( :person_name => "Andre Foeken",
                                                       :external_person_id => 1,
                                                       :body => "Test message",
                                                       :external_id => 1,
                                                       :in_reply_to_id => nil )
-    
+
     @external_message_b = Caren::ExternalMessage.new( :person_name => "Ria Foeken",
                                                       :external_person_id => 2,
                                                       :body => "Test message reply",
                                                       :external_id => 2,
                                                       :in_reply_to_id => 99 )
   end
-  
+
   it "should be able to convert a link to valid xml" do
     @external_message_a.should convert_to_valid_caren_xml
   end
-  
+
   it "should be able to convert an array of links to valid xml" do
     [@external_message_a,@external_message_b].should convert_to_valid_caren_array_xml
   end
-  
+
 end
 
 describe "ExternalMessage", "REST methods" do
-  
+
   before do
     message = File.read("spec/fixtures/caren_external_message.xml")
     messages = File.read("spec/fixtures/caren_external_messages.xml")
-    
+
     messages_url = Caren::Api.session.url_for( Caren::ExternalMessage.resource_url(1) )
-    message_url = Caren::Api.session.url_for( Caren::ExternalMessage.resource_url(1,1) )    
+    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,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
-  
+
   it "should be able to find all external messages" do
     messages = Caren::ExternalMessage.all 1, Caren::Api.session
     messages.should have(2).things
     messages.first.body.should == "Test"
   end
-  
+
   it "should be able to find one external messages" do
     message = Caren::ExternalMessage.find 1, 1, Caren::Api.session
     message.body.should == "Test"
   end
-  
+
   it "should be able to create an external message" do
-    lambda{ Caren::ExternalMessage.new( :person_name => "Andre Foeken", 
-                                        :external_person_id => 1, 
-                                        :body => "Test message", 
-                                        :external_id => 1, 
+    lambda{ Caren::ExternalMessage.new( :person_name => "Andre Foeken",
+                                        :external_person_id => 1,
+                                        :body => "Test message",
+                                        :external_id => 1,
                                         :subject_id => 1 ).create(Caren::Api.session) }.should_not raise_error
   end
-  
+
   it "should be able to delete an external message" do
     lambda{ Caren::ExternalMessage.new( :subject_id => 1, :id => 1 ).delete(Caren::Api.session) }.should_not raise_error
   end
-  
-end
+
+end

data/spec/link_spec.rb

@@ -1,45 +1,45 @@
 require 'spec_helper'
 
 describe "Link", "converting to xml" do
-    
+
   before do
     @link_a = Caren::Link.new( :patient_number => "12345" )
     @link_b = Caren::Link.new( :patient_number => "67890" )
   end
-  
+
   it "should be able to convert a link to valid xml" do
     @link_a.should convert_to_valid_caren_xml
   end
-  
+
   it "should be able to convert an array of links to valid xml" do
     [@link_a,@link_b].should convert_to_valid_caren_array_xml
   end
-  
+
 end
 
 describe "Link", "REST methods" do
-  
+
   before do
     link  = File.read("spec/fixtures/caren_link.xml")
     links  = File.read("spec/fixtures/caren_links.xml")
     search = File.read("spec/fixtures/caren_links_search.xml")
-    
+
     link_url  = Caren::Api.session.url_for(Caren::Link.resource_url(1))
     links_url  = Caren::Api.session.url_for(Caren::Link.resource_url)
     search_url = Caren::Api.session.url_for("#{Caren::Link.resource_url}?key=external-id&value=1")
-    
+
     timestamp = DateTime.now.to_i
-    
+
     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
-  
+
   it "should be able to create a new link using the API" do
     lambda{ Caren::Link.new( :patient_number => "12345" ).create(Caren::Api.session) }.should_not raise_error
   end
-  
+
   it "should be find all links using the API" do
     links = Caren::Link.all(Caren::Api.session)
     links.should have(3).things
@@ -49,15 +49,15 @@ describe "Link", "REST methods" do
     links.first.person_name.should == "Andre Foeken"
     links.first.person_id.should == 3
   end
-  
+
   it "should be find all links using the API" do
     link = Caren::Link.find(1,Caren::Api.session)
     link.id.should == 1
   end
-  
+
   it "should be find a specific link using the API" do
     links = Caren::Link.search(:external_id, 1, Caren::Api.session)
     links.should have(1).thing
   end
-  
-end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caren-api
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 4
-  - 30
-  version: 0.4.30
+  - 31
+  version: 0.4.31
 platform: ruby
 authors: 
 - Andre Foeken