seivan-generators 0.3 → 0.4

data/features/seivan_authentication.feature

@@ -22,6 +22,8 @@ Feature: Seivan Authentication Generator
       | match 'signup' => 'users#new', :as => :signup        |
       | match 'user/edit' => 'users#edit', :as => :edit_user |
     And I should see "include ControllerAuthentication" in file "app/controllers/application_controller.rb"
+    And I should see "conditions = ['username = ? or email = ?', login, login]" in file "app/models/user.rb"
+    And I should see "user = User.where(conditions).first" in file "app/models/user.rb"
     And I should see "gem "mocha", :group => :test" in file "Gemfile"
     And I should see "gem "bcrypt-ruby", :require => "bcrypt"" in file "Gemfile"
 

data/features/seivan_config.feature

@@ -14,4 +14,5 @@ Feature: Seivan Config Generator
     When I run "rails g seivan:config FooBar"
     Then I should see "FOO_BAR_CONFIG" in file "config/initializers/load_foo_bar_config.rb"
     And I should see "config/foo_bar_config.yml" in file "config/initializers/load_foo_bar_config.rb"
+    And I should see "default: &default" in file "config/foo_bar_config.yml"
     And I should see file "config/foo_bar_config.yml"

data/lib/generators/seivan/authentication/templates/user.rb

@@ -8,18 +8,35 @@ class <%= user_class_name %> < ActiveRecord::Base
   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 .-_@"
-  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
+  validates :email, 
+            :format => {:with => /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i,
+                        :allow_blank => true, 
+                        :allow_nil => true },
+            :presence => { :if => lambda {self.username.nil?} },
+            :uniqueness => true
+                        
+  validates :username,
+            :format => {:with => /[A-Za-z0-9]+/, :allow_blank => true, :allow_nil => true},
+            :presence => { :if => lambda {self.email.nil?} },
+            :length => {:minimum => 3, :allow_blank => true},
+            :uniqueness => true
+            
+  validates :role, 
+            :inclusion => { :in => %w(admin moderator writer user guest) }
+
+  validates :password,
+            :length => {:minimum => 3},
+            :presence => 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)
+  def self.authenticate(params)
+    login = params[:login]
+    conditions = ['username = ? or email = ?', login, login]
+    <%= user_singular_name %> = <%= user_class_name %>.where(conditions).first
+    return <%= user_singular_name %> if <%= user_singular_name %> && <%= user_singular_name %>.matching_password?(params[:password])
   end
 
   def matching_password?(pass)

data/lib/generators/seivan/config/templates/config.yml

@@ -1,3 +1,5 @@
+default: &default
+  
 development:
   domain: localhost:3000
 

data/lib/generators/seivan/html5/templates/_head.html.haml

@@ -1,9 +1,6 @@
 %head
   %meta{ :charset => "utf-8" }/
   
-  -# 
-    Always force latest IE rendering engine (even in intranet) & Chrome Frame
-    Remove this if you use the .htaccess
   %meta{ :content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible" }/
   
   %title
@@ -20,8 +17,6 @@
   -# %link{ :href => "/apple-touch-icon.png", :rel => "apple-touch-icon" }/
   
   = render :partial => 'layouts/stylesheets'
-  
-  -# All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects
-  = javascript_include_tag 'modernizr-1.5.min'
+
   
   = csrf_meta_tag

data/lib/generators/seivan/html5/templates/_javascripts.html.haml

@@ -6,7 +6,7 @@
 -# asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet
 -# Generate a rails g seivan:config google and write the credentials in config/google.yml
 :javascript
-  var _gaq = [['_setAccount', '#{GOOGLE[:account_id]}'], ['_trackPageview']];
+  var _gaq = [['_setAccount', '#{APP_CONFIG[:account_id]}'], ['_trackPageview']];
   (function(d, t) {
     var g = d.createElement(t),
         s = d.getElementsByTagName(t)[0];

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Seivan Heidari
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 +02:00
+date: 2010-10-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency