remarkable_rails 3.1.4 → 3.1.5

data/CHANGELOG

@@ -1,3 +1,9 @@
+* [DEPRECATION] By default all matchers perform expectations, use with_stubs => true
+  if you want otherwise.
+
+* [DEPRECATION] mock_models now creates model_proc instead of mock_model.
+  Altough this won't fire any deprecation warning, all the documentation was changed.
+
 * assert_valid_keys on expects
 
 * mock_models now creates a second class method to be used on the index action [#71]
@@ -70,10 +76,10 @@ specs for a create action rewritten like this:
     mock_models :task
 
     describe :post => :create, :task => { :these => 'params' } do
-      expects :new,  :on => Task, with => {'these' => 'params'}, :returns => mock_task
+      expects :new,  :on => Task, with => {'these' => 'params'}, :returns => task_proc
       expects :save, :on => mock_task, :returns => true
 
-      should_assign_to :task, :with => mock_task
+      should_assign_to :task, :with => task_proc
       should_redirect_to { task_url(mock_task) }
     end
   end

data/README

@@ -65,17 +65,17 @@ An equivalent in remarkable would be:
     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
+      expects :new,  :on => Task, :with => {'these' => 'params'}, :returns => task_proc
+      expects :save, :on => task_proc, :returns => true
 
-      should_assign_to :task, :with => mock_task
-      should_redirect_to { task_url(mock_task) }
+      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. 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.
+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:
 

data/lib/remarkable_rails/action_controller/base.rb

@@ -3,10 +3,10 @@ module Remarkable
     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
@@ -22,7 +22,7 @@ module Remarkable
           elsif @options.key?(:with_expectations)
             @options[:with_expectations]
           else
-            false
+            true
           end
         end
 

data/lib/remarkable_rails/action_controller/macro_stubs.rb

@@ -36,27 +36,16 @@ module Remarkable
     #     assigns(:project).should == mock_project
     #   end
     #
-    # On the other hand, should render template is doing something like this:
-    #
-    #   it 'should render template show' do
-    #     Project.stub!(:find).and_return(mock_project)
-    #     get :show, :id => '37'
-    #     response.should render_template('show')
-    #   end
-    #
-    # Now comes the first question: how each macro knows if they should perform
-    # expectations or stubs?
-    #
-    # By default, only should_assign_to macro performs expectations. You can change
+    # By default, all macros perform expectations. You can change
     # this behavior sending :with_stubs or :with_expectations as options:
     #
     #   should_assign_to       :project, :with_stubs => true
-    #   should_render_template 'show', :with_expectations => true
+    #   should_render_template 'show', :with_expectations => false
     #
     # This also works in the rspec way:
     #
-    #   it { should assign_to(:project).with_stubs            }
-    #   it { should render_template('show').with_expectations }
+    #   it { should assign_to(:project).with_stubs                   }
+    #   it { should render_template('show').with_expectations(false) }
     #
     # == Attention!
     #
@@ -84,12 +73,12 @@ module Remarkable
     #
     # And it creates:
     #
-    #   def self.mock_project
+    #   def self.project_proc
     #     proc { mock_project }
     #   end
     #
     #   # To be used on index actions
-    #   def self.mock_projects
+    #   def self.projects_proc
     #     proc { [mock_project] }
     #   end
     #
@@ -104,8 +93,8 @@ module Remarkable
     #
     # For:
     #
-    #    expects :find, :on => Project, :with => '37', :returns => mock_project
-    #    should_assign_to :project, :with => mock_project
+    #    expects :find, :on => Project, :with => '37', :returns => project_proc
+    #    should_assign_to :project, :with => project_proc
     #
     # = Give me more!
     #
@@ -122,11 +111,11 @@ module Remarkable
     #     params :project_id => '42' #=> define params for all requests
     #
     #     # Those two expectations get inherited in all describe groups below
-    #     expects :find_by_title, :on => Project, :with => '42', :returns => mock_project
+    #     expects :find_by_title, :on => Project, :with => '42', :returns => project_proc
     #     expects :tasks, :and_return => Task
     #
     #     describe :get => :show, :id => '37' do
-    #       expects :find, :with => '37', :and_return => mock_task
+    #       expects :find, :with => '37', :and_return => task_proc
     #
     #       should_assign_to :project, :task
     #       should_render_template 'show'
@@ -140,7 +129,7 @@ module Remarkable
     # expectations with run_action!, run_expectations! and run_stubs!. Examples:
     #
     #   describe :get => :new do
-    #     expects :new, :on => Project, :returns => mock_project
+    #     expects :new, :on => Project, :returns => project_proc
     #
     #     it "should do something different" do
     #       run_action!
@@ -223,9 +212,9 @@ module Remarkable
         #
         # == Example
         #
-        #   expects :new, :on => Project, :returns => :mock_project, :times => 2
+        #   expects :new, :on => Project, :returns => :project_proc, :times => 2
         #
-        #   expects :new, :find, :on => Project, :returns => :mock_project
+        #   expects :new, :find, :on => Project, :returns => :project_proc
         #
         #   expects :human_attribute_name, :on => Project, :with => :title do |attr|
         #     attr.to_s.humanize
@@ -429,12 +418,12 @@ module Remarkable
         #
         # Will create one instance and two class mock methods for you:
         #
-        #   def self.mock_project
+        #   def self.project_proc
         #     proc { mock_project }
         #   end
         #
         #   # To be used on index actions
-        #   def self.mock_projects
+        #   def self.projects_procs
         #     proc { [ mock_project ] }
         #   end
         #
@@ -450,11 +439,18 @@ module Remarkable
           options = { :class_method => true }.merge(options)
 
           models.each do |model|
-            model = model.to_s
-            self.class_eval <<-METHOD
-              #{"def self.mock_#{model}; proc { mock_#{model} }; end"               if options[:class_method]}
-              #{"def self.mock_#{model.pluralize}; proc { [ mock_#{model} ] }; end" if options[:class_method]}
+            model = model.to_s
+            if options[:class_method]
+              (class << self; self; end).class_eval <<-METHOD
+                def #{model}_proc; proc { mock_#{model} }; end
+                def #{model.pluralize}_proc; proc { [ mock_#{model} ] }; end
+
+                alias :mock_#{model} :#{model}_proc
+                alias :mock_#{model.pluralize} :#{model.pluralize}_proc
+              METHOD
+            end
 
+            self.class_eval <<-METHOD
               def mock_#{model}(stubs={})
                 @#{model} ||= mock_model(#{model.classify}, stubs)
               end

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

@@ -11,8 +11,6 @@ module Remarkable
 
         before_assert :evaluate_expected_value
 
-        default_options :with_expectations => true
-
         protected
 
           def assigned_value?

data/spec/action_controller/macro_stubs_spec.rb

@@ -11,21 +11,29 @@ describe 'MacroStubs' do
 
   describe 'mock_models' do
     before(:each) do
-      self.class.metaclass.send(:undef_method, :mock_projects) if self.class.respond_to?(:mock_projects)
-      self.class.metaclass.send(:undef_method, :mock_project)  if self.class.respond_to?(:mock_project)
+      self.class.metaclass.send(:undef_method, :projects_proc) if self.class.respond_to?(:projects_proc)
+      self.class.metaclass.send(:undef_method, :project_proc)  if self.class.respond_to?(:project_proc)
       self.class.send(:undef_method, :mock_project)            if self.respond_to?(:mock_project)
     end
+
+    it 'should alias model_proc to mock_model' do
+      self.class.respond_to?(:mock_project).should be_false
+      self.class.respond_to?(:mock_projects).should be_false
+      self.class.mock_models :project
+      self.class.respond_to?(:mock_project).should be_true
+      self.class.respond_to?(:mock_projects).should be_true
+    end
 
     it 'should create a class singular mock method' do
-      self.class.respond_to?(:mock_project).should be_false
+      self.class.respond_to?(:project_proc).should be_false
       self.class.mock_models :project
-      self.class.respond_to?(:mock_project).should be_true
+      self.class.respond_to?(:project_proc).should be_true
     end
 
     it 'should create a class plural mock method' do
-      self.class.respond_to?(:mock_projects).should be_false
+      self.class.respond_to?(:projects_proc).should be_false
       self.class.mock_models :project
-      self.class.respond_to?(:mock_projects).should be_true
+      self.class.respond_to?(:projects_proc).should be_true
     end
 
     it 'should create an instance mock method' do
@@ -35,15 +43,15 @@ describe 'MacroStubs' do
     end
 
     it 'should create just an instance method when :class_method is false' do
-      self.class.respond_to?(:mock_project).should be_false
+      self.class.respond_to?(:project_proc).should be_false
       self.respond_to?(:mock_project).should be_false
       self.class.mock_models :project, :class_method => false
-      self.class.respond_to?(:mock_project).should be_false
+      self.class.respond_to?(:project_proc).should be_false
       self.respond_to?(:mock_project).should be_true
     end
 
     it 'should create procs which evals to a mock dynamically' do
-      proc = self.class.mock_task
+      proc = self.class.task_proc
       proc.should be_kind_of(Proc)
 
       @task.should be_nil
@@ -52,7 +60,7 @@ describe 'MacroStubs' do
     end
 
     it 'should create procs which evals to an array of mocks dynamically' do
-      proc = self.class.mock_tasks
+      proc = self.class.tasks_proc
       proc.should be_kind_of(Proc)
 
       @task.should be_nil
@@ -62,7 +70,7 @@ describe 'MacroStubs' do
   end
 
   describe 'failures' do
-    expects :find, :on => Task, :with => proc{ current_id }, :returns => mock_task
+    expects :find, :on => Task, :with => proc{ current_id }, :returns => task_proc
     expects :max, :min, :count, :on => Task, :ordered => true
 
     get :show, :id => 37
@@ -109,7 +117,7 @@ describe 'MacroStubs' do
   end
 
   describe 'when extending describe group behavior' do
-    expects :find, :on => Task, :with => proc{ current_id }, :returns => mock_task
+    expects :find, :on => Task, :with => proc{ current_id }, :returns => task_proc
     expects :count, :max, :min, :on => Task
 
     get :show, :id => 37
@@ -176,7 +184,7 @@ describe 'MacroStubs' do
     end
 
     describe Mime::XML do
-      expects :to_xml, :on => mock_task, :returns => 'XML'
+      expects :to_xml, :on => task_proc, :returns => 'XML'
 
       it 'should provide a description based on the mime given in describe' do
         self.class.description.should =~ /with xml$/
@@ -225,9 +233,9 @@ describe 'MacroStubs' do
     [:delete, :delete!].each do |method|
 
       describe method => :destroy, :id => '37' do
-        expects :find,    :on => Task, :with => '37', :returns => mock_task
-        expects :destroy, :on => mock_task
-        expects :title,   :on => mock_task, :with => false do |boolean|
+        expects :find,    :on => Task, :with => '37', :returns => task_proc
+        expects :destroy, :on => task_proc
+        expects :title,   :on => task_proc, :with => false do |boolean|
           if boolean
             'This should not appear'
           else
@@ -239,7 +247,7 @@ describe 'MacroStubs' do
         subject { controller }
 
         should_assign_to :task
-        should_assign_to :task, :with => mock_task
+        should_assign_to :task, :with => task_proc
         should_assign_to :task, :with_kind_of => Task
 
         should_set_the_flash

data/spec/functional_builder.rb

@@ -55,10 +55,9 @@ module FunctionalBuilder
 
   module ClassMethods
     def generate_macro_stubs_specs_for(matcher, *args)
-      stubs_args = args.dup
-
-      options = args.extract_options!
-      expectations_args = (args << options.merge(:with_expectations => true))
+      expectation_args = args.dup
+      options          = args.extract_options!
+      stub_args        = (args << options.merge(:with_stubs => true))
 
       describe 'macro stubs' do
         before(:each) do
@@ -70,21 +69,21 @@ module FunctionalBuilder
         expects :new, :on => String, :with => 'ola', :returns => 'ola'
         get :new
 
-        it 'should run stubs by default' do
-          String.should_receive(:stub!).with(:new).and_return(@mock=mock('chain'))
-          @mock.should_receive(:and_return).with('ola').and_return('ola')
-
-          send(matcher, *stubs_args).matches?(@controller)
-        end
-
-        it 'should run expectations' do
+        it 'should run expectations by default' do
           String.should_receive(:should_receive).with(:new).and_return(@mock=mock('chain'))
           @mock.should_receive(:with).with('ola').and_return(@mock)
           @mock.should_receive(:exactly).with(1).and_return(@mock)
           @mock.should_receive(:times).and_return(@mock)
           @mock.should_receive(:and_return).with('ola').and_return('ola')
 
-          send(matcher, *expectations_args).matches?(@controller)
+          send(matcher, *expectation_args).matches?(@controller)
+        end
+
+        it 'should run stubs' do
+          String.should_receive(:stub!).with(:new).and_return(@mock=mock('chain'))
+          @mock.should_receive(:and_return).with('ola').and_return('ola')
+
+          send(matcher, *stub_args).matches?(@controller)
         end
       end
 

metadata

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