remarkable_rails 3.0.1 → 3.0.2

data/locale/en.yml

@@ -1,87 +1,87 @@
 en:
   remarkable:
-    action_controller:
-      responding: "responding to #{{verb}} {{action}}"
+    action_controller:
+      responding: "responding to #{{verb}} {{action}}"
       mime_type: "with {{format}}"
       assign_to:
         description: "assign {{names}}"
         expectations:
           assigned_value: "action to assign {{name}}, got no assignment"
-          is_kind_of: "assign {{name}} to be kind of {{with_kind_of}}, got a {{assign_class}}"
-          is_equal_value: "assign {{name}} to be equal to {{with}}, got {{assign_inspect}}"
-        optionals:
-          with_kind_of:
-            positive: "with kind of {{value}}"
-      filter_params:
-        description: "filter {{params}} parameters from log"
-        expectations:
-          respond_to_filter_params: "controller to respond to filter_parameters (controller is not filtering any parameter)"
-          is_filtered: "{{param}} to be filtered, got no filtering"
-      redirect_to:
-        description: "redirect to {{expected}}"
-        expectations:
-          redirected: "redirect to {{expected}}, got no redirect"
-          status_matches: "redirect to {{expected}} with status {{with}}, got status {{status}}"
-          url_matches: "redirect to {{expected}}, got redirect to {{actual}}"
-        optionals:
-          with:
-            positive: "with status {{inspect}}"
-      render_template:
-        description: "render"
-        expectations:
-          rendered: "template {{template}} to be rendered, got no render"
-          template_matches: "template {{template}} to be rendered, got {{actual_template}}"
-          layout_matches: "to render with layout {{layout}}, got {{actual_layout}}"
-          status_matches: "to render with {{with}}, got {{actual_status}}"
-          body_matches: "to render with body equals to {{body}}, got {{actual_body}}"
-          content_type_matches: "to render with content type {{content_type}}, got {{actual_content_type}}"
-        optionals:
-          template:
-            positive: "template {{inspect}}"
-          layout:
-            positive: "with layout {{inspect}}"
-            negative: "with no layout"
-          with:
-            positive: "with {{value}}"
-          body:
-            positive: "with body {{inspect}}"
-          content_type:
-            positive: "with content type {{inspect}}"
-      respond_with:
-        description: "respond"
-        expectations:
-          status_matches: "to respond with {{with}}, got {{actual_status}}"
-          body_matches: "to respond with body equals to {{body}}, got {{actual_body}}"
-          content_type_matches: "to respond with content type {{content_type}}, got {{actual_content_type}}"
-        optionals:
-          with:
-            positive: "with {{value}}"
-          body:
-            positive: "with body {{inspect}}"
-          content_type:
-            positive: "with content type {{inspect}}"
-      route:
-        description: "route {{method}} {{path}} to/from {{options}}"
-        expectations:
-          map_to_path: "to map {{options}} to {{method}} {{path}}, got {{actual}}"
-          generate_params: "to generate params {{options}} from {{method}} {{path}}, got {{actual}}"
-      set_session:
+          is_kind_of: "assign {{name}} to be kind of {{with_kind_of}}, got a {{assign_class}}"
+          is_equal_value: "assign {{name}} to be equal to {{with}}, got {{assign_inspect}}"
+        optionals:
+          with_kind_of:
+            positive: "with kind of {{value}}"
+      filter_params:
+        description: "filter {{params}} parameters from log"
+        expectations:
+          respond_to_filter_params: "controller to respond to filter_parameters (controller is not filtering any parameter)"
+          is_filtered: "{{param}} to be filtered, got no filtering"
+      redirect_to:
+        description: "redirect to {{expected}}"
+        expectations:
+          redirected: "redirect to {{expected}}, got no redirect"
+          status_matches: "redirect to {{expected}} with status {{with}}, got status {{status}}"
+          url_matches: "redirect to {{expected}}, got redirect to {{actual}}"
+        optionals:
+          with:
+            positive: "with status {{inspect}}"
+      render_template:
+        description: "render"
+        expectations:
+          rendered: "template {{template}} to be rendered, got no render"
+          template_matches: "template {{template}} to be rendered, got {{actual_template}}"
+          layout_matches: "to render with layout {{layout}}, got {{actual_layout}}"
+          status_matches: "to render with {{with}}, got {{actual_status}}"
+          body_matches: "to render with body equals to {{body}}, got {{actual_body}}"
+          content_type_matches: "to render with content type {{content_type}}, got {{actual_content_type}}"
+        optionals:
+          template:
+            positive: "template {{inspect}}"
+          layout:
+            positive: "with layout {{inspect}}"
+            negative: "with no layout"
+          with:
+            positive: "with {{value}}"
+          body:
+            positive: "with body {{inspect}}"
+          content_type:
+            positive: "with content type {{inspect}}"
+      respond_with:
+        description: "respond"
+        expectations:
+          status_matches: "to respond with {{with}}, got {{actual_status}}"
+          body_matches: "to respond with body equals to {{body}}, got {{actual_body}}"
+          content_type_matches: "to respond with content type {{content_type}}, got {{actual_content_type}}"
+        optionals:
+          with:
+            positive: "with {{value}}"
+          body:
+            positive: "with body {{inspect}}"
+          content_type:
+            positive: "with content type {{inspect}}"
+      route:
+        description: "route {{method}} {{path}} to/from {{options}}"
+        expectations:
+          map_to_path: "to map {{options}} to {{method}} {{path}}, got {{actual}}"
+          generate_params: "to generate params {{options}} from {{method}} {{path}}, got {{actual}}"
+      set_session:
         description: "set session variable {{keys}}"
-        expectations:
-          is_not_empty: "any session variable to be set, got {{session_inspect}}"
+        expectations:
+          is_not_empty: "any session variable to be set, got {{session_inspect}}"
           contains_value: "any session variable to be set to {{to}}, got {{session_inspect}}"
           assigned_value: "session variable {{key}} to be set, got {{session_inspect}}"
-          is_equal_value: "session variable {{key}} to be set to {{to}}, got {{session_inspect}}"
-        optionals:
-          to:
-            positive: "to {{inspect}}"
-      set_the_flash:
+          is_equal_value: "session variable {{key}} to be set to {{to}}, got {{session_inspect}}"
+        optionals:
+          to:
+            positive: "to {{inspect}}"
+      set_the_flash:
         description: "set the flash message {{keys}}"
-        expectations:
-          is_not_empty: "any flash message to be set, got {{flash_inspect}}"
+        expectations:
+          is_not_empty: "any flash message to be set, got {{flash_inspect}}"
           contains_value: "any flash message to be set to {{to}}, got {{flash_inspect}}"
           assigned_value: "flash message {{key}} to be set, got {{flash_inspect}}"
-          is_equal_value: "flash message {{key}} to be set to {{to}}, got {{flash_inspect}}"
-        optionals:
-          to:
-            positive: "to {{inspect}}"
+          is_equal_value: "flash message {{key}} to be set to {{to}}, got {{flash_inspect}}"
+        optionals:
+          to:
+            positive: "to {{inspect}}"

data/spec/action_controller/assign_to_matcher_spec.rb

@@ -37,13 +37,13 @@ describe 'assign_to' do
   end
 
   describe 'matcher' do
-    before(:each) do
-      build_response {
-        @user  = 'jose'
-        @true  = true
-        @false = false
-        @nil   = nil
-      }
+    before(:each) do
+      build_response {
+        @user  = 'jose'
+        @true  = true
+        @false = false
+        @nil   = nil
+      }
     end
 
     it { should assign_to(:user) }
@@ -56,32 +56,32 @@ describe 'assign_to' do
 
     it { should assign_to(:user){ 'jose' } }
     it { should assign_to(:user, :with => proc{ 'jose' }) }
-
+
     it { should_not assign_to(:user).with(nil) }
     it { should_not assign_to(:user){ 'joseph' } }
-    it { should_not assign_to(:user, :with => proc{ 'joseph' }) }
-
-    it { should assign_to(:true) }
-    it { should assign_to(:true).with(true) }
-    it { should_not assign_to(:true).with(false) }
-
-    it { should assign_to(:false) }
-    it { should assign_to(:false).with(false) }
-    it { should_not assign_to(:false).with(true) }
-
-    it { should assign_to(:nil) }
-    it { should assign_to(:nil).with(nil) }
-    it { should_not assign_to(:nil).with(true) }
+    it { should_not assign_to(:user, :with => proc{ 'joseph' }) }
+
+    it { should assign_to(:true) }
+    it { should assign_to(:true).with(true) }
+    it { should_not assign_to(:true).with(false) }
+
+    it { should assign_to(:false) }
+    it { should assign_to(:false).with(false) }
+    it { should_not assign_to(:false).with(true) }
+
+    it { should assign_to(:nil) }
+    it { should assign_to(:nil).with(nil) }
+    it { should_not assign_to(:nil).with(true) }
   end
 
   describe 'macro' do
-    before(:each) do
-      build_response {
-        @user  = 'jose'
-        @true  = true
-        @false = false
-        @nil   = nil
-      }
+    before(:each) do
+      build_response {
+        @user  = 'jose'
+        @true  = true
+        @false = false
+        @nil   = nil
+      }
     end
 
     should_assign_to :user
@@ -97,47 +97,47 @@ describe 'assign_to' do
 
     should_not_assign_to :user, :with => nil
     should_not_assign_to(:user){ 'joseph' }
-    should_not_assign_to :user, :with => proc{ 'joseph' }
-
-    should_assign_to :true
-    should_assign_to :true, :with => true
-    should_not_assign_to :true, :with => false
-
-    should_assign_to :false
-    should_assign_to :false, :with => false
-    should_not_assign_to :false, :with => true
-
-    should_assign_to :nil
-    should_assign_to :nil, :with => nil
+    should_not_assign_to :user, :with => proc{ 'joseph' }
+
+    should_assign_to :true
+    should_assign_to :true, :with => true
+    should_not_assign_to :true, :with => false
+
+    should_assign_to :false
+    should_assign_to :false, :with => false
+    should_not_assign_to :false, :with => true
+
+    should_assign_to :nil
+    should_assign_to :nil, :with => nil
     should_not_assign_to :nil, :with => true
   end
-
-  describe 'macro stubs' do
-    before(:each) do
-      @controller = TasksController.new
-      @request    = ActionController::TestRequest.new
-      @response   = ActionController::TestResponse.new
-    end
-
-    expects :new, :on => String, :with => 'ola', :returns => 'ola'
-    get :new
-
-    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')
-
-      assign_to(:user).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')
-
-      assign_to(:user, :with_stubs => true).matches?(@controller)
-    end
-
+
+  describe 'macro stubs' do
+    before(:each) do
+      @controller = TasksController.new
+      @request    = ActionController::TestRequest.new
+      @response   = ActionController::TestResponse.new
+    end
+
+    expects :new, :on => String, :with => 'ola', :returns => 'ola'
+    get :new
+
+    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')
+
+      assign_to(:user).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')
+
+      assign_to(:user, :with_stubs => true).matches?(@controller)
+    end
+
   end
 end

data/spec/action_controller/filter_params_matcher_spec.rb

@@ -3,62 +3,62 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe 'filter_params' do
   include FunctionalBuilder
 
-  describe 'messages' do
-    before(:each) do
-      @controller = define_controller :Posts do
-        filter_parameter_logging :password
-      end.new
+  describe 'messages' do
+    before(:each) do
+      @controller = define_controller :Posts do
+        filter_parameter_logging :password
+      end.new
 
       @matcher = filter_params(:user)
-    end
+    end
 
     it 'should contain a description message' do
       @matcher.description.should == 'filter user parameters from log'
     end
 
-    it 'should set respond_to_filter_params? message' do
-      @controller = define_controller(:Comments).new
-      @matcher.matches?(@controller)
+    it 'should set respond_to_filter_params? message' do
+      @controller = define_controller(:Comments).new
+      @matcher.matches?(@controller)
       @matcher.failure_message.should == 'Expected controller to respond to filter_parameters (controller is not filtering any parameter)'
     end
 
-    it 'should set is_filtered? message' do
-      @matcher.matches?(@controller)
+    it 'should set is_filtered? message' do
+      @matcher.matches?(@controller)
       @matcher.failure_message.should == 'Expected user to be filtered, got no filtering'
     end
   end
 
-  describe 'filtering parameter' do
-    before(:each) do 
-      @controller = define_controller :Comments do
-        filter_parameter_logging :password
-      end.new
-
-      self.class.subject { @controller }
-    end
-
-    should_filter_params
-    should_filter_params(:password)
-    should_not_filter_params(:user)
-
-    it { should filter_params }
-    it { should filter_params(:password) }
-    it { should_not filter_params(:user) }
-  end
-
-  describe 'not filtering parameter' do
-    before(:each) do 
-      @controller = define_controller(:Comments).new
-      self.class.subject { @controller }
-    end
-
-    should_not_filter_params
-    should_not_filter_params(:password)
-    should_not_filter_params(:user)
-
-    it { should_not filter_params }
-    it { should_not filter_params(:user) }
-    it { should_not filter_params(:password) }
+  describe 'filtering parameter' do
+    before(:each) do 
+      @controller = define_controller :Comments do
+        filter_parameter_logging :password
+      end.new
+
+      self.class.subject { @controller }
+    end
+
+    should_filter_params
+    should_filter_params(:password)
+    should_not_filter_params(:user)
+
+    it { should filter_params }
+    it { should filter_params(:password) }
+    it { should_not filter_params(:user) }
+  end
+
+  describe 'not filtering parameter' do
+    before(:each) do 
+      @controller = define_controller(:Comments).new
+      self.class.subject { @controller }
+    end
+
+    should_not_filter_params
+    should_not_filter_params(:password)
+    should_not_filter_params(:user)
+
+    it { should_not filter_params }
+    it { should_not filter_params(:user) }
+    it { should_not filter_params(:password) }
   end
 
 end

data/spec/action_controller/macro_stubs_spec.rb

@@ -126,27 +126,27 @@ describe 'MacroStubs' do
     end
 
     describe 'and running actions in a before(:all) filter' do
-      get :show, :id => 37
-
-      get! do
-        @request.should_not be_nil
-      end
-
-      get! do
-        @flag = true
-      end
-
-      get! do
-        @controller.should_not be_nil
+      get :show, :id => 37
+
+      get! do
+        @request.should_not be_nil
+      end
+
+      get! do
+        @flag = true
+      end
+
+      get! do
+        @controller.should_not be_nil
       end
 
       it 'should run the action before each example' do
         @controller.send(:performed?).should be_true
-      end
-
-      it 'should execute the given block' do
-        @flag.should be_true
-      end
+      end
+
+      it 'should execute the given block' do
+        @flag.should be_true
+      end
     end
   end
 

data/spec/action_controller/redirect_to_matcher_spec.rb

@@ -4,12 +4,12 @@ describe 'redirect_to' do
   include FunctionalBuilder
 
   describe 'messages' do
-    before(:each) do
-      build_response { redirect_to projects_url }
+    before(:each) do
+      build_response { redirect_to projects_url }
       @matcher = redirect_to(project_tasks_url(1)).with(302)
     end
 
-    it 'should contain a description message' do
+    it 'should contain a description message' do
       @matcher = redirect_to(project_tasks_url(1))
       @matcher.description.should == 'redirect to "http://test.host/projects/1/tasks"'
 
@@ -17,13 +17,13 @@ describe 'redirect_to' do
       @matcher.description.should == 'redirect to "http://test.host/projects/1/tasks" with status 301'
     end
 
-    it 'should set redirected? message' do
-      build_response
+    it 'should set redirected? message' do
+      build_response
       @matcher.matches?(@controller)
       @matcher.failure_message.should == 'Expected redirect to "http://test.host/projects/1/tasks", got no redirect'
     end
 
-    it 'should set status_matches? message' do
+    it 'should set status_matches? message' do
       @matcher.with(200).matches?(@controller)
       @matcher.failure_message.should == 'Expected redirect to "http://test.host/projects/1/tasks" with status 200, got status 302'
     end
@@ -34,69 +34,69 @@ describe 'redirect_to' do
     end
   end
 
-  describe 'matcher' do
-
-    {
-      :hash => { :controller => 'tasks', :action => 'index', :project_id => 1 },
-      :url =>  'http://test.host/projects/1/tasks',
-      :path => '/projects/1/tasks'
-    }.each do |type, route|
+  describe 'matcher' do
+
+    {
+      :hash => { :controller => 'tasks', :action => 'index', :project_id => 1 },
+      :url =>  'http://test.host/projects/1/tasks',
+      :path => '/projects/1/tasks'
+    }.each do |type, route|
       describe "redirecting to an #{type}" do 
-        before(:each){ build_response { redirect_to route } }
-
-        it { should redirect_to(project_tasks_url(1)) }
-        it { should redirect_to(project_tasks_path(1)) }
-        it { should redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1) }
-        it { should redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1).with(302) }
-
-        it { should_not redirect_to(project_tasks_url(2)) }
-        it { should_not redirect_to(project_tasks_path(2)) }
-        it { should_not redirect_to(:controller => 'tasks', :action => 'index', :project_id => 2) }
-        it { should_not redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1).with(301) }
-
-        it { response.should redirect_to(project_tasks_url(1)) }
-        it { response.should redirect_to(project_tasks_path(1)) }
-        it { response.should redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1) }
-        it { response.should redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1).with(302) }
-
-        it { response.should_not redirect_to(project_tasks_url(2)) }
-        it { response.should_not redirect_to(project_tasks_path(2)) }
-        it { response.should_not redirect_to(:controller => 'tasks', :action => 'index', :project_id => 2) }
-        it { response.should_not redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1).with(301) }
-      end
+        before(:each){ build_response { redirect_to route } }
+
+        it { should redirect_to(project_tasks_url(1)) }
+        it { should redirect_to(project_tasks_path(1)) }
+        it { should redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1) }
+        it { should redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1).with(302) }
+
+        it { should_not redirect_to(project_tasks_url(2)) }
+        it { should_not redirect_to(project_tasks_path(2)) }
+        it { should_not redirect_to(:controller => 'tasks', :action => 'index', :project_id => 2) }
+        it { should_not redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1).with(301) }
+
+        it { response.should redirect_to(project_tasks_url(1)) }
+        it { response.should redirect_to(project_tasks_path(1)) }
+        it { response.should redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1) }
+        it { response.should redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1).with(302) }
+
+        it { response.should_not redirect_to(project_tasks_url(2)) }
+        it { response.should_not redirect_to(project_tasks_path(2)) }
+        it { response.should_not redirect_to(:controller => 'tasks', :action => 'index', :project_id => 2) }
+        it { response.should_not redirect_to(:controller => 'tasks', :action => 'index', :project_id => 1).with(301) }
+      end
     end
 
   end
 
   describe 'macro' do
-
-    {
-      :hash => { :controller => 'tasks', :action => 'index', :project_id => 1 },
-      :url =>  'http://test.host/projects/1/tasks',
-      :path => '/projects/1/tasks'
-    }.each do |type, route|
+
+    {
+      :hash => { :controller => 'tasks', :action => 'index', :project_id => 1 },
+      :url =>  'http://test.host/projects/1/tasks',
+      :path => '/projects/1/tasks'
+    }.each do |type, route|
       describe "redirecting to an #{type}" do 
-        before(:each){ build_response { redirect_to route } }
-
-        should_redirect_to{ project_tasks_url(1) }
-        should_redirect_to{ project_tasks_path(1) }
-        should_redirect_to proc{ project_tasks_url(1) }
-        should_redirect_to proc{ project_tasks_path(1) }
-        should_redirect_to proc{ project_tasks_url(1) }, :with => 302
-        should_redirect_to proc{ project_tasks_path(1) }, :with => 302
-        should_redirect_to :controller => 'tasks', :action => 'index', :project_id => 1
-
-        should_not_redirect_to{ project_tasks_url(2) }
-        should_not_redirect_to{ project_tasks_path(2) }
-        should_not_redirect_to proc{ project_tasks_url(2) }
-        should_not_redirect_to proc{ project_tasks_path(2) }
-        should_not_redirect_to proc{ project_tasks_url(1) }, :with => 301
-        should_not_redirect_to proc{ project_tasks_path(1) }, :with => 301
-        should_not_redirect_to :controller => 'tasks', :action => 'index', :project_id => 2
-      end
+        before(:each){ build_response { redirect_to route } }
+
+        should_redirect_to{ project_tasks_url(1) }
+        should_redirect_to{ project_tasks_path(1) }
+        should_redirect_to proc{ project_tasks_url(1) }
+        should_redirect_to proc{ project_tasks_path(1) }
+        should_redirect_to proc{ project_tasks_url(1) }, :with => 302
+        should_redirect_to proc{ project_tasks_path(1) }, :with => 302
+        should_redirect_to :controller => 'tasks', :action => 'index', :project_id => 1
+
+        should_not_redirect_to{ project_tasks_url(2) }
+        should_not_redirect_to{ project_tasks_path(2) }
+        should_not_redirect_to proc{ project_tasks_url(2) }
+        should_not_redirect_to proc{ project_tasks_path(2) }
+        should_not_redirect_to proc{ project_tasks_url(1) }, :with => 301
+        should_not_redirect_to proc{ project_tasks_path(1) }, :with => 301
+        should_not_redirect_to :controller => 'tasks', :action => 'index', :project_id => 2
+      end
     end
 
   end
-
+
   generate_macro_stubs_specs_for(:redirect_to, 'http://google.com/')
 end