activeresource-response 0.5.3 → 1.0.0

data/.travis.yml

@@ -1,12 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 1.9.2
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
   - rbx-19mode
-  - 1.8.7
-  - ree
   - ruby-head
   - jruby-head

data/activeresource-response.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{This gem adds possibility to access http response object from result of ActiveResource::Base find method }
 
 
-  s.add_dependency('activeresource', '>= 3.0')
+  s.add_dependency('activeresource', '>= 4.0.0')
 
   s.add_dependency "jruby-openssl" if RUBY_PLATFORM == "java"
   s.add_development_dependency "test-unit"

data/lib/active_resource_response/custom_methods.rb

@@ -31,7 +31,7 @@ module ActiveResourceResponse
         def get(custom_method_name, options = {})
           result = self.origin_get(custom_method_name, options)
           if self.respond_to? :http_response_method
-            result = self.merge_response_to_result(result)
+            result = self.wrap_result(result)
           end
           result
         end
@@ -41,7 +41,7 @@ module ActiveResourceResponse
     def get(custom_method_name, options = {})
       result = super(custom_method_name, options)
       if self.class.respond_to? :http_response_method
-        result = self.class.merge_response_to_result(result)
+        result = self.class.wrap_result(result)
       end
       result
     end

data/lib/active_resource_response/response_method.rb

@@ -20,6 +20,7 @@
 # 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 'delegate'
 module ActiveResourceResponse
 
   module ResponseMethod
@@ -36,34 +37,33 @@ module ActiveResourceResponse
 
       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)
+            self.wrap_result(result)
           end
         end unless methods.map(&:to_sym).include?(:find_without_http_response)
       end
-      
+
       def remove_response_method
-         class << self
-            undef :find
-            alias :find :find_without_http_response
-            undef :find_without_http_response
-            undef :http_response_method
-            undef :http_response_method=
-         end
+        class << self
+          undef :find
+          alias :find :find_without_http_response
+          undef :find_without_http_response
+          undef :http_response_method
+          undef :http_response_method=
+        end
       end
 
-      def merge_response_to_result(result)
-        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
+      def wrap_result(result)
+
+        result = SimpleDelegator.new(result)
+        result.instance_variable_set(:@http_response, connection.http_response)
+        result.singleton_class.send(:define_method, self.http_response_method) do
+          @http_response
         end
         result
       end

data/lib/active_resource_response/version.rb

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

data/test/active_resource_response_test.rb

@@ -33,12 +33,13 @@ 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"]}}
+    @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}}
@@ -51,7 +52,7 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
       mock.get "/regions/cities.json", {}, [@city].to_json, 200, {"X-total"=>'2'}
       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/population.json", {}, {:count => 45000000}.to_json, 200, {"X-total"=>'1'}
-      mock.post "/countries.json", {}, @country.to_json, 422, {"X-total"=>'1'}
+      mock.post "/countries.json", {}, @country_create_error.to_json, 422, {"X-total"=>'1'}
       mock.get "/countries/1/cities.json", {}, [@city].to_json, 200, {"X-total"=>'1'}
       mock.get "/regions/1/cities.json", {}, [@city].to_json, 200, {"X-total"=>'1'}
       mock.get "/cities/1/population.json", {}, {:count => 2500000}.to_json, 200, {"X-total"=>'1'}
@@ -87,7 +88,13 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
     assert cities.respond_to?(:http_response)
     assert_equal cities.http_response.headers[:x_total].to_i, 2
     count = Country.find(1).get("population")
-    assert_equal count.to_i, 45000000
+
+    #immutable objects doing good
+    some_numeric = 45000000
+    assert_equal count.to_i, some_numeric
+    assert count.respond_to?(:http)
+    assert !some_numeric.respond_to?(:http)
+
     assert_equal Country.connection.http_response.headers[:x_total].to_i, 1
     assert_equal Country.http_response.headers[:x_total].to_i, 1
     cities = Country.find(1).get("cities")
@@ -107,6 +114,7 @@ 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
@@ -128,6 +136,8 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
     country = Country.create(@country[:country])
     assert_equal Country.http_response.headers[:x_total].to_i, 1
     assert_equal Country.http_response.code, 422
+    assert_equal country.errors.full_messages.count ,1
+    assert_equal country.errors.count ,1
   end
 
   def test_remove_method

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-response
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70124761807700 !ruby/object:Gem::Requirement
+  requirement: &70196300726880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70124761807700
+  version_requirements: *70196300726880
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70124761805760 !ruby/object:Gem::Requirement
+  requirement: &70196300725540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124761805760
+  version_requirements: *70196300725540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70124758023700 !ruby/object:Gem::Requirement
+  requirement: &70196300738620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124758023700
+  version_requirements: *70196300738620
 description: ! 'This gem adds possibility to access http response object from result
   of ActiveResource::Base find method '
 email: