caren-api 0.4.29 → 0.4.30

data/VERSION

@@ -1 +1 @@
-0.4.29
+0.4.30

data/caren-api.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "caren-api"
-  s.version = "0.4.29"
+  s.version = "0.4.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/caren/client.rb",
     "lib/caren/error.rb",
     "lib/caren/event.rb",
+    "lib/caren/event_slot.rb",
     "lib/caren/external_message.rb",
     "lib/caren/link.rb",
     "spec/.DS_Store",
@@ -45,6 +46,7 @@ Gem::Specification.new do |s|
     "spec/care_provider_spec.rb",
     "spec/caren_spec.rb",
     "spec/client_spec.rb",
+    "spec/event_slot_spec.rb",
     "spec/event_spec.rb",
     "spec/external_message_spec.rb",
     "spec/fixtures/bacon.jpg",

data/lib/caren-api.rb

@@ -1,28 +1,19 @@
-begin
-  require "rubygems"
-rescue LoadError
-end
-
-require "active_support"
-require "active_support/core_ext"
-
-begin
-  require "active_support/secure_random"
-rescue LoadError
-end
+require "active_support/core_ext/hash/conversions"
+require "active_support/core_ext/array/conversions"
 
 require "builder"
 require "rest_client"
 require "rexml/document"
 require "base64"
 
-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/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/billable.rb"
-require "#{File.dirname(__FILE__)}/caren/billable_category.rb"
+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"

data/lib/caren/base.rb

@@ -2,9 +2,9 @@
 # The class provides basic functionality to convert objects to and from xml based
 # on the default Caren API format.
 class Caren::Base
-  
+
   attr_accessor :attributes
-  
+
   # Basic initializer, handles quick setting of passed attributes.
   def initialize args={}
     self.attributes = {}
@@ -21,32 +21,32 @@ class Caren::Base
     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
   def self.keys
     [ :updated_at, :created_at, :action ]
   end
-  
+
   # Root name of the XML array of objects
   def self.array_root
     :objects
   end
-  
+
   # Name of each XML if converted to XML
   def self.node_root
     :object
   end
-  
+
   # The relative location of this resource.
   def self.resource_location
     raise "No resource location found"
   end
-  
+
   # Convert an array of these objects to XML
   def self.to_xml array
     array.to_xml( :root => self.array_root )
   end
-  
+
   # Convert a XML string to a single object or an array of objects
   def self.from_xml xml
     return nil if xml == ''
@@ -60,45 +60,45 @@ class Caren::Base
       return self.new( hash )
     end
   end
-  
+
   # Convert this object to XML
   def to_xml options={}
     self.as_xml.to_xml(options.merge( :root => self.class.node_root ))
   end
-  
+
   # Overridable hash of attributes that is used for converting to XML.
   def as_xml
     attributes.reject{ |k,v| k == :action }
   end
-  
+
   # The absolute (constructed url) to the resource.
   def self.resource_url id=nil
     [self.resource_location,id].compact.join("/")
   end
-  
+
   def self.search_url key, value
     "#{self.resource_url}?key=#{key.to_s.dasherize}&value=#{value}"
   end
-  
+
   # The absolute (constructed url) to the resource.
   def resource_url id=nil
     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 -b --mime-type #{hash_or_path}`.gsub(/\n/,"").split(";")[0] }
   end
-  
+
   private
-  
+
   # Method missing calls to enable getters/setters
   def method_missing args, value=nil
     return self.attributes[args] if self.class.keys.include?(args)
     return self.attributes[args.to_s.gsub('=','').to_sym] = value if self.class.keys.include?(args.to_s.gsub('=','').to_sym)
     super
   end
-  
+
 end

data/lib/caren/event_slot.rb

@@ -0,0 +1,20 @@
+# This class is just an intermediate for representing potential event occurences.
+class Caren::EventSlot < Caren::Base
+
+  def self.keys
+    [ :date,              # Date
+      :start,             # String
+      :duration,          # Integer
+    ] + super
+  end
+
+  def self.array_root
+   :event_slots
+  end
+
+  def self.node_root
+   :event_slot
+  end
+
+end
+

data/lib/caren/link.rb

@@ -1,5 +1,5 @@
 class Caren::Link < Caren::Base
-      
+
   def self.keys
     [:id,               # Integer (Caren id)
      :person_name,      # String (Caren person name)
@@ -11,19 +11,19 @@ class Caren::Link < Caren::Base
      :status            # String (pending,confirmed,cancelled)
     ] + 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
-  
+
   # Request to create a new link. Example:
   # Caren::Link.new( :patient_number => 1234 ).create
   def create session
@@ -31,20 +31,20 @@ class Caren::Link < Caren::Base
   end
 
   def as_xml
-    { :patient_number => self.patient_number, 
+    { :patient_number => self.patient_number,
       :external_id => self.external_id }
   end
-  
+
   def self.array_root
     :links
   end
-  
+
   def self.node_root
     :link
   end
-  
+
   def self.resource_location
     "/api/pro/links"
   end
-        
-end
+
+end

data/spec/event_slot_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe "Event", "converting to xml" do
+
+  before do
+    @slot_a = Caren::EventSlot.new( :date => Date.today, :start => "10:00", :duration => 3600)
+    @slot_b = Caren::EventSlot.new( :date => Date.today + 1, :start => "10:00", :duration => 7200)
+  end
+
+  it "should be able to convert an event to valid xml" do
+    @slot_a.should convert_to_valid_caren_xml
+  end
+
+  it "should be able to convert an array of events to valid xml" do
+    [@slot_a,@slot_b].should convert_to_valid_caren_array_xml
+  end
+
+end

data/spec/event_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
 describe "Event", "converting to xml" do
-    
+
   before do
-    @event_a = Caren::Event.new( :external_id => 1, :name => "Washing", :comment => "Real good", :start => "12:00", 
-                                 :duration => 30, :valid_from => Date.today, :valid_to => Date.today+1.day, 
+    @event_a = Caren::Event.new( :external_id => 1, :name => "Washing", :comment => "Real good", :start => "12:00",
+                                 :duration => 30, :valid_from => Date.today, :valid_to => Date.today+1.day,
                                  :person_first_name => "Andre", :person_last_name => "Foeken", :person_male => true, :external_person_id => 100 )
-    
-    @event_b = Caren::Event.new( :external_id => 2, :name => "Clothing", :comment => "Real bad", 
-                                 :start => "13:00", :duration => 30, :valid_from => Date.today, :valid_to => Date.today+1.day, 
+
+    @event_b = Caren::Event.new( :external_id => 2, :name => "Clothing", :comment => "Real bad",
+                                 :start => "13:00", :duration => 30, :valid_from => Date.today, :valid_to => Date.today+1.day,
                                  :person_first_name => "Oscar", :person_last_name => "Foeken", :person_male => true, :external_person_id => 101 )
   end
-  
+
   it "should be able to convert an event to valid xml" do
     @event_a.should convert_to_valid_caren_xml
   end
-  
+
   it "should be able to convert an array of events to valid xml" do
     [@event_a,@event_b].should convert_to_valid_caren_array_xml
   end
-  
-end
+
+end

data/spec/spec_helper.rb

@@ -5,11 +5,11 @@ 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.
@@ -39,5 +39,5 @@ RSpec::Matchers.define :convert_to_valid_caren_array_xml do
 end
 
 RSpec.configure do |config|
-  
-end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caren-api
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 4
-  - 29
-  version: 0.4.29
+  - 30
+  version: 0.4.30
 platform: ruby
 authors: 
 - Andre Foeken
@@ -175,6 +175,7 @@ files:
 - lib/caren/client.rb
 - lib/caren/error.rb
 - lib/caren/event.rb
+- lib/caren/event_slot.rb
 - lib/caren/external_message.rb
 - lib/caren/link.rb
 - spec/.DS_Store
@@ -183,6 +184,7 @@ files:
 - spec/care_provider_spec.rb
 - spec/caren_spec.rb
 - spec/client_spec.rb
+- spec/event_slot_spec.rb
 - spec/event_spec.rb
 - spec/external_message_spec.rb
 - spec/fixtures/bacon.jpg