activeresource-response 0.5.1 → 0.5.3

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - jruby-19mode
   - rbx-18mode
   - rbx-19mode
-  - ruby-head
   - 1.8.7
-  - ree
+  - ree
+  - ruby-head
+  - jruby-head

data/README.rdoc

@@ -1,5 +1,5 @@
 = Activeresource-response 
-This gem adds possibility to access http response object from result (single object or collection) of activeresource call (methods : find, all, first, last, get )
+This gem adds possibility to access http response (Net::HTTPResponse) object from result (single object or collection) of activeresource call (methods : find, all, first, last, get )
 
 == Build status {<img src="https://secure.travis-ci.org/Fivell/activeresource-response.png" />}[http://travis-ci.org/Fivell/activeresource-response]  
 
@@ -74,11 +74,12 @@ Example
   class Order < ActiveResource::Base
     self.site = 'http://0.0.0.0:3000/'
     self.element_name = "order" 
-    add_response_method :my_response  # our new method
+    add_response_method :my_response  # our new method 
   end
 
   orders = Order.all
   first_order = Order.find(1) 
+  #see Net::HTTPResponse#[] method
   orders.my_response['content-length'] 
   # => "3831" 
   first_order.my_response['content-length'] 
@@ -121,12 +122,5 @@ http response is object of Net::HTTPOK, Net::HTTPClientError or one of other sub
 of Net::HTTPResponse class. For more information see documentation  http://www.ruby-doc.org/stdlib-1.9.3/libdoc/net/http/rdoc/Net/HTTPResponse.html
 
 
-== Inspirators
-
-http://phpblog.com.ua/2012/01/rails-activeresource-i-zagolovki/
-
-http://stackoverflow.com/questions/5972429/active-resource-responses-how-to-get-them
-
-
 == Please, feel free to contact me if you have any questions
 fedoronchuk(at)gmail.com

data/lib/active_resource_response.rb

@@ -30,8 +30,7 @@ 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
 
-end
+if defined?(Rails) and Rails.env.test?
+  require "active_resource_response/http_mock"
+end

data/lib/active_resource_response/custom_methods.rb

@@ -34,9 +34,7 @@ module ActiveResourceResponse
             result = self.merge_response_to_result(result)
           end
           result
-
         end
-
       end
     end
 

data/lib/active_resource_response/{response.rb → http_mock.rb}

@@ -20,19 +20,20 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
+require 'active_resource/http_mock'
 module ActiveResourceResponse
-  module Response
-    def self.included(base)
-      base.class_eval do
-        def to_hash
-          @headers
-        end
-
-        # to avoid method name conflict with Response:HttpResponse:headers
-        def [](key)
-          @headers[key]
+  module HttpMock
+    module Response
+    #to avoid methods conflict with Net:HttpResponse and ActiveResource::Response (HttpMock)
+      def self.included(base)
+        base.class_eval do
+          def to_hash
+            @headers
+          end
         end
       end
     end
   end
 end
+
+ActiveResource::Response.send :include, ActiveResourceResponse::HttpMock::Response

data/lib/active_resource_response/response_method.rb

@@ -26,7 +26,6 @@ module ActiveResourceResponse
 
     def self.included(base)
       base.extend ClassMethods
-
     end
 
     module ClassMethods
@@ -36,26 +35,18 @@ module ActiveResourceResponse
       end
 
       def add_response_method(method_name = :http_response)
-
         class_attribute :http_response_method
-        self.http_response_method = method_name
-
-
-
+        self.http_response_method = method_name 
         class << self
           alias :find_without_http_response :find
 
           def find(*arguments)
             result = find_without_http_response(*arguments)
             self.merge_response_to_result(result)
-
           end
         end unless methods.map(&:to_sym).include?(:find_without_http_response)
-
       end
-
-
-
+      
       def remove_response_method
          class << self
             undef :find
@@ -63,20 +54,19 @@ module ActiveResourceResponse
             undef :find_without_http_response
             undef :http_response_method
             undef :http_response_method=
-
          end
       end
 
       def merge_response_to_result(result)
-        result.instance_variable_set(:@http_response, connection.http_response)
-        (class << result; self; end).send(:define_method, self.http_response_method) do
-          @http_response
-        end rescue nil
-
+        begin
+          result.instance_variable_set(:@http_response, connection.http_response)
+          (class << result; self; end).send(:define_method, self.http_response_method) do
+            @http_response
+          end 
+        rescue StandardError
+        end
         result
       end
-
-
     end
   end
 end

data/lib/active_resource_response/version.rb

@@ -23,6 +23,6 @@
 
 module ActiveResourceResponse
   module Version
-    VERSION = "0.5.1"
+    VERSION = "0.5.3"
   end
 end

data/test/active_resource_response_test.rb

@@ -27,26 +27,23 @@ $:.unshift(lib)
 $:.unshift(unit_tests)
 
 require 'test/unit'
-require 'active_resource'
-require 'active_resource/http_mock'
 require 'active_resource_response'
 require "fixtures/country"
 require "fixtures/city"
 require "fixtures/region"
 require "fixtures/street"
-
+require "active_resource_response/http_mock"
 class ActiveResourceResponseTest < Test::Unit::TestCase
 
 
   def setup
-
     @country = {:country => {:id => 1, :name => "Ukraine", :iso=>"UA"}}
+    @country_create_error = {"errors"=>{:base => ["Country exists"]}}
     @city = {:city => {:id => 1, :name => "Odessa", :population => 2500000}}
     @region = {:region => {:id => 1, :name => "Odessa region", :population => 4500000}}
     @street = {:street => {:id => 1, :name => "Deribasovskaya", :population => 2300}}
+    
     ActiveResource::HttpMock.respond_to do |mock|
-
-
       mock.get "/countries.json", {}, [@country].to_json, 200, {"X-total"=>'1'}
       mock.get "/regions.json", {}, [@region].to_json, 200, {"X-total"=>'1'}
       mock.get "/regions/1.json", {}, @region.to_json, 200, {"X-total"=>'1'}
@@ -64,8 +61,6 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
       mock.get "/streets/1/city.json", {}, @city.to_json, 200, {"X-total"=>'1'}
       mock.get "/streets/1.json", {}, @street.to_json, 200, {"X-total"=>'1'}
     end
-
-
   end
 
 
@@ -75,46 +70,34 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
     assert countries.http.respond_to?(:cookies)
     assert countries.http.respond_to?(:headers)
     assert Country.respond_to?(:http_response)
-
     regions = Region.all
     assert regions.respond_to?(:http_response)
-
   end
 
   def test_get_headers_from_all
     countries = Country.all
     assert_kind_of Country, countries.first
     assert_equal "UA", countries.first.iso
-
-    assert_equal countries.http['X-total'].to_i, 1
     assert_equal countries.http.headers[:x_total].to_i, 1
-
   end
 
 
   def test_get_headers_from_custom_methods
     cities = Region.get("cities")
-
     assert cities.respond_to?(:http_response)
-    assert_equal cities.http_response['X-total'].to_i, 2
-
-
+    assert_equal cities.http_response.headers[:x_total].to_i, 2
     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
+    assert_equal Country.http_response.headers[:x_total].to_i, 1
     cities = Country.find(1).get("cities")
     assert cities.respond_to?(:http), "Cities should respond to http"
-    assert_equal cities.http['X-total'].to_i, 1, "Cities total value should be 1"
-
+    assert_equal cities.http.headers[:x_total].to_i, 1, "Cities total value should be 1"
     regions_population = Region.get("population")
     assert_equal regions_population.to_i, 45000000
-
     cities = Region.find(1).get("cities")
     assert cities.respond_to?(:http_response)
-    assert_equal cities.http_response['X-total'].to_i, 1
-
+    assert_equal cities.http_response.headers[:x_total].to_i, 1
 
   end
 
@@ -124,18 +107,13 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
     assert_kind_of City, cities.first
     count = cities.first.get("population")
     assert_equal count.to_i, 2500000
-
   end
 
-
   def test_get_headers_from_find
     country = Country.find(1)
-    assert_equal country.http['X-total'].to_i, 1
     assert_equal country.http.headers[:x_total].to_i, 1
-
   end
 
-
   def test_get_cookies
     country = Country.find(1)
     assert_equal country.http.cookies['foo'], 'bar'
@@ -146,16 +124,13 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
 
   end
 
-
   def test_get_headers_after_exception
-    Country.create(@country[:country])
-    assert_equal Country.http_response['X-total'].to_i, 1
+    country = Country.create(@country[:country])
+    assert_equal Country.http_response.headers[:x_total].to_i, 1
     assert_equal Country.http_response.code, 422
   end
 
-
   def test_remove_method
-
      street  = Street.find(:first)
      assert !(street.respond_to?(ActiveResourceResponseBase.http_response_method))
      city = Street.find(1).get('city')
@@ -165,9 +140,6 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
      assert country.respond_to?(Country.http_response_method)
      region = Region.find(1)
      assert region.respond_to?(ActiveResourceResponseBase.http_response_method)
-
-
   end
 
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-response
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70232052579580 !ruby/object:Gem::Requirement
+  requirement: &70124761807700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70232052579580
+  version_requirements: *70124761807700
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70232052578700 !ruby/object:Gem::Requirement
+  requirement: &70124761805760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232052578700
+  version_requirements: *70124761805760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70232052577620 !ruby/object:Gem::Requirement
+  requirement: &70124758023700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232052577620
+  version_requirements: *70124758023700
 description: ! 'This gem adds possibility to access http response object from result
   of ActiveResource::Base find method '
 email:
@@ -62,8 +62,8 @@ files:
 - lib/active_resource_response.rb
 - lib/active_resource_response/connection.rb
 - lib/active_resource_response/custom_methods.rb
+- lib/active_resource_response/http_mock.rb
 - lib/active_resource_response/http_response.rb
-- lib/active_resource_response/response.rb
 - lib/active_resource_response/response_method.rb
 - lib/active_resource_response/version.rb
 - lib/activeresource-response.rb
@@ -104,3 +104,4 @@ test_files:
 - test/fixtures/country.rb
 - test/fixtures/region.rb
 - test/fixtures/street.rb
+has_rdoc: