action_args 1.0.3 → 1.0.4

data/README.md

@@ -20,7 +20,7 @@ class HogeController < ApplicationController
 end
 ```
 
-Hitting "/hoge/fuga?piyo=foo" will call fuga('foo') and output 'foo'.
+Hitting "/hoge/fuga?piyo=foo" will call `fuga('foo')` and output 'foo'.
 So, you do never need to touch the ugly `params` Hash in order to fetch the request parameters.
 
 
@@ -29,7 +29,7 @@ So, you do never need to touch the ugly `params` Hash in order to fetch the requ
 ActionArgs plays very nice with Rails 4 StrongParameters.
 
 In this `show` action, ActionArgs `require`s the `id` parameter.
-Hence, raises an error if the `id` value has not been specified, in the same way as usual Ruby methods do.
+Hence, if the `id` value has not been specified in the request parameter, it raises an error in the same way as usual Ruby methods do.
 
 ```ruby
 class UsersController < ApplicationController
@@ -90,7 +90,7 @@ Thus, by hitting the scaffold generator command like this:
 % rails g scaffold user name age:integer email
 ```
 
-The following beautiful controller code will be generated:
+The following elegant controller code will be generated:
 
 ```ruby
 # coding: utf-8
@@ -183,7 +183,7 @@ Of courese you still can use both Merbish style and plain old Rails style action
 
 ### Argument Naming Convention
 
-Each action method parameter name corresponds to `params` key name. For example, the following beautifully written nested show action works perfectly (this might not be a very good example of effective querying, but that's another story).
+Each action method parameter name corresponds to `params` key name. For example, the following beautifully written nested `show` action works perfectly (this might not be a very good example of effective querying, but that's another story).
 
 ```ruby
 Rails.application.routes.draw do

data/lib/action_args/version.rb

@@ -1,3 +1,3 @@
 module ActionArgs
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/action_args.rb

@@ -1,8 +1,8 @@
-require 'action_args/abstract_controller'
 begin
   require 'strong_parameters'
 rescue LoadError
 end
+require 'action_args/abstract_controller'
 
 module ActionArgs
   class Railtie < ::Rails::Railtie

data/lib/generators/action_args/rspec/scaffold/templates/action_args_controller_spec.rb

@@ -5,21 +5,17 @@ describe <%= controller_class_name %>Controller do
   # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
   # update the return value of this method accordingly.
   def valid_attributes
-    {}
-  end
-  
-  before do
-    @controller = <%= controller_class_name %>Controller.new
+    <%= formatted_hash(example_valid_attributes) %>
   end
 
 <% unless options[:singleton] -%>
   describe 'GET index' do
     before do
       @<%= file_name %> = <%= class_name %>.create! valid_attributes
-      @controller.index
+      controller.index
     end
     describe 'assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>' do
-      subject { @controller.instance_variable_get('@<%= table_name %>') }
+      subject { controller.instance_variable_get('@<%= table_name %>') }
       it { should eq([@<%= file_name %>]) }
     end
   end
@@ -28,20 +24,20 @@ describe <%= controller_class_name %>Controller do
   describe 'GET show' do
     before do
       @<%= file_name %> = <%= class_name %>.create! valid_attributes
-      @controller.show(@<%= file_name %>.to_param)
+      controller.show(@<%= file_name %>.to_param)
     end
     describe 'assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>' do
-      subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+      subject { controller.instance_variable_get('@<%= ns_file_name %>') }
       it { should eq(@<%= file_name %>) }
     end
   end
 
   describe 'GET new' do
     before do
-      @controller.new
+      controller.new
     end
     describe 'assigns a new <%= ns_file_name %> as @<%= ns_file_name %>' do
-      subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+      subject { controller.instance_variable_get('@<%= ns_file_name %>') }
       it { should be_a_new(<%= class_name %>) }
     end
   end
@@ -49,10 +45,10 @@ describe <%= controller_class_name %>Controller do
   describe 'GET edit' do
     before do
       @<%= file_name %> = <%= class_name %>.create! valid_attributes
-      @controller.edit(@<%= file_name %>.to_param)
+      controller.edit(@<%= file_name %>.to_param)
     end
     describe 'assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>' do
-      subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+      subject { controller.instance_variable_get('@<%= ns_file_name %>') }
       it { should eq(@<%= file_name %>) }
     end
   end
@@ -60,19 +56,19 @@ describe <%= controller_class_name %>Controller do
   describe 'POST create' do
     context 'with valid params' do
       before do
-        @controller.should_receive(:redirect_to) {|u| u.should eq(<%= class_name %>.last) }
+        controller.should_receive(:redirect_to) {|u| u.should eq(<%= class_name %>.last) }
       end
       describe 'creates a new <%= class_name %>' do
         it { expect {
-          @controller.create(valid_attributes)
+          controller.create(valid_attributes)
         }.to change(<%= class_name %>, :count).by(1) }
       end
 
       describe 'assigns a newly created <%= ns_file_name %> as @<%= ns_file_name %> and redirects to the created <%= ns_file_name %>' do
         before do
-          @controller.create(valid_attributes)
+          controller.create(valid_attributes)
         end
-        subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+        subject { controller.instance_variable_get('@<%= ns_file_name %>') }
         it { should be_a(<%= class_name %>) }
         it { should be_persisted }
       end
@@ -82,10 +78,10 @@ describe <%= controller_class_name %>Controller do
       describe "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>, and re-renders the 'new' template" do
         before do
           <%= class_name %>.any_instance.stub(:save) { false }
-          @controller.should_receive(:render).with(:action => 'new')
-          @controller.create({})
+          controller.should_receive(:render).with(:action => 'new')
+          controller.create(<%= formatted_hash(example_invalid_attributes) %>)
         end
-        subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+        subject { controller.instance_variable_get('@<%= ns_file_name %>') }
         it { should be_a_new(<%= class_name %>) }
       end
     end
@@ -96,10 +92,10 @@ describe <%= controller_class_name %>Controller do
       describe 'updates the requested <%= ns_file_name %>, assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>, and redirects to the <%= ns_file_name %>' do
         before do
           @<%= file_name %> = <%= class_name %>.create! valid_attributes
-          @controller.should_receive(:redirect_to).with(@<%= file_name %>, anything)
-          @controller.update(@<%= file_name %>.to_param, valid_attributes)
+          controller.should_receive(:redirect_to).with(@<%= file_name %>, anything)
+          controller.update(@<%= file_name %>.to_param, valid_attributes)
         end
-        subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+        subject { controller.instance_variable_get('@<%= ns_file_name %>') }
         it { should eq(@<%= file_name %>) }
       end
     end
@@ -110,10 +106,10 @@ describe <%= controller_class_name %>Controller do
           @<%= file_name %> = <%= class_name %>.create! valid_attributes
           # Trigger the behavior that occurs when invalid params are submitted
           <%= class_name %>.any_instance.stub(:save) { false }
-          @controller.should_receive(:render).with(:action => 'edit')
-          @controller.update(@<%= file_name %>.to_param, {})
+          controller.should_receive(:render).with(:action => 'edit')
+          controller.update(@<%= file_name %>.to_param, <%= formatted_hash(example_invalid_attributes) %>)
         end
-        subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+        subject { controller.instance_variable_get('@<%= ns_file_name %>') }
         it { should eq(@<%= file_name %>) }
       end
     end
@@ -122,12 +118,12 @@ describe <%= controller_class_name %>Controller do
   describe 'DELETE destroy' do
     before do
       @<%= file_name %> = <%= class_name %>.create! valid_attributes
-      @controller.stub(:<%= index_helper %>_url) { '/<%= index_helper %>' }
-      @controller.should_receive(:redirect_to).with('/<%= index_helper %>')
+      controller.stub(:<%= index_helper %>_url) { '/<%= index_helper %>' }
+      controller.should_receive(:redirect_to).with('/<%= index_helper %>')
     end
     it 'destroys the requested <%= ns_file_name %>, and redirects to the <%= table_name %> list' do
       expect {
-        @controller.destroy(@<%= file_name %>.to_param)
+        controller.destroy(@<%= file_name %>.to_param)
       }.to change(<%= class_name %>, :count).by(-1)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies: []
 description: Rails plugin gem that supports Merbish style controller action arguments.
 email: