caren-api 0.4.24 → 0.4.25

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+notifications:
+  email:
+    - info@carenzorgt.nl

data/Gemfile

@@ -1,13 +1,16 @@
 source "http://rubygems.org"
 
-gem "i18n", ">= 0"
-gem "activesupport", ">= 0"
-gem "builder", ">= 0"
+gem "i18n"
+gem "activesupport"
+gem "builder"
 gem "rest-client", "1.6.7"
 
+platforms :jruby do
+  gem "jruby-openssl"
+end
+
 group :development do
   gem "bundler"
-  gem "rcov"
   gem "capybara"
   gem "rspec"
   gem "fakeweb"

data/Rakefile

@@ -31,9 +31,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.4.24
+0.4.25

data/caren-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "caren-api"
-  s.version = "0.4.24"
+  s.version = "0.4.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Foeken"]
-  s.date = "2012-02-08"
+  s.date = "2012-02-09"
   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 = [
@@ -17,9 +17,8 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
-    ".rvmrc",
+    ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -85,8 +84,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<builder>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, ["= 1.6.7"])
+      s.add_runtime_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<capybara>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
@@ -96,8 +95,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<rest-client>, ["= 1.6.7"])
+      s.add_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
@@ -108,8 +107,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<rest-client>, ["= 1.6.7"])
+    s.add_dependency(%q<jruby-openssl>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<fakeweb>, [">= 0"])

data/lib/caren/base.rb

@@ -89,7 +89,7 @@ class Caren::Base
     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 -Ib #{hash_or_path}`.gsub(/\n/,"").split(";")[0] }
+      :content_type => `file -b --mime-type #{hash_or_path}`.gsub(/\n/,"").split(";")[0] }
   end
   
   private
@@ -101,4 +101,4 @@ class Caren::Base
     super
   end
   
-end
+end

data/lib/caren/billable.rb

@@ -12,18 +12,20 @@ class Caren::Billable < Caren::Base
       :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)
+      :rounding,                # Integer (in seconds)
+      :min_amount,              # Integer (in seconds)
+      :default_amount,          # Integer (in seconds)
+      :piece_duration,          # Integer (in seconds)
       :vat_promillage,          # Integer
       :type,                    # String (Store::Product,Store::Service,Store::ChatSession)
       :status,                  # String (pending, active)
       :send_reminder_subject,   # Boolean
       :send_reminder_person,    # Boolean
-      :send_reminder_in_advance,# Integer (in minutes)
+      :send_reminder_in_advance,# Integer (in seconds)
       :plannable_by_subject,    # Boolean
-      :plannable_margin_before, # Integer (in minutes)
-      :plannable_margin_after,  # Integer (in minutes)
+      :plannable_margin_before, # Integer (in seconds)
+      :plannable_margin_after,  # Integer (in seconds)
+      :plannable_max_duration,  # Integer (in seconds)
       :valid_from,              # Date
       :valid_to                 # Date
     ] + super
@@ -66,6 +68,7 @@ class Caren::Billable < Caren::Base
       :rounding => self.rounding,
       :vat_promillage => self.vat_promillage,
       :external_id => self.external_id,
+      :piece_duration => self.piece_duration,
       :min_amount => self.min_amount,
       :default_amount => self.default_amount,
       :send_reminder_subject => self.send_reminder_subject,   
@@ -74,6 +77,7 @@ class Caren::Billable < Caren::Base
       :plannable_by_subject => self.plannable_by_subject,
       :plannable_margin_before => self.plannable_margin_before, 
       :plannable_margin_after => self.plannable_margin_after,  
+      :plannable_max_duration => self.plannable_max_duration,  
       :valid_from => self.valid_from,
       :valid_to => self.valid_to
     }

data/lib/caren/caren.rb

@@ -168,7 +168,7 @@ module Caren
     # Timestamp is UNIX timestamp seconds since 1970
     def sign timestamp, path=nil, string=nil, private_key=self.private_key
       path = URI.parse(path).path if path
-      encrypted_digest = private_key.sign( "sha1", path.to_s + string.to_s + timestamp.to_s )
+      encrypted_digest = private_key.sign( OpenSSL::Digest::SHA1.new, path.to_s + string.to_s + timestamp.to_s )
       signature = CGI.escape(Base64.encode64(encrypted_digest))
       return signature
     end
@@ -183,11 +183,11 @@ module Caren
     def verify_signature signature, timestamp, path, string=nil, public_key=self.caren_public_key
       return false unless public_key
       signature = Base64.decode64(CGI.unescape(signature.to_s))
-      public_key.verify( "sha1", signature, path.to_s + string.to_s + timestamp.to_s )
+      public_key.verify( OpenSSL::Digest::SHA1.new, signature, path.to_s + string.to_s + timestamp.to_s )
     end
         
     def create_photo_signature url_shortcut, external_or_caren_id, private_key=self.private_key
-      digest = OpenSSL::PKey::RSA.new(private_key).sign( "sha1", url_shortcut.to_s + external_or_caren_id.to_s )
+      digest = OpenSSL::PKey::RSA.new(private_key).sign( OpenSSL::Digest::SHA1.new, url_shortcut.to_s + external_or_caren_id.to_s )
       return CGI.escape(Base64.encode64(digest))
     end
     
@@ -195,7 +195,7 @@ module Caren
     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 )
+      public_key.verify( OpenSSL::Digest::SHA1.new, signature, url_shortcut.to_s + external_id.to_s )
     end
         
     private
@@ -217,4 +217,4 @@ module Caren
     
   end
 
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caren-api
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 4
-  - 24
-  version: 0.4.24
+  - 25
+  version: 0.4.25
 platform: ruby
 authors: 
 - Andre Foeken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-08 00:00:00 Z
+date: 2012-02-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -86,9 +86,9 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id005
-  name: bundler
+  name: jruby-openssl
   prerelease: false
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -100,7 +100,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id006
-  name: rcov
+  name: bundler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -169,9 +169,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files: 
-- .rvmrc
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.8.7@caren-api

data/Gemfile.lock

@@ -1,66 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
-    builder (3.0.0)
-    capybara (1.1.1)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.2.2)
-      ffi (~> 1.0.6)
-    diff-lcs (1.1.3)
-    fakeweb (1.3.0)
-    ffi (1.0.9)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    json_pure (1.6.1)
-    mime-types (1.17.1)
-    multi_json (1.0.3)
-    nokogiri (1.5.0)
-    rack (1.3.5)
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.9.1)
-      childprocess (>= 0.2.1)
-      ffi (= 1.0.9)
-      json_pure
-      rubyzip
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  builder
-  bundler
-  capybara
-  fakeweb
-  i18n
-  jeweler
-  rcov
-  rest-client (= 1.6.7)
-  rspec