activeresource-response 0.3.0 → 0.4.0

data/README.rdoc

@@ -87,7 +87,17 @@ Example
   Order.connection.http_response.to_hash
   # => {"content-type"=>["application/json; charset=utf-8"], "x-ua-compatible"=>["IE=Edge"], "etag"=>["\"573cabd02b2f1f90405f7f4f77995fab\""], "cache-control"=>["max-age=0, private, must-revalidate"], "x-request-id"=>["2911c13a0c781044c474450ed789613d"], "x-runtime"=>["0.071018"], "content-length"=>["260"], "server"=>["WEBrick/1.3.1 (Ruby/1.9.2/2011-02-18)"], "date"=>["Sun, 19 Feb 2012 10:21:29 GMT"], "connection"=>["close"]} 
   
+== Custom get method
+You can access response from result of custom get method
+Example
 
+  class Country < ActiveResource::Base
+    self.site = 'http://0.0.0.0:3000/'
+    add_response_method :http  # our new method
+  end
+  cities = Country.find(1).get(:cities)
+  cities.http #method from Country class is available
+ 
 
 == Headers and cookies methods 
 You can get cookies and headers from response 

data/lib/active_resource_response.rb

@@ -26,8 +26,10 @@ require "active_resource_response/version"
 require "active_resource_response/http_response"
 require "active_resource_response/connection"
 require "active_resource_response/response_method"
+require "active_resource_response/custom_methods"
 ActiveResource::Connection.send :include, ActiveResourceResponse::Connection
 ActiveResource::Base.send :include, ActiveResourceResponse::ResponseMethod
+ActiveResource::Base.send :include, ActiveResourceResponse::CustomMethods
 if defined? ActiveResource::Response
    require "active_resource_response/response"
    ActiveResource::Response.send :include, ActiveResourceResponse::Response

data/lib/active_resource_response/connection.rb

@@ -26,14 +26,11 @@ module ActiveResourceResponse
        base.class_eval  do
            alias_method :origin_handle_response, :handle_response 
            def handle_response(response)
-
              begin
                 origin_handle_response(response)
              rescue
-
                raise
              ensure
-
                 response.extend HttpResponse
                 Thread.current[:ActiveResourceResponse] = response
              end

data/lib/active_resource_response/custom_methods.rb

@@ -0,0 +1,39 @@
+#--
+# Copyright (c) 2012 Igor Fedoronchuk
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+module ActiveResourceResponse
+  module CustomMethods
+    
+     def get(custom_method_name, options = {})
+        result = super(custom_method_name, options)
+        if self.class.http_response_method
+            result.instance_variable_set(:@http_response, connection.http_response)
+            (class << result; self; end).send(:define_method, self.class.http_response_method ) do    
+                 @http_response
+            end rescue nil
+        end 
+        result     
+     end
+      
+  end
+end  
+    

data/lib/active_resource_response/response_method.rb

@@ -27,7 +27,7 @@ module ActiveResourceResponse
     def self.included(base)
       base.extend ClassMethods
     end
-    
+        
     module ClassMethods
 
       def http_response
@@ -36,10 +36,10 @@ module ActiveResourceResponse
 
 
       def add_response_method(method_name = :http_response)
-
-
-
-
+          
+        class_attribute :http_response_method
+        self.http_response_method = method_name
+        
         remove_response_method  if methods.map(&:to_sym).include?(:find_without_http_response)
         [:find, :get].each do |method| 
           instance_eval  <<-EOS

data/lib/active_resource_response/version.rb

@@ -23,6 +23,6 @@
 
 module ActiveResourceResponse
   module Version
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/test/active_resource_response_test.rb

@@ -16,16 +16,21 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
   def setup
 
     @country = {:country => {:id => 1, :name => "Ukraine", :iso=>"UA"}}
-
+    @city = {:city => {:id => 1, :name => "Odessa", :population => 2500000 }}
     ActiveResource::HttpMock.respond_to do |mock|
+      
+     
       mock.get "/countries.json", {}, [@country].to_json, 200, {"X-total"=>'1'}
       mock.get "/countries/1.json", {}, @country.to_json, 200, {"X-total"=>'1', 'Set-Cookie'=>['path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT, foo=bar, bar=foo']}
-      mock.get "/countries/1/count.json", {}, {:count => 1155}.to_json, 200, {"X-total"=>'1'}
+      mock.get "/countries/1/population.json", {}, {:count => 45000000}.to_json, 200, {"X-total"=>'1'}
       mock.post "/countries.json" , {},   @country.to_json, 422, {"X-total"=>'1'}
-
+      mock.get "/countries/1/cities.json", {}, [@city].to_json, 200, {"X-total"=>'1'}
     end
 
 
+
+
+
   end
 
 
@@ -49,13 +54,15 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
 
 
   def test_get_headers_from_custom_methods
-    count = Country.find(1).get("count")
-    assert_equal count.to_i, 1155
+    count = Country.find(1).get("population")    
+    assert_equal count.to_i, 45000000
     assert_equal Country.connection.http_response['X-total'].to_i, 1
     assert_equal Country.connection.http_response.headers[:x_total].to_i, 1
     assert_equal Country.http_response['X-total'].to_i ,1
 
-
+    cities = Country.find(1).get("cities")
+    assert cities.respond_to?(:http)
+    assert_equal cities.http['X-total'].to_i, 1  
   end
 
 
@@ -79,15 +86,9 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
 
 
   def test_get_headers_after_exception
-
      Country.create(@country[:country])
-
      assert_equal Country.http_response['X-total'].to_i, 1
-
      assert_equal Country.http_response.code, 422
-
-
-
   end
 
 

data/test/fixtures/country.rb

@@ -1,4 +1,9 @@
-class Country < ActiveResource::Base
+class ActiveResourceResponseBase < ActiveResource::Base
   self.site = "http://37s.sunrise.i:3000"
+  add_response_method :http_response
+end
+
+
+class Country < ActiveResourceResponseBase
   add_response_method :http
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-response
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70242253517800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  version_requirements: *70242253517800
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70242253516380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70242253516380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70242253515460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,12 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70242253515460
 description: ! 'This gem adds possibility to access http response object from result
   of ActiveResource::Base find method '
 email:
@@ -76,6 +61,7 @@ files:
 - activeresource-response.gemspec
 - lib/active_resource_response.rb
 - lib/active_resource_response/connection.rb
+- lib/active_resource_response/custom_methods.rb
 - lib/active_resource_response/http_response.rb
 - lib/active_resource_response/response.rb
 - lib/active_resource_response/response_method.rb
@@ -97,21 +83,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3062498070536117201
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3062498070536117201
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: activeresource extension