jzajpt-blueberry_scaffold 0.3.2 → 0.3.3

data/README

@@ -6,9 +6,9 @@ Scaffold generator used by Blueberry Apps. Features I18n support, Shoulda and Fa
 
 Usage
 ======
-  
+
   script/generate blueberry_scaffold [namespace]/[name] [controller actions] [model attributes]
-  
+
 If you specify namespace, it will be used for controller not for model. Model attributes are
 in format name:type.
 

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/blueberry_scaffold.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blueberry_scaffold}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ji\305\231\303\255 Zajpt"]
-  s.date = %q{2009-06-08}
+  s.date = %q{2009-06-11}
   s.description = %q{Scaffold generator featuring i18n, shoulda & factory girl tests.}
   s.email = %q{jzajpt@blueberryapps.com}
   s.extra_rdoc_files = [

data/generators/blueberry_scaffold/blueberry_scaffold_generator.rb

@@ -1,6 +1,6 @@
 class BlueberryScaffoldGenerator < Rails::Generator::Base
   attr_accessor :attributes
-  
+
   def initialize(runtime_args, runtime_options = {})
     super
     usage if @args.empty?
@@ -8,7 +8,7 @@ class BlueberryScaffoldGenerator < Rails::Generator::Base
     # First argument is our controller/model name
     @name = runtime_args.shift
     @namespace, @name = @name.split('/') if @name.include?('/')
-    
+
     # Model attributes
     @attributes = []
     # Controller actions
@@ -44,16 +44,16 @@ class BlueberryScaffoldGenerator < Rails::Generator::Base
         unless options[:skip_migration]
           m.migration_template 'migration.rb', 'db/migrate', :migration_file_name => "create_#{plural_name}"
         end
-        
+
         # Factory
         m.directory "test/factories"
         m.template "factory.rb", "test/factories/#{singular_name}_factory.rb"
-        
+
         # Model test
         m.directory "test/unit"
         m.template "model_test.rb", "test/unit/#{singular_name}_test.rb"
       end
-      
+
       unless options[:skip_controller]
         # Create controller
         m.directory controller_path
@@ -76,7 +76,7 @@ class BlueberryScaffoldGenerator < Rails::Generator::Base
 
         # Add resources route
         m.route_resources plural_name
-        
+
         # Controller tst
         m.directory controller_test_path
         m.template "controller_test.rb", "#{controller_test_path}/#{plural_name}_controller_test.rb"
@@ -84,63 +84,63 @@ class BlueberryScaffoldGenerator < Rails::Generator::Base
 
     end
   end
-  
+
   protected
-  
+
   def all_actions
     %w(index show new edit create update destroy)
   end
-  
+
   def action?(name)
     @actions.include? name.to_s
   end
-  
+
   def singular_name
     @name.singularize.underscore
   end
-  
+
   def class_name
     @name.singularize.camelize
   end
-  
+
   def plural_name
     @name.underscore.pluralize
   end
-  
+
   def plural_class_name
     plural_name.camelize
   end
-  
+
   def controller_class_name
     @namespace ? "#{@namespace.camelize}::#{plural_name.camelize}Controller" :
       "#{plural_name.camelize}Controller"
   end
-  
+
   def helper_class_name
     @namespace ? "#{@namespace.camelize}::#{plural_name.camelize}Helper" :
       "#{plural_name.camelize}Helper"
   end
-  
+
   def controller_test_name
     "#{controller_class_name}Test"
   end
-  
+
   def controller_path
     @namespace ? "app/controllers/#{@namespace}" : "app/controllers"
   end
-  
+
   def helper_path
     @namespace ? "app/helpers/#{@namespace}" : "app/helpers"
   end
-  
+
   def controller_test_path
     @namespace ? "test/functional/#{@namespace}" : "test/functional"
   end
-  
+
   def view_path
     @namespace ? "app/views/#{@namespace}" : "app/views"
   end
-  
+
   def url
     @namespace ? "#{@namespace}_#{plural_name}_url" : "#{plural_name}_url"
   end
@@ -148,7 +148,7 @@ class BlueberryScaffoldGenerator < Rails::Generator::Base
   def i18n_prefix
     @namespace ? "#{@namespace}.#{plural_name}" : plural_name
   end
-  
+
   def items_path
     @namespace ? "#{@namespace}_#{plural_name}_path" : "#{plural_name}_path"
   end
@@ -156,19 +156,19 @@ class BlueberryScaffoldGenerator < Rails::Generator::Base
   def item_path
     @namespace ? "#{@namespace}_#{singular_name}_path" : "#{singular_name}_path"
   end
-  
+
   def new_item_path
     @namespace ? "new_#{@namespace}_#{singular_name}_path" : "new_#{singular_name}_path"
   end
-  
+
   def edit_item_path
     @namespace ? "edit_#{@namespace}_edit_#{singular_name}_path" : "edit_#{singular_name}_path"
   end
-  
+
   def controller_route
     @namespace ? "/#{@namespace}/#{plural_name}" : "/#{plural_name}"
   end
-  
+
   def add_options!(opt)
     opt.separator ''
     opt.separator 'Options:'

data/generators/blueberry_scaffold/templates/controller.rb

@@ -14,21 +14,21 @@ class <%= controller_class_name %> < ApplicationController
   def show
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
   end
-  
+
 <% end -%>
 <% if action? :new -%>
   # GET /<%= plural_name %>/new
   def new
     @<%= singular_name %> = <%= class_name %>.new
   end
-  
+
 <% end -%>
 <% if action? :edit -%>
   # GET /<%= plural_name %>/:id/edit
   def edit
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
   end
-  
+
 <% end -%>
 <% if action? :create -%>
   # POST /<%= plural_name %>
@@ -52,7 +52,7 @@ class <%= controller_class_name %> < ApplicationController
   rescue ActiveRecord::RecordInvalid
     render 'edit'
   end
-  
+
 <% end -%>
 <% if action? :destroy -%>
   # DELETE /<%= plural_name %>/:id

data/generators/blueberry_scaffold/templates/controller_test.rb

@@ -7,17 +7,18 @@ class <%= controller_test_name %> < ActionController::TestCase
       5.times { Factory :<%= singular_name %> }
       get :index
     end
-  
+
     should_respond_with :success
     should_assign_to :<%= plural_name %>, :class => Array
     # should_paginate_collection :<%= plural_name %>
-    should_render_template :index
     should_not_set_the_flash
-  
+    should_render_with_layout
+    should_render_template :index
+
     should "return 5 items" do
       assert_equal 5, assigns(:<%= plural_name %>).size
     end
-    
+
     should "display <%= plural_name %> table with 5 items" do
       assert_select "table.list > tbody > tr", 5
     end
@@ -33,8 +34,9 @@ class <%= controller_test_name %> < ActionController::TestCase
 
     should_respond_with :success
     should_assign_to(:<%= singular_name %>, :class => <%= class_name %>) { @<%= singular_name %> }
-    should_render_template :show
-    should_not_set_the_flash    
+    should_not_set_the_flash
+    should_render_with_layout
+    should_render_template :show   
   end
 
 <% end -%>
@@ -44,10 +46,11 @@ class <%= controller_test_name %> < ActionController::TestCase
 
     should_respond_with :success
     should_assign_to(:<%= singular_name %>, :class => <%= class_name %>)
+    should_not_set_the_flash
+    should_render_with_layout
     should_render_template :new
     should_render_a_form
-    should_not_set_the_flash    
-  
+
     should "build new <%= class_name %>" do
       assert assigns(:<%= singular_name %>).new_record?
     end
@@ -63,9 +66,10 @@ class <%= controller_test_name %> < ActionController::TestCase
 
     should_respond_with :success
     should_assign_to(:<%= singular_name %>, :class => <%= class_name %>) { @<%= singular_name %> }
+    should_not_set_the_flash
+    should_render_with_layout
     should_render_template :edit
     should_render_a_form
-    should_not_set_the_flash    
   end
 
 <% end -%>
@@ -87,18 +91,19 @@ class <%= controller_test_name %> < ActionController::TestCase
       should_assign_to :<%= singular_name %>, :class => <%= class_name %>
       should_set_the_flash_to I18n.t('<%= i18n_prefix %>.create.success')
     end
-  
+
     context "with invalid attributes" do
       setup do
         <%= class_name %>.any_instance.stubs(:valid?).returns(false)
         post :create
       end
-    
+
       should_respond_with :success
       should_assign_to :<%= singular_name %>, :class => <%= class_name %>
+      should_render_with_layout
       should_render_template :new
-      should_render_a_form
-      should_not_set_the_flash    
+      should_not_set_the_flash
+      should_render_a_form   
 
       should "build new <%= class_name %>" do
         assert assigns(:<%= singular_name %>).new_record?
@@ -131,12 +136,13 @@ class <%= controller_test_name %> < ActionController::TestCase
         <%= class_name %>.any_instance.stubs(:valid?).returns(false)
         put :update, :id => @<%= singular_name %>.id
       end
-    
+
       should_respond_with :success
       should_assign_to(:<%= singular_name %>, :class => <%= class_name %>) { @<%= singular_name %> }
+      should_not_set_the_flash
+      should_render_with_layout
       should_render_template :edit
       should_render_a_form
-      should_not_set_the_flash
     end
   end
 
@@ -152,7 +158,7 @@ class <%= controller_test_name %> < ActionController::TestCase
     should_redirect_to('portfolio items listing') { <%= url %> }
     should_assign_to(:<%= singular_name %>, :class => <%= class_name %>) { @<%= singular_name %> }
     should_set_the_flash_to I18n.t('<%= i18n_prefix %>.destroy.success')
-    
+
     should "delete item" do
       assert !<%= class_name %>.exists?(@<%= singular_name %>.id)
     end
@@ -165,7 +171,7 @@ class <%= controller_test_name %> < ActionController::TestCase
 <% if action? :show -%>
   should_route :get, '<%= controller_route %>/1', :action => 'show', :id => 1
 <% end -%>
-<% if action? :now -%>
+<% if action? :new -%>
   should_route :get, '<%= controller_route %>/new', :action => 'new'
 <% end -%>
 <% if action? :edit -%>

data/generators/blueberry_scaffold/templates/migration.rb

@@ -9,7 +9,7 @@ class Create<%= plural_class_name %> < ActiveRecord::Migration
     <%- end -%>
     end
   end
-  
+
   def self.down
     drop_table :<%= plural_name %>
   end

data/generators/blueberry_scaffold/templates/model_test.rb

@@ -5,10 +5,10 @@ class <%= class_name %>Test < ActiveSupport::TestCase
     setup do
       @<%= singular_name %> = Factory :<%= singular_name %>
     end
-    
+
     should_change "<%= class_name %>.count", :by => 1
   end
-  
+
   # Mass assignment attributes
   should_allow_mass_assignment_of <%= attributes.map(&:name).map { |a| ':'+a }.join(', ') %>
   should_not_allow_mass_assignment_of :id<% unless options[:skip_timestamps] %>, :created_at, :modified_at<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jzajpt-blueberry_scaffold
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - "Ji\xC5\x99\xC3\xAD Zajpt"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 -07:00
+date: 2009-06-11 00:00:00 -07:00
 default_executable: 
 dependencies: []