caren-api 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/caren-api.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{caren-api}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]
@@ -46,14 +46,19 @@ Gem::Specification.new do |s|
     "spec/event_spec.rb",
     "spec/external_message_spec.rb",
     "spec/fixtures/bacon.jpg",
+    "spec/fixtures/caren_care_provider.xml",
     "spec/fixtures/caren_care_provider_validation.xml",
     "spec/fixtures/caren_care_providers.xml",
     "spec/fixtures/caren_care_providers_search.xml",
+    "spec/fixtures/caren_external_message.xml",
     "spec/fixtures/caren_external_messages.xml",
+    "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",

data/lib/caren/base.rb

@@ -46,7 +46,7 @@ class Caren::Base
     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)
+    elsif hash.has_key?(self.node_root.to_s)
       return self.new( hash[self.node_root.to_s] )
     else
       return self.new( hash )

data/lib/caren/care_provider.rb

@@ -30,6 +30,10 @@ class Caren::CareProvider < Caren::Base
     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

data/lib/caren/external_message.rb

@@ -18,6 +18,10 @@ class Caren::ExternalMessage < Caren::Base
     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
     session.post self.class.resource_url(self.subject_id), self.to_xml
   end

data/lib/caren/link.rb

@@ -16,6 +16,10 @@ class Caren::Link < Caren::Base
     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

data/lib/caren/product.rb

@@ -22,6 +22,10 @@ class Caren::Product < Caren::Base
     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

data/lib/caren/product_category.rb

@@ -13,6 +13,10 @@ class Caren::ProductCategory < Caren::Base
     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

data/spec/care_provider_spec.rb

@@ -70,6 +70,7 @@ 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")
 
@@ -80,7 +81,8 @@ describe "CareProvider", "REST methods" do
     timestamp = DateTime.now.to_i
     
     FakeWeb.register_uri(:put, care_provider_url, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp) )    
-    FakeWeb.register_uri(:get, care_providers_url, :body => care_providers, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,care_providers) )                                                             
+    FakeWeb.register_uri(:get, care_provider_url, :body => care_provider, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,care_provider) )
+    FakeWeb.register_uri(:get, care_providers_url, :body => care_providers, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,care_providers) )
     FakeWeb.register_uri(:get, search_url, :body => care_providers_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,care_providers_search) )
   end
   
@@ -105,5 +107,10 @@ describe "CareProvider", "REST methods" do
     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

data/spec/external_message_spec.rb

@@ -29,15 +29,17 @@ 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) )
-    delete_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,messages), :timestamp => timestamp )
+    FakeWeb.register_uri(:get, message_url, :body => message, :signature => Caren::Api.session.sign(timestamp,message), :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 )
+    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
@@ -46,6 +48,11 @@ describe "ExternalMessage", "REST methods" do
     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, 

data/spec/fixtures/caren_care_provider.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<care-provider>
+  <url-shortcut>demo</url-shortcut>
+  <name>Demo</name>
+  <created-at type="datetime">2011-10-10T10:38:13+02:00</created-at>
+  <address-line></address-line>
+  <updated-at type="datetime">2011-10-10T10:38:13+02:00</updated-at>
+  <lng type="float">5.29127</lng>
+  <id type="integer">1</id>
+  <website></website>
+  <telephone></telephone>
+  <time-zone>Europe/Amsterdam</time-zone>
+  <lat type="float">52.1326</lat>
+  <email></email>
+  <logo></logo>
+  <linkable>true</linkable>
+</care-provider>

data/spec/fixtures/caren_external_message.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>

data/spec/fixtures/caren_link.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<link>
+  <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>
+  <id type="integer">1</id>
+  <care-provider-id type="integer">1</care-provider-id>
+  <person-id type="integer">3</person-id>
+  <person-name>Andre Foeken</person-name>
+  <person-photo>http://example.com/1.png</person-photo>
+  <external-id>1</external-id>
+  <status>confirmed</status>
+</link>

data/spec/fixtures/caren_product.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>

data/spec/fixtures/caren_product_category.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>

data/spec/link_spec.rb

@@ -20,14 +20,17 @@ 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,link) )
     FakeWeb.register_uri(:get, links_url, :body => links, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,links) )
     FakeWeb.register_uri(:get, search_url, :body => search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,search) )
     FakeWeb.register_uri(:post, links_url, :status => 201, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp) )
@@ -47,6 +50,11 @@ describe "Link", "REST methods" do
     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

data/spec/product_category_spec.rb

@@ -20,15 +20,18 @@ 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,product_categories) )                                                             
+    FakeWeb.register_uri(:get, product_categories_url, :body => product_categories, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product_categories) )  
+    FakeWeb.register_uri(:get, product_category_url, :body => product_category, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product_category) )                                                           
     FakeWeb.register_uri(:get, search_url, :body => product_categories_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product_categories_search) )
   end
     
@@ -37,6 +40,11 @@ describe "ProductCategory", "REST methods" do
     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

data/spec/product_spec.rb

@@ -20,6 +20,7 @@ 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")
     
@@ -31,7 +32,8 @@ describe "Product", "REST methods" do
     
     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, products_url, :body => products, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,products) )   
+    FakeWeb.register_uri(:get, product_url, :body => product, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product) )                                                                                                                       
     FakeWeb.register_uri(:get, search_url, :body => product_search, :timestamp => timestamp, :signature => Caren::Api.session.sign(timestamp,product_search) )
   end
   
@@ -42,6 +44,11 @@ describe "Product", "REST methods" do
   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

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 4
+  - 5
   segments_generated: true
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Andre Foeken
@@ -189,14 +189,19 @@ files:
 - spec/event_spec.rb
 - spec/external_message_spec.rb
 - spec/fixtures/bacon.jpg
+- spec/fixtures/caren_care_provider.xml
 - spec/fixtures/caren_care_provider_validation.xml
 - spec/fixtures/caren_care_providers.xml
 - spec/fixtures/caren_care_providers_search.xml
+- spec/fixtures/caren_external_message.xml
 - spec/fixtures/caren_external_messages.xml
+- 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