caren-api 0.4.3 → 0.4.4

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.8.7@api
+rvm use 1.8.7@caren-api

data/Gemfile

@@ -3,13 +3,13 @@ source "http://rubygems.org"
 gem "i18n", ">= 0"
 gem "activesupport", ">= 0"
 gem "builder", ">= 0"
-gem "rest-client", ">= 0"
+gem "rest-client", "1.6.7"
 
 group :development do
   gem "bundler"
   gem "rcov"
   gem "capybara"
   gem "rspec"
-  gem "fakeweb", :git => "git://github.com/nedap/fakeweb.git", :branch => "master"
+  gem "fakeweb"
   gem "jeweler"
-end
+end

data/Gemfile.lock

@@ -1,14 +1,8 @@
-GIT
-  remote: git://github.com/nedap/fakeweb.git
-  revision: c91964160483fa2aeed89945461b50d75b9016b5
-  branch: master
-  specs:
-    fakeweb (1.2.2.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.0)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
     builder (3.0.0)
     capybara (1.1.1)
       mime-types (>= 1.16)
@@ -20,6 +14,7 @@ GEM
     childprocess (0.2.2)
       ffi (~> 1.0.6)
     diff-lcs (1.1.3)
+    fakeweb (1.3.0)
     ffi (1.0.9)
     git (1.2.5)
     i18n (0.6.0)
@@ -28,12 +23,13 @@ GEM
       git (>= 1.2.5)
       rake
     json_pure (1.6.1)
-    mime-types (1.16)
+    mime-types (1.17.1)
+    multi_json (1.0.3)
     nokogiri (1.5.0)
     rack (1.3.5)
     rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.8.7)
+    rake (0.9.2.2)
     rcov (0.9.11)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -41,14 +37,14 @@ GEM
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
       rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.0)
+    rspec-core (2.7.1)
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
     rubyzip (0.9.4)
-    selenium-webdriver (2.8.0)
+    selenium-webdriver (2.9.1)
       childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
+      ffi (= 1.0.9)
       json_pure
       rubyzip
     xpath (0.1.4)
@@ -62,9 +58,9 @@ DEPENDENCIES
   builder
   bundler
   capybara
-  fakeweb!
+  fakeweb
   i18n
   jeweler
   rcov
-  rest-client
+  rest-client (= 1.6.7)
   rspec

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/caren-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{caren-api}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]
-  s.date = %q{2011-10-21}
+  s.date = %q{2011-10-26}
   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 = [
@@ -38,6 +38,8 @@ Gem::Specification.new do |s|
     "lib/caren/external_message.rb",
     "lib/caren/link.rb",
     "lib/caren/person.rb",
+    "lib/caren/product.rb",
+    "lib/caren/product_category.rb",
     "spec/.DS_Store",
     "spec/care_provider_spec.rb",
     "spec/caren_spec.rb",
@@ -47,12 +49,20 @@ Gem::Specification.new do |s|
     "spec/fixtures/caren_care_provider_validation.xml",
     "spec/fixtures/caren_care_providers.xml",
     "spec/fixtures/caren_care_providers_search.xml",
+    "spec/fixtures/caren_external_messages.xml",
     "spec/fixtures/caren_links.xml",
     "spec/fixtures/caren_links_search.xml",
+    "spec/fixtures/caren_product_categories.xml",
+    "spec/fixtures/caren_product_categories_search.xml",
+    "spec/fixtures/caren_products.xml",
+    "spec/fixtures/caren_products_search.xml",
     "spec/fixtures/caren_unauthorized.xml",
     "spec/fixtures/incoming.xml",
+    "spec/fixtures/incoming_single_object.xml",
     "spec/link_spec.rb",
     "spec/person_spec.rb",
+    "spec/product_category_spec.rb",
+    "spec/product_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
@@ -70,7 +80,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<builder>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, ["= 1.6.7"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<capybara>, [">= 0"])
@@ -81,7 +91,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 0"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<rest-client>, ["= 1.6.7"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
@@ -93,7 +103,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 0"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<rest-client>, ["= 1.6.7"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])

data/lib/caren/base.rb

@@ -17,7 +17,7 @@ class Caren::Base
     
   # List of available attributes for this object
   def self.keys
-    []
+    [ :updated_at, :created_at, :action ]
   end
   
   # Root name of the XML array of objects
@@ -43,6 +43,7 @@ class Caren::Base
   # Convert a XML string to a single object or an array of objects
   def self.from_xml 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)
       return hash[self.array_root.to_s].map{ |h| self.from_xml(h) }
     elsif hash.has_key?(self.node_root)
@@ -76,6 +77,13 @@ class Caren::Base
     self.class.resource_url(id)
   end
   
+  def self.hash_from_image hash_or_path
+    return hash_or_path if hash_or_path.is_a?(Hash)
+    { :name => File.basename(hash_or_path),
+      :content => Base64.encode64(File.open(hash_or_path).read),
+      :content_type => `file -Ib #{hash_or_path}`.gsub(/\n/,"").split(";")[0] }
+  end
+  
   private
   
   # Method missing calls to enable getters/setters

data/lib/caren/care_provider.rb

@@ -5,12 +5,13 @@
 class Caren::CareProvider < Caren::Base
       
   def self.keys
-    [ :id,                          # String (The id of this CP inside Caren)
+    [ :id,                          # Integer (The id of this CP inside Caren)
       :name,                        # String
       :telephone,                   # String
       :website,                     # String
       :email,                       # String
       :address_line,                # String (Kerkstraat 1, 7522AH, Enschede)
+      :logo,                        # String
       :url_shortcut,                # String
       :time_zone,                   # String (Amsterdam)
       :resolution,                  # String (exact,daypart,range)
@@ -22,7 +23,7 @@ class Caren::CareProvider < Caren::Base
       :communication,               # Boolean
       :api_push_support,            # Boolean
       :api_url                      # String (Required url to api resources)
-    ]
+    ] + super
   end
     
   def self.search key, value, session
@@ -62,19 +63,12 @@ class Caren::CareProvider < Caren::Base
   
   def to_logo_xml logo_hash_or_path
     builder = Builder::XmlMarkup.new
-    logo = self.class.logo_hash(logo_hash_or_path)
+    logo = self.class.hash_from_image(logo_hash_or_path)
     xml = builder.care_provider do |care_provider|
       care_provider.tag!("logo", logo[:content], "name" => logo[:name], "content-type" => logo[:content_type] ) if logo
     end
   end
-  
-  def self.logo_hash logo_hash_or_path
-    return logo_hash_or_path if logo_hash_or_path.is_a?(Hash)
-    { :name => File.basename(logo_hash_or_path),
-      :content => Base64.encode64(File.open(logo_hash_or_path).read),
-      :content_type => `file -Ib #{logo_hash_or_path}`.gsub(/\n/,"").split(";")[0] }
-  end
-  
+    
   def self.resource_location
     "/api/pro/care_providers/"
   end

data/lib/caren/caren.rb

@@ -6,6 +6,8 @@ module Caren
     
     class SignatureMismatch < Caren::Exceptions::StandardError ; end
     
+    class InvalidXmlResponse < Caren::Exceptions::StandardError ; end
+    
     class ServerSideError < Caren::Exceptions::StandardError
       
       attr_accessor :errors
@@ -102,20 +104,48 @@ module Caren
       }
     end
     
+    # These types of Caren objects are supported by the Caren::Api.incoming method
+    def self.supported_incoming_single_objects
+      singles = {}
+      self.supported_incoming_objects.each do |object,klass|
+        singles[ klass.node_root ] = klass
+      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
-      if self.verify_signature(signature,xml)
-        objects = []
-        hash = Hash.from_xml(xml)["caren_objects"]
-        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
+    def incoming xml, signature, timestamp
+      if self.verify_signature(signature,timestamp, xml)
+       return parse(xml)
       else
         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            
+      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 :)                  
+      Caren::Api.supported_incoming_single_objects.each do |key, klass|
+        object = hash[key] || hash[key.to_s]
+        if object
+          return klass.new(object)
+        end
+      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
@@ -132,6 +162,7 @@ module Caren
     
     # Verify the signature using the caren public key
     def verify_signature signature, timestamp, 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 )
     end
@@ -149,8 +180,7 @@ module Caren
         else
           errors << Caren::Error.new( error.attributes["category"], error.text.strip )
         end
-      end        
-      y errors
+      end
       raise Caren::Exceptions::ServerSideError.new(errors)
     end
     

data/lib/caren/event.rb

@@ -14,7 +14,7 @@ class Caren::Event < Caren::Base
       :person_last_name,  # String
       :person_male,       # Boolean
       :external_person_id # String (Your person id)
-    ]
+    ] + super
   end
   
   def self.array_root

data/lib/caren/external_message.rb

@@ -1,17 +1,23 @@
 class Caren::ExternalMessage < Caren::Base
       
   def self.keys
-    [ :id,                  # String (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)      
+      :care_provider_id,    # Integer (Caren CP id)
       :body,                # Text
       :external_id,         # String (Your message id)
       :in_reply_to_id,      # Integer (Caren message id)
       :in_reply_to_type,    # The type of message this is a reply to. (Always ExternalMessage if reply is set)
       :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 create session
     session.post self.class.resource_url(self.subject_id), self.to_xml
   end

data/lib/caren/link.rb

@@ -1,14 +1,15 @@
 class Caren::Link < Caren::Base
       
   def self.keys
-    [:id,             # String (Caren id)
-     :person_name,    # String (Caren person name)
-     :person_id,      # String (Caren person id)
-     :person_photo,   # String (url of photo)
-     :patient_number, # String (12345)
-     :external_id,    # String (Your person id)
-     :status          # String (pending,confirmed,cancelled)
-    ]
+    [:id,               # Integer (Caren id)
+     :person_name,      # String (Caren person name)
+     :care_provider_id, # Integer
+     :person_id,        # String (Caren person id)
+     :person_photo,     # String (url of photo)
+     :patient_number,   # String (12345)
+     :external_id,      # String (Your person id)
+     :status            # String (pending,confirmed,cancelled)
+    ] + super
   end
   
   def self.search key, value, session

data/lib/caren/person.rb

@@ -11,7 +11,7 @@ class Caren::Person < Caren::Base
       :address_zipcode, # String
       :address_city,    # String
       :address_country  # String
-    ]
+    ] + super
   end
   
   def self.array_root

data/lib/caren/product.rb

@@ -0,0 +1,75 @@
+class Caren::Product < Caren::Base
+    
+  def self.keys
+    [ :id,                    # Integer (Id of this product in Caren)
+      :name,                  # String
+      :description,           # Text
+      :care_provider_id,      # Integer (Care provider id)
+      :product_category_id,   # Integer (Reference to product category; Caren id)
+      :photo,                 # String
+      :in_store,              # Boolean (Use in store)
+      :unit,                  # String (piece, minute, hour)
+      :price,                 # Integer (in eurocents)
+      :rounding,              # Integer (in minutes)
+      :min_amount,            # Integer (in minutes)
+      :status,                # String (pending, active)
+      :valid_from,            # Date
+      :valid_to               # Date
+    ] + super
+  end
+  
+  def self.search key, value, session
+    from_xml session.get( self.search_url(key,value) )
+  end
+  
+  def self.all session
+    from_xml session.get(self.resource_url)
+  end
+  
+  def create session
+    session.post(self.resource_url, self.to_xml)
+  end
+  
+  def update session
+    session.put(self.resource_url(self.id), self.to_xml)
+  end
+  
+  def update_photo photo_hash_or_path, session
+    session.put(self.resource_url(self.id), self.to_photo_xml(photo_hash_or_path))
+  end
+  
+  def as_xml
+    { :name => self.name,
+      :description => self.description,
+      :product_category_id => self.product_category_id,
+      :in_store => self.in_store,
+      :unit => self.unit,
+      :price => self.price,
+      :rounding => self.rounding,
+      :min_amount => self.min_amount,
+      :valid_from => self.valid_from,
+      :valid_to => self.valid_to
+    }
+  end
+  
+  def to_photo_xml photo_hash_or_path
+    builder = Builder::XmlMarkup.new
+    photo = self.class.hash_from_image(photo_hash_or_path)
+    xml = builder.product do |product|
+      product.tag!("photo", photo[:content], "name" => photo[:name], "content-type" => photo[:content_type] ) if photo
+    end
+  end
+  
+  def self.array_root
+    :products
+  end
+  
+  def self.node_root
+    :product
+  end
+  
+  def self.resource_location
+    "/api/pro/products/"
+  end
+  
+end

data/lib/caren/product_category.rb

@@ -0,0 +1,32 @@
+class Caren::ProductCategory < Caren::Base
+    
+  def self.keys
+    [ :id,                    # Integer (Id of this category in Caren)
+      :name,                  # String
+      :description,           # Text
+      :icon,                  # String
+      :product_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.all session
+    from_xml session.get(self.resource_url)
+  end
+    
+  def self.array_root
+    :product_categories
+  end
+  
+  def self.node_root
+    :product_category
+  end
+  
+  def self.resource_location
+    "/api/pro/product_categories/"
+  end
+  
+end

data/lib/caren-api.rb

@@ -18,4 +18,6 @@ require "#{File.dirname(__FILE__)}/caren/event.rb"
 require "#{File.dirname(__FILE__)}/caren/person.rb"
 require "#{File.dirname(__FILE__)}/caren/care_provider.rb"
 require "#{File.dirname(__FILE__)}/caren/external_message.rb"
-require "#{File.dirname(__FILE__)}/caren/link.rb"
+require "#{File.dirname(__FILE__)}/caren/link.rb"
+require "#{File.dirname(__FILE__)}/caren/product.rb"
+require "#{File.dirname(__FILE__)}/caren/product_category.rb"

data/spec/care_provider_spec.rb

@@ -59,7 +59,7 @@ 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.logo_hash( filename )
+    logo = Caren::CareProvider.hash_from_image( filename )
     logo[:content_type].should == "image/jpeg"
     logo[:name].should == "bacon.jpg"
     logo[:content].should == Base64.encode64(File.open(filename).read)
@@ -72,7 +72,7 @@ describe "CareProvider", "REST methods" do
   before do
     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_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" )

data/spec/caren_spec.rb

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

data/spec/external_message_spec.rb

@@ -29,14 +29,23 @@ end
 describe "ExternalMessage", "REST methods" do
   
   before do
-    post_url = Caren::Api.session.url_for( Caren::ExternalMessage.resource_url(1) )
+    messages = File.read("spec/fixtures/caren_external_messages.xml")
+    
+    messages_url = Caren::Api.session.url_for( Caren::ExternalMessage.resource_url(1) )
     delete_url = Caren::Api.session.url_for( Caren::ExternalMessage.resource_url(1,1) )    
     timestamp = DateTime.now.to_i
     
-    FakeWeb.register_uri(:post, post_url, :status => 201, :signature => Caren::Api.session.sign(timestamp), :timestamp => timestamp )
+    FakeWeb.register_uri(:get, messages_url, :body => messages, :signature => Caren::Api.session.sign(timestamp,messages), :timestamp => timestamp )
+    FakeWeb.register_uri(:post, messages_url, :status => 201, :signature => Caren::Api.session.sign(timestamp), :timestamp => timestamp )
     FakeWeb.register_uri(:delete, delete_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 create an external message" do
     lambda{ Caren::ExternalMessage.new( :person_name => "Andre Foeken", 
                                         :external_person_id => 1, 

data/spec/fixtures/caren_external_messages.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<external-messages type="array">
+  <external-message>
+    <created-at type="datetime">2011-09-09T15:14:13+02:00</created-at>
+    <body>Test</body>
+    <updated-at type="datetime">2011-09-09T15:14:13+02:00</updated-at>
+    <in-reply-to-id type="integer" nil="true"></in-reply-to-id>
+    <subject-id type="integer">5</subject-id>
+    <id type="integer">1</id>
+    <in-reply-to-type nil="true"></in-reply-to-type>
+    <care-provider-id type="integer">1</care-provider-id>
+    <person-id type="integer">1</person-id>
+    <external-person-id nil="true"></external-person-id>
+  </external-message>
+  <external-message>
+    <created-at type="datetime">2011-09-09T15:14:13+02:00</created-at>
+    <body>Does it work ...</body>
+    <updated-at type="datetime">2011-09-09T15:14:13+02:00</updated-at>
+    <in-reply-to-id type="integer" nil="true"></in-reply-to-id>
+    <subject-id type="integer">5</subject-id>
+    <id type="integer">2</id>
+    <in-reply-to-type nil="true"></in-reply-to-type>
+    <care-provider-id type="integer">1</care-provider-id>
+    <person-id type="integer">1</person-id>
+    <external-person-id nil="true"></external-person-id>
+  </external-message>
+</external-messages>

data/spec/fixtures/caren_product_categories.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<product-categories type="array">
+  <product-category>
+    <name>Products</name>
+    <created-at type="datetime">2011-10-10T10:38:49+02:00</created-at>
+    <updated-at type="datetime">2011-10-10T10:40:35+02:00</updated-at>
+    <product-category-id type="integer"></product-category-id>
+    <id type="integer">1</id>
+    <description>Generic products</description>
+    <icon>http://example.com/1.png</icon>
+  </product-category>
+  <product-category>
+    <name>Services</name>
+    <created-at type="datetime">2011-10-10T10:38:49+02:00</created-at>
+    <updated-at type="datetime">2011-10-10T10:40:35+02:00</updated-at>
+    <product-category-id type="integer"></product-category-id>
+    <id type="integer">2</id>
+    <description>Generic services</description>
+    <icon>http://example.com/2.png</icon>
+  </product-category>
+</product-categories>

data/spec/fixtures/caren_product_categories_search.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<product-categories type="array">
+  <product-category>
+    <name>products</name>
+    <created-at type="datetime">2011-10-10T10:38:49+02:00</created-at>
+    <updated-at type="datetime">2011-10-10T10:40:35+02:00</updated-at>
+    <product-category-id type="integer"></product-category-id>
+    <id type="integer">1</id>
+    <description>Generic products</description>
+    <icon>http://example.com/1.png</icon>
+  </product-category>
+</product-categories>

data/spec/fixtures/caren_products.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<products type="array">
+  <product>
+    <price type="integer">10000</price>
+    <in-store type="boolean">true</in-store>
+    <name>Dishwashing</name>
+    <created-at type="datetime">2011-10-10T10:38:49+02:00</created-at>
+    <updated-at type="datetime">2011-10-10T10:40:35+02:00</updated-at>
+    <valid-to type="date">9999-01-01</valid-to>
+    <product-category-id type="integer">1</product-category-id>
+    <id type="integer">1</id>
+    <valid-from type="date">2011-01-01</valid-from>
+    <unit>piece</unit>
+    <description>Nice Dishwashing</description>
+    <status>pending</status>
+    <rounding type="integer">0</rounding>
+    <photo>http://example.com/1.png</photo>
+  </product>
+  <product>
+    <price type="integer">12000</price>
+    <in-store type="boolean">true</in-store>
+    <name>Krukken</name>
+    <created-at type="datetime">2011-10-10T10:38:49+02:00</created-at>
+    <updated-at type="datetime">2011-10-10T10:40:35+02:00</updated-at>
+    <valid-to type="date">9999-01-01</valid-to>
+    <product-category-id type="integer">1</product-category-id>
+    <id type="integer">2</id>
+    <valid-from type="date">2011-01-01</valid-from>
+    <unit>piece</unit>
+    <description>Nice krukken</description>
+    <status>pending</status>
+    <rounding type="integer">0</rounding>
+    <photo>http://example.com/2.png</photo>
+  </product>
+</products>

data/spec/fixtures/caren_products_search.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<products type="array">
+  <product>
+    <price type="integer">10000</price>
+    <in-store type="boolean">true</in-store>
+    <name>bedpan</name>
+    <created-at type="datetime">2011-10-10T10:38:49+02:00</created-at>
+    <updated-at type="datetime">2011-10-10T10:40:35+02:00</updated-at>
+    <valid-to type="date">9999-01-01</valid-to>
+    <product-category-id type="integer">1</product-category-id>
+    <id type="integer">1</id>
+    <valid-from type="date">2011-01-01</valid-from>
+    <unit>piece</unit>
+    <description>Nice bedpan</description>
+    <status>pending</status>
+    <rounding type="integer">0</rounding>
+    <photo>http://example.com/1.png</photo>
+  </product>
+</products>

data/spec/fixtures/incoming_single_object.xml

@@ -0,0 +1,14 @@
+<external-message>
+  <created-at type="datetime">2011-09-09T15:14:13+02:00</created-at>
+  <body>Expecting this to work somehow ...</body>
+  <updated-at type="datetime">2011-09-09T15:14:13+02:00</updated-at>
+  <in-reply-to-id type="integer" nil="true"></in-reply-to-id>
+  <subject-id type="integer">5</subject-id>
+  <id type="integer">1</id>
+  <in-reply-to-type nil="true"></in-reply-to-type>
+  <care-provider-id type="integer">1</care-provider-id>
+  <person-id type="integer">2</person-id>
+  <person-first-name>Matthijs Langenberg</person-first-name>
+  <person-last-name></person-last-name>
+  <person-photo>http://example.com/1.png</person-photo>
+</external-message>

data/spec/product_category_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe "ProductCategory", "converting to xml" do
+    
+  before do
+    @product_category_a = Caren::ProductCategory.new( :name => "Services" )
+    @product_category_b = Caren::ProductCategory.new( :name => "Products" )
+  end
+  
+  it "should be able to convert a product to valid xml" do
+    @product_category_a.should convert_to_valid_caren_xml
+  end
+  
+  it "should be able to convert an array of products to valid xml" do
+    [@product_category_a,@product_category_b].should convert_to_valid_caren_array_xml
+  end
+  
+end
+
+describe "ProductCategory", "REST methods" do
+  
+  before do
+    product_categories = File.read("spec/fixtures/caren_product_categories.xml")
+    product_categories_search = File.read("spec/fixtures/caren_product_categories_search.xml")
+    
+    product_categories_url = Caren::Api.session.url_for( Caren::ProductCategory.resource_url )
+    search_url = Caren::Api.session.url_for( "#{Caren::ProductCategory.resource_url}?key=name&value=products" )
+    
+    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, search_url, :body => product_categories_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product_categories_search) )
+  end
+    
+  it "should be able to search for a specific product category" do
+    product_categories = Caren::ProductCategory.search :name, "products", Caren::Api.session
+    product_categories.should have(1).things
+    product_categories.first.name.should == "products"
+  end
+  
+  it "should be able to find all product category" do
+    product_categories = Caren::ProductCategory.all Caren::Api.session
+    product_categories.should have(2).things
+    product_categories.first.name.should == "Products"
+  end
+    
+end

data/spec/product_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe "Product", "converting to xml" do
+    
+  before do
+    @product_a = Caren::Product.new( :name => "Washing", :price => 100.euros, :in_store => true )
+    @product_b = Caren::Product.new( :name => "Bedpan", :price => 100.euros, :in_store => false )
+  end
+  
+  it "should be able to convert a product to valid xml" do
+    @product_a.should convert_to_valid_caren_xml
+  end
+  
+  it "should be able to convert an array of products to valid xml" do
+    [@product_a,@product_b].should convert_to_valid_caren_array_xml
+  end
+  
+end
+
+describe "Product", "REST methods" do
+  
+  before do
+    products = File.read("spec/fixtures/caren_products.xml")
+    product_search = File.read("spec/fixtures/caren_products_search.xml")
+    
+    product_url = Caren::Api.session.url_for( Caren::Product.resource_url(1) )    
+    products_url = Caren::Api.session.url_for( Caren::Product.resource_url )
+    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, search_url, :body => product_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product_search) )
+  end
+  
+  it "should be able to update a product" do
+    lambda{ Caren::Product.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::Product.new( :id => 1 ).update_photo( "spec/fixtures/bacon.jpg", Caren::Api.session ) }.should_not raise_error
+  end
+  
+  it "should be able to search for a specific product" do
+    products = Caren::Product.search :name, "bedpan", Caren::Api.session
+    products.should have(1).things
+    products.first.name.should == "bedpan"
+  end
+  
+  it "should be able to find all products" do
+    products = Caren::Product.all Caren::Api.session
+    products.should have(2).things
+    products.first.name.should == "Dishwashing"
+  end
+  
+end

data/spec/spec_helper.rb

@@ -4,6 +4,14 @@ require 'rspec'
 require 'fakeweb'
 require 'capybara'
 
+class Integer
+  
+  def euros
+    self*100
+  end
+  
+end
+
 # For the tests we need to know both the public and private key, so we share them here.
 # We also use a smaller key here, to make the tests faster.
 new_private_key = Caren::Api.generate_private_key( 512 )

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 3
+  - 4
   segments_generated: true
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Andre Foeken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 +02:00
+date: 2011-10-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,12 +62,14 @@ dependencies:
   name: rest-client
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
+        - 1
+        - 6
+        - 7
         segments_generated: true
-        version: "0"
+        version: 1.6.7
   requirement: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -179,6 +181,8 @@ files:
 - lib/caren/external_message.rb
 - lib/caren/link.rb
 - lib/caren/person.rb
+- lib/caren/product.rb
+- lib/caren/product_category.rb
 - spec/.DS_Store
 - spec/care_provider_spec.rb
 - spec/caren_spec.rb
@@ -188,12 +192,20 @@ files:
 - spec/fixtures/caren_care_provider_validation.xml
 - spec/fixtures/caren_care_providers.xml
 - spec/fixtures/caren_care_providers_search.xml
+- spec/fixtures/caren_external_messages.xml
 - spec/fixtures/caren_links.xml
 - spec/fixtures/caren_links_search.xml
+- spec/fixtures/caren_product_categories.xml
+- spec/fixtures/caren_product_categories_search.xml
+- spec/fixtures/caren_products.xml
+- spec/fixtures/caren_products_search.xml
 - spec/fixtures/caren_unauthorized.xml
 - spec/fixtures/incoming.xml
+- spec/fixtures/incoming_single_object.xml
 - spec/link_spec.rb
 - spec/person_spec.rb
+- spec/product_category_spec.rb
+- spec/product_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true