remarkable_rails 3.0.1 → 3.0.2

data/CHANGELOG

@@ -1,44 +1,44 @@
-[TODO] Port views matchers from rspec to Remarkable to provide I18n.
-
-# v3.0.0
-
-[ENHANCEMENT] 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.
-
-[ENHANCEMENT] 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 => mock_task
-      expects :save, :on => mock_task, :returns => true
-
-      should_assign_to :task, :with => mock_task
-      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
-
-[ENHANCMENT] Added assign_to, filter_params, render_with_layout, respond_with
-respond_with_content_type, route, set_session and set_the_flash matchers.
+[TODO] Port views matchers from rspec to Remarkable to provide I18n.
+
+# v3.0.0
+
+[ENHANCEMENT] 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.
+
+[ENHANCEMENT] 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 => mock_task
+      expects :save, :on => mock_task, :returns => true
+
+      should_assign_to :task, :with => mock_task
+      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
+
+[ENHANCMENT] Added assign_to, filter_params, render_with_layout, respond_with
+respond_with_content_type, route, set_session and set_the_flash matchers.

data/LICENSE

@@ -17,4 +17,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -1,83 +1,83 @@
-= 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 and ActiveRecord, it will automatically
-add your ActiveRecord matchers. So just one line is needed to install both:
-
-  sudo gem install 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 => mock_task
-      expects :save, :on => mock_task, :returns => true
-
-      should_assign_to :task, :with => mock_task
-      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.
-
-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.
+= 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 and ActiveRecord, it will automatically
+add your ActiveRecord matchers. So just one line is needed to install both:
+
+  sudo gem install 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 => mock_task
+      expects :save, :on => mock_task, :returns => true
+
+      should_assign_to :task, :with => mock_task
+      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.
+
+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.

data/lib/remarkable_rails/action_controller/base.rb

@@ -1,30 +1,30 @@
 module Remarkable
   module ActionController
     class Base < Remarkable::Base
-
-      before_assert :perform_action_with_macro_stubs
-
-      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
-            false
-          end
-        end
+
+      before_assert :perform_action_with_macro_stubs
+
+      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
+            false
+          end
+        end
 
     end
   end