amiando 0.5.1 → 0.5.2

data/Gemfile

@@ -11,6 +11,7 @@ end
 group :development do
   gem 'minitest-reporters', '= 0.8.0'
   gem 'guard-minitest'
+  gem 'typhoeus', '0.4.2'
   if RbConfig::CONFIG['target_os'] =~ /darwin/i
     gem 'rb-fsevent', '>= 0.4.0', :require => false
     gem 'growl',      '~> 1.0.3', :require => false

data/amiando.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'hydra_cache'
   s.add_development_dependency 'minitest', '2.9.0'
   s.add_development_dependency 'webmock', '~> 1.7.9'
+  s.add_development_dependency 'mocha'
   s.add_development_dependency 'rake'
 end

data/lib/amiando.rb

@@ -60,6 +60,9 @@ module Amiando
     # Used for statistics (time-bandits for example)
     attr_accessor :total_time, :total_requests
 
+    # Set default options for typhoeus
+    attr_accessor :default_options
+
     URL       = 'https://www.amiando.com'
     TEST_URL  = 'https://test.amiando.com'
 

data/lib/amiando/request.rb

@@ -2,7 +2,7 @@ module Amiando
   class Request < Typhoeus::Request
     attr_reader :object
 
-    def initialize(object, verb, path, params)
+    def initialize(object, verb, path, params, options = {})
       @object = object
 
       if verb == :post
@@ -12,7 +12,8 @@ module Amiando
         params = default_params.merge(params || {})
       end
 
-      super(path, :method => verb, :params => params, :verbose => Amiando.verbose, :timeout => Amiando.timeout)
+      options = options.merge(:method => verb, :params => params, :verbose => Amiando.verbose, :timeout => Amiando.timeout)  
+      super(path, options)
     end
 
     def log_request

data/lib/amiando/resource.rb

@@ -22,7 +22,8 @@ module Amiando
       private
 
       def do_request(object, verb, path, options = {})
-        req = Request.new(object, verb, path, map_params(options[:params] || {}))
+        options = options.merge Amiando.default_options if Amiando.default_options 
+        req = Request.new(object, verb, path, map_params(options[:params] || {}), options)
         object.request = req
 
         req.log_request

data/lib/amiando/version.rb

@@ -1,3 +1,3 @@
 module Amiando
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/test/amiando/request_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+require 'mocha'
+
+describe "Using options" do 
+
+  it "should send any options to the request" do
+    Amiando.default_options = { :ignore_ssl => true }
+    
+    Amiando::Request.expects(:new).with do |object, verb, path, params, options |
+      options[:ignore_ssl] == true
+    end.returns(stub_everything)
+    
+    Amiando::Public::Event.search(:start_date => Time.utc(2012, 6, 18))
+  end
+  
+end

metadata

@@ -1,122 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amiando
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 1
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
-authors: 
+authors:
 - Jorge Dias
 - Albert Llop
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-03-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
   type: :runtime
-  name: typhoeus
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  type: :runtime
-  name: multi_json
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hydra_cache
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
   type: :development
-  name: hydra_cache
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 9
-        - 0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.9.0
-  version_requirements: *id004
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: webmock
   type: :development
-  name: minitest
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 7
-        - 9
+      - !ruby/object:Gem::Version
         version: 1.7.9
-  version_requirements: *id005
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.9
+- !ruby/object:Gem::Dependency
+  name: mocha
   type: :development
-  name: webmock
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A ruby client for the amiando REST API with parallel requests in mind
-email: 
+email:
 - jorge@mrdias.com
 - mrsimo@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - ChangeLog
@@ -152,6 +167,7 @@ files:
 - test/amiando/partner_test.rb
 - test/amiando/payment_type_test.rb
 - test/amiando/public/event_test.rb
+- test/amiando/request_test.rb
 - test/amiando/resource_test.rb
 - test/amiando/result_test.rb
 - test/amiando/sync_test.rb
@@ -251,40 +267,31 @@ files:
 - test/support/factory.rb
 - test/support/hydra_monkey_patch.rb
 - test/test_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: amiando
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A ruby client for the amiando REST API
-test_files: 
+test_files:
 - test/amiando/amiando_test.rb
 - test/amiando/api_key_test.rb
 - test/amiando/boolean_test.rb
@@ -292,6 +299,7 @@ test_files:
 - test/amiando/partner_test.rb
 - test/amiando/payment_type_test.rb
 - test/amiando/public/event_test.rb
+- test/amiando/request_test.rb
 - test/amiando/resource_test.rb
 - test/amiando/result_test.rb
 - test/amiando/sync_test.rb