remarkable_rails 3.0.8 → 3.0.9

data/CHANGELOG

@@ -21,7 +21,7 @@
 
 # v3.0
 
-[ENHANCEMENT] redirect_to and render_template were ported from rspec-rails to
+* 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.
 
@@ -34,7 +34,7 @@ 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.
+* 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:
@@ -59,5 +59,5 @@ For more options, information and configuration, check macro stubs documentation
 
 # v2.x
 
-[ENHANCMENT] Added assign_to, filter_params, render_with_layout, respond_with
+* Added assign_to, filter_params, render_with_layout, respond_with
 respond_with_content_type, route, set_session and set_the_flash matchers.

data/lib/remarkable_rails/action_controller/macro_stubs.rb

@@ -354,7 +354,7 @@ module Remarkable
             verb   = verb.to_s
 
             description = Remarkable.t 'remarkable.action_controller.responding',
-                                        :default => "responding to ##{verb.upcase} #{action}",
+                                        :default => "responding to \#{{verb}} {{action}}",
                                         :verb => verb.sub('!', '').upcase, :action => action
 
             send_args = [ verb, action, options ]

data/lib/remarkable_rails/action_controller/matchers/assign_to_matcher.rb

@@ -2,9 +2,11 @@ module Remarkable
   module ActionController
     module Matchers
       class AssignToMatcher < Remarkable::ActionController::Base #:nodoc:
-        arguments :collection => :names, :as => :name, :block => :block
+        arguments :collection => :names, :as => :name, :block => true
+
+        optional :with, :block => true
+        optional :with_kind_of
 
-        optional :with, :with_kind_of
         collection_assertions :assigned_value?, :is_kind_of?, :is_equal_value?
 
         before_assert :evaluate_expected_value

data/lib/remarkable_rails/action_controller/matchers/filter_params_matcher.rb

@@ -31,8 +31,8 @@ module Remarkable
       #   it { should filter_params(:password) }
       #   it { should_not filter_params(:username) }
       #
-      def filter_params(*params)
-        FilterParamsMatcher.new(*params).spec(self)
+      def filter_params(*params, &block)
+        FilterParamsMatcher.new(*params, &block).spec(self)
       end
       alias :filter_param :filter_params
 

data/lib/remarkable_rails/action_controller/matchers/redirect_to_matcher.rb

@@ -4,8 +4,8 @@ module Remarkable
       class RedirectToMatcher < Remarkable::ActionController::Base #:nodoc:
         include ::ActionController::StatusCodes
 
-        arguments :expected, :block => :block
-        optional :with
+        arguments :expected, :block => true
+        optional :with, :block => true
 
         assertions :redirected?, :status_matches?, :url_matches?
 

data/lib/remarkable_rails/action_controller/matchers/render_template_matcher.rb

@@ -4,7 +4,6 @@ module Remarkable
   module ActionController
     module Matchers
       class RenderTemplateMatcher < RespondWithMatcher #:nodoc:
-
         prepend_optional :template, :layout
 
         assertions :rendered?, :template_matches?, :layout_matches?
@@ -122,24 +121,24 @@ module Remarkable
       #
       # Extensions check does not work in Rails 2.1.x.
       #
-      def render_template(*args)
+      def render_template(*args, &block)
         options = args.extract_options!
-        RenderTemplateMatcher.new(options.merge(:template => args.first)).spec(self)
+        RenderTemplateMatcher.new(options.merge(:template => args.first), &block).spec(self)
       end
 
       # This is just a shortcut for render_template :layout => layout. It's also
       # used for Shoulda compatibility. Check render_template for more information.
       #
-      def render_with_layout(*args)
+      def render_with_layout(*args, &block)
         options = args.extract_options!
-        RenderTemplateMatcher.new(options.merge(:layout => args.first)).spec(self)
+        RenderTemplateMatcher.new(options.merge(:layout => args.first), &block).spec(self)
       end
 
       # This is just a shortcut for render_template :layout => nil. It's also
       # used for Shoulda compatibility. Check render_template for more information.
       #
-      def render_without_layout(options={})
-        RenderTemplateMatcher.new(options.merge(:layout => nil)).spec(self)
+      def render_without_layout(options={}, &block)
+        RenderTemplateMatcher.new(options.merge(:layout => nil), &block).spec(self)
       end
 
     end

data/lib/remarkable_rails/action_controller/matchers/respond_with_matcher.rb

@@ -2,7 +2,6 @@ module Remarkable
   module ActionController
     module Matchers
       class RespondWithMatcher < Remarkable::ActionController::Base #:nodoc:
-
         arguments
 
         optional :with, :body, :content_type
@@ -98,26 +97,26 @@ module Remarkable
       #   it { should respond_with(301).content_type(Mime::XML)      }
       #   it { should respond_with(300..399).content_type(Mime::XML) }
       #
-      def respond_with(*args)
+      def respond_with(*args, &block)
         options = args.extract_options!
-        RespondWithMatcher.new(options.merge(:with => args.first)).spec(self)
+        RespondWithMatcher.new(options.merge(:with => args.first), &block).spec(self)
       end
 
       # This is just a shortcut for respond_with :body => body. Check respond_with
       # for more information.
       #
-      def respond_with_body(*args)
+      def respond_with_body(*args, &block)
         options = args.extract_options!
-        RespondWithMatcher.new(options.merge(:body => args.first)).spec(self)
+        RespondWithMatcher.new(options.merge(:body => args.first), &block).spec(self)
       end
 
       # This is just a shortcut for respond_with :content_type => content_type.
       # It's also used for Shoulda compatibility. Check respond_with for more
       # information.
       #
-      def respond_with_content_type(*args)
+      def respond_with_content_type(*args, &block)
         options = args.extract_options!
-        RespondWithMatcher.new(options.merge(:content_type => args.first)).spec(self)
+        RespondWithMatcher.new(options.merge(:content_type => args.first), &block).spec(self)
       end
 
     end

data/lib/remarkable_rails/action_controller/matchers/route_matcher.rb

@@ -85,8 +85,8 @@ module Remarkable
       #   should_route :get,    '/users/5/posts', :controller => :posts, :action => :index,   :user_id => 5
       #   should_route :post,   '/users/5/posts', :controller => :posts, :action => :create,  :user_id => 5
       #
-      def route(*params)
-        RouteMatcher.new(*params).spec(self)
+      def route(*params, &block)
+        RouteMatcher.new(*params, &block).spec(self)
       end
 
     end

data/lib/remarkable_rails/action_controller/matchers/set_session_matcher.rb

@@ -2,9 +2,9 @@ module Remarkable
   module ActionController
     module Matchers
       class SetSessionMatcher < Remarkable::ActionController::Base #:nodoc:
-        arguments :collection => :keys, :as => :key, :block => :block
+        arguments :collection => :keys, :as => :key, :block => true
 
-        optional :to
+        optional :to, :block => true
 
         assertion :is_not_empty?, :contains_value?
         collection_assertions :assigned_value?, :is_equal_value?

data/spec/action_controller/assign_to_matcher_spec.rb

@@ -86,7 +86,12 @@ describe 'assign_to' do
 
     should_assign_to :user
     should_assign_to :user, :with => 'jose'
-    should_assign_to :user, :with_kind_of => String
+    should_assign_to :user, :with_kind_of => String
+
+    should_assign_to :user do |m|
+      m.with { 'jose' }
+      m.with_kind_of String
+    end
 
     should_not_assign_to :post
     should_not_assign_to :user, :with => 'joseph'

data/spec/action_controller/respond_with_matcher_spec.rb

@@ -141,7 +141,12 @@ describe 'respond_with' do
       should_respond_with 200, :content_type => Mime::HTML
       should_respond_with :ok, :content_type => Mime::HTML
       should_respond_with :success, :content_type => Mime::HTML
-      should_respond_with 200..299, :content_type => Mime::HTML
+      should_respond_with 200..299, :content_type => Mime::HTML
+
+      should_respond_with 200 do |m|
+        m.body /\s*/
+        m.content_type Mime::HTML
+      end
 
       should_not_respond_with 404
       should_not_respond_with :not_found

data/spec/action_controller/set_cookies_matcher_spec.rb

@@ -130,7 +130,10 @@ describe 'set_cookies' do
     should_not_set_cookies :user, :to => 'joseph'
 
     should_set_cookies(:user){ 'jose' }
-    should_set_cookies :user, :to => proc{ 'jose' }
+    should_set_cookies :user, :to => proc{ 'jose' }
+    should_set_cookies :user do |m|
+      m.to { 'jose' }
+    end
 
     should_not_set_cookies :user, :to => nil
     should_not_set_cookies(:user){ 'joseph' }

data/spec/action_controller/set_session_matcher_spec.rb

@@ -115,7 +115,11 @@ describe 'set_session' do
     should_not_set_session :user, :to => 'joseph'
 
     should_set_session(:user){ 'jose' }
-    should_set_session :user, :to => proc{ 'jose' }
+    should_set_session :user, :to => proc{ 'jose' }
+
+    should_set_session :user do |m|
+      m.to { 'jose' }
+    end
 
     should_not_set_session :user, :to => nil
     should_not_set_session(:user){ 'joseph' }

data/spec/action_controller/set_the_flash_matcher_spec.rb

@@ -82,8 +82,8 @@ describe 'set_the_flash' do
     should_set_the_flash :to => /jose/
     should_set_the_flash :notice
     should_set_the_flash :notice, :to => 'jose'
-    should_set_the_flash :notice, :to => /jose/
-
+    should_set_the_flash :notice, :to => /jose/
+
     should_not_set_the_flash :to => 'joseph'
     should_not_set_the_flash :to => /joseph/
     should_not_set_the_flash :error
@@ -93,7 +93,11 @@ describe 'set_the_flash' do
     should_set_the_flash(:notice){ 'jose' }
     should_set_the_flash(:notice){ /jose/ }
     should_set_the_flash :notice, :to => proc{ 'jose' }
-    should_set_the_flash :notice, :to => proc{ /jose/ }
+    should_set_the_flash :notice, :to => proc{ /jose/ }
+
+    should_set_the_flash :notice do |m|
+      m.to = /jose/
+    end
 
     should_not_set_the_flash :notice, :to => nil
     should_not_set_the_flash(:notice){ 'joseph' }

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'ruby-debug'
 
 RAILS_ENV     = 'test'
-RAILS_VERSION = ENV['RAILS_VERSION'] || '2.2.2'
+RAILS_VERSION = ENV['RAILS_VERSION'] || '2.3.2'
 RSPEC_VERSION = ENV['RSPEC_VERSION'] || Spec::VERSION::STRING
 
 # Load Rails

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable_rails
 version: !ruby/object:Gem::Version 
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors: 
 - Carlos Brando
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 +02:00
+date: 2009-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.8
+        version: 3.0.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: remarkable_activerecord
@@ -41,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.8
+        version: 3.0.9
     version: 
 description: "Remarkable Rails: collection of matchers and macros with I18n for Rails"
 email: