roar-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b1ea90fac1d4d0f740b45d12ded7f1db7af0c26e
+  data.tar.gz: 9c77c62ec70cd206238d49d2e387b556783199c0
+SHA512:
+  metadata.gz: 8bb37394bb6c50e75bbd7a6168cf4925713a548fbbc96a5ccb4672e1b7e2a0e93bbbaccde93167dcf4fde56e192e7f08721907847bd286f9e0664ac3c019d2e2
+  data.tar.gz: 402b43bbd21317a323db435af6e713399364eb3a471db05628026a5ca73d96d1a0a5bfd467ec228c26eb986a91ec582e905891a795050f64dd5fef482827b43f

data/CHANGES.markdown

@@ -1,3 +1,9 @@
+h2. 0.1.2
+
+* Introducing a check where `request.body.read` is called (as usual) if `request.body.string` isn't present. This is due to some faulty behaviour in Rails and some web servers that don't provide a properly working `#read`, as it's the Rack rule. Should finally fix https://github.com/apotonick/roar-rails/issues/18 and friends.
+* `TestCase#process` no longer triggers a deprecation warning for Rails > 3.1.
+* Now allows using roar >= 0.11.
+
 h2. 0.1.1
 
 * Added the `represented_formats: [...]` option to be passed to `#respond_with` for either suppressing roar-rails from extending/decorating models when rendering or to fine-tune so this will only happen on white-listed formats as `:hal`. This can also be set globally using `config.representer.represented_formats`.

data/gemfiles/Gemfile.rails3-0

@@ -5,5 +5,3 @@ gemspec :path => '../'
 
 gem 'railties', '~> 3.0.11'
 gem 'activerecord', '~> 3.0.11'
-
-gem 'roar', 	">= 0.11.17"

data/gemfiles/Gemfile.rails3-2

@@ -6,5 +6,3 @@ gemspec :path => '../'
 
 gem 'railties', '~> 3.2.13'
 gem 'activerecord', '~> 3.2.13'
-
-gem 'roar', 	">= 0.11.17"

data/gemfiles/Gemfile.rails4-0

@@ -8,5 +8,3 @@ gem 'actionpack', '~> 4.0.0'
 
 gem 'activemodel', '~> 4.0.0'
 gem 'activerecord', '~> 4.0.0'
-
-gem 'roar', ">= 0.11.17"

data/lib/roar-rails.rb

@@ -24,10 +24,16 @@ module Roar
       ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 0
     end
 
+    def self.rails3_1?
+      ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 1
+    end
+
     if rails3_0?
       require 'roar/rails/rails3_0_strategy'
-    else
+    elsif rails3_1?
       require 'roar/rails/rails3_1_strategy'
+    else
+      require 'roar/rails/rails3_2_strategy'
     end
 
     autoload("TestCase", "roar/rails/test_case")

data/lib/roar/rails/controller_additions.rb

@@ -48,7 +48,11 @@ module Roar::Rails
     end
 
     def incoming_string
-      request.body.read
+      body = request.body
+
+      # this is my first respond_to? ever and i hate it (thanks, Rails :)
+      return body.string if body.respond_to?(:string)
+      body.read
     end
 
     def render_to_body(options)

data/lib/roar/rails/rails3_0_strategy.rb

@@ -9,4 +9,12 @@ module Roar::Rails
       end
     end
   end
+
+  module TestCase
+    module VersionStrategy
+      def process_args(action, http_method, document="", params={})
+        [action, params, nil, nil, http_method]
+      end
+    end
+  end
 end

data/lib/roar/rails/rails3_1_strategy.rb

@@ -3,4 +3,12 @@ module Roar::Rails
     module VersionStrategy
     end
   end
+
+  module TestCase
+    module VersionStrategy
+      def process_args(action, http_method, document="", params={})
+        [action, params, nil, nil, http_method]
+      end
+    end
+  end
 end

data/lib/roar/rails/rails3_2_strategy.rb

@@ -0,0 +1,11 @@
+module Roar::Rails
+  module Responder
+    module VersionStrategy
+    end
+  end
+
+  module TestCase
+    module VersionStrategy
+    end
+  end
+end

data/lib/roar/rails/test_case.rb

@@ -33,16 +33,25 @@ module Roar
 
         request.env['RAW_POST_DATA'] = document
 
-        super(action, params, nil, nil, http_method)  # FIXME: for Rails <=3.1, only.
+        super(*process_args(action, http_method, document, params))
       end
 
+    private
+      module ProcessArgs
+        def process_args(*args) # TODO: remove when <= 3.1 support is dropped (in 2016).
+          args
+        end
+      end
+      include ProcessArgs
+      include TestCase::VersionStrategy # overwrites #process_args for <= 3.1.
+
+
       module Assertions
         def assert_body(body, options={})
           return assert_xml_equal body, response.body if options[:xml]
           assert_equal body, response.body
         end
       end
-
       include Assertions
     end
   end

data/lib/roar/rails/version.rb

@@ -1,5 +1,5 @@
 module Roar
   module Rails
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/roar-rails.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "roar",          "~> 0.11.13"
+  s.add_runtime_dependency "roar",          ">= 0.11.13"
   s.add_runtime_dependency "test_xml",      ">= 0.1.6"  # TODO: remove dependency as most people don't use XML.
   s.add_runtime_dependency "actionpack"
   s.add_runtime_dependency "railties",      ">= 3.0.0"

data/test/consume_test.rb

@@ -70,3 +70,20 @@ class ConsumeWithOptionsOverridingConfigurationTest < ActionController::TestCase
     assert_equal %{#<struct Singer name="Bumi">}, @response.body
   end
 end
+
+class RequestBodyStringTest < ConsumeTest
+  test "allows Request instances supporting #string instead of #read" do
+    @request.instance_eval do
+      def body
+        Object.new.instance_eval do
+          def read;   "";                     end
+          def string; "{\"name\": \"Bumi\"}"; end # in rails 4, for whatever reasons, #read doesn't work as expected.
+
+          self
+        end
+      end
+    end
+    post :consume_json, "{\"name\": \"Bumi\"}", :format => 'json'
+    assert_equal %{#<struct Singer name="Bumi">}, @response.body
+  end
+end

metadata

@@ -1,100 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: roar-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.13
 - !ruby/object:Gem::Dependency
   name: test_xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,65 +97,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   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: activerecord
   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: sqlite3
   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: tzinfo
   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: Rails extensions for using Roar in the popular web framework.
@@ -193,6 +172,7 @@ files:
 - lib/roar/rails/hal.rb
 - lib/roar/rails/rails3_0_strategy.rb
 - lib/roar/rails/rails3_1_strategy.rb
+- lib/roar/rails/rails3_2_strategy.rb
 - lib/roar/rails/railtie.rb
 - lib/roar/rails/responder.rb
 - lib/roar/rails/test_case.rb
@@ -248,26 +228,25 @@ files:
 - test/validations_test.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: roar-rails
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use Roar in Rails.
 test_files: []