remarkable_rails 3.1.3 → 3.1.4

data/CHANGELOG

@@ -1,48 +1,50 @@
-* mock_models now creates a second class method to be used on the index action [#71]
-  In other words, mock_models :project will create:
+* assert_valid_keys on expects
 
-    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]
+* 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
 

data/lib/remarkable_rails/action_controller/macro_stubs.rb

@@ -233,6 +233,8 @@ module Remarkable
         #
         def expects(*args, &block)
           options = args.extract_options!
+          options.assert_valid_keys(:on, :with, :returns, :times, :ordered)
+
           args.each do |arg|
             write_inheritable_array(:expects_chain, [ [ arg, options, block] ])
           end

data/locale/en.yml

@@ -71,7 +71,7 @@ en:
         expectations:
           map_to_path: "to map {{options}} to {{method}} {{path}}, got {{actual}}"
           generate_params: "to generate params {{options}} from {{method}} {{path}}, got {{actual}}"
-
+
       set_cookies:
         description: "set cookies {{keys}}"
         expectations:
@@ -81,8 +81,8 @@ en:
           is_equal_value: "cookie {{key}} to be set to {{to}}, got {{cookies_inspect}}"
         optionals:
           to:
-            positive: "to {{inspect}}"
-            negative: "to {{inspect}}"
+            positive: "to {{inspect}}"
+            negative: "to {{inspect}}"
 
       set_session:
         description: "set session variable {{keys}}"
@@ -93,7 +93,7 @@ en:
           is_equal_value: "session variable {{key}} to be set to {{to}}, got {{session_inspect}}"
         optionals:
           to:
-            positive: "to {{inspect}}"
+            positive: "to {{inspect}}"
             negative: "to {{inspect}}"
 
       set_the_flash:
@@ -105,6 +105,6 @@ en:
           is_equal_value: "flash message {{key}} to be set to {{to}}, got {{flash_inspect}}"
         optionals:
           to:
-            positive: "to {{inspect}}"
-            negative: "to {{inspect}}"
+            positive: "to {{inspect}}"
+            negative: "to {{inspect}}"
 

data/spec/action_controller/filter_params_matcher_spec.rb

@@ -46,7 +46,7 @@ describe 'filter_params' do
     it { should_not filter_params(:user) }
   end
 
-  describe 'not filtering parameter' do
+  describe 'not filtering any parameter' do
     before(:each) do 
       @controller = define_controller(:Comments).new
       self.class.subject { @controller }

data/spec/action_controller/macro_stubs_spec.rb

@@ -125,6 +125,12 @@ describe 'MacroStubs' do
       @controller.request.method.should == :get
       @controller.send(:performed?).should be_true
     end
+
+    it 'should raise an error if an invalid key is supplied' do
+      lambda {
+        self.class.expects :find, :on => Task, :and_return => true
+      }.should raise_error(ArgumentError, "Unknown key(s): and_return")
+    end
 
     it 'should use parameters given in params on request' do
       self.should_receive(:current_id).once.and_return('37')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable_rails
 version: !ruby/object:Gem::Version 
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors: 
 - Carlos Brando
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-28 00:00:00 +02:00
+date: 2009-05-29 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.3
+        version: 3.1.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: remarkable_activerecord
@@ -51,7 +51,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.3
+        version: 3.1.4
     version: 
 description: "Remarkable Rails: collection of matchers and macros with I18n for Rails"
 email: