action_args 0.0.2 → 0.0.3

data/README.rdoc

@@ -60,9 +60,9 @@ The following beautiful controller code will be generated:
       @user = User.new(user)
 
       if @user.save
-        redirect_to @user, :notice => 'User was successfully created.'
+        redirect_to @user, notice: 'User was successfully created.'
       else
-        render :action => 'new'
+        render action: 'new'
       end
     end
 
@@ -71,9 +71,9 @@ The following beautiful controller code will be generated:
       @user = User.find(id)
 
       if @user.update_attributes(user)
-        redirect_to @user, :notice => 'User was successfully updated.'
+        redirect_to @user, notice: 'User was successfully updated.'
       else
-        render :action => 'edit'
+        render action: 'edit'
       end
     end
 

data/lib/action_args/version.rb

@@ -1,3 +1,3 @@
 module ActionArgs
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/generators/action_args/rspec/scaffold/scaffold_generator.rb

@@ -0,0 +1,18 @@
+# load original rspec scaffold generator
+require 'generators/rspec/scaffold/scaffold_generator'
+
+# override rspec genarator to switch template file
+module Rspec
+  module Generators
+    class ScaffoldGenerator < Base
+      source_paths << File.expand_path('../templates', __FILE__)
+
+      def generate_controller_spec
+        return unless options[:controller_specs]
+
+        template 'action_args_controller_spec.rb',
+                 File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,134 @@
+require 'spec_helper'
+
+describe <%= controller_class_name %>Controller do
+  # This should return the minimal set of attributes required to create a valid
+  # <%= 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
+  end
+
+<% unless options[:singleton] -%>
+  describe 'GET index' do
+    before do
+      @<%= file_name %> = <%= class_name %>.create! valid_attributes
+      @controller.index
+    end
+    describe 'assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>' do
+      subject { @controller.instance_variable_get('@<%= table_name %>') }
+      it { should eq([@<%= file_name %>]) }
+    end
+  end
+
+<% end -%>
+  describe 'GET show' do
+    before do
+      @<%= file_name %> = <%= class_name %>.create! valid_attributes
+      @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 %>') }
+      it { should eq(@<%= file_name %>) }
+    end
+  end
+
+  describe 'GET new' do
+    before do
+      @controller.new
+    end
+    describe 'assigns a new <%= ns_file_name %> as @<%= ns_file_name %>' do
+      subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+      it { should be_a_new(<%= class_name %>) }
+    end
+  end
+
+  describe 'GET edit' do
+    before do
+      @<%= file_name %> = <%= class_name %>.create! valid_attributes
+      @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 %>') }
+      it { should eq(@<%= file_name %>) }
+    end
+  end
+
+  describe 'POST create' do
+    context 'with valid params' do
+      before do
+        @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)
+        }.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)
+        end
+        subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+        it { should be_a(<%= class_name %>) }
+        it { should be_persisted }
+      end
+    end
+
+    context 'with invalid params' 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({})
+        end
+        subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+        it { should be_a_new(<%= class_name %>) }
+      end
+    end
+  end
+
+  describe 'PUT update' do
+    context 'with valid params' 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)
+        end
+        subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+        it { should eq(@<%= file_name %>) }
+      end
+    end
+
+    context 'with invalid params' do
+      describe "assigns the <%= ns_file_name %> as @<%= ns_file_name %>, and re-renders the 'edit' template" do
+        before 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, {})
+        end
+        subject { @controller.instance_variable_get('@<%= ns_file_name %>') }
+        it { should eq(@<%= file_name %>) }
+      end
+    end
+  end
+
+  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 %>')
+    end
+    it 'destroys the requested <%= ns_file_name %>, and redirects to the <%= table_name %> list' do
+      expect {
+        @controller.destroy(@<%= file_name %>.to_param)
+      }.to change(<%= class_name %>, :count).by(-1)
+    end
+  end
+end

data/lib/generators/rails/action_args_scaffold_controller_generator.rb

@@ -1,5 +1,7 @@
+# load original rails scaffold_controller generator
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 
+# override rails genarator to switch template directory
 module Rails
   module Generators
     class ActionArgsScaffoldControllerGenerator < ::Rails::Generators::ScaffoldControllerGenerator
@@ -7,3 +9,6 @@ module Rails
     end
   end
 end
+
+# load custom rspec generator
+require 'generators/action_args/rspec/scaffold/scaffold_generator' if defined? ::RSpec::Rails

metadata

@@ -1,33 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: action_args
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-17 00:00:00 Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies: []
-
 description: Rails 3 plugin gem that supports Merbish style controller action arguments.
-email: 
+email:
 - ronnie@dio.jp
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -37,40 +27,32 @@ files:
 - lib/action_args.rb
 - lib/action_args/abstract_controller.rb
 - lib/action_args/version.rb
+- lib/generators/action_args/rspec/scaffold/scaffold_generator.rb
+- lib/generators/action_args/rspec/scaffold/templates/action_args_controller_spec.rb
 - lib/generators/rails/action_args_scaffold_controller_generator.rb
 - lib/generators/rails/templates/controller.rb
 homepage: http://asakusa.rubyist.net/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: action_args
-rubygems_version: 1.8.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Controller action arguments parameterizer for Rails 3 + Ruby 1.9
 test_files: []
-