i0n_rails3_generators 0.2.13 → 0.2.14

data/config/version.yml

@@ -1,4 +1,4 @@
 --- 
 :version_major: 0
 :version_minor: 2
-:version_patch: 13
+:version_patch: 14

data/lib/generators/i0n/authentication/authentication_generator.rb

@@ -5,7 +5,7 @@ module I0n
       source_root File.expand_path('../templates', __FILE__)
 
       def gemfile
-        gem("bcrypt-ruby")  
+        gem("bcrypt-ruby", :require => 'bcrypt')  
       end
 
       def setup_application
@@ -21,7 +21,7 @@ module I0n
 
       def create_authentication_lib_and_include_in_application_helper
         copy_file "lib/authentication.rb", "#{Rails.root}/lib/authentication.rb" 
-        inject_into_class("app/controllers/application_controller.rb", "include Authentication")
+        inject_into_class("app/controllers/application_controller.rb", ApplicationController, "include Authentication\n")
       end
 
       def create_routes
@@ -34,17 +34,23 @@ module I0n
 
       def create_models
         generate("model", "user email:string password_hash:string password_salt:string")
+        inject_into_class("app/models/user.rb", User, IO.read("#{AuthenticationGenerator.source_root}/app/models/_user.rb")) 
       end
       
       def create_controllers
         generate("controller", "user_sessions")   
         generate("controller", "users")
-        inject_into_class("app/controllers/users_controller.rb", IO.read("#{AuthenticationGenerator.source_root}/app/controllers/_users_controller.rb")) 
+        inject_into_class("app/controllers/users_controller.rb", UsersController, IO.read("#{AuthenticationGenerator.source_root}/app/controllers/_users_controller.rb")) 
+        inject_into_class("app/controllers/user_sessions_controller.rb", UserSessionsController, IO.read("#{AuthenticationGenerator.source_root}/app/controllers/_user_sessions_controller.rb"))
       end
 
       def create_views
         directory "app/views/users", "#{Rails.root}/app/views/users"
-        directory "app/view/user_sessions", "#{Rails.root}/app/views/user_sessions" 
+        directory "app/views/user_sessions", "#{Rails.root}/app/views/user_sessions" 
+      end
+
+      def create_rake_tasks
+        copy_file "lib/tasks/create_default_user.rake", "#{Rails.root}/lib/tasks/create_default_user.rake" 
       end
 
     end

data/lib/generators/i0n/authentication/templates/app/controllers/{_sessions_controller.rb → _user_sessions_controller.rb}

@@ -5,19 +5,17 @@
   end
 
   def create
-    user = User.authenticate(params[:login], params[:password])
+    user = User.authenticate(params[:email], params[:password])
     if user
       session[:user_id] = user.id
-      flash[:notice] = "Logged in successfully."
-      redirect_to_target_or_default("/")
+      redirect_to root_url, :notice => "Logged in!"
     else
       flash.now[:error] = "Invalid login or password."
-      render :action => 'new'
+      render 'new'
     end
   end
 
   def destroy
     session[:user_id] = nil
-    flash[:notice] = "You have been logged out."
-    redirect_to "/"
+    redirect_to "root_url"
   end

data/lib/generators/i0n/authentication/templates/app/models/_user.rb

@@ -0,0 +1,25 @@
+  attr_accessor :password
+  before_save :encrypt_password
+
+  validates_presence_of :email
+  validates_uniqueness_of :email
+  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 
+
+  def self.authenticate(email, password)
+    user = find(:first, :conditions => {:email => email})
+    if user && user.password_hash == BCrypt::Engine.hash_secret(password, user.password_salt)
+      user
+    else
+      nil
+    end
+  end
+
+  def encrypt_password
+    if password.present?
+      self.password_salt = BCrypt::Engine.generate_salt
+      self.password_hash = BCrypt::Engine.hash_secret(password, password_salt)
+    end
+  end

data/lib/generators/i0n/authentication/templates/app/views/user_sessions/new.haml

@@ -2,22 +2,13 @@
   Log in
 
 - content_for :description do
-  Ian Web Designs - Website design and web development. Friendly helpful advice and state of the art web design. Contact me now for a free consultation!
+  description goes here 
 
-- content_for :keywords do
-  web design,website design,web development,website development,user experience design,usability
-
-- content_for :body_id do 
-  form_layout
-
-- content_for :h1 do
-  Login
-  
 %article  
   = form_tag user_sessions_path do
     .field
-      = label_tag :login, "Username or Email Address"
-      = text_field_tag :login, params[:login], :autofocus => true
+      = label_tag :email, "Email Address"
+      = text_field_tag :email, params[:email], :autofocus => true
     .field
       = label_tag :password
       = password_field_tag :password

data/lib/generators/i0n/authentication/templates/app/views/users/edit.haml

@@ -1,8 +1,11 @@
-- content_for :title do 
+- content_for :title do
   Edit User
+
+- content_for :description do
+  description goes here 
   
 %p 
   Already have an account? 
   = link_to "Log in", login_path
   
-= render 'form'
+= render 'form'

data/lib/generators/i0n/authentication/templates/app/views/users/index.haml

@@ -1,5 +1,8 @@
 - content_for :title do
-  List of users
+  Log in
+
+- content_for :description do
+  description goes here 
   
 - @users.each do |user|
   %p

data/lib/generators/i0n/authentication/templates/app/views/users/new.haml

@@ -1,8 +1,11 @@
-- content_for :title do 
+- content_for :title do
   New User
+
+- content_for :description do
+  description goes here 
   
 %p 
   Already have an account? 
   = link_to "Log in", login_path
   
-= render 'form'
+= render 'form'

data/lib/generators/i0n/authentication/templates/lib/tasks/create_default_user.rake

@@ -0,0 +1,8 @@
+namespace :db do
+
+  desc "Creates the first user for the authentication system"
+  task :create_default_user => :environment do
+    User.create(:email => "ianalexanderwood@gmail.com", :password => "password")
+  end
+
+end

data/lib/generators/i0n/layout/templates/app/views/layouts/application.haml

@@ -3,7 +3,6 @@
   %head		
     %meta{ :content => "text/html;charset=UTF-8", "http-equiv" => "content-type" }
     %meta{:name => 'description', :content => "#{yield :description}"}
-    %meta{:name => 'keywords', :content => "#{yield :keywords}"}
     = csrf_meta_tag
     %title 
       #{yield :title}
@@ -12,11 +11,9 @@
       = stylesheet_link_tag 'ie', :media => 'screen, projection'
     /[if lt IE 9]
       %script{ :src => "http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js" }
-  %body{:id => "#{yield :body_id}"}
+  %body
     .container
       %header
-        %h1 
-          #{yield :h1}
         - if flash[:notice] != nil
           %p{:class => "flash_notice"}
             = flash[:notice]

metadata

@@ -2,7 +2,7 @@
 name: i0n_rails3_generators
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors: 
 - Ian Alexander Wood (i0n)
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 +00:00
+date: 2011-03-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,16 +64,16 @@ files:
 - lib/generators/authlogic/complete/templates/users_controller.rb
 - lib/generators/authlogic/complete/templates/users_controller_test.rb
 - lib/generators/i0n/authentication/authentication_generator.rb
-- lib/generators/i0n/authentication/templates/app/controllers/_sessions_controller.rb
+- lib/generators/i0n/authentication/templates/app/controllers/_user_sessions_controller.rb
 - lib/generators/i0n/authentication/templates/app/controllers/_users_controller.rb
-- lib/generators/i0n/authentication/templates/app/models/user.rb
+- lib/generators/i0n/authentication/templates/app/models/_user.rb
 - lib/generators/i0n/authentication/templates/app/views/user_sessions/new.haml
 - lib/generators/i0n/authentication/templates/app/views/users/_form.haml
 - lib/generators/i0n/authentication/templates/app/views/users/edit.haml
 - lib/generators/i0n/authentication/templates/app/views/users/index.haml
 - lib/generators/i0n/authentication/templates/app/views/users/new.haml
 - lib/generators/i0n/authentication/templates/lib/authentication.rb
-- lib/generators/i0n/authentication/templates/lib/tasks/populate.rake
+- lib/generators/i0n/authentication/templates/lib/tasks/create_default_user.rake
 - lib/generators/i0n/authentication/USAGE
 - lib/generators/i0n/i0n.rb
 - lib/generators/i0n/layout/layout_generator.rb

data/lib/generators/i0n/authentication/templates/app/models/user.rb

@@ -1,46 +0,0 @@
-class User 
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  field :username,      :type => String
-  field :email,         :type => String
-  field :password_salt, :type => String
-  field :password_hash, :type => String
-
-  # 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 .-_@"
-  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)
-    user = find(:first, :conditions => {:username => login}) || find(:first, :conditions => {:email => login})
-    return user if user && user.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
-  
-end

data/lib/generators/i0n/authentication/templates/lib/tasks/populate.rake

@@ -1,16 +0,0 @@
-namespace :db do
-  
-  desc "Erase and fill database"
-  task :populate => :environment do
-    require 'faker'
-    [Contact].each(&:delete_all)
-    10.times do
-      contact = Contact.create(:name => Faker::Name.name,
-                            :email => (rand(10000).to_s + Faker::Internet.email),
-                            :message => "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-      )
-    end
-     
-  end
-  
-end