activeresource-response 0.1.0 → 0.2.0

data/README.rdoc

@@ -23,6 +23,13 @@ You can add method to ActiveResource::Base to use it in all subclasses
   end
 
 
+You can remove method from ActiveResource subclass
+
+  class Order < ActiveResource::Base
+    remove_response_method  
+  end
+
+
 == Full example of usage with kaminari gem
 
 Rest Client
@@ -112,4 +119,4 @@ http://stackoverflow.com/questions/5972429/active-resource-responses-how-to-get-
 
 
 == Please, feel free to contact me if you have any questions
-fedoronchuk(at)gmail.com
+fedoronchuk(at)gmail.com

data/Rakefile

@@ -1 +1,13 @@
 require 'bundler/gem_tasks'
+
+require 'rake'
+require 'rake/testtask'
+
+task :default => [:test_units]
+
+desc "Run basic tests"
+Rake::TestTask.new("test_units") { |t|
+  t.pattern = 'test/*_test.rb'
+  t.verbose = true
+  t.warning = true
+}

data/activeresource-response.gemspec

@@ -15,11 +15,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activeresource', '>= 3.0')
 
-
+  s.add_development_dependency "test-unit"
+  s.add_development_dependency 'rake'
 
   s.extra_rdoc_files = %w( README.rdoc )
   s.rdoc_options.concat ['--main', 'README.rdoc']
-
+   
 
   s.files         = `git ls-files | sed '/.gitignore/d'`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/activeresource-response.rb

@@ -4,4 +4,9 @@ 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
+ActiveResource::Base.send :include, ActiveresourceResponse::ResponseMethod
+if defined? ActiveResource::Response
+   require "activeresource-response/active_resource_response"
+   ActiveResource::Response.send :include, ActiveResourceResponse::Response
+
+end

data/lib/activeresource-response/active_resource_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 ActiveresourceResponse:HttpResponse:headers
+          def [](key)
+            @headers[key]
+          end
+        end
+      end
+    end
+  end

data/lib/activeresource-response/connection.rb

@@ -9,7 +9,8 @@ module ActiveresourceResponse
              rescue StandardError => e
                raise e
              end
-             response.extend(ActiveresourceResponse::HttpResponse)      
+             response.extend(ActiveresourceResponse::HttpResponse)
+            
              Thread.current[:ActiveResourceHttpResponse] = response
            end
            def http_response

data/lib/activeresource-response/http_response.rb

@@ -1,27 +1,32 @@
 module ActiveresourceResponse
-   module HttpResponse
-       def headers
-         @_active_resource_response_headers || symbolize_keys(to_hash)
-       end
-       def cookies
-          unless @_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
+  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   
        
-       private
-       def symbolize_keys(hash)
-         hash.inject({}) do |out, (key, value)|
-             out[key.gsub(/-/, '_').downcase.to_sym] = value
-             out
-         end
-       end   
-       
-   end
+  end
 end

data/lib/activeresource-response/response_method.rb

@@ -9,7 +9,7 @@ module ActiveresourceResponse
     module ClassMethods
       def add_response_method(method_name = :http_response)
 
-        remove_response_method  if methods.include?(:find_without_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}

data/lib/activeresource-response/version.rb

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

data/test/active_resource_response_test.rb

@@ -0,0 +1,73 @@
+lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+test = File.expand_path("#{File.dirname(__FILE__)}/../test")
+$:.unshift(lib)
+$:.unshift(test)
+
+require 'test/unit'
+require 'active_resource'
+require 'active_resource/http_mock'
+require 'activeresource-response'
+require "fixtures/country"
+
+
+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'}
+
+
+    end
+
+
+  end
+
+
+  def test_methods_appeared
+    countries = Country.all
+    assert countries.respond_to?(:http)
+    assert countries.http.respond_to?(:cookies)
+    assert countries.http.respond_to?(:headers)
+  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
+    count = Country.find(1).get("count")
+    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
+
+  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'
+    assert_equal country.http.cookies['bar'] ,  'foo'
+  end
+
+
+end

data/test/fixtures/country.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-response
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'This gem adds possibility to access http response object from result
   of ActiveResource::Base find method '
 email:
@@ -42,10 +74,13 @@ files:
 - Rakefile
 - activeresource-response.gemspec
 - 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/
 licenses: []
 post_install_message: 
@@ -68,8 +103,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: activeresource extension
-test_files: []
+test_files:
+- test/active_resource_response_test.rb
+- test/fixtures/country.rb