nifty-generators 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.2.2 (November 11th, 2008)
+
+* fixing sessions_path reference in nifty_authentication
+
+* adding more validations to user model in nifty_authentication
+
+* cleaning up nifty_layout stylesheet
+
 0.2.1 (November 10th, 2008)
 
 * adding missing nifty_authentication files

data/Rakefile

@@ -2,14 +2,13 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('nifty-generators', '0.2.1') do |p|
+Echoe.new('nifty-generators', '0.2.2') do |p|
   p.project        = "niftygenerators"
-  p.summary        = "A collection of useful generator scripts for Rails."
   p.description    = "A collection of useful generator scripts for Rails."
   p.url            = "http://github.com/ryanb/nifty-generators"
   p.author         = 'Ryan Bates'
   p.email          = "ryan (at) railscasts (dot) com"
-  p.ignore_pattern = ["script/*", "*.gemspec"]
+  p.ignore_pattern = ["script/*"]
   p.development_dependencies = []
 end
 

data/nifty-generators.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Nifty-generators-0.2.1
+# Gem::Specification for Nifty-generators-0.2.2
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: nifty-generators
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ryan Bates
 autorequire: 
 bindir: bin
 
-date: 2008-11-10 00:00:00 -08:00
+date: 2008-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: []
 

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

@@ -9,6 +9,10 @@ describe <%= user_class_name %> do
     <%= 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
@@ -25,6 +29,24 @@ describe <%= user_class_name %> 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
@@ -37,14 +59,12 @@ describe <%= user_class_name %> do
   end
   
   it "should authenticate by username" do
-    <%= user_class_name %>.delete_all
     <%= 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_class_name %>.delete_all
     <%= 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 %>
@@ -55,7 +75,6 @@ describe <%= user_class_name %> do
   end
   
   it "should not authenticate bad password" do
-    <%= user_class_name %>.delete_all
     new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret').save!
     <%= user_class_name %>.authenticate('foobar', 'badpassword').should be_nil
   end

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

@@ -11,6 +11,10 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
     <%= user_singular_name %>
   end
   
+  def setup
+    <%= user_class_name %>.delete_all
+  end
+  
   should "be valid" do
     assert new_<%= user_singular_name %>.valid?
   end
@@ -27,6 +31,24 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
     assert new_<%= user_singular_name %>(:email => 'foo@bar@example.com').errors.on(:email)
   end
   
+  should "validate uniqueness of email" do
+    new_<%= user_singular_name %>(:email => 'bar@example.com').save!
+    assert new_<%= user_singular_name %>(:email => 'bar@example.com').errors.on(:email)
+  end
+  
+  should "validate uniqueness of username" do
+    new_<%= user_singular_name %>(:username => 'uniquename').save!
+    assert new_<%= user_singular_name %>(:username => 'uniquename').errors.on(:username)
+  end
+  
+  should "not allow odd characters in username" do
+    assert new_<%= user_singular_name %>(:username => 'odd ^&(@)').errors.on(:username)
+  end
+  
+  should "validate password is longer than 3 characters" do
+    assert new_<%= user_singular_name %>(:password => 'bad').errors.on(:password)
+  end
+  
   should "require matching password confirmation" do
     assert new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').errors.on(:password)
   end
@@ -39,14 +61,12 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
   end
   
   should "authenticate by username" do
-    <%= 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
   
   should "authenticate by email" do
-    <%= 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')
@@ -57,7 +77,6 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
   end
   
   should "not authenticate bad password" do
-    <%= user_class_name %>.delete_all
     new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret').save!
     assert_nil <%= user_class_name %>.authenticate('foobar', 'badpassword')
   end

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

@@ -11,6 +11,10 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
     <%= user_singular_name %>
   end
   
+  def setup
+    <%= user_class_name %>.delete_all
+  end
+  
   def test_valid
     assert new_<%= user_singular_name %>.valid?
   end
@@ -27,6 +31,24 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
     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

data/rails_generators/nifty_authentication/templates/user.rb

@@ -6,9 +6,12 @@ class <%= user_class_name %> < ActiveRecord::Base
   before_create :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 .-_@"
   validates_format_of :email, :with => /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i
   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)

data/rails_generators/nifty_authentication/templates/views/erb/login.html.erb

@@ -2,7 +2,7 @@
 
 <p>Don't have an account? <%%= link_to "Sign up!", signup_path %></p>
 
-<%% form_tag sessions_path do %>
+<%% form_tag <%= sessions_underscore_name %>_path do %>
   <p>
     <%%= label_tag :login, "Username or Email Address" %><br />
     <%%= text_field_tag :login, params[:login] %>

data/rails_generators/nifty_authentication/templates/views/haml/login.html.haml

@@ -2,7 +2,7 @@
 
 %p== Don't have an account? #{link_to "Sign up!", signup_path}
 
-- form_tag sessions_path do
+- form_tag <%= sessions_underscore_name %>_path do
   %p
     = label_tag :login, "Username or Email Address"
     %br

data/rails_generators/nifty_layout/templates/stylesheet.css

@@ -14,7 +14,7 @@ a {
 
 .clear {
   clear: both;
-  height: 0px;
+  height: 0;
   overflow: hidden;
 }
 
@@ -42,8 +42,6 @@ a {
   border: solid 1px #C66;
 }
 
-
-
 .fieldWithErrors {
   display: inline;
 }
@@ -62,18 +60,21 @@ a {
   font-weight: bold;
   padding: 5px 5px 5px 15px;
   font-size: 12px;
-  margin: 0px;
+  margin: 0;
   background-color: #c00;
   color: #fff;
 }
+
 #errorExplanation p {
   color: #333;
   margin-bottom: 0;
   padding: 8px;
 }
+
 #errorExplanation ul {
   margin: 2px 24px;
 }
+
 #errorExplanation ul li {
   font-size: 12px;
   list-style: disc;

data/rails_generators/nifty_layout/templates/stylesheet.sass

@@ -6,9 +6,6 @@ body
     :family Verdana, Helvetica, Arial
     :size 14px
 
-ul li
-  :list-style none
-
 a
   :color #0000FF
   img
@@ -16,7 +13,7 @@ a
 
 .clear
   :clear both
-  :height 0px
+  :height 0
   :overflow hidden
 
 #container
@@ -40,19 +37,23 @@ a
   :background-color #FCC
   :border solid 1px #C66
 
+.fieldWithErrors
+  :display inline
+
 #errorExplanation
   :width 400px
   :border 2px solid #CF0000
-  :padding 0px
+  :padding 0
   :padding-bottom 12px
   :margin-bottom 20px
   :background-color #f0f0f0
   h2
     :text-align left
-    :font-weight bold
     :padding 5px 5px 5px 15px
-    :font-size 12px
-    :margin 0px
+    :margin 0
+    :font
+      :weight bold
+      :size 12px
     :background-color #c00
     :color #fff
   p

data/rails_generators/nifty_scaffold/templates/actions/index.rb

@@ -1,3 +1,3 @@
   def index
-    @<%= plural_name %> = <%= class_name %>.find(:all)
+    @<%= plural_name %> = <%= class_name %>.all
   end

data/test/test_helper.rb

@@ -96,9 +96,9 @@ module ActiveRecord
       attr_accessor :name, :default, :type, :limit, :null, :sql_type, :precision, :scale
 
       def initialize(name, default, sql_type = nil)
-        @name=name
-        @default=default
-        @type=@sql_type=sql_type
+        @name = name
+        @default = default
+        @type = @sql_type = sql_type
       end
 
       def human_name

data/test/test_nifty_scaffold_generator.rb

@@ -100,7 +100,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
       should "generate controller with index action" do
         assert_generated_file "app/controllers/line_items_controller.rb" do |body|
           assert_match "def index", body
-          assert_match "@line_items = LineItem.find(:all)", body
+          assert_match "@line_items = LineItem.all", body
           assert_no_match(/    def index/, body)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nifty-generators
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-10 00:00:00 -08:00
+date: 2008-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: []