activeresource-response 0.2.0 → 0.3.0

data/.travis.yml

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

data/README.rdoc

@@ -1,7 +1,7 @@
-= Activeresource-response
-
+= 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 )
 
+== Build status {<img src="https://secure.travis-ci.org/Fivell/activeresource-response.png" />}[http://travis-ci.org/Fivell/activeresource-response]  
 
 
 == Why It can be used?

data/activeresource-response.gemspec

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "activeresource-response/version"
+require "active_resource_response/version"
 
 Gem::Specification.new do |s|
   
   s.name        = "activeresource-response"
-  s.version     = ActiveresourceResponse::Version::VERSION
+  s.version     = ActiveResourceResponse::Version::VERSION
   s.authors     = ["Igor Fedoronchuk"]
   s.email       = ["fedoronchuk@gmail.com"]
   s.homepage    = "http://fivell.github.com/activeresource-response/"
@@ -14,7 +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

@@ -0,0 +1,35 @@
+#--
+# 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.
+#++
+require 'cgi'
+require 'active_resource'
+require "active_resource_response/version"
+require "active_resource_response/http_response"
+require "active_resource_response/connection"
+require "active_resource_response/response_method"
+ActiveResource::Connection.send :include, ActiveResourceResponse::Connection
+ActiveResource::Base.send :include, ActiveResourceResponse::ResponseMethod
+if defined? ActiveResource::Response
+   require "active_resource_response/response"
+   ActiveResource::Response.send :include, ActiveResourceResponse::Response
+
+end

data/lib/active_resource_response/connection.rb

@@ -0,0 +1,47 @@
+#--
+# 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 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    
+        end
+     end 
+   end
+end

data/lib/active_resource_response/http_response.rb

@@ -0,0 +1,54 @@
+#--
+# 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 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|
+          CGI::Cookie::parse(cookie_str).each do |key, cookie|
+            out[key] = cookie.value.first unless ['expires', 'path'].include? key
+          end
+          out
+        end
+      end
+      @_active_resource_response_cookies
+    end
+
+    private
+    def symbolize_keys(hash)
+      hash.inject({}) do |out, (key, value)|
+        out[key.gsub(/-/, '_').downcase.to_sym] = value
+        out
+      end
+    end   
+       
+  end
+end

data/lib/active_resource_response/response.rb

@@ -0,0 +1,15 @@
+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]
+        end
+      end
+    end
+  end
+end

data/lib/active_resource_response/response_method.rb

@@ -0,0 +1,74 @@
+#--
+# 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 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)
+
+
+
+
+        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
+          end
+          EOS
+        end
+      end
+
+      def remove_response_method
+
+
+        [: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

data/lib/active_resource_response/version.rb

@@ -0,0 +1,28 @@
+#--
+# 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 Version
+    VERSION = "0.3.0"
+  end
+end

data/lib/activeresource-response.rb

@@ -1,12 +1,24 @@
-require 'cgi'
-require "activeresource-response/version"
-require "activeresource-response/http_response"
-require "activeresource-response/connection"
-require "activeresource-response/response_method"
-ActiveResource::Connection.send :include, ActiveresourceResponse::Connection
-ActiveResource::Base.send :include, ActiveresourceResponse::ResponseMethod
-if defined? ActiveResource::Response
-   require "activeresource-response/active_resource_response"
-   ActiveResource::Response.send :include, ActiveResourceResponse::Response
+#--
+# 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.
+#++
 
-end
+require 'active_resource_response'

data/test/active_resource_response_test.rb

@@ -1,12 +1,12 @@
 lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
-test = File.expand_path("#{File.dirname(__FILE__)}/../test")
+unit_tests = File.expand_path("#{File.dirname(__FILE__)}/../test")
 $:.unshift(lib)
-$:.unshift(test)
+$:.unshift(unit_tests)
 
 require 'test/unit'
 require 'active_resource'
 require 'active_resource/http_mock'
-require 'activeresource-response'
+require 'active_resource_response'
 require "fixtures/country"
 
 
@@ -16,11 +16,12 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
   def setup
 
     @country = {:country => {:id => 1, :name => "Ukraine", :iso=>"UA"}}
+
     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.post "/countries.json" , {},   @country.to_json, 422, {"X-total"=>'1'}
 
     end
 
@@ -33,6 +34,7 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
     assert countries.respond_to?(:http)
     assert countries.http.respond_to?(:cookies)
     assert countries.http.respond_to?(:headers)
+    assert Country.respond_to?(:http_response)
   end
 
   def test_get_headers_from_all
@@ -51,6 +53,8 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
     assert_equal count.to_i, 1155
     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
+
 
   end
 
@@ -67,6 +71,23 @@ class ActiveResourceResponseTest < Test::Unit::TestCase
     country = Country.find(1)
     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'
+
+  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
+
+
+
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-response
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -68,17 +68,19 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - activeresource-response.gemspec
+- lib/active_resource_response.rb
+- lib/active_resource_response/connection.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
-- lib/activeresource-response/active_resource_response.rb
-- lib/activeresource-response/connection.rb
-- lib/activeresource-response/http_response.rb
-- lib/activeresource-response/response_method.rb
-- lib/activeresource-response/version.rb
 - test/active_resource_response_test.rb
 - test/fixtures/country.rb
 homepage: http://fivell.github.com/activeresource-response/
@@ -95,12 +97,18 @@ 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

data/lib/activeresource-response/active_resource_response.rb

@@ -1,15 +0,0 @@
-  module ActiveResourceResponse
-    module Response
-      def self.included(base)
-        base.class_eval  do
-          def to_hash
-            @headers
-          end
-          # to avoid method name conflict with ActiveresourceResponse:HttpResponse:headers
-          def [](key)
-            @headers[key]
-          end
-        end
-      end
-    end
-  end

data/lib/activeresource-response/connection.rb

@@ -1,22 +0,0 @@
-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 StandardError => e
-               raise e
-             end
-             response.extend(ActiveresourceResponse::HttpResponse)
-            
-             Thread.current[:ActiveResourceHttpResponse] = response
-           end
-           def http_response
-              Thread.current[:ActiveResourceHttpResponse]
-           end    
-        end
-     end 
-   end
-end

data/lib/activeresource-response/http_response.rb

@@ -1,32 +0,0 @@
-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|
-          CGI::Cookie::parse(cookie_str).each do |key, cookie|
-            out[key] = cookie.value.first unless ['expires', 'path'].include? key
-          end
-          out
-        end
-      end
-      @_active_resource_response_cookies
-    end
-
-    private
-    def symbolize_keys(hash)
-      hash.inject({}) do |out, (key, value)|
-        out[key.gsub(/-/, '_').downcase.to_sym] = value
-        out
-      end
-    end   
-       
-  end
-end

data/lib/activeresource-response/response_method.rb

@@ -1,41 +0,0 @@
-module ActiveresourceResponse   
-
-  module ResponseMethod
-    
-    def self.included(base)
-      base.extend ClassMethods
-    end
-    
-    module ClassMethods
-      def add_response_method(method_name = :http_response)
-
-        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
-          end
-          EOS
-        end
-      end
-
-      def remove_response_method
-        [: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

data/lib/activeresource-response/version.rb

@@ -1,5 +0,0 @@
-module ActiveresourceResponse
-  module Version
-    VERSION = "0.2.0"
-  end
-end