inherited_resources 0.9.5 → 1.0.pre

data/test/customized_base_test.rb

@@ -39,11 +39,17 @@ module CarTestHelper
     @controller          = CarsController.new
     @controller.request  = @request  = ActionController::TestRequest.new
     @controller.response = @response = ActionController::TestResponse.new
+    @controller.stubs(:car_url).returns("/")
   end
 
   protected
-    def mock_car(stubs={})
-      @mock_car ||= mock(stubs)
+    def mock_car(expectations={})
+      @mock_car ||= begin
+        car = mock(expectations.except(:errors))
+        car.stubs(:class).returns(Car)
+        car.stubs(:errors).returns(expectations.fetch(:errors, {}))
+        car
+      end
     end
 end
 
@@ -154,9 +160,9 @@ class DestroyActionCustomizedBaseTest < ActionController::TestCase
   end
 
   def test_show_flash_message_when_cannot_be_deleted
-    Car.stubs(:get).returns(mock_car(:destroy_successfully => false))
+    Car.stubs(:get).returns(mock_car(:destroy_successfully => false, :errors => { :fail => true }))
     delete :destroy
-    assert_equal flash[:error], 'Car could not be destroyed.'
+    assert_equal flash[:alert], 'Car could not be destroyed.'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 1.0.pre
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -11,8 +11,27 @@ cert_chain: []
 
 date: 2009-12-22 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: responders
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.2"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: has_scope
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.3"
+    version: 
 description: Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important.
 email: jose.valim@gmail.com
 executables: []
@@ -26,18 +45,20 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- init.rb
 - lib/inherited_resources.rb
 - lib/inherited_resources/actions.rb
 - lib/inherited_resources/base.rb
 - lib/inherited_resources/base_helpers.rb
 - lib/inherited_resources/belongs_to_helpers.rb
+- lib/inherited_resources/blank_slate.rb
 - lib/inherited_resources/class_methods.rb
 - lib/inherited_resources/dsl.rb
-- lib/inherited_resources/dumb_responder.rb
-- lib/inherited_resources/has_scope_helpers.rb
 - lib/inherited_resources/legacy/respond_to.rb
 - lib/inherited_resources/legacy/responder.rb
+- lib/inherited_resources/locales/en.yml
 - lib/inherited_resources/polymorphic_helpers.rb
+- lib/inherited_resources/responder.rb
 - lib/inherited_resources/singleton_helpers.rb
 - lib/inherited_resources/url_helpers.rb
 - lib/inherited_resources/version.rb
@@ -58,9 +79,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
@@ -78,8 +99,6 @@ test_files:
 - test/customized_base_test.rb
 - test/customized_belongs_to_test.rb
 - test/defaults_test.rb
-- test/flash_test.rb
-- test/has_scope_test.rb
 - test/nested_belongs_to_test.rb
 - test/optional_belongs_to_test.rb
 - test/polymorphic_test.rb

data/lib/inherited_resources/dumb_responder.rb

@@ -1,20 +0,0 @@
-module InheritedResources
-  # = Dumb Responder
-  #
-  # This responder discards all messages sent to him.
-  #
-  class DumbResponder
-
-    instance_methods.each do |m|
-      undef_method m unless m =~ /^(__|object_id)/
-    end
-
-    # This is like a good husband, he will just listen everything that his wife
-    # says (which is a lot) without complaining. :)
-    #
-    def method_missing(*args)
-      nil
-    end
-
-  end
-end

data/lib/inherited_resources/has_scope_helpers.rb

@@ -1,83 +0,0 @@
-module InheritedResources
-
-  # = has_scopes
-  #
-  # This module in included in your controller when has_scope is called for the
-  # first time.
-  #
-  module HasScopeHelpers
-    TRUE_VALUES = ["true", true, "1", 1] unless self.const_defined?(:TRUE_VALUES)
-
-    protected
-
-      # Overwrites apply to scope to implement default scope logic.
-      #
-      def apply_scope_to(target_object) #:nodoc:
-        @current_scopes ||= {}
-
-        self.scopes_configuration.each do |scope, options|
-          next unless apply_scope_to_action?(options)
-          key = options[:as]
-
-          if params.key?(key)
-            value, call_scope = params[key], true
-          elsif options.key?(:default)
-            value, call_scope = options[:default], true
-            value = value.call(self) if value.is_a?(Proc)
-          end
-
-          if call_scope
-            @current_scopes[key] = value
-
-            if options[:boolean]
-              target_object = target_object.send(scope) if TRUE_VALUES.include?(value)
-            else
-              target_object = target_object.send(scope, value)
-            end
-          end
-        end
-
-        target_object
-      end
-
-      # Given an options with :only and :except arrays, check if the scope
-      # can be performed in the current action.
-      #
-      def apply_scope_to_action?(options) #:nodoc:
-        return false unless applicable?(options[:if], true)
-        return false unless applicable?(options[:unless], false)
-        if options[:only].empty?
-          if options[:except].empty?
-            true
-          else
-            !options[:except].include?(action_name.to_sym)
-          end
-        else
-          options[:only].include?(action_name.to_sym)
-        end
-      end
-
-      # Evaluates the scope options :if or :unless. Returns true if the proc
-      # method, or string evals to the expected value.
-      #
-      def applicable?(string_proc_or_symbol, expected)
-        case string_proc_or_symbol
-          when String
-            eval(string_proc_or_symbol) == expected
-          when Proc
-            string_proc_or_symbol.call(self) == expected
-          when Symbol
-            send(string_proc_or_symbol) == expected
-          else
-            true
-        end
-      end
-
-      # Returns the scopes used in this action.
-      #
-      def current_scopes
-        @current_scopes || {}
-      end
-
-  end
-end

data/test/flash_test.rb

@@ -1,88 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Address
-  def self.human_name; 'Address'; end
-end
-
-class AddressesController < InheritedResources::Base
-  respond_to :xml
-  protected
-    def interpolation_options
-      { :reference => 'Ocean Avenue' }
-    end
-end
-
-module Admin; end
-class Admin::AddressesController < InheritedResources::Base
-  respond_to :xml
-  protected
-    def interpolation_options
-      { :reference => 'Ocean Avenue' }
-    end
-end
-
-class FlashBaseHelpersTest < ActionController::TestCase
-  tests AddressesController
-
-  def setup
-    super
-    @request.accept = 'application/xml'
-    @controller.stubs(:resource_url).returns("http://test.host/")
-    @controller.stubs(:collection_url).returns("http://test.host/")
-  end
-
-  def test_success_flash_message_on_create_with_yml
-    Address.stubs(:new).returns(mock_address(:save => true))
-    post :create
-    assert_equal 'You created a new address close to <b>Ocean Avenue</b>.', flash[:notice]
-  end
-
-  def test_success_flash_message_on_create_with_namespaced_controller
-    @controller = Admin::AddressesController.new
-    @controller.stubs(:resource_url).returns("http://test.host/")
-    Address.stubs(:new).returns(mock_address(:save => true))
-    post :create
-    assert_equal 'Admin, you created a new address close to <b>Ocean Avenue</b>.', flash[:notice]
-  end
-
-  def test_failure_flash_message_on_create_with_namespaced_controller_actions
-    @controller = Admin::AddressesController.new
-    @controller.stubs(:resource_url).returns("http://test.host/")
-    Address.stubs(:new).returns(mock_address(:save => false))
-    post :create
-    assert_equal 'Admin error message.', flash[:error]
-  end
-
-  def test_inherited_success_flash_message_on_update_on_namespaced_controllers
-    @controller = Admin::AddressesController.new
-    @controller.stubs(:resource_url).returns("http://test.host/")
-    Address.stubs(:find).returns(mock_address(:update_attributes => true))
-    put :update
-    assert_response :success
-    assert_equal 'Nice! Address was updated with success!', flash[:notice]
-  end
-
-  def test_success_flash_message_on_update
-    Address.stubs(:find).returns(mock_address(:update_attributes => true))
-    put :update
-    assert_response :success
-    assert_equal 'Nice! Address was updated with success!', flash[:notice]
-  end
-
-  def test_failure_flash_message_on_update
-    Address.stubs(:find).returns(mock_address(:update_attributes => false, :errors => {:some => :error}))
-    put :update
-    assert_equal 'Oh no! We could not update your address!', flash[:error]
-  end
-
-  def test_success_flash_message_on_destroy
-    Address.stubs(:find).returns(mock_address(:destroy => true))
-    delete :destroy
-    assert_equal 'Address was successfully destroyed.', flash[:notice]
-  end
-
-  protected
-    def mock_address(stubs={})
-      @mock_address ||= stub(stubs.merge(:to_xml => "xml"))
-    end
-end

data/test/has_scope_test.rb

@@ -1,139 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Tree
-  def self.human_name; 'Tree'; end
-end
-
-class TreesController < InheritedResources::Base
-  has_scope :color, :unless => :show_all_colors?
-  has_scope :only_tall, :boolean => true, :only => :index, :if => :restrict_to_only_tall_trees?
-  has_scope :shadown_range, :default => 10, :except => [ :index, :show, :destroy, :new ]
-  has_scope :root_type, :as => :root
-  has_scope :calculate_height, :default => proc {|c| c.session[:height] || 20 }, :only => :new
-
-  protected
-    def restrict_to_only_tall_trees?
-      true
-    end
-
-    def show_all_colors?
-      false
-    end
-end
-
-class HasScopeTest < ActionController::TestCase
-  tests TreesController
-
-  def setup
-    @controller.stubs(:resource_url).returns('/')
-    @controller.stubs(:collection_url).returns('/')
-  end
-
-  def test_boolean_scope_is_called_when_boolean_param_is_true
-    Tree.expects(:only_tall).with().returns(Tree).in_sequence
-    Tree.expects(:find).with(:all).returns([mock_tree]).in_sequence
-    get :index, :only_tall => 'true'
-    assert_equal([mock_tree], assigns(:trees))
-    assert_equal({ :only_tall => 'true' }, assigns(:current_scopes))
-  end
-
-  def test_boolean_scope_is_called_when_boolean_param_is_false
-    Tree.expects(:only_tall).never
-    Tree.expects(:find).with(:all).returns([mock_tree])
-    get :index, :only_tall => 'false'
-    assert_equal([mock_tree], assigns(:trees))
-    assert_equal({ :only_tall => 'false' }, assigns(:current_scopes))
-  end
-
-  def test_scope_is_called_only_on_index
-    Tree.expects(:only_tall).never
-    Tree.expects(:find).with('42').returns(mock_tree)
-    get :show, :only_tall => 'true', :id => '42'
-    assert_equal(mock_tree, assigns(:tree))
-    assert_equal({ }, assigns(:current_scopes))
-  end
-
-  def test_scope_is_skipped_when_if_option_is_false
-    @controller.stubs(:restrict_to_only_tall_trees?).returns(false)
-    Tree.expects(:only_tall).never
-    Tree.expects(:find).with(:all).returns([mock_tree])
-    get :index, :only_tall => 'true'
-    assert_equal([mock_tree], assigns(:trees))
-    assert_equal({ }, assigns(:current_scopes))
-  end
-
-  def test_scope_is_skipped_when_unless_option_is_true
-    @controller.stubs(:show_all_colors?).returns(true)
-    Tree.expects(:color).never
-    Tree.expects(:find).with(:all).returns([mock_tree])
-    get :index, :color => 'blue'
-    assert_equal([mock_tree], assigns(:trees))
-    assert_equal({ }, assigns(:current_scopes))
-  end
-
-  def test_scope_is_called_except_on_index
-    Tree.expects(:shadown_range).with().never
-    Tree.expects(:find).with(:all).returns([mock_tree])
-    get :index, :shadown_range => 20
-    assert_equal([mock_tree], assigns(:trees))
-    assert_equal({ }, assigns(:current_scopes))
-  end
-
-  def test_scope_is_called_with_arguments
-    Tree.expects(:color).with('blue').returns(Tree).in_sequence
-    Tree.expects(:find).with(:all).returns([mock_tree]).in_sequence
-    get :index, :color => 'blue'
-    assert_equal([mock_tree], assigns(:trees))
-    assert_equal({ :color => 'blue' }, assigns(:current_scopes))
-  end
-
-  def test_multiple_scopes_are_called
-    Tree.expects(:only_tall).with().returns(Tree)
-    Tree.expects(:color).with('blue').returns(Tree)
-    Tree.expects(:find).with(:all).returns([mock_tree])
-    get :index, :color => 'blue', :only_tall => 'true'
-    assert_equal([mock_tree], assigns(:trees))
-    assert_equal({ :color => 'blue', :only_tall => 'true' }, assigns(:current_scopes))
-  end
-
-  def test_scope_is_called_with_default_value
-    Tree.expects(:shadown_range).with(10).returns(Tree).in_sequence
-    Tree.expects(:find).with('42').returns(mock_tree).in_sequence
-    get :edit, :id => '42'
-    assert_equal(mock_tree, assigns(:tree))
-    assert_equal({ :shadown_range => 10 }, assigns(:current_scopes))
-  end
-
-  def test_default_scope_value_can_be_overwritten
-    Tree.expects(:shadown_range).with('20').returns(Tree).in_sequence
-    Tree.expects(:find).with('42').returns(mock_tree).in_sequence
-    get :edit, :id => '42', :shadown_range => '20'
-    assert_equal(mock_tree, assigns(:tree))
-    assert_equal({ :shadown_range => '20' }, assigns(:current_scopes))
-  end
-
-  def test_scope_with_different_key
-    Tree.expects(:root_type).with('outside').returns(Tree).in_sequence
-    Tree.expects(:find).with('42').returns(mock_tree).in_sequence
-    get :show, :id => '42', :root => 'outside'
-    assert_equal(mock_tree, assigns(:tree))
-    assert_equal({ :root => 'outside' }, assigns(:current_scopes))
-  end
-
-  def test_scope_with_default_value_as_proc
-    session[:height] = 100
-    Tree.expects(:calculate_height).with(100).returns(Tree).in_sequence
-    Tree.expects(:new).returns(mock_tree).in_sequence
-    get :new
-    assert_equal(mock_tree, assigns(:tree))
-    assert_equal({ :calculate_height => 100 }, assigns(:current_scopes))
-   end
-
-  protected
-
-    def mock_tree(stubs={})
-      @mock_tree ||= mock(stubs)
-    end
-
-end
-