nifty-generators 0.4.0 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,14 @@
+0.4.1 (September 23rd, 2010)
+
+* fixing frozen hash error when not passing additional arguments to nifty:scaffold - issue #35
+
+* fixing rendering of default title in nifty:layout - issue #36
+
+* fixing integrate_views error in nifty:scaffold specs - issue #43
+
+* updating SASS syntax (thanks semaperepelitsa) - issue #46
+
+
 0.4.0 (April 19th, 2010)
 
 * adding error_messages_for and f.error_messages helper for Rails 3 nifty:layout

data/README.rdoc

@@ -87,10 +87,10 @@ Try restarting your development server. Sometimes it doesn't detect the change i
 Make sure you have mocha installed and require it in your spec/test helper.
 
   gem install mocha
-  
+
   # in spec_helper.rb
   config.mock_with :mocha
-  
+
   # in test_helper.rb
   require 'mocha'
 

data/features/nifty_authentication.feature

@@ -2,7 +2,7 @@ Feature: Nifty Authentication Generator
   In order to authenticate users
   As a rails developer
   I want to generate some user authentication
-  
+
   Scenario: Generate default authentication
     Given a new Rails app
     When I run "rails g nifty:authentication"
@@ -31,7 +31,7 @@ Feature: Nifty Authentication Generator
     And I run "rake db:migrate"
     And I add "gem 'mocha', :group => :test" to file "Gemfile"
     Then I should successfully run "rake test"
-  
+
   Scenario: Generate named authentication
     Given a new Rails app
     When I run "rails g nifty:authentication Account CurrentSession"

data/features/nifty_scaffold.feature

@@ -18,5 +18,20 @@ Feature: Nifty Scaffold Generator
     And I should see "resources :projects" in file "config/routes.rb"
     When I run "rails g nifty:layout -f"
     And I run "rake db:migrate"
+    And I should successfully run "rails g nifty:scaffold Project -f"
     And I add "gem 'mocha', :group => :test" to file "Gemfile"
     Then I should successfully run "rake test"
+
+  Scenario: Generate scaffold with rspec tests
+    Given a new Rails app
+    When I run "rails g nifty:scaffold Project name:string --rspec"
+    Then I should see the following files
+      | spec/models/project_spec.rb                  |
+      | spec/controllers/projects_controller_spec.rb |
+    And I should see "resources :projects" in file "config/routes.rb"
+    When I run "rails g nifty:layout -f"
+    And I run "rake db:migrate"
+    And I add "gem 'mocha', :group => :test" to file "Gemfile"
+    And I add "gem 'rspec-rails', '>= 2.0.0.beta.19'" to file "Gemfile"
+    And I run "rails g rspec:install"
+    Then I should successfully run "rake spec"

data/features/step_definitions/common_steps.rb

@@ -5,7 +5,7 @@ end
 When /^I add "([^\"]*)" to file "([^\"]*)"$/ do |content, short_path|
   path = File.join(@current_directory, short_path)
   File.should exist(path)
-  File.open(path, 'a') { |f| f.write(content) }
+  File.open(path, 'a') { |f| f.write(content + "\n") }
 end
 
 Then /^I should see file "([^\"]*)"$/ do |path|

data/features/step_definitions/rails_setup_steps.rb

@@ -1,6 +1,6 @@
 Given /^a new Rails app$/ do
   FileUtils.mkdir_p("tmp")
-  system("rails tmp/rails_app").should be_true
+  system("rails new tmp/rails_app").should be_true
   system("ln -s ../../../lib/generators tmp/rails_app/lib/generators").should be_true
   @current_directory = File.expand_path("tmp/rails_app")
 end

data/lib/generators/nifty.rb

@@ -1,12 +1,12 @@
 require 'rails/generators/base'
- 
+
 module Nifty
   module Generators
     class Base < Rails::Generators::Base #:nodoc:
       def self.source_root
         @_nifty_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'nifty', generator_name, 'templates'))
       end
- 
+
       def self.banner
         "#{$0} nifty:#{generator_name} #{self.arguments.map{ |a| a.usage }.join(' ')} [options]"
       end

data/lib/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.
-    
+
       gem "authlogic" # in Gemfile
 
 Examples:
     rails generate nifty:authentication
-        
+
         Creates user model, users_controller, and sessions_controller.
-    
+
     rails generate nifty:authentication account
-    
+
         Creates account model, accounts_controller, and sessions_controller.
-    
+
     rails 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/lib/generators/nifty/authentication/authentication_generator.rb

@@ -5,17 +5,17 @@ module Nifty
   module Generators
     class AuthenticationGenerator < Base
       include Rails::Generators::Migration
-      
+
       argument :user_name, :type => :string, :default => 'user', :banner => 'user_name'
       argument :session_name, :type => :string, :default => '[[DEFAULT]]', :banner => 'sessions_controller_name'
-      
+
       class_option :testunit, :desc => 'Use test/unit for test files.', :group => 'Test framework', :type => :boolean
       class_option :rspec, :desc => 'Use RSpec for test files.', :group => 'Test framework', :type => :boolean
       class_option :shoulda, :desc => 'Use shoulda for test files.', :group => 'Test framework', :type => :boolean
-      
+
       class_option :haml, :desc => 'Generate HAML views instead of ERB.', :type => :boolean
       class_option :authlogic, :desc => 'Use Authlogic for authentication.', :type => :boolean
-      
+
       def create_model_files
         template 'user.rb', "app/models/#{user_singular_name}.rb"
         template 'authlogic_session.rb', "app/models/#{user_singular_name}_session.rb" if options.authlogic?
@@ -26,7 +26,7 @@ module Nifty
         template 'sessions_controller.rb', "app/controllers/#{session_plural_name}_controller.rb"
       end
 
-      def crete_helper_files
+      def create_helper_files
         template 'users_helper.rb', "app/helpers/#{user_plural_name}_helper.rb"
         template 'sessions_helper.rb', "app/helpers/#{session_plural_name}_helper.rb"
       end
@@ -47,12 +47,13 @@ module Nifty
         route "match 'logout' => '#{session_plural_name}#destroy', :as => :logout"
         route "match 'signup' => '#{user_plural_name}#new', :as => :signup"
       end
-      
+
       def create_migration
         migration_template 'migration.rb', "db/migrate/create_#{user_plural_name}.rb"
       end
-      
-      def create_include_line
+
+      def load_and_include_authentication
+        inject_into_class "config/application.rb", "Application", "    config.autoload_paths << \"\#{config.root}/lib\""
         inject_into_class "app/controllers/application_controller.rb", "ApplicationController", "  include Authentication\n"
       end
 
@@ -71,7 +72,7 @@ module Nifty
       end
 
       private
-      
+
       def session_name
         @_session_name ||= @session_name == '[[DEFAULT]]' ?
           (options.authlogic? ? user_name + '_session' : 'session') :

data/lib/generators/nifty/authentication/templates/authentication.rb

@@ -1,7 +1,7 @@
 # This module is included in your application controller which makes
 # several methods available to all controllers and views. Here's a
 # common example you might add to your application layout file.
-# 
+#
 #   <%% if logged_in? %>
 #     Welcome <%%= current_<%= user_singular_name %>.username %>! Not you?
 #     <%%= link_to "Log out", logout_path %>
@@ -9,16 +9,16 @@
 #     <%%= 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]
 module Authentication
   def self.included(controller)
     controller.send :helper_method, :current_<%= user_singular_name %>, :logged_in?, :redirect_to_target_or_default
   end
-  
+
 <%- if options[:authlogic] -%>
   def current_<%= session_singular_name %>
     return @current_<%= session_singular_name %> if defined?(@current_<%= session_singular_name %>)
@@ -34,11 +34,11 @@ module Authentication
     @current_<%= user_singular_name %> ||= <%= user_class_name %>.find(session[:<%= user_singular_name %>_id]) if session[:<%= user_singular_name %>_id]
   end
 <%- end -%>
-  
+
   def logged_in?
     current_<%= user_singular_name %>
   end
-  
+
   def login_required
     unless logged_in?
       flash[:error] = "You must first log in or sign up before accessing this page."
@@ -46,14 +46,14 @@ module Authentication
       redirect_to login_url
     end
   end
-  
+
   def redirect_to_target_or_default(default)
     redirect_to(session[:return_to] || default)
     session[:return_to] = nil
   end
-  
+
   private
-  
+
   def store_target_location
     session[:return_to] = request.request_uri
   end

data/lib/generators/nifty/authentication/templates/migration.rb

@@ -13,7 +13,7 @@ class Create<%= user_plural_class_name %> < ActiveRecord::Migration
       t.timestamps
     end
   end
-  
+
   def self.down
     drop_table :<%= user_plural_name %>
   end

data/lib/generators/nifty/authentication/templates/sessions_controller.rb

@@ -3,7 +3,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
   def new
     @<%= session_singular_name %> = <%= session_class_name %>.new
   end
-  
+
   def create
     @<%= session_singular_name %> = <%= session_class_name %>.new(params[:<%= session_singular_name %>])
     if @<%= session_singular_name %>.save
@@ -13,7 +13,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
       render :action => 'new'
     end
   end
-  
+
   def destroy
     @<%= session_singular_name %> = <%= session_class_name %>.find
     @<%= session_singular_name %>.destroy
@@ -23,7 +23,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
 <%- else -%>
   def new
   end
-  
+
   def create
     <%= user_singular_name %> = <%= user_class_name %>.authenticate(params[:login], params[:password])
     if <%= user_singular_name %>
@@ -35,7 +35,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
       render :action => 'new'
     end
   end
-  
+
   def destroy
     session[:<%= user_singular_name %>_id] = nil
     flash[:notice] = "You have been logged out."

data/lib/generators/nifty/authentication/templates/tests/rspec/sessions_controller.rb

@@ -1,21 +1,21 @@
 require File.dirname(__FILE__) + '/../spec_helper'
- 
+
 describe <%= session_plural_class_name %>Controller do
   fixtures :all
-  integrate_views
-  
+  render_views
+
   it "new action should render new template" do
     get :new
     response.should render_template(:new)
   end
-  
+
 <%- if options[:authlogic] -%>
   it "create action should render new template when authentication is invalid" do
     post :create, :<%= session_singular_name %> => { :username => "foo", :password => "badpassword" }
     response.should render_template(:new)
     <%= session_class_name %>.find.should be_nil
   end
-  
+
   it "create action should redirect when authentication is valid" do
     post :create, :<%= session_singular_name %> => { :username => "foo", :password => "secret" }
     response.should redirect_to("/")
@@ -28,7 +28,7 @@ describe <%= session_plural_class_name %>Controller do
     response.should render_template(:new)
     session['<%= user_singular_name %>_id'].should be_nil
   end
-  
+
   it "create action should redirect when authentication is valid" do
     <%= user_class_name %>.stubs(:authenticate).returns(<%= user_class_name %>.first)
     post :create

data/lib/generators/nifty/authentication/templates/tests/rspec/user.rb

@@ -9,72 +9,72 @@ describe <%= user_class_name %> do
     attributes[:password_confirmation] ||= attributes[:password]
     <%= user_class_name %>.new(attributes)
   end
-  
+
   before(:each) do
     <%= user_class_name %>.delete_all
   end
-  
+
   it "should be valid" do
     new_<%= user_singular_name %>.should be_valid
   end
-  
+
   it "should require username" do
     new_<%= user_singular_name %>(:username => '').should have(1).error_on(:username)
   end
-  
+
   it "should require password" do
     new_<%= user_singular_name %>(:password => '').should have(1).error_on(:password)
   end
-  
+
   it "should require well formed email" do
     new_<%= user_singular_name %>(:email => 'foo@bar@example.com').should have(1).error_on(:email)
   end
-  
+
   it "should validate uniqueness of email" do
     new_<%= user_singular_name %>(:email => 'bar@example.com').save!
     new_<%= user_singular_name %>(:email => 'bar@example.com').should have(1).error_on(:email)
   end
-  
+
   it "should validate uniqueness of username" do
     new_<%= user_singular_name %>(:username => 'uniquename').save!
     new_<%= user_singular_name %>(:username => 'uniquename').should have(1).error_on(:username)
   end
-  
+
   it "should not allow odd characters in username" do
     new_<%= user_singular_name %>(:username => 'odd ^&(@)').should have(1).error_on(:username)
   end
-  
+
   it "should validate password is longer than 3 characters" do
     new_<%= user_singular_name %>(:password => 'bad').should have(1).error_on(:password)
   end
-  
+
   it "should require matching password confirmation" do
     new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').should have(1).error_on(:password)
   end
-  
+
   it "should generate password hash and salt on create" do
     <%= user_singular_name %> = new_<%= user_singular_name %>
     <%= user_singular_name %>.save!
     <%= user_singular_name %>.password_hash.should_not be_nil
     <%= user_singular_name %>.password_salt.should_not be_nil
   end
-  
+
   it "should authenticate by username" do
     <%= user_singular_name %> = new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret')
     <%= user_singular_name %>.save!
     <%= user_class_name %>.authenticate('foobar', 'secret').should == <%= user_singular_name %>
   end
-  
+
   it "should authenticate by email" do
     <%= user_singular_name %> = new_<%= user_singular_name %>(:email => 'foo@bar.com', :password => 'secret')
     <%= user_singular_name %>.save!
     <%= user_class_name %>.authenticate('foo@bar.com', 'secret').should == <%= user_singular_name %>
   end
-  
+
   it "should not authenticate bad username" do
     <%= user_class_name %>.authenticate('nonexisting', 'secret').should be_nil
   end
-  
+
   it "should not authenticate bad password" do
     new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret').save!
     <%= user_class_name %>.authenticate('foobar', 'badpassword').should be_nil