caren-api 0.4.10 → 0.4.11

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.4.11

data/caren-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{caren-api}
-  s.version = "0.4.10"
+  s.version = "0.4.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]
-  s.date = %q{2011-11-09}
+  s.date = %q{2011-11-15}
   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 = [
@@ -74,13 +74,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/foeken/caren-api}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Reference implementation of Caren CareProvider API}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<builder>, [">= 0"])

data/lib/caren/base.rb

@@ -89,7 +89,7 @@ class Caren::Base
   # 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] = value if self.class.keys.include?(args.to_s.gsub('=','').to_sym)
+    return self.attributes[args.to_s.gsub('=','').to_sym] = value if self.class.keys.include?(args.to_s.gsub('=','').to_sym)
     super
   end
   

data/lib/caren/caren.rb

@@ -101,7 +101,8 @@ module Caren
       { :links => Caren::Link, 
         :external_messages => Caren::ExternalMessage, 
         :care_providers => Caren::CareProvider,
-        :product_categories => Caren::ProductCategory
+        :product_categories => Caren::ProductCategory,
+        :products => Caren::Product
       }
     end
     
@@ -167,6 +168,13 @@ module Caren
       signature = Base64.decode64(CGI.unescape(signature.to_s))
       public_key.verify( "sha1", signature, string.to_s + timestamp.to_s )
     end
+    
+    # Verify photo url signature using the caren public key
+    def verify_photo_signature signature, url_shortcut, external_id, public_key=self.caren_public_key
+      return false unless public_key
+      signature = Base64.decode64(CGI.unescape(signature.to_s))
+      public_key.verify( "sha1", signature, url_shortcut.to_s + external_id.to_s )
+    end
         
     private
                 

data/lib/caren/product.rb

@@ -2,6 +2,7 @@ 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)
@@ -12,6 +13,7 @@ class Caren::Product < Caren::Base
       :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
@@ -50,6 +52,8 @@ class Caren::Product < Caren::Base
       :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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caren-api
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  segments_generated: true
+  version: 0.4.11
 platform: ruby
 authors: 
 - Andre Foeken
@@ -15,150 +15,140 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 +01:00
+date: 2011-11-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  name: i18n
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: i18n
-  version_requirements: *id001
+  requirement: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  name: activesupport
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: activesupport
-  version_requirements: *id002
+  requirement: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  name: builder
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: builder
-  version_requirements: *id003
+  requirement: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  name: rest-client
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 6
         - 7
+        segments_generated: true
         version: 1.6.7
-  name: rest-client
-  version_requirements: *id004
+  requirement: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  name: bundler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: bundler
-  version_requirements: *id005
+  requirement: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  name: rcov
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: rcov
-  version_requirements: *id006
+  requirement: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
+  name: capybara
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: capybara
-  version_requirements: *id007
+  requirement: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
+  name: rspec
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: rspec
-  version_requirements: *id008
+  requirement: *id008
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
+  name: fakeweb
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: fakeweb
-  version_requirements: *id009
+  requirement: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
+  name: jeweler
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: jeweler
-  version_requirements: *id010
+  requirement: *id010
   prerelease: false
 description: You can use this gem as inspiration of the base of your connections with Caren.
 email: andre.foeken@nedap.com
@@ -233,27 +223,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Reference implementation of Caren CareProvider API