caren-api 0.4.6 → 0.4.7

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/caren-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{caren-api}
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]
-  s.date = %q{2011-10-28}
+  s.date = %q{2011-11-08}
   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 = [
@@ -33,16 +33,17 @@ Gem::Specification.new do |s|
     "lib/caren/base.rb",
     "lib/caren/care_provider.rb",
     "lib/caren/caren.rb",
+    "lib/caren/client.rb",
     "lib/caren/error.rb",
     "lib/caren/event.rb",
     "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",
+    "spec/client_spec.rb",
     "spec/event_spec.rb",
     "spec/external_message_spec.rb",
     "spec/fixtures/bacon.jpg",
@@ -65,7 +66,6 @@ Gem::Specification.new do |s|
     "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",

data/lib/caren/base.rb

@@ -60,7 +60,7 @@ class Caren::Base
   
   # Overridable hash of attributes that is used for converting to XML.
   def as_xml
-    attributes
+    attributes.reject{ |k,v| k == :action }
   end
   
   # The absolute (constructed url) to the resource.

data/lib/caren/care_provider.rb

@@ -21,8 +21,6 @@ class Caren::CareProvider < Caren::Base
       :min_start,                   # String (07:00)
       :show_employee_name_as_title, # Boolean
       :communication,               # Boolean
-      :api_push_support,            # Boolean
-      :api_url                      # String (Required url to api resources)
     ] + super
   end
     
@@ -60,9 +58,8 @@ class Caren::CareProvider < Caren::Base
       :max_start => self.max_start,
       :show_employee_name_as_title => self.show_employee_name_as_title,
       :show_employee_names => self.show_employee_names,
-      :communication => self.communication,
-      :api_push_support => self.api_push_support,
-      :api_url => self.api_url }
+      :communication => self.communication 
+    }
   end
   
   def to_logo_xml logo_hash_or_path

data/lib/caren/{person.rb → client.rb}

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

data/lib/caren/event.rb

@@ -13,7 +13,8 @@ class Caren::Event < Caren::Base
       :person_first_name, # String
       :person_last_name,  # String
       :person_male,       # Boolean
-      :external_person_id # String (Your person id)
+      :external_person_id,# String (Your person id)
+      :source             # String (remote_schedule,remote_realisation)
     ] + super
   end
   

data/lib/caren/product.rb

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

data/lib/caren/product_category.rb

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

data/lib/caren-api.rb

@@ -15,7 +15,7 @@ require "#{File.dirname(__FILE__)}/caren/caren.rb"
 require "#{File.dirname(__FILE__)}/caren/error.rb"
 require "#{File.dirname(__FILE__)}/caren/base.rb"
 require "#{File.dirname(__FILE__)}/caren/event.rb"
-require "#{File.dirname(__FILE__)}/caren/person.rb"
+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"

data/spec/{person_spec.rb → client_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe "Person", "converting to xml" do
+describe "Client", "converting to xml" do
     
   before do
-    @person_a = Caren::Person.new( :external_id => 1, 
+    @client_a = Caren::Client.new( :external_id => 1, 
                                    :uid => "ABC123", 
                                    :first_name => "Andre", 
                                    :last_name => "Foeken", 
@@ -14,7 +14,7 @@ describe "Person", "converting to xml" do
                                    :address_city => "Groenlo", 
                                    :address_country => "The Netherlands" )
     
-    @person_b = Caren::Person.new( :external_id => 2, 
+    @client_b = Caren::Client.new( :external_id => 2, 
                                    :uid => "ABC456", 
                                    :first_name => "Oscar", 
                                    :last_name => "Foeken", 
@@ -26,12 +26,12 @@ describe "Person", "converting to xml" do
                                    :address_country => "The Netherlands" )
   end
   
-  it "should be able to convert a person to valid xml" do
-    @person_a.should convert_to_valid_caren_xml
+  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
-    [@person_a,@person_b].should convert_to_valid_caren_array_xml
+    [@client_a,@client_b].should convert_to_valid_caren_array_xml
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caren-api
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Andre Foeken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 +02:00
+date: 2011-11-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -186,16 +186,17 @@ files:
 - lib/caren/base.rb
 - lib/caren/care_provider.rb
 - lib/caren/caren.rb
+- lib/caren/client.rb
 - lib/caren/error.rb
 - lib/caren/event.rb
 - 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
+- spec/client_spec.rb
 - spec/event_spec.rb
 - spec/external_message_spec.rb
 - spec/fixtures/bacon.jpg
@@ -218,7 +219,6 @@ files:
 - 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