activeresource-response 0.4.0 → 0.5.0

data/.travis.yml

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

data/activeresource-response.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
 
 
   s.add_dependency('activeresource', '>= 3.0')
+
   s.add_dependency "jruby-openssl" if RUBY_PLATFORM == "java"
   s.add_development_dependency "test-unit"
   s.add_development_dependency 'rake'

data/lib/active_resource_response.rb

@@ -31,7 +31,7 @@ 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
+  require "active_resource_response/response"
+  ActiveResource::Response.send :include, ActiveResourceResponse::Response
 
 end

data/lib/active_resource_response/connection.rb

@@ -21,24 +21,26 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 module ActiveResourceResponse
-   module Connection
-     def self.included(base)
-       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
-           end
-           def http_response
-              Thread.current[:ActiveResourceResponse]
-           end    
+  module Connection
+    def self.included(base)
+      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
         end
-     end 
-   end
+
+        def http_response
+          Thread.current[:ActiveResourceResponse]
+        end
+      end
+    end
+  end
 end

data/lib/active_resource_response/custom_methods.rb

@@ -22,18 +22,33 @@
 #++
 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
-      
+    extend ActiveSupport::Concern
+    included do
+      class << self
+
+        alias :origin_get :get
+
+        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)
+          end
+          result
+
+        end
+
+      end
+    end
+
+    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)
+      end
+      result
+    end
+
+
   end
 end  
     

data/lib/active_resource_response/http_response.rb

@@ -22,17 +22,17 @@
 #++
 module ActiveResourceResponse
   module HttpResponse
-    
+
     def headers
       unless defined? @_active_resource_response_headers
         @_active_resource_response_headers = symbolize_keys(to_hash)
       end
       @_active_resource_response_headers
     end
-         
+
     def cookies
       unless defined? @_active_resource_response_cookies
-        @_active_resource_response_cookies    = (self.headers[:set_cookie] || {}).inject({}) do |out, cookie_str|
+        @_active_resource_response_cookies = (self.headers[:set_cookie] || {}).inject({}) do |out, cookie_str|
           CGI::Cookie::parse(cookie_str).each do |key, cookie|
             out[key] = cookie.value.first unless ['expires', 'path'].include? key
           end
@@ -48,7 +48,7 @@ module ActiveResourceResponse
         out[key.gsub(/-/, '_').downcase.to_sym] = value
         out
       end
-    end   
-       
+    end
+
   end
 end

data/lib/active_resource_response/response.rb

@@ -1,10 +1,33 @@
+#--
+# 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 Response
     def self.included(base)
-      base.class_eval  do
+      base.class_eval do
         def to_hash
           @headers
         end
+
         # to avoid method name conflict with Response:HttpResponse:headers
         def [](key)
           @headers[key]

data/lib/active_resource_response/response_method.rb

@@ -23,52 +23,48 @@
 module ActiveResourceResponse
 
   module ResponseMethod
-    
+
     def self.included(base)
       base.extend ClassMethods
+
     end
-        
+
     module ClassMethods
 
       def http_response
         connection.http_response
       end
 
-
       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
-          alias #{method}_without_http_response #{method}
-          def #{method}(*arguments)
-            result = #{method}_without_http_response(*arguments)
-            result.instance_variable_set(:@http_response, connection.http_response)
-            def result.#{method_name} 
-              @http_response
-            end   
-            result
+
+
+
+        class << self
+          alias find_without_http_response find
+
+          def find(*arguments)
+            result = find_without_http_response(*arguments)
+            self.merge_response_to_result(result)
+
           end
-          EOS
-        end
+        end unless methods.map(&:to_sym).include?(:find_without_http_response)
+
       end
 
-      def remove_response_method
 
+      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
+
+        result
+      end
 
-        [:find, :get].each do |method| 
-          instance_eval   <<-EOS
-            undef :#{method}
-            alias :#{method} :#{method}_without_http_response 
-            undef :#{method}_without_http_response
-          EOS
-                     
-        end 
-      end   
 
     end
-  end   
+  end
 end

data/lib/active_resource_response/version.rb

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

data/test/active_resource_response_test.rb

@@ -1,3 +1,26 @@
+#--
+# 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.
+#++
+
 lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
 unit_tests = File.expand_path("#{File.dirname(__FILE__)}/../test")
 $:.unshift(lib)
@@ -8,7 +31,9 @@ require 'active_resource'
 require 'active_resource/http_mock'
 require 'active_resource_response'
 require "fixtures/country"
+require "fixtures/city"
 
+require "fixtures/region"
 
 class ActiveResourceResponseTest < Test::Unit::TestCase
 
@@ -16,21 +41,27 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
   def setup
 
     @country = {:country => {:id => 1, :name => "Ukraine", :iso=>"UA"}}
-    @city = {:city => {:id => 1, :name => "Odessa", :population => 2500000 }}
+    @city = {:city => {:id => 1, :name => "Odessa", :population => 2500000}}
+    @region = {:region => {:id => 1, :name => "Odessa region", :population => 4500000}}
     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'}
+      mock.get "/regions/population.json", {}, {:count => 45000000}.to_json, 200, {"X-total"=>'1'}
+      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.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'}
+      mock.get "/cities/1.json", {}, @city.to_json, 200, {"X-total"=>'1'}
+      mock.get "/cities.json", {}, [@city].to_json, 200, {"X-total"=>'1'}
     end
 
 
-
-
-
   end
 
 
@@ -40,6 +71,10 @@ 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
@@ -54,15 +89,38 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
 
 
   def test_get_headers_from_custom_methods
-    count = Country.find(1).get("population")    
+    cities = Region.get("cities")
+
+    assert cities.respond_to?(:http_response)
+    assert_equal cities.http_response['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['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  
+    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"
+
+    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
+
+
+  end
+
+
+  def test_methods_without_http
+    cities = City.all
+    assert_kind_of City, cities.first
+    count = cities.first.get("population")
+    assert_equal count.to_i, 2500000
+
   end
 
 
@@ -76,19 +134,19 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
 
   def test_get_cookies
     country = Country.find(1)
-    assert_equal country.http.cookies['foo'] ,  'bar'
-    assert_equal country.http.cookies['bar'] ,  'foo'
+    assert_equal country.http.cookies['foo'], 'bar'
+    assert_equal country.http.cookies['bar'], 'foo'
     #from class
-    assert_equal Country.http_response.cookies['foo'] ,  'bar'
-    assert_equal Country.http_response.cookies['bar'] ,  'foo'
+    assert_equal Country.http_response.cookies['foo'], 'bar'
+    assert_equal Country.http_response.cookies['bar'], 'foo'
 
   end
 
 
   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
+    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/city.rb

@@ -0,0 +1,26 @@
+#--
+# 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.
+#++
+
+class City < ActiveResource::Base
+  self.site = "http://37s.sunrise.i:3000"
+end

data/test/fixtures/country.rb

@@ -1,3 +1,26 @@
+#--
+# 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.
+#++
+
 class ActiveResourceResponseBase < ActiveResource::Base
   self.site = "http://37s.sunrise.i:3000"
   add_response_method :http_response
@@ -6,4 +29,11 @@ end
 
 class Country < ActiveResourceResponseBase
   add_response_method :http
-end
+end
+
+
+
+
+
+
+

data/test/fixtures/region.rb

@@ -0,0 +1,25 @@
+#--
+# 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.
+#++
+class Region < ActiveResourceResponseBase
+  self.site = "http://37s.sunrise.i:3000"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-response
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70242253517800 !ruby/object:Gem::Requirement
+  requirement: &70193338619360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242253517800
+  version_requirements: *70193338619360
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70242253516380 !ruby/object:Gem::Requirement
+  requirement: &70193338618600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242253516380
+  version_requirements: *70193338618600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70242253515460 !ruby/object:Gem::Requirement
+  requirement: &70193338617880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242253515460
+  version_requirements: *70193338617880
 description: ! 'This gem adds possibility to access http response object from result
   of ActiveResource::Base find method '
 email:
@@ -68,7 +68,9 @@ files:
 - lib/active_resource_response/version.rb
 - lib/activeresource-response.rb
 - test/active_resource_response_test.rb
+- test/fixtures/city.rb
 - test/fixtures/country.rb
+- test/fixtures/region.rb
 homepage: http://fivell.github.com/activeresource-response/
 licenses: []
 post_install_message: 
@@ -97,4 +99,6 @@ specification_version: 3
 summary: activeresource extension
 test_files:
 - test/active_resource_response_test.rb
+- test/fixtures/city.rb
 - test/fixtures/country.rb
+- test/fixtures/region.rb