caren-api 0.4.22 → 0.4.23

data/VERSION

@@ -1 +1 @@
-0.4.22
+0.4.23

data/caren-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "caren-api"
-  s.version = "0.4.22"
+  s.version = "0.4.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]
-  s.date = "2012-02-03"
+  s.date = "2012-02-08"
   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 = [
@@ -31,6 +31,8 @@ Gem::Specification.new do |s|
     "init.rb",
     "lib/caren-api.rb",
     "lib/caren/base.rb",
+    "lib/caren/billable.rb",
+    "lib/caren/billable_category.rb",
     "lib/caren/care_provider.rb",
     "lib/caren/caren.rb",
     "lib/caren/client.rb",
@@ -38,15 +40,21 @@ Gem::Specification.new do |s|
     "lib/caren/event.rb",
     "lib/caren/external_message.rb",
     "lib/caren/link.rb",
-    "lib/caren/product.rb",
-    "lib/caren/product_category.rb",
     "spec/.DS_Store",
+    "spec/billable_category_spec.rb",
+    "spec/billable_spec.rb",
     "spec/care_provider_spec.rb",
     "spec/caren_spec.rb",
     "spec/client_spec.rb",
     "spec/event_spec.rb",
     "spec/external_message_spec.rb",
     "spec/fixtures/bacon.jpg",
+    "spec/fixtures/caren_billable.xml",
+    "spec/fixtures/caren_billable_categories.xml",
+    "spec/fixtures/caren_billable_categories_search.xml",
+    "spec/fixtures/caren_billable_category.xml",
+    "spec/fixtures/caren_billables.xml",
+    "spec/fixtures/caren_billables_search.xml",
     "spec/fixtures/caren_care_provider.xml",
     "spec/fixtures/caren_care_provider_validation.xml",
     "spec/fixtures/caren_care_providers.xml",
@@ -56,18 +64,10 @@ Gem::Specification.new do |s|
     "spec/fixtures/caren_link.xml",
     "spec/fixtures/caren_links.xml",
     "spec/fixtures/caren_links_search.xml",
-    "spec/fixtures/caren_product.xml",
-    "spec/fixtures/caren_product_categories.xml",
-    "spec/fixtures/caren_product_categories_search.xml",
-    "spec/fixtures/caren_product_category.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/product_category_spec.rb",
-    "spec/product_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]

data/lib/caren-api.rb

@@ -24,5 +24,5 @@ require "#{File.dirname(__FILE__)}/caren/client.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/product.rb"
-require "#{File.dirname(__FILE__)}/caren/product_category.rb"
+require "#{File.dirname(__FILE__)}/caren/billable.rb"
+require "#{File.dirname(__FILE__)}/caren/billable_category.rb"

data/lib/caren/base.rb

@@ -11,8 +11,9 @@ class Caren::Base
     self.class.keys.each do |key|
       self.attributes[key] = args[key] || args[key.to_s] || nil
     end
-    # We want to use #id (in Ruby 1.8.x we need to undef it)
+    # We want to use #id and #type (in Ruby 1.8.x we need to undef it)
     self.instance_eval('undef id') if self.respond_to?(:id)
+    self.instance_eval('undef type') if self.respond_to?(:type)
   end
     
   # List of available attributes for this object

data/lib/caren/billable.rb

@@ -0,0 +1,102 @@
+class Caren::Billable < Caren::Base
+    
+  def self.keys
+    [ :id,                      # Integer (Id of this product in Caren)
+      :external_id,             # Integer (Your id)
+      :name,                    # String
+      :description,             # Text
+      :care_provider_id,        # Integer (Care provider id)
+      :billable_category_id,    # Integer (Reference to product category; Caren id)
+      :photo,                   # String
+      :in_store,                # Boolean (Use in store)
+      :unit,                    # String (piece, minute, hour)
+      :price_with_vat_in_cents, # Integer
+      :currency,                # String (EUR,USD)
+      :rounding,                # Integer (in minutes)
+      :min_amount,              # Integer (in minutes)
+      :default_amount,          # Integer (in minutes)
+      :vat_promillage,          # Integer
+      :type,                    # String (Product,Service,ChatSession)
+      :status,                  # String (pending, active)
+      :send_reminder_subject,   # Boolean
+      :send_reminder_person,    # Boolean
+      :send_reminder_in_advance,# Integer (in minutes)
+      :plannable_by_subject,    # Boolean
+      :plannable_margin_before, # Integer (in minutes)
+      :plannable_margin_after,  # Integer (in minutes)
+      :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.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 create session
+    self.class.from_xml session.post(self.resource_url, self.to_xml)
+  end
+  
+  def update session
+    self.class.from_xml session.put(self.resource_url(self.id), self.to_xml)
+  end
+  
+  def update_photo photo_hash_or_path, session
+    self.class.from_xml 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,
+      :billable_category_id => self.billable_category_id,
+      :in_store => self.in_store,
+      :unit => self.unit,
+      :photo => self.photo,
+      :price_with_vat_in_cents => self.price_with_vat_in_cents,
+      :currency => self.currency,
+      :type => self.type,      
+      :rounding => self.rounding,
+      :vat_promillage => self.vat_promillage,
+      :external_id => self.external_id,
+      :min_amount => self.min_amount,
+      :default_amount => self.default_amount,
+      :send_reminder_subject => self.send_reminder_subject,   
+      :send_reminder_person => self.send_reminder_person,    
+      :send_reminder_in_advance => self.send_reminder_in_advance,
+      :plannable_by_subject => self.plannable_by_subject,
+      :plannable_margin_before => self.plannable_margin_before, 
+      :plannable_margin_after => self.plannable_margin_after,  
+      :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.billable do |billable|
+      billable.tag!("photo", photo[:content], "name" => photo[:name], "content-type" => photo[:content_type] ) if photo
+    end
+  end
+  
+  def self.array_root
+    :billables
+  end
+  
+  def self.node_root
+    :billable
+  end
+  
+  def self.resource_location
+    "/api/pro/store/billables"
+  end
+  
+end

data/lib/caren/{product_category.rb → billable_category.rb}

@@ -1,11 +1,11 @@
-class Caren::ProductCategory < Caren::Base
+class Caren::BillableCategory < 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)
+      :billable_category_id    # Integer (Parent category; Caren id; Nil for root node)
     ] + super
   end
   
@@ -22,15 +22,15 @@ class Caren::ProductCategory < Caren::Base
   end
     
   def self.array_root
-    :product_categories
+    :billable_categories
   end
   
   def self.node_root
-    :product_category
+    :billable_category
   end
   
   def self.resource_location
-    "/api/pro/store/product_categories"
+    "/api/pro/store/billable_categories"
   end
   
 end

data/lib/caren/caren.rb

@@ -118,8 +118,8 @@ module Caren
       { :links => Caren::Link, 
         :external_messages => Caren::ExternalMessage, 
         :care_providers => Caren::CareProvider,
-        :product_categories => Caren::ProductCategory,
-        :products => Caren::Product
+        :billable_categories => Caren::BillableCategory,
+        :billables => Caren::Billable
       }
     end
     

data/spec/billable_category_spec.rb

@@ -0,0 +1,55 @@
+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, 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
+    billable_categories.first.name.should == "Billables"
+  end
+
+  it "should be able to find a billable category" 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

data/spec/billable_spec.rb

@@ -0,0 +1,65 @@
+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) )    
+    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, 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
+
+  it "should be able to find a specific billable" 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

data/spec/fixtures/{caren_product.xml → caren_billable.xml}

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product>
+<billable>
   <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>
+  <billable-category-id type="integer">1</billable-category-id>
   <id type="integer">1</id>
   <valid-from type="date">2011-01-01</valid-from>
   <unit>piece</unit>
@@ -14,4 +14,5 @@
   <status>pending</status>
   <rounding type="integer">0</rounding>
   <photo>http://example.com/1.png</photo>
-</product>
+  <type>Product</type>
+</billable>

data/spec/fixtures/{caren_product_categories.xml → caren_billable_categories.xml}

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product-categories type="array">
-  <product-category>
+<billable-categories type="array">
+  <billable-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>
+    <billable-category-id type="integer"></billable-category-id>
     <id type="integer">1</id>
-    <description>Generic products</description>
+    <description>Generic billables</description>
     <icon>http://example.com/1.png</icon>
-  </product-category>
-  <product-category>
+  </billable-category>
+  <billable-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>
+    <billable-category-id type="integer"></billable-category-id>
     <id type="integer">2</id>
     <description>Generic services</description>
     <icon>http://example.com/2.png</icon>
-  </product-category>
-</product-categories>
+  </billable-category>
+</billable-categories>

data/spec/fixtures/{caren_product_categories_search.xml → caren_billable_categories_search.xml}

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product-categories type="array">
-  <product-category>
-    <name>products</name>
+<billable-categories type="array">
+  <billable-category>
+    <name>Billables</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>
+    <billable-category-id type="integer"></billable-category-id>
     <id type="integer">1</id>
-    <description>Generic products</description>
+    <description>Generic billables</description>
     <icon>http://example.com/1.png</icon>
-  </product-category>
-</product-categories>
+  </billable-category>
+</billable-categories>

data/spec/fixtures/{caren_product_category.xml → caren_billable_category.xml}

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product-category>
-  <name>Products</name>
+<billable-category>
+  <name>Billables</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>
+  <billable-category-id type="integer"></billable-category-id>
   <id type="integer">1</id>
-  <description>Generic products</description>
+  <description>Generic billables</description>
   <icon>http://example.com/1.png</icon>
-</product-category>
+</billable-category>

data/spec/fixtures/{caren_products.xml → caren_billables.xml}

@@ -1,35 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<products type="array">
-  <product>
+<billables type="array">
+  <billable>
     <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>
+    <billable-category-id type="integer">1</billable-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>
+    <type>Product</type>
     <photo>http://example.com/1.png</photo>
-  </product>
-  <product>
+  </billable>
+  <billable>
     <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>
+    <billable-category-id type="integer">1</billable-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>
+    <type>Product</type>
     <photo>http://example.com/2.png</photo>
-  </product>
-</products>
+  </billable>
+</billables>

data/spec/fixtures/{caren_products_search.xml → caren_billables_search.xml}

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<products type="array">
-  <product>
+<billables type="array">
+  <billable>
     <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>
+    <billable-category-id type="integer">1</billable-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>
+    <type>Product</type>
     <photo>http://example.com/1.png</photo>
-  </product>
-</products>
+  </billable>
+</billables>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caren-api
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 0
   - 4
-  - 22
-  version: 0.4.22
+  - 23
+  version: 0.4.23
 platform: ruby
 authors: 
 - Andre Foeken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-03 00:00:00 Z
+date: 2012-02-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -183,6 +183,8 @@ files:
 - init.rb
 - lib/caren-api.rb
 - lib/caren/base.rb
+- lib/caren/billable.rb
+- lib/caren/billable_category.rb
 - lib/caren/care_provider.rb
 - lib/caren/caren.rb
 - lib/caren/client.rb
@@ -190,15 +192,21 @@ files:
 - lib/caren/event.rb
 - lib/caren/external_message.rb
 - lib/caren/link.rb
-- lib/caren/product.rb
-- lib/caren/product_category.rb
 - spec/.DS_Store
+- spec/billable_category_spec.rb
+- spec/billable_spec.rb
 - spec/care_provider_spec.rb
 - spec/caren_spec.rb
 - spec/client_spec.rb
 - spec/event_spec.rb
 - spec/external_message_spec.rb
 - spec/fixtures/bacon.jpg
+- spec/fixtures/caren_billable.xml
+- spec/fixtures/caren_billable_categories.xml
+- spec/fixtures/caren_billable_categories_search.xml
+- spec/fixtures/caren_billable_category.xml
+- spec/fixtures/caren_billables.xml
+- spec/fixtures/caren_billables_search.xml
 - spec/fixtures/caren_care_provider.xml
 - spec/fixtures/caren_care_provider_validation.xml
 - spec/fixtures/caren_care_providers.xml
@@ -208,18 +216,10 @@ files:
 - spec/fixtures/caren_link.xml
 - spec/fixtures/caren_links.xml
 - spec/fixtures/caren_links_search.xml
-- spec/fixtures/caren_product.xml
-- spec/fixtures/caren_product_categories.xml
-- spec/fixtures/caren_product_categories_search.xml
-- spec/fixtures/caren_product_category.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/product_category_spec.rb
-- spec/product_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: http://github.com/foeken/caren-api

data/lib/caren/product.rb

@@ -1,83 +0,0 @@
-class Caren::Product < Caren::Base
-    
-  def self.keys
-    [ :id,                    # Integer (Id of this product in Caren)
-      :external_id,           # Integer (Your id)
-      :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)
-      :vat_promille,          # Integer
-      :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.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 create session
-    self.class.from_xml session.post(self.resource_url, self.to_xml)
-  end
-  
-  def update session
-    self.class.from_xml session.put(self.resource_url(self.id), self.to_xml)
-  end
-  
-  def update_photo photo_hash_or_path, session
-    self.class.from_xml 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,
-      :vat_promille => self.vat_promille,
-      :external_id => self.external_id,
-      :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/store/products"
-  end
-  
-end

data/spec/product_category_spec.rb

@@ -1,55 +0,0 @@
-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_category = File.read("spec/fixtures/caren_product_category.xml")
-    product_categories = File.read("spec/fixtures/caren_product_categories.xml")
-    product_categories_search = File.read("spec/fixtures/caren_product_categories_search.xml")
-    
-    product_category_url = Caren::Api.session.url_for( Caren::ProductCategory.resource_url(1) )
-    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,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
-    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 a product category" do
-    product_category = Caren::ProductCategory.find 1, Caren::Api.session
-    product_category.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

@@ -1,65 +0,0 @@
-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
-    product = File.read("spec/fixtures/caren_product.xml")
-    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,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
-    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 find a specific product" do
-    product = Caren::Product.find 1, Caren::Api.session
-    product.name.should == "Dishwashing"
-  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