nifty-generators 0.4.0 → 0.4.1

data/rails_generators/nifty_authentication/templates/tests/shoulda/users_controller.rb

@@ -7,14 +7,14 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
       assert_template 'new'
     end
   end
-  
+
   context "create action" do
     should "render new template when model is invalid" do
       <%= user_class_name %>.any_instance.stubs(:valid?).returns(false)
       post :create
       assert_template 'new'
     end
-  
+
     should "redirect when model is valid" do
       <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
       post :create

data/rails_generators/nifty_authentication/templates/tests/testunit/sessions_controller.rb

@@ -5,14 +5,14 @@ class <%= session_plural_class_name %>ControllerTest < ActionController::TestCas
     get :new
     assert_template 'new'
   end
-  
+
 <%- if options[:authlogic] -%>
   def test_create_invalid
     post :create, :<%= session_singular_name %> => { :username => "foo", :password => "badpassword" }
     assert_template 'new'
     assert_nil <%= session_class_name %>.find
   end
-  
+
   def test_create_valid
     post :create, :<%= session_singular_name %> => { :username => "foo", :password => "secret" }
     assert_redirected_to root_url
@@ -25,7 +25,7 @@ class <%= session_plural_class_name %>ControllerTest < ActionController::TestCas
     assert_template 'new'
     assert_nil session['<%= user_singular_name %>_id']
   end
-  
+
   def test_create_valid
     <%= user_class_name %>.stubs(:authenticate).returns(<%= user_class_name %>.first)
     post :create

data/rails_generators/nifty_authentication/templates/tests/testunit/user.rb

@@ -11,74 +11,74 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
     <%= user_singular_name %>.valid? # run validations
     <%= user_singular_name %>
   end
-  
+
   def setup
     <%= user_class_name %>.delete_all
   end
-  
+
   def test_valid
     assert new_<%= user_singular_name %>.valid?
   end
-  
+
   def test_require_username
     assert new_<%= user_singular_name %>(:username => '').errors.on(:username)
   end
-  
+
   def test_require_password
     assert new_<%= user_singular_name %>(:password => '').errors.on(:password)
   end
-  
+
   def test_require_well_formed_email
     assert new_<%= user_singular_name %>(:email => 'foo@bar@example.com').errors.on(:email)
   end
-  
+
   def test_validate_uniqueness_of_email
     new_<%= user_singular_name %>(:email => 'bar@example.com').save!
     assert new_<%= user_singular_name %>(:email => 'bar@example.com').errors.on(:email)
   end
-  
+
   def test_validate_uniqueness_of_username
     new_<%= user_singular_name %>(:username => 'uniquename').save!
     assert new_<%= user_singular_name %>(:username => 'uniquename').errors.on(:username)
   end
-  
+
   def test_validate_odd_characters_in_username
     assert new_<%= user_singular_name %>(:username => 'odd ^&(@)').errors.on(:username)
   end
-  
+
   def test_validate_password_length
     assert new_<%= user_singular_name %>(:password => 'bad').errors.on(:password)
   end
-  
+
   def test_require_matching_password_confirmation
     assert new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').errors.on(:password)
   end
-  
+
   def test_generate_password_hash_and_salt_on_create
     <%= user_singular_name %> = new_<%= user_singular_name %>
     <%= user_singular_name %>.save!
     assert <%= user_singular_name %>.password_hash
     assert <%= user_singular_name %>.password_salt
   end
-  
+
   def test_authenticate_by_username
     <%= user_class_name %>.delete_all
     <%= user_singular_name %> = new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret')
     <%= user_singular_name %>.save!
     assert_equal <%= user_singular_name %>, <%= user_class_name %>.authenticate('foobar', 'secret')
   end
-  
+
   def test_authenticate_by_email
     <%= user_class_name %>.delete_all
     <%= user_singular_name %> = new_<%= user_singular_name %>(:email => 'foo@bar.com', :password => 'secret')
     <%= user_singular_name %>.save!
     assert_equal <%= user_singular_name %>, <%= user_class_name %>.authenticate('foo@bar.com', 'secret')
   end
-  
+
   def test_authenticate_bad_username
     assert_nil <%= user_class_name %>.authenticate('nonexisting', 'secret')
   end
-  
+
   def test_authenticate_bad_password
     <%= user_class_name %>.delete_all
     new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret').save!

data/rails_generators/nifty_authentication/templates/tests/testunit/users_controller.rb

@@ -5,13 +5,13 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
     get :new
     assert_template 'new'
   end
-  
+
   def test_create_invalid
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(false)
     post :create
     assert_template 'new'
   end
-  
+
   def test_create_valid
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
     post :create

data/rails_generators/nifty_authentication/templates/user.rb

@@ -4,10 +4,10 @@ class <%= user_class_name %> < ActiveRecord::Base
 <%- else -%>
   # new columns need to be added here to be writable through mass assignment
   attr_accessible :username, :email, :password, :password_confirmation
-  
+
   attr_accessor :password
   before_save :prepare_password
-  
+
   validates_presence_of :username
   validates_uniqueness_of :username, :email, :allow_blank => true
   validates_format_of :username, :with => /^[-\w\._@]+$/i, :allow_blank => true, :message => "should only contain letters, numbers, or .-_@"
@@ -15,26 +15,26 @@ class <%= user_class_name %> < ActiveRecord::Base
   validates_presence_of :password, :on => :create
   validates_confirmation_of :password
   validates_length_of :password, :minimum => 4, :allow_blank => true
-  
+
   # login can be either username or email address
   def self.authenticate(login, pass)
     <%= user_singular_name %> = find_by_username(login) || find_by_email(login)
     return <%= user_singular_name %> if <%= user_singular_name %> && <%= user_singular_name %>.matching_password?(pass)
   end
-  
+
   def matching_password?(pass)
     self.password_hash == encrypt_password(pass)
   end
-  
+
   private
-  
+
   def prepare_password
     unless password.blank?
       self.password_salt = Digest::SHA1.hexdigest([Time.now, rand].join)
       self.password_hash = encrypt_password(password)
     end
   end
-  
+
   def encrypt_password(pass)
     Digest::SHA1.hexdigest([pass, password_salt].join)
   end

data/rails_generators/nifty_authentication/templates/users_controller.rb

@@ -2,7 +2,7 @@ class <%= user_plural_class_name %>Controller < ApplicationController
   def new
     @<%= user_singular_name %> = <%= user_class_name %>.new
   end
-  
+
   def create
     @<%= user_singular_name %> = <%= user_class_name %>.new(params[:<%= user_singular_name %>])
     if @<%= user_singular_name %>.save

data/rails_generators/nifty_config/USAGE

@@ -3,11 +3,11 @@ Description:
     directory and an initializer to load this config. The config has a
     separate section for each environment. This is a great place to put
     any config settings you don't want in your app.
-  
+
     The config is loaded into a constant called APP_CONFIG by default,
     this changes depending on the name you choose to pass the generator.
     Use this constant to access the config settings like this.
-  
+
     APP_CONFIG[:some_setting]
 
 

data/rails_generators/nifty_config/nifty_config_generator.rb

@@ -3,7 +3,7 @@ class NiftyConfigGenerator < Rails::Generator::Base
     super
     @name = @args.first || 'app'
   end
-  
+
   def manifest
     record do |m|
       m.directory 'config/initializers'
@@ -12,11 +12,11 @@ class NiftyConfigGenerator < Rails::Generator::Base
       m.file     "config.yml",  "config/#{file_name}_config.yml"
     end
   end
-  
+
   def file_name
     @name.underscore
   end
-  
+
   def constant_name
     @name.underscore.upcase
   end

data/rails_generators/nifty_layout/USAGE

@@ -1,11 +1,11 @@
 Description:
   The nifty_layout generator creates a basic layout, stylesheet and
   helper which will give some structure to a starting Rails app.
-  
+
   The generator takes one argument which will be the name of the
 	layout and stylesheet files. If no argument is passed then it defaults
 	to "application".
-  
+
   The helper module includes some methods which can be called in any
   template or partial to set variables to be used in the layout, such as
   page title and javascript/stylesheet includes.

data/rails_generators/nifty_layout/nifty_layout_generator.rb

@@ -3,13 +3,13 @@ class NiftyLayoutGenerator < Rails::Generator::Base
     super
     @name = @args.first || 'application'
   end
-  
+
   def manifest
     record do |m|
       m.directory 'app/views/layouts'
       m.directory 'public/stylesheets'
       m.directory 'app/helpers'
-      
+
       if options[:haml]
         m.directory 'public/stylesheets/sass'
         m.template "layout.html.haml", "app/views/layouts/#{file_name}.html.haml"
@@ -21,7 +21,7 @@ class NiftyLayoutGenerator < Rails::Generator::Base
       m.file "helper.rb", "app/helpers/layout_helper.rb"
     end
   end
-  
+
   def file_name
     @name.underscore
   end

data/rails_generators/nifty_layout/templates/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/rails_generators/nifty_layout/templates/layout.html.erb

@@ -11,11 +11,11 @@
       <%%- flash.each do |name, msg| -%>
         <%%= content_tag :div, msg, :id => "flash_#{name}" %>
       <%%- end -%>
-      
+
       <%%- if show_title? -%>
         <h1><%%=h yield(:title) %></h1>
       <%%- end -%>
-      
+
       <%%= yield %>
     </div>
   </body>

data/rails_generators/nifty_layout/templates/layout.html.haml

@@ -1,19 +1,19 @@
 !!! Strict
 %html{html_attrs}
-  
+
   %head
     %title
       = h(yield(:title) || "Untitled")
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
     = stylesheet_link_tag '<%= file_name %>'
     = yield(:head)
-  
+
   %body
     #container
       - flash.each do |name, msg|
         = content_tag :div, msg, :id => "flash_#{name}"
-      
+
       - if show_title?
         %h1=h yield(:title)
-      
+
       = yield

data/rails_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:
     script/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.
-    
+
     script/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.
-    
+
     script/generate nifty_scaffold post ! show new
-        
+
         Creates a posts controller (no model) with index, edit, update, and
         destroy actions.

data/rails_generators/nifty_scaffold/nifty_scaffold_generator.rb

@@ -1,14 +1,14 @@
 class NiftyScaffoldGenerator < Rails::Generator::Base
   attr_accessor :name, :attributes, :controller_actions
-  
+
   def initialize(runtime_args, runtime_options = {})
     super
     usage if @args.empty?
-    
+
     @name = @args.first
     @controller_actions = []
     @attributes = []
-    
+
     @args[1..-1].each do |arg|
       if arg == '!'
         options[:invert] = true
@@ -20,14 +20,14 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
         @controller_actions << 'update' if arg == 'edit'
       end
     end
-    
+
     @controller_actions.uniq!
     @attributes.uniq!
-    
+
     if options[:invert] || @controller_actions.empty?
       @controller_actions = all_actions - @controller_actions
     end
-    
+
     if @attributes.empty?
       options[:skip_model] = true # default to skipping model if no attributes passed
       if model_exists?
@@ -39,7 +39,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
       end
     end
   end
-  
+
   def manifest
     record do |m|
       unless options[:skip_model]
@@ -48,7 +48,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
         unless options[:skip_migration]
           m.migration_template "migration.rb", "db/migrate", :migration_file_name => "create_#{plural_name}"
         end
-        
+
         if rspec?
           m.directory "spec/models"
           m.template "tests/#{test_framework}/model.rb", "spec/models/#{singular_name}_spec.rb"
@@ -61,27 +61,27 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
           m.template "fixtures.yml", "test/fixtures/#{plural_name}.yml"
         end
       end
-      
+
       unless options[:skip_controller]
         m.directory "app/controllers"
         m.template "controller.rb", "app/controllers/#{plural_name}_controller.rb"
-        
+
         m.directory "app/helpers"
         m.template "helper.rb", "app/helpers/#{plural_name}_helper.rb"
-        
+
         m.directory "app/views/#{plural_name}"
         controller_actions.each do |action|
           if File.exist? source_path("views/#{view_language}/#{action}.html.#{view_language}")
             m.template "views/#{view_language}/#{action}.html.#{view_language}", "app/views/#{plural_name}/#{action}.html.#{view_language}"
           end
         end
-      
+
         if form_partial?
           m.template "views/#{view_language}/_form.html.#{view_language}", "app/views/#{plural_name}/_form.html.#{view_language}"
         end
-      
+
         m.route_resources plural_name
-        
+
         if rspec?
           m.directory "spec/controllers"
           m.template "tests/#{test_framework}/controller.rb", "spec/controllers/#{plural_name}_controller_spec.rb"
@@ -92,45 +92,45 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
       end
     end
   end
-  
+
   def form_partial?
     actions? :new, :edit
   end
-  
+
   def all_actions
     %w[index show new create edit update destroy]
   end
-  
+
   def action?(name)
     controller_actions.include? name.to_s
   end
-  
+
   def actions?(*names)
     names.all? { |n| action? n.to_s }
   end
-  
+
   def singular_name
     name.underscore
   end
-  
+
   def plural_name
     name.underscore.pluralize
   end
-  
+
   def class_name
     name.camelize
   end
-  
+
   def plural_class_name
     plural_name.camelize
   end
-  
+
   def controller_methods(dir_name)
     controller_actions.map do |action|
       read_template("#{dir_name}/#{action}.rb")
     end.join("  \n").strip
   end
-  
+
   def render_form
     if form_partial?
       if options[:haml]
@@ -142,7 +142,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
       read_template("views/#{view_language}/_form.html.#{view_language}")
     end
   end
-  
+
   def items_path(suffix = 'path')
     if action? :index
       "#{plural_name}_#{suffix}"
@@ -150,7 +150,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
       "root_#{suffix}"
     end
   end
-  
+
   def item_path(suffix = 'path')
     if action? :show
       "@#{singular_name}"
@@ -158,7 +158,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
       items_path(suffix)
     end
   end
-  
+
   def item_path_for_spec(suffix = 'path')
     if action? :show
       "#{singular_name}_#{suffix}(assigns[:#{singular_name}])"
@@ -166,7 +166,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
       items_path(suffix)
     end
   end
-  
+
   def item_path_for_test(suffix = 'path')
     if action? :show
       "#{singular_name}_#{suffix}(assigns(:#{singular_name}))"
@@ -174,31 +174,31 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
       items_path(suffix)
     end
   end
-  
+
   def model_columns_for_attributes
     class_name.constantize.columns.reject do |column|
       column.name.to_s =~ /^(id|created_at|updated_at)$/
     end
   end
-  
+
   def rspec?
     test_framework == :rspec
   end
-  
+
 protected
-  
+
   def view_language
     options[:haml] ? 'haml' : 'erb'
   end
-  
+
   def test_framework
     options[:test_framework] ||= default_test_framework
   end
-  
+
   def default_test_framework
     File.exist?(destination_path("spec")) ? :rspec : :testunit
   end
-  
+
   def add_options!(opt)
     opt.separator ''
     opt.separator 'Options:'
@@ -212,16 +212,16 @@ protected
     opt.on("--rspec", "Use RSpec for test files.") { options[:test_framework] = :rspec }
     opt.on("--shoulda", "Use Shoulda for test files.") { options[:test_framework] = :shoulda }
   end
-  
+
   # is there a better way to do this? Perhaps with const_defined?
   def model_exists?
     File.exist? destination_path("app/models/#{singular_name}.rb")
   end
-  
+
   def read_template(relative_path)
     ERB.new(File.read(source_path(relative_path)), nil, '-').result(binding)
   end
-  
+
   def banner
     <<-EOS
 Creates a controller and optional model given the name, actions, and attributes.