nifty-generators 0.4.0 → 0.4.1

data/lib/generators/nifty/layout/templates/layout.html.haml

@@ -1,6 +1,6 @@
 !!!
 %html
-  
+
   %head
     %title
       = yield(:title) || "Untitled"
@@ -9,13 +9,13 @@
     = javascript_include_tag :defaults
     = csrf_meta_tag
     = yield(:head)
-  
+
   %body
     #container
       - flash.each do |name, msg|
         = content_tag :div, msg, :id => "flash_#{name}"
-      
+
       - if show_title?
         %h1= yield(:title)
-      
+
       = yield

data/lib/generators/nifty/layout/templates/layout_helper.rb

@@ -7,15 +7,15 @@ module LayoutHelper
     content_for(:title) { page_title.to_s }
     @show_title = show_title
   end
-  
+
   def show_title?
     @show_title
   end
-  
+
   def stylesheet(*args)
     content_for(:head) { stylesheet_link_tag(*args) }
   end
-  
+
   def javascript(*args)
     content_for(:head) { javascript_include_tag(*args) }
   end

data/lib/generators/nifty/layout/templates/stylesheet.sass

@@ -1,66 +1,66 @@
-!primary_color = #4B7399
+$primary_color: #4b7399
 
 body
-  :background-color = !primary_color
-  :font
-    :family Verdana, Helvetica, Arial
-    :size 14px
+  background-color: $primary_color
+  font:
+    family: Verdana, Helvetica, Arial
+    size: 14px
 
 a
-  :color #0000FF
+  color: blue
   img
-    :border none
+    border: none
 
 .clear
-  :clear both
-  :height 0
-  :overflow hidden
+  clear: both
+  height: 0
+  overflow: hidden
 
 #container
-  :width 75%
-  :margin 0 auto
-  :background #fff
-  :padding 20px 40px
-  :border solid 1px black
-  :margin-top 20px
+  width: 75%
+  margin: 0 auto
+  background: white
+  padding: 20px 40px
+  border: solid 1px black
+  margin-top: 20px
 
 #flash_notice,
 #flash_error,
 #flash_alert
-  :padding 5px 8px
-  :margin 10px 0
+  padding: 5px 8px
+  margin: 10px 0
 
 #flash_notice
-  :background-color #CFC
-  :border solid 1px #6C6
+  background-color: #ccffcc
+  border: solid 1px #66cc66
 
 #flash_error,
 #flash_alert
-  :background-color #FCC
-  :border solid 1px #C66
+  background-color: #ffcccc
+  border: solid 1px #cc6666
 
 .fieldWithErrors
-  :display inline
+  display: inline
 
 .error_messages
-  :width 400px
-  :border 2px solid #CF0000
-  :padding 0
-  :padding-bottom 12px
-  :margin-bottom 20px
-  :background-color #f0f0f0
-  :font
-    :size 12px
+  width: 400px
+  border: 2px solid #cf0000
+  padding: 0
+  padding-bottom: 12px
+  margin-bottom: 20px
+  background-color: #f0f0f0
+  font:
+    size: 12px
   h2
-    :text-align left
-    :padding 5px 5px 5px 15px
-    :margin 0
-    :font
-      :weight bold
-      :size 12px
-    :background-color #c00
-    :color #fff
+    text-align: left
+    padding: 5px 5px 5px 15px
+    margin: 0
+    font:
+      weight: bold
+      size: 12px
+    background-color: #cc0000
+    color: white
   p
-    :margin 8px 10px
+    margin: 8px 10px
   ul
-    :margin 0
+    margin: 0

data/lib/generators/nifty/scaffold/USAGE

@@ -3,17 +3,17 @@ Description:
     views. The resource is ready to use as a starting point for your restful,
     resource-oriented application. Tests or specs are also generated depending
     on if you have a "spec" directory or not.
-    
+
     IMPORTANT: This generator uses the "title" helper method which is generated
     by the nifty_layout generator. You may want to run that generator first.
 
 Usage:
     Pass the name of the model, either CamelCased or under_scored, as the first
     argument along with an optional list of attribute pairs and controller actions.
-    
+
     If no controller actions are specified, they will default to index, show,
     new, create, edit, update, and destroy.
-    
+
     IMPORTANT: If no attribute pairs are specified, no model will be generated.
     It will try to determine the attributes from an existing model.
 
@@ -26,26 +26,26 @@ Usage:
     the create/show/update/destroy, forms to create and edit your posts, and
     an index that lists them all, as well as a map.resources :posts
     declaration in config/routes.rb.
-    
+
     Adding an "!" in the mix of arguments will invert the passed controller
     actions. This will include all 7 controller actitons except the ones
     mentioned. This option doesn't affect model attributes.
 
 Examples:
     rails generate nifty:scaffold post
-        
+
         Will create a controller called "posts" it will contain all seven
         CRUD actions along with the views. A model will NOT be created,
         instead it will look for an existing model and use those attributes.
-    
+
     rails generate nifty:scaffold post name:string content:text index new edit
-        
+
         Will create a Post model and migration file with the name and content
         attributes. It will also create a controller with index, new, create,
         edit, and update actions. Notice the create and update actions are
         added automatically with new and edit.
-    
+
     rails generate nifty:scaffold post ! show new
-        
+
         Creates a posts controller (no model) with index, edit, update, and
         destroy actions.

data/lib/generators/nifty/scaffold/scaffold_generator.rb

@@ -27,10 +27,12 @@ module Nifty
 
         @controller_actions = []
         @model_attributes = []
+        @skip_model = options.skip_model?
+        @invert_actions = options.invert?
 
         args_for_c_m.each do |arg|
           if arg == '!'
-            options[:invert] = true
+            @invert_actions = true
           elsif arg.include?(':')
             @model_attributes << Rails::Generators::GeneratedAttribute.new(*arg.split(':'))
           else
@@ -43,12 +45,12 @@ module Nifty
         @controller_actions.uniq!
         @model_attributes.uniq!
 
-        if options.invert? || @controller_actions.empty?
+        if @invert_actions || @controller_actions.empty?
           @controller_actions = all_actions - @controller_actions
         end
 
         if @model_attributes.empty?
-          options[:skip_model] = true # default to skipping model if no attributes passed
+          @skip_model = true # skip model if no attributes
           if model_exists?
             model_columns_for_attributes.each do |column|
               @model_attributes << Rails::Generators::GeneratedAttribute.new(column.name.to_s, column.type.to_s)
@@ -60,7 +62,7 @@ module Nifty
       end
 
       def create_model
-        unless options.skip_model?
+        unless @skip_model
           template 'model.rb', "app/models/#{singular_name}.rb"
           if options.rspec?
             template "tests/rspec/model.rb", "spec/models/#{singular_name}_spec.rb"
@@ -73,7 +75,7 @@ module Nifty
       end
 
       def create_migration
-        unless options.skip_model? || options.skip_migration?
+        unless @skip_model || options.skip_migration?
           migration_template 'migration.rb', "db/migrate/create_#{plural_name}.rb"
         end
       end
@@ -105,7 +107,7 @@ module Nifty
       end
 
       private
-      
+
       def form_partial?
         actions? :new, :edit
       end

data/lib/generators/nifty/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/lib/generators/nifty/scaffold/templates/tests/rspec/actions/create.rb

@@ -3,7 +3,7 @@
     post :create
     response.should render_template(:new)
   end
-  
+
   it "create action should redirect when model is valid" do
     <%= class_name %>.any_instance.stubs(:valid?).returns(true)
     post :create

data/lib/generators/nifty/scaffold/templates/tests/rspec/actions/update.rb

@@ -3,7 +3,7 @@
     put :update, :id => <%= class_name %>.first
     response.should render_template(:edit)
   end
-  
+
   it "update action should redirect when model is valid" do
     <%= class_name %>.any_instance.stubs(:valid?).returns(true)
     put :update, :id => <%= class_name %>.first

data/lib/generators/nifty/scaffold/templates/tests/rspec/controller.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../spec_helper'
- 
+
 describe <%= plural_class_name %>Controller do
   fixtures :all
-  integrate_views
-  
+  render_views
+
   <%= controller_methods 'tests/rspec/actions' %>
 end

data/lib/generators/nifty/scaffold/templates/tests/shoulda/actions/create.rb

@@ -4,7 +4,7 @@
       post :create
       assert_template 'new'
     end
-    
+
     should "redirect when model is valid" do
       <%= class_name %>.any_instance.stubs(:valid?).returns(true)
       post :create

data/lib/generators/nifty/scaffold/templates/tests/shoulda/actions/update.rb

@@ -4,7 +4,7 @@
       put :update, :id => <%= class_name %>.first
       assert_template 'edit'
     end
-  
+
     should "redirect when model is valid" do
       <%= class_name %>.any_instance.stubs(:valid?).returns(true)
       put :update, :id => <%= class_name %>.first

data/lib/generators/nifty/scaffold/templates/tests/testunit/actions/create.rb

@@ -3,7 +3,7 @@
     post :create
     assert_template 'new'
   end
-  
+
   def test_create_valid
     <%= class_name %>.any_instance.stubs(:valid?).returns(true)
     post :create

data/lib/generators/nifty/scaffold/templates/tests/testunit/actions/update.rb

@@ -3,7 +3,7 @@
     put :update, :id => <%= class_name %>.first
     assert_template 'edit'
   end
-  
+
   def test_update_valid
     <%= class_name %>.any_instance.stubs(:valid?).returns(true)
     put :update, :id => <%= class_name %>.first

data/rails_generators/nifty_authentication/USAGE

@@ -1,9 +1,9 @@
 Description:
-    Generates a user model, users controller, and sessions controller. The 
-    users controller handles the registration and the sessions controller 
-    handles authentication. This is similar to restful_authentication, but 
+    Generates a user model, users controller, and sessions controller. The
+    users controller handles the registration and the sessions controller
+    handles authentication. This is similar to restful_authentication, but
     simpler.
-    
+
     IMPORTANT: This generator uses the "title" helper method which is generated
     by the nifty_layout generator. You may want to run that generator first.
 
@@ -12,28 +12,28 @@ Usage:
     the authentication controller will default to "session". You can override
     each of these respectively by passing one or two arguments. Either name can
     be CamelCased or under_scored.
-    
+
     Make sure to setup the authlogic gem if you are using that option.
-    
+
       config.gem "authlogic"
 
 Examples:
     script/generate nifty_authentication
-        
+
         Creates user model, users_controller, and sessions_controller.
-    
+
     script/generate nifty_authentication account
-    
+
         Creates account model, accounts_controller, and sessions_controller.
-    
+
     script/generate nifty_authentication Account UserSession
-    
+
         Creates account model, accounts_controller, and user_sessions_controller.
 
 Methods:
     There are several methods generated which you can use in your application.
     Here's a common example of what you might add to your layout.
-    
+
       <% if logged_in? %>
         Welcome <%= current_user.username %>! Not you?
         <%= link_to "Log out", logout_path %>
@@ -41,10 +41,10 @@ Methods:
         <%= link_to "Sign up", signup_path %> or
         <%= link_to "log in", login_path %>.
       <% end %>
-    
+
     You can also restrict unregistered users from accessing a controller using
     a before filter. For example.
-    
+
       before_filter :login_required, :except => [:index, :show]
-    
+
     See the generated file lib/authentication.rb for details.

data/rails_generators/nifty_authentication/lib/insert_commands.rb

@@ -2,7 +2,7 @@ Rails::Generator::Commands::Create.class_eval do
   def route_resource(*resources)
     resource_list = resources.map { |r| r.to_sym.inspect }.join(', ')
     sentinel = 'ActionController::Routing::Routes.draw do |map|'
-    
+
     logger.route "map.resource #{resource_list}"
     unless options[:pretend]
       gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
@@ -10,10 +10,10 @@ Rails::Generator::Commands::Create.class_eval do
       end
     end
   end
-  
+
   def route_name(name, path, route_options = {})
     sentinel = 'ActionController::Routing::Routes.draw do |map|'
-    
+
     logger.route "map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
     unless options[:pretend]
       gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
@@ -21,7 +21,7 @@ Rails::Generator::Commands::Create.class_eval do
       end
     end
   end
-  
+
   def insert_into(file, line)
     logger.insert "#{line} into #{file}"
     unless options[:pretend]
@@ -41,7 +41,7 @@ Rails::Generator::Commands::Destroy.class_eval do
       gsub_file 'config/routes.rb', /(#{look_for})/mi, ''
     end
   end
-  
+
   def route_name(name, path, route_options = {})
     look_for =   "\n  map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
     logger.route "map.#{name} '#{path}',     :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
@@ -49,7 +49,7 @@ Rails::Generator::Commands::Destroy.class_eval do
       gsub_file    'config/routes.rb', /(#{look_for})/mi, ''
     end
   end
-  
+
   def insert_into(file, line)
     logger.remove "#{line} from #{file}"
     unless options[:pretend]
@@ -63,11 +63,11 @@ Rails::Generator::Commands::List.class_eval do
     resource_list = resources.map { |r| r.to_sym.inspect }.join(', ')
     logger.route "map.resource #{resource_list}"
   end
-  
+
   def route_name(name, path, options = {})
     logger.route "map.#{name} '#{path}', :controller => '{options[:controller]}', :action => '#{options[:action]}'"
   end
-  
+
   def insert_into(file, line)
     logger.insert "#{line} into #{file}"
   end