roar-rails 0.0.9 → 0.0.10

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+h2. 0.0.10
+
+* Empty resources now work properly in Rails 3.0 and 3.1.
+
 h2. 0.0.9
 
 * Changed `request.body.string` to `read` to make it work with Unicorn.

data/lib/roar-rails.rb

@@ -17,11 +17,24 @@ module Roar::Representer
 end
 
 
+
 module Roar
   module Rails
+    def self.rails3_0?
+      ::Rails::VERSION::MINOR == 0
+    end
+    
+    if rails3_0?
+      require 'roar/rails/rails3_0_strategy'
+    else
+      require 'roar/rails/rails3_1_strategy'
+    end
+    
     autoload("TestCase", "roar/rails/test_case")
     autoload("ControllerAdditions", "roar/rails/controller_additions")
     autoload("Responder", "roar/rails/responder")
     autoload("ModelMethods", "roar/rails/responder")
   end
 end
+
+

data/lib/roar/rails/controller_additions.rb

@@ -1,10 +1,13 @@
+require 'hooks/inheritable_attribute'
+
 module Roar::Rails
   module ControllerAdditions
     extend ActiveSupport::Concern
     include ModelMethods
     
     included do
-      class_attribute :represents_options
+      extend Hooks::InheritableAttribute
+      inheritable_attr :represents_options
       self.represents_options ||= {}
     end
     

data/lib/roar/rails/rails3_0_strategy.rb

@@ -0,0 +1,12 @@
+module Roar::Rails
+  module Responder
+    module VersionStrategy
+      def prepare_model!(model)
+        # rails <= 3.1 compatibility. #display gets called for empty responses
+        # >= 3.2 fixes by calling #head, not #display for all empty bodies (PUT, DELETE)
+        return if respond_to?("empty_#{format}_resource") && model == empty_resource
+        super
+      end
+    end
+  end
+end

data/lib/roar/rails/rails3_1_strategy.rb

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

data/lib/roar/rails/responder.rb

@@ -1,9 +1,15 @@
 module Roar::Rails
   module ModelMethods
+  private
     # DISCUSS: move this into a generic namespace as we could need that in Sinatra as well.
     def extend_with!(model, representer)
       model.extend(representer)
     end
+  
+    def prepare_model!(model)
+      representer = controller.representer_for(format, model, options)
+      extend_with!(model, representer)
+    end
   end
   
   module Responder
@@ -16,8 +22,8 @@ module Roar::Rails
         return super
       end
       
-      representer = controller.representer_for(format, model, options)
-      extend_with!(model, representer)
+      prepare_model!(model)
+      
       super
     end
     
@@ -29,5 +35,6 @@ module Roar::Rails
       end
     end
     
+    include VersionStrategy
   end
 end

data/lib/roar/rails/version.rb

@@ -1,5 +1,5 @@
 module Roar
   module Rails
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/roar-rails.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "test_xml"
   s.add_runtime_dependency "actionpack",    "~> 3.0"
   s.add_runtime_dependency "railties",    "~> 3.0"
+  s.add_runtime_dependency "hooks"
   
   s.add_development_dependency "minitest",	">= 2.8.1"
   s.add_development_dependency "tzinfo" # FIXME: why the hell do we need this for 3.1?

data/test/responder_test.rb

@@ -113,13 +113,26 @@ class ResponderTest < ActionController::TestCase
       instance_exec &@block
     end
   end
-  
+
+  class UniqueRepresentsOptionsTest < ResponderTest
+    class One < BaseController
+      represents :json, Object
+    end
+    class Two < BaseController
+      represents :json, Singer
+    end
+    test "each subclass of a roar-augmented controller can represent different things" do
+      assert_not_equal One.represents_options, Two.represents_options
+    end
+  end
+
   class UnconfiguredControllerTest < ResponderTest
+    SingersRepresenter = ::SingersRepresenter
     class SingersController < BaseController
     end
-    
+
     tests SingersController
-    
+
     test "responder finds SingerRepresenter representer by convention" do
       get do
         singer = Singer.new("Bumi")
@@ -137,8 +150,17 @@ class ResponderTest < ActionController::TestCase
       
       assert_equal({:singers => singers.collect {|s| s.extend(SingerRepresenter).to_hash }}.to_json, @response.body)
     end
+
+    test "responder allows empty response bodies to pass through" do
+      put do
+        singer = Singer.new("Bumi")
+        respond_with singer
+      end
+    end
+
   end
-  
+
+
   class RespondToOptionsOverridingConfigurationTest < ResponderTest
     class SingersController < BaseController
       represents :json, Object
@@ -207,6 +229,13 @@ class ResponderTest < ActionController::TestCase
     
     super :execute, :format => 'json'
   end
+
+  def put(&block)
+    @controller.instance_eval do
+      @block = block
+    end
+    super :execute, :format => 'json'
+  end
   
   def singer(name="Bumi")
     singer = Musician.new(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roar-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roar
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &69918720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.10'
+  version_requirements: *69918720
 - !ruby/object:Gem::Dependency
   name: test_xml
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &69918510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *69918510
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &69918240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  version_requirements: *69918240
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &69917990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,21 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *69917990
+- !ruby/object:Gem::Dependency
+  name: hooks
+  requirement: &69917800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *69917800
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &69917530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +76,10 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.8.1
+  version_requirements: *69917530
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &68875180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,12 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *68875180
 description: Rails extensions for using Roar in the popular web framework.
 email:
 - apotonick@gmail.com
@@ -124,6 +105,8 @@ files:
 - gemfiles/Gemfile.rails3-2
 - lib/roar-rails.rb
 - lib/roar/rails/controller_additions.rb
+- lib/roar/rails/rails3_0_strategy.rb
+- lib/roar/rails/rails3_1_strategy.rb
 - lib/roar/rails/railtie.rb
 - lib/roar/rails/responder.rb
 - lib/roar/rails/test_case.rb
@@ -192,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: roar-rails
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Use Roar in Rails.