api_resource 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/api_resource.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "api_resource"
-  s.version = "0.2.1"
+  s.name = %q{api_resource}
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ethan Langevin"]
-  s.date = "2012-01-05"
-  s.description = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
-  s.email = "ejl6266@gmail.com"
+  s.date = %q{2012-01-07}
+  s.description = %q{A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources}
+  s.email = %q{ejl6266@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -76,11 +76,11 @@ Gem::Specification.new do |s|
     "spec/support/requests/test_resource_requests.rb",
     "spec/support/test_resource.rb"
   ]
-  s.homepage = "http://github.com/ejlangev/resource"
+  s.homepage = %q{http://github.com/ejlangev/resource}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
-  s.summary = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/api_resource.rb

@@ -56,21 +56,14 @@ module ApiResource
     Dir["#{File.dirname(__FILE__)}/../spec/support/**/*.rb"].each {|f| require f}
   end
   
-  def self.site=(new_site)
-    ApiResource::Base.site = new_site
+  class << self
+    [:site, :site=, :format, :format=, :token, :token=, :timeout, :open_timeout, :reset_connection].each do |m|
+      define_method(m) do |*args|
+        ApiResource::Base.send(m, *args)
+      end
+    end
   end
   
-  def self.format=(new_format)
-    ApiResource::Base.format = new_format
-  end
-  # set token
-  def self.token=(new_token)
-    ApiResource::Base.token = new_token
-  end
-  # get token
-  def self.token
-    ApiResource::Base.token
-  end
   # Run a block with a given token - useful for AroundFilters
   def self.with_token(new_token, &block)
     old_token = self.token
@@ -82,34 +75,22 @@ module ApiResource
     end
   end
   
-  # delegated to Base
-  def self.reset_connection
-    ApiResource::Base.reset_connection
-  end
 
   # set the timeout val and reset the connection
   def self.timeout=(val)
-    @timeout = val
+    ApiResource::Base.timeout = val
     self.reset_connection
     val
   end
-  
-  # Getter for timeout
-  def self.timeout
-    @timeout ||= DEFAULT_TIMEOUT
-  end
 
   # set the timeout val and reset the connection
   def self.open_timeout=(val)
-    @open_timeout = val
+    ApiResource::Base.open_timeout = val
     self.reset_connection
     val
   end
   
-  # Getter for timeout
-  def self.open_timeout
-    @open_timeout ||= DEFAULT_TIMEOUT
-  end
+  self.timeout = self.open_timeout = DEFAULT_TIMEOUT
   
   # logger
   def self.logger

data/lib/api_resource/base.rb

@@ -7,7 +7,7 @@ module ApiResource
   
   class Base
     
-    class_inheritable_accessor :site, :proxy, :user, :password, :auth_type, :format, :timeout, :ssl_options, :token
+    class_inheritable_accessor :site, :proxy, :user, :password, :auth_type, :format, :timeout, :open_timeout, :ssl_options, :token
     
     class_inheritable_accessor :include_root_in_json; self.include_root_in_json = true
     class_inheritable_accessor :include_blank_attributes_on_create; self.include_blank_attributes_on_create = false
@@ -124,6 +124,11 @@ module ApiResource
         write_inheritable_attribute(:timeout, timeout)
       end
       
+      def open_timeout=(timeout)
+        @connection = nil
+        write_inheritable_attribute(:open_timeout, timeout)
+      end
+      
       def connection(refresh = false)
         @connection = Connection.new(self.site, self.format) if refresh || @connection.nil?
         @connection.timeout = self.timeout

data/lib/api_resource/connection.rb

@@ -155,7 +155,7 @@ module ApiResource
         unless path =~ /\./
           path += ".#{self.format.extension}"
         end
-        RestClient::Resource.new("#{site.scheme}://#{site.host}:#{site.port}#{path}", {:timeout => ApiResource.timeout, :open_timeout => ApiResource.open_timeout})
+        RestClient::Resource.new("#{site.scheme}://#{site.host}:#{site.port}#{path}", {:timeout => ApiResource::Base.timeout, :open_timeout => ApiResource::Base.open_timeout})
       end
       
       def build_request_headers(headers, verb, uri)

data/spec/spec_helper.rb

@@ -5,10 +5,6 @@ require 'bundler'
 require 'api_resource'
 require 'simplecov'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Bundler.require(:default, :development)
-Debugger.start
 
 SimpleCov.start do
   add_filter "/spec/"
@@ -18,6 +14,11 @@ SimpleCov.at_exit do
   SimpleCov.result.format!
 end
 
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Bundler.require(:default, :development)
+Debugger.start
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 #ApiResource.load_mocks_and_factories

metadata

@@ -1,247 +1,246 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: api_resource
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Ethan Langevin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-07 00:00:00.000000000 -05:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70184031659720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031659720
+- !ruby/object:Gem::Dependency
   name: hash_dealer
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70184031659140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031659140
+- !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70184031658500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031658500
+- !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70184031656140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031656140
+- !ruby/object:Gem::Dependency
   name: differ
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70184031655400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031655400
+- !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70184031654560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031654560
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70184031653900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031653900
+- !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70184031653380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031653380
+- !ruby/object:Gem::Dependency
   name: growl
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70184031652400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031652400
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70184031651600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031651600
+- !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &70184031650840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031650840
+- !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &70184031650220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031650220
+- !ruby/object:Gem::Dependency
   name: faker
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &70184031649420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031649420
+- !ruby/object:Gem::Dependency
   name: guard
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &70184031648740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031648740
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &70184031648080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031648080
+- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &70184031638420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031638420
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &70184031637880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031637880
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &70184031637120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031637120
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &70184031636400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 3.0.9
   type: :development
   prerelease: false
-  version_requirements: *id019
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70184031636400
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &70184031635200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id020
-description: A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources
+  version_requirements: *70184031635200
+description: A replacement for ActiveResource for RESTful APIs that handles associated
+  object and multiple data sources
 email: ejl6266@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -300,35 +299,34 @@ files:
 - spec/support/requests/error_resource_requests.rb
 - spec/support/requests/test_resource_requests.rb
 - spec/support/test_resource.rb
+has_rdoc: true
 homepage: http://github.com/ejlangev/resource
-licenses: 
+licenses:
 - MIT
 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: 1458540798497608710
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4465182740306650
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources
+summary: A replacement for ActiveResource for RESTful APIs that handles associated
+  object and multiple data sources
 test_files: []
-