remarkable_rails 3.1.8 → 3.1.9

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Allow should route(:get, :action => :show, :id => 1).to("/projects/1") and
+  should route(:get, "/projects/1").from(:action => :show, :id => 1) syntax.
+
 * Plugin files are automatically loaded [#86]
 
 * Allow should_route to use environment configuration [#88] (thanks to Lawrence Pit)
@@ -12,91 +15,91 @@
 
 * assert_valid_keys on expects
 
-* mock_models now creates a second class method to be used on the index action [#71]
-  In other words, mock_models :project will create:
-
-    def self.mock_project
-     proc { mock_project }
-    end
-
-    # This was added to be used on index actions
-    def self.mock_projects
-      proc { [ mock_project ] }
-    end
-
-    def mock_project(stubs={})
-      @project ||= mock_model(Project, stubs)
-    end
-
-* Allow multiple args to be given to :with in expects. If you need to verify that
-  an array is being sent, you need to send an array inside another array [#70]
-
-* Allow procs or blocks to be given to respond_with_body and respond_with :body [#67]
-
-* Allow ordered to be given to macro stubs as option [#66]
-
-# v3.1
-
-* Ensure set_cookies and set_session work with arrays [#55]
-
-* Added set_cookies matcher [#51]
-
-* Add a helper to declare that a XmlHttpRequest should be performed:
-
-    describe :get => :show do
-      xhr!
-
-* Macro stubs now supports blocks too [#50]
-
-    expects :human_attribute_name, :on => Project, :with => :title do |attr|
-      attr.to_s.humanize
-    end
-
-* :to option in set_session and set_the_flash now accepts Regexp [#46]
-
-* render_template now works with partials [#43]
-
-* Added to support for routing example group (inside spec/routing) [#26]
-
-# v3.0
-
-* redirect_to and render_template were ported from rspec-rails to
-remarkable to provide I18n. The second was also extended to deal with :with,
-:layout and :content_type as options.
-
-render_with_layout, render_without_layout delegate their logic to render_template
-so they share the same options.
-
-respond_with_content_type and respond_wity_body delegate their logic to
-respond_with matcher, so they also share the same options.
-
-:set_the_flash was also redesign to inherit from :set_session, providing a
-consistent API.
-
-* remarkable_rails now ships with a new feature, called macro stubs.
-This allows you to declare just once your mocks and/or expectations, and each
-matcher will know how to deal with properly. A TasksController could have your
-specs for a create action rewritten like this:
-
-  describe TasksController do
-    mock_models :task
-
-    describe :post => :create, :task => { :these => 'params' } do
-      expects :new,  :on => Task, with => {'these' => 'params'}, :returns => task_proc
-      expects :save, :on => mock_task, :returns => true
-
-      should_assign_to :task, :with => task_proc
-      should_redirect_to { task_url(mock_task) }
-    end
-  end
-
-It automatically performs the action before running each macro. In assign_to,
-it executes the expects as expectations (:should_receive), and in redirect_to
-it executes the expects as stubs (:stub!), just as above.
-
-For more options, information and configuration, check macro stubs documentation.
-
-# v2.x
-
-* Added assign_to, filter_params, render_with_layout, respond_with
-respond_with_content_type, route, set_session and set_the_flash matchers.
+* mock_models now creates a second class method to be used on the index action [#71]
+  In other words, mock_models :project will create:
+
+    def self.mock_project
+     proc { mock_project }
+    end
+
+    # This was added to be used on index actions
+    def self.mock_projects
+      proc { [ mock_project ] }
+    end
+
+    def mock_project(stubs={})
+      @project ||= mock_model(Project, stubs)
+    end
+
+* Allow multiple args to be given to :with in expects. If you need to verify that
+  an array is being sent, you need to send an array inside another array [#70]
+
+* Allow procs or blocks to be given to respond_with_body and respond_with :body [#67]
+
+* Allow ordered to be given to macro stubs as option [#66]
+
+# v3.1
+
+* Ensure set_cookies and set_session work with arrays [#55]
+
+* Added set_cookies matcher [#51]
+
+* Add a helper to declare that a XmlHttpRequest should be performed:
+
+    describe :get => :show do
+      xhr!
+
+* Macro stubs now supports blocks too [#50]
+
+    expects :human_attribute_name, :on => Project, :with => :title do |attr|
+      attr.to_s.humanize
+    end
+
+* :to option in set_session and set_the_flash now accepts Regexp [#46]
+
+* render_template now works with partials [#43]
+
+* Added to support for routing example group (inside spec/routing) [#26]
+
+# v3.0
+
+* redirect_to and render_template were ported from rspec-rails to
+remarkable to provide I18n. The second was also extended to deal with :with,
+:layout and :content_type as options.
+
+render_with_layout, render_without_layout delegate their logic to render_template
+so they share the same options.
+
+respond_with_content_type and respond_wity_body delegate their logic to
+respond_with matcher, so they also share the same options.
+
+:set_the_flash was also redesign to inherit from :set_session, providing a
+consistent API.
+
+* remarkable_rails now ships with a new feature, called macro stubs.
+This allows you to declare just once your mocks and/or expectations, and each
+matcher will know how to deal with properly. A TasksController could have your
+specs for a create action rewritten like this:
+
+  describe TasksController do
+    mock_models :task
+
+    describe :post => :create, :task => { :these => 'params' } do
+      expects :new,  :on => Task, with => {'these' => 'params'}, :returns => task_proc
+      expects :save, :on => mock_task, :returns => true
+
+      should_assign_to :task, :with => task_proc
+      should_redirect_to { task_url(mock_task) }
+    end
+  end
+
+It automatically performs the action before running each macro. In assign_to,
+it executes the expects as expectations (:should_receive), and in redirect_to
+it executes the expects as stubs (:stub!), just as above.
+
+For more options, information and configuration, check macro stubs documentation.
+
+# v2.x
+
+* Added assign_to, filter_params, render_with_layout, respond_with
+respond_with_content_type, route, set_session and set_the_flash matchers.

data/LICENSE

@@ -1,20 +1,20 @@
-Copyright (c) 2009 Carlos Brando
-
-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.
+Copyright (c) 2009 Carlos Brando
+
+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.

data/README

@@ -1,11 +1,11 @@
-= Remarkable Rails
-
-Remarkable Rails is a collection of matchers to Rails. This package has some
-ActionController matchers and soon some ActionView matchers.
-
+= Remarkable Rails
+
+Remarkable Rails is a collection of matchers to Rails. This package has some
+ActionController matchers and soon some ActionView matchers.
+
 Whenever using the Remarkable Rails gem, it will automatically add your ActiveRecord
-matchers. So just one line is needed to install both:
-
+matchers. So just one line is needed to install both:
+
   sudo gem install remarkable_rails
 
 If you are using Rails 2.3, you need to have this configuration on your
@@ -18,82 +18,82 @@ config/environments/test.rb:
 And then require remarkable inside your spec_helper.rb, after "spec/rails":
 
   require 'spec/rails'
-  require 'remarkable_rails'
-
-== Matchers & Macros
-
-The supported matchers and macros are:
-
-  assign_to, filter_params, render_with_layout, respond_with, 
-  respond_with_content_type, route, set_session and set_the_flash matchers.
-
-In Remarkable 3.0, we also ported and extended redirect to and render template
-from rspec rails matchers to provide I18n. You can also do:
-
-  render_template 'edit', :layout => 'default'
-  respond_with 404, :content_type => Mime::XML, :body => /Not found/
-
-== Macro stubs
-
-Another cool feature in Remarkable 3.0 is macro stubs, which makes your mocks
-and stubs DRY and easier to maintain. An rspec default scaffold would be:
-
-  describe TasksController do
-    def mock_task(stubs={})
-      @task ||= mock_model(Task, stubs)
-    end
-
-    describe “responding to #POST create” do
-      it "exposes a newly created task as @task" do
-        Task.should_receive(:new).with({'these' => 'params'}).
-                                  and_return(mock_task(:save => true))
-        post :create, :task => {:these => 'params'}
-        assigns[:task].should equal(mock_task)
-      end
-
-      it "redirects to the created task" do
-        Task.stub!(:new).and_return(mock_task(:save => true))
-        post :create, :task => {}
-        response.should redirect_to(task_url(mock_task))
-      end
-    end
-  end
-
-An equivalent in remarkable would be:
-
-  describe TasksController do
-    mock_models :task
-
-    describe :post => :create, :task => { :these => 'params' } do
-      expects :new,  :on => Task, :with => {'these' => 'params'}, :returns => task_proc
-      expects :save, :on => task_proc, :returns => true
-
-      should_assign_to :task, :with => task_proc
-      should_redirect_to { task_url(task_proc) }
-    end
-  end
-
+  require 'remarkable_rails'
+
+== Matchers & Macros
+
+The supported matchers and macros are:
+
+  assign_to, filter_params, render_with_layout, respond_with, 
+  respond_with_content_type, route, set_session and set_the_flash matchers.
+
+In Remarkable 3.0, we also ported and extended redirect to and render template
+from rspec rails matchers to provide I18n. You can also do:
+
+  render_template 'edit', :layout => 'default'
+  respond_with 404, :content_type => Mime::XML, :body => /Not found/
+
+== Macro stubs
+
+Another cool feature in Remarkable 3.0 is macro stubs, which makes your mocks
+and stubs DRY and easier to maintain. An rspec default scaffold would be:
+
+  describe TasksController do
+    def mock_task(stubs={})
+      @task ||= mock_model(Task, stubs)
+    end
+
+    describe “responding to #POST create” do
+      it "exposes a newly created task as @task" do
+        Task.should_receive(:new).with({'these' => 'params'}).
+                                  and_return(mock_task(:save => true))
+        post :create, :task => {:these => 'params'}
+        assigns[:task].should equal(mock_task)
+      end
+
+      it "redirects to the created task" do
+        Task.stub!(:new).and_return(mock_task(:save => true))
+        post :create, :task => {}
+        response.should redirect_to(task_url(mock_task))
+      end
+    end
+  end
+
+An equivalent in remarkable would be:
+
+  describe TasksController do
+    mock_models :task
+
+    describe :post => :create, :task => { :these => 'params' } do
+      expects :new,  :on => Task, :with => {'these' => 'params'}, :returns => task_proc
+      expects :save, :on => task_proc, :returns => true
+
+      should_assign_to :task, :with => task_proc
+      should_redirect_to { task_url(task_proc) }
+    end
+  end
+
 It automatically performs the action before running each macro. It executes the
 expects as expectations (:should_receive), but you can supply :with_stubs => true
-if you want it to be executed with stubs.
-
-There are also params and mime methods:
-
-  describe TasksController
-    params :project_id => 42
-    mime Mime::HTML
-
-    describe :get => :show, :id => 37 do
-      should_assign_to :project, :task
-
-      describe Mime::XML do
-        should_assign_to :project, :task
-      end
-    end
-  end
-
+if you want it to be executed with stubs.
+
+There are also params and mime methods:
+
+  describe TasksController
+    params :project_id => 42
+    mime Mime::HTML
+
+    describe :get => :show, :id => 37 do
+      should_assign_to :project, :task
+
+      describe Mime::XML do
+        should_assign_to :project, :task
+      end
+    end
+  end
+
 And much more. Be sure to check macro stubs documentation.
-
+
 == Rails plugin developers
 
 Remarkable automatically loads files at the remarkable directory on your plugins

data/lib/remarkable_rails/action_controller/base.rb

@@ -1,31 +1,31 @@
-module Remarkable
-  module ActionController
-    class Base < Remarkable::Base
-
-      before_assert :perform_action_with_macro_stubs
+module Remarkable
+  module ActionController
+    class Base < Remarkable::Base
 
-      optional :with_expectations, :default => true
-      optional :with_stubs,        :default => true
+      before_assert :perform_action_with_macro_stubs
 
-      protected
-
-        # Before assertions, call run_action! to perform the action if it was
-        # not performed yet.
-        #
-        def perform_action_with_macro_stubs #:nodoc:
-          @spec.send(:run_action!, run_with_expectations?) if @spec.send(:controller)
-        end
-
-        def run_with_expectations? #:nodoc:
-          if @options.key?(:with_stubs)
-            !@options[:with_stubs]
-          elsif @options.key?(:with_expectations)
-            @options[:with_expectations]
-          else
-            true
-          end
-        end
-
-    end
-  end
-end
+      optional :with_expectations, :default => true
+      optional :with_stubs,        :default => true
+
+      protected
+
+        # Before assertions, call run_action! to perform the action if it was
+        # not performed yet.
+        #
+        def perform_action_with_macro_stubs #:nodoc:
+          @spec.send(:run_action!, run_with_expectations?) if @spec.send(:controller)
+        end
+
+        def run_with_expectations? #:nodoc:
+          if @options.key?(:with_stubs)
+            !@options[:with_stubs]
+          elsif @options.key?(:with_expectations)
+            @options[:with_expectations]
+          else
+            true
+          end
+        end
+
+    end
+  end
+end