padrino-admin 0.9.18 → 0.9.19

data/lib/padrino-admin/generators/admin_app.rb

@@ -43,11 +43,12 @@ module Padrino
 
           ext = fetch_component_choice(:renderer)
 
+          empty_directory destination_root("admin")
           directory "templates/app",     destination_root("admin")
           directory "templates/assets",  destination_root("public", "admin")
 
           account_params = [
-            "account", "name:string", "surname:string", "email:string", "crypted_password:string", "salt:string", "role:string",
+            "account", "name:string", "surname:string", "email:string", "crypted_password:string", "role:string",
             "-r=#{options[:root]}"
           ]
 
@@ -67,30 +68,49 @@ module Padrino
             { :name => :role,                  :field_type => :text_field }
           ]
 
-          admin_app = Padrino::Generators::AdminPage.new(["account"], :root => options[:root])
+          admin_app = Padrino::Generators::AdminPage.new(["account"], :root => options[:root], :destroy => options[:destroy])
           admin_app.default_orm = Padrino::Admin::Generators::Orm.new(:account, orm, columns, column_fields)
           admin_app.invoke_all
 
           template "templates/account/#{orm}.rb.tt",                     destination_root("app", "models", "account.rb"), :force => true
-          template "templates/account/seeds.rb.tt",                      destination_root("db/seeds.rb")
+
+          if File.exist?(destination_root("db/seeds.rb"))
+            append_file(destination_root("db/seeds.rb")) { "\n\n" + File.read(self.class.source_root+"/templates/account/seeds.rb.tt") }
+          else
+            template "templates/account/seeds.rb.tt",                    destination_root("db/seeds.rb")
+          end
+
+          empty_directory destination_root("admin/controllers")
+          empty_directory destination_root("admin/views")
+          empty_directory destination_root("admin/views/base")
+          empty_directory destination_root("admin/views/layouts")
+          empty_directory destination_root("admin/views/sessions")
+
           template "templates/#{ext}/app/base/_sidebar.#{ext}.tt",       destination_root("admin/views/base/_sidebar.#{ext}")
           template "templates/#{ext}/app/base/index.#{ext}.tt",          destination_root("admin/views/base/index.#{ext}")
           template "templates/#{ext}/app/layouts/application.#{ext}.tt", destination_root("admin/views/layouts/application.#{ext}")
           template "templates/#{ext}/app/sessions/new.#{ext}.tt",        destination_root("admin/views/sessions/new.#{ext}")
 
           add_project_module :accounts
+          require_dependencies('bcrypt-ruby', :require => 'bcrypt')
           append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"Admin\").to(\"/admin\")"
           gsub_file destination_root("admin/views/accounts/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles"
           gsub_file destination_root("admin/controllers/accounts.rb"), "if account.destroy", "if account != current_account && account.destroy"
           return if self.behavior == :revoke
+
+          instructions = []
+          instructions << "Run 'padrino rake ar:migrate'" if orm == :activerecord
+          instructions << "Run 'padrino rake dm:migrate'" if orm == :datamapper
+          instructions << "Run 'padrino rake seed'"
+          instructions << "Visit the admin panel in the browser at '/admin'"
+          instructions.map! { |i| "  #{instructions.index(i) + 1}) #{i}" }
+
           say((<<-TEXT).gsub(/ {10}/,''))
 
           =================================================================
           The admin panel has been mounted! Next, follow these steps:
           =================================================================
-            1) Run migrations (if necessary)
-            2) Run 'padrino rake seed'
-            3) Visit the admin panel in the browser at '/admin'
+          #{instructions.join("\n")}
           =================================================================
 
           TEXT
@@ -100,4 +120,4 @@ module Padrino
       end
     end # AdminApp
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-admin/generators/admin_page.rb

@@ -34,13 +34,15 @@ module Padrino
             self.behavior = :revoke if options[:destroy]
             ext = fetch_component_choice(:renderer)
 
+            empty_directory destination_root("/admin/views/#{@orm.name_plural}")
+
             template "templates/page/controller.rb.tt",       destination_root("/admin/controllers/#{@orm.name_plural}.rb")
             template "templates/#{ext}/page/_form.#{ext}.tt", destination_root("/admin/views/#{@orm.name_plural}/_form.#{ext}")
             template "templates/#{ext}/page/edit.#{ext}.tt",  destination_root("/admin/views/#{@orm.name_plural}/edit.#{ext}")
             template "templates/#{ext}/page/index.#{ext}.tt", destination_root("/admin/views/#{@orm.name_plural}/index.#{ext}")
             template "templates/#{ext}/page/new.#{ext}.tt",   destination_root("/admin/views/#{@orm.name_plural}/new.#{ext}")
 
-            add_project_module(@orm.name_plural)
+            add_project_module(@orm.name_plural) unless options[:destroy]
           end
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)"

data/lib/padrino-admin/generators/orm.rb

@@ -18,6 +18,7 @@ module Padrino
         end
 
         def field_type(type)
+          type = :string if type.nil? #Couchrest-Hack to avoid the next line to fail
           type = type.to_s.demodulize.downcase.to_sym unless type.is_a?(Symbol)
           case type
             when :integer, :float, :decimal   then :text_field

data/lib/padrino-admin/generators/templates/account/activerecord.rb.tt

@@ -1,7 +1,5 @@
-require 'digest/sha1'
-
 class Account < ActiveRecord::Base
-  attr_accessor :password
+  attr_accessor :password, :password_confirmation
 
   # Validations
   validates_presence_of     :email, :role
@@ -15,28 +13,23 @@ class Account < ActiveRecord::Base
   validates_format_of       :role,     :with => /[A-Za-z]/
 
   # Callbacks
-  before_save :generate_password
+  before_save :encrypt_password
 
   ##
   # This method is for authentication purpose
   #
   def self.authenticate(email, password)
     account = first(:conditions => { :email => email }) if email.present?
-    account && account.password_clean == password ? account : nil
+    account && account.has_password?(password) ? account : nil
   end
 
-  ##
-  # This method is used to retrieve the original password.
-  #
-  def password_clean
-    crypted_password.decrypt(salt)
+  def has_password?(password)
+    ::BCrypt::Password.new(crypted_password) == password
   end
 
   private
-    def generate_password
-      return if password.blank?
-      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
-      self.crypted_password = password.encrypt(self.salt)
+    def encrypt_password
+      self.crypted_password = ::BCrypt::Password.create(password)
     end
 
     def password_required

data/lib/padrino-admin/generators/templates/account/couchrest.rb.tt

@@ -1,5 +1,3 @@
-require 'digest/sha1'
-
 class Account < CouchRest::ExtendedDocument
   include CouchRest::Validation
   use_database COUCHDB
@@ -11,7 +9,6 @@ class Account < CouchRest::ExtendedDocument
   property :surname
   property :email
   property :crypted_password
-  property :salt
   property :role
 
   view_by :email
@@ -30,7 +27,7 @@ class Account < CouchRest::ExtendedDocument
   validates_format_of       :role,     :with => /[A-Za-z]/
 
   # Callbacks
-  before_save :generate_password
+  before_save :encrypt_password
 
   ##
   # This method is for authentication purpose
@@ -38,14 +35,7 @@ class Account < CouchRest::ExtendedDocument
   def self.authenticate(email, password)
     email_array = self.by_email :key => email
     account = email_array[0]
-    account && account.password_clean == password ? account : nil
-  end
-
-  ##
-  # This method is used to retrieve the original password.
-  #
-  def password_clean
-    crypted_password.decrypt(salt)
+    account && account.has_password?(password) ? account : nil
   end
 
   ##
@@ -56,11 +46,13 @@ class Account < CouchRest::ExtendedDocument
     id_array[0]
   end
 
+  def has_password?(password)
+    ::BCrypt::Password.new(crypted_password) == password
+  end
+
   private
-    def generate_password
-      return if password.blank?
-      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if self.salt.blank?
-      self.crypted_password = password.encrypt(self.salt)
+    def encrypt_password
+      self.crypted_password = ::BCrypt::Password.create(password)
     end
 
     def password_required
@@ -75,6 +67,6 @@ class Account < CouchRest::ExtendedDocument
         # there is an id, make sure updates are being applied to same account
         return true if self["_id"] == account["_id"]
       end
-      [false, "Email has already been taken"] 
+      [false, "Email has already been taken"]
     end
 end

data/lib/padrino-admin/generators/templates/account/datamapper.rb.tt

@@ -1,5 +1,3 @@
-require 'digest/sha1'
-
 class Account
   include DataMapper::Resource
   include DataMapper::Validate
@@ -11,7 +9,6 @@ class Account
   property :surname,          String
   property :email,            String
   property :crypted_password, String
-  property :salt,             String
   property :role,             String
 
   # Validations
@@ -30,7 +27,7 @@ class Account
   #
   def self.authenticate(email, password)
     account = first(:conditions => { :email => email }) if email.present?
-    account && account.password_clean == password ? account : nil
+    account && account.has_password?(password) ? account : nil
   end
 
   ##
@@ -40,25 +37,16 @@ class Account
     get(id) rescue nil
   end
 
-  ##
-  # This method is used to retrieve the original password.
-  #
-  def password_clean
-    crypted_password.decrypt(salt)
-  end
-
-  ###
-  # Password setter generates salt and crypted_password
-  #
-  def password=(val)
-    return if val.blank?
-    attribute_set(:salt, Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--")) if new?
-    attribute_set(:crypted_password, val.encrypt(self.salt))
+  def has_password?(password)
+    ::BCrypt::Password.new(crypted_password) == password
   end
 
   private
-
     def password_required
       crypted_password.blank? || !password.blank?
     end
+
+    def encrypt_password
+      self.crypted_password = ::BCrypt::Password.create(password)
+    end
 end

data/lib/padrino-admin/generators/templates/account/mongoid.rb.tt

@@ -1,15 +1,12 @@
-require 'digest/sha1'
-
 class Account
   include Mongoid::Document
-  attr_accessor :password
+  attr_accessor :password, :password_confirmation
 
   # Fields
   field :name,             :type => String
   field :surname,          :type => String
   field :email,            :type => String
   field :crypted_password, :type => String
-  field :salt,             :type => String
   field :role,             :type => String
 
   # Validations
@@ -31,7 +28,7 @@ class Account
   #
   def self.authenticate(email, password)
     account = first(:conditions => { :email => email }) if email.present?
-    account && account.password_clean == password ? account : nil
+    account && account.has_password?(password) ? account : nil
   end
 
   ##
@@ -41,18 +38,13 @@ class Account
     find(id) rescue nil
   end
 
-  ##
-  # This method is used to retrieve the original password.
-  #
-  def password_clean
-    crypted_password.decrypt(salt)
+  def has_password?(password)
+    ::BCrypt::Password.new(crypted_password) == password
   end
 
   private
     def generate_password
-      return if password.blank?
-      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
-      self.crypted_password = password.encrypt(self.salt)
+      self.crypted_password = ::BCrypt::Password.create(self.password)
     end
 
     def password_required

data/lib/padrino-admin/generators/templates/account/mongomapper.rb.tt

@@ -1,15 +1,12 @@
-require 'digest/sha1'
-
 class Account
   include MongoMapper::Document
-  attr_accessor :password
+  attr_accessor :password, :password_confirmation
 
   # Keys
   key :name,             String
   key :surname,          String
   key :email,            String
   key :crypted_password, String
-  key :salt,             String
   key :role,             String
 
   # Validations
@@ -31,21 +28,16 @@ class Account
   #
   def self.authenticate(email, password)
     account = first(:email => email) if email.present?
-    account && account.password_clean == password ? account : nil
+    account && account.has_password?(password) ? account : nil
   end
 
-  ##
-  # This method is used to retrieve the original password.
-  #
-  def password_clean
-    crypted_password.decrypt(salt)
+  def has_password?(password)
+    ::BCrypt::Password.new(crypted_password) == password
   end
 
   private
     def generate_password
-      return if password.blank?
-      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
-      self.crypted_password = password.encrypt(self.salt)
+      self.crypted_password = ::BCrypt::Password.create(password)
     end
 
     def password_required

data/lib/padrino-admin/generators/templates/account/seeds.rb.tt

@@ -5,7 +5,7 @@
 #   name = shell.ask("What's your name?")
 #   shell.say name
 #
-email     = shell.ask "Which email do you want use for loggin into admin?"
+email     = shell.ask "Which email do you want use for logging into admin?"
 password  = shell.ask "Tell me the password to use:"
 
 shell.say ""
@@ -20,7 +20,7 @@ if account.valid?
   shell.say "   password: #{password}"
   shell.say "================================================================="
 else
-  shell.say "Sorry but some thing went worng!"
+  shell.say "Sorry but some thing went wrong!"
   shell.say ""
   account.errors.full_messages.each { |m| shell.say "   - #{m}" }
 end

data/lib/padrino-admin/generators/templates/account/sequel.rb.tt

@@ -1,5 +1,3 @@
-require 'digest/sha1'
-
 class Account < ::Sequel::Model
 
   plugin :validation_helpers
@@ -29,7 +27,7 @@ class Account < ::Sequel::Model
   #
   def self.authenticate(email, password)
     account = filter(:email => email).first
-    account && account.password_clean == password ? account : nil
+    account && account.has_password?(password) ? account : nil
   end
 
   ##
@@ -39,19 +37,13 @@ class Account < ::Sequel::Model
     self[id] rescue nil
   end
 
-  ##
-  # This method is used to retrieve the original password.
-  #
-  def password_clean
-    self.crypted_password.decrypt(salt)
+  def has_password?(password)
+    ::BCrypt::Password.new(crypted_password) == password
   end
 
   private
-
     def generate_password
-      return if password.blank?
-      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new?
-      self.crypted_password = password.encrypt(self.salt)
+      self.crypted_password = ::BCrypt::Password.create(password)
     end
 
     def password_required

data/lib/padrino-admin/generators/templates/app/controllers/sessions.rb

@@ -8,6 +8,10 @@ Admin.controllers :sessions do
     if account = Account.authenticate(params[:email], params[:password])
       set_current_account(account)
       redirect url(:base, :index)
+    elsif Padrino.env == :development && params[:bypass]
+      account = Account.first
+      set_current_account(account)
+      redirect url(:base, :index)
     else
       flash[:warning] = "Login or password wrong."
       redirect url(:sessions, :new)

data/lib/padrino-admin/generators/templates/erb/app/sessions/new.erb.tt

@@ -32,6 +32,16 @@
                 <%%= password_field_tag :password, :value => params[:password], :class => 'text_field' %>
               </div>
             </div>
+      <%% if Padrino.env == :development %>
+      <div class="group wat-cf">
+        <div class="left">
+    <label class="label right">Bypass login?</label>
+        </div>
+        <div class="right">
+    <%%= check_box_tag :bypass %>
+        </div>
+      </div>
+      <%% end %>
             <div class="group navform wat-cf">
               <div class="right">
                 <%%= submit_tag "Sign in", :class => :button %>
@@ -43,4 +53,4 @@
     </div>
   </div>
 </body>
-</html>
+</html>

data/lib/padrino-admin/generators/templates/erb/page/index.erb.tt

@@ -6,7 +6,7 @@
     </ul>
   </div>
   <div class="content">
-    <h2 class="title"><%%= pat(:all) %> <%% mt(:<%= @orm.name_singular %>) %></h2>
+    <h2 class="title"><%%= pat(:all) %> <%% mt(:<%= @orm.name_plural %>) %></h2>
     <div class="inner">
       <table class="table">
         <tr>

data/lib/padrino-admin/generators/templates/haml/app/sessions/new.haml.tt

@@ -21,5 +21,11 @@
                 .left
                   %label.label.right Password
                 .right=password_field_tag :password, :value => params[:password], :class => :text_field
+              -if Padrino.env == :development
+                .group.wat-cf
+                  .left
+                    %label.label.right Bypass login?
+                  .right=check_box_tag :bypass
+
               .group.navform.wat-cf
                 .right=submit_tag('Sign In', :class => :button)

data/lib/padrino-admin/generators/templates/haml/page/index.haml.tt

@@ -6,7 +6,7 @@
   .content
     %h2.title
       =pat(:all)
-      =mt(:<%= @orm.name_singular %>)
+      =mt(:<%= @orm.name_plural %>)
     .inner
       %table.table
         %tr

data/lib/padrino-admin/locale/admin/no.yml

@@ -0,0 +1,17 @@
+"no":
+  padrino:
+    admin:
+      save: Lagre 
+      cancel: Avbryt 
+      list: Liste
+      edit: Rediger
+      new: Ny 
+      show: Vis
+      delete: Slett
+      confirm: Er du sikker?
+      created_at: Opprettet
+      all: Alle
+      profile: Profil
+      settings: Instillinger
+      logout: Logg ut
+

data/lib/padrino-admin/locale/orm/no.yml

@@ -0,0 +1,27 @@
+"no":
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "finnes ikke i listen"
+        exclusion: "er reservert"
+        invalid: "er ikke gyldig"
+        confirmation: "matcher ikke bekreftelsen"
+        accepted: "må aksepteres"
+        empty: "kan ikke være tom"
+        blank: "kan ikke være blank"
+        too_long: "er for lang (maksimum er %{count} tegn)"
+        too_short: "er for kort (minimum er %{count} tegn)"
+        wrong_length: "har ikke den riktige lengden(skal være på %{count} tegn)"
+        taken: "er allerede i bruk"
+        not_a_number: "er ikke et tall"
+        greater_than: "skal være større enn %{count}"
+        greater_than_or_equal_to: "skal være større enn eller lik %{count}"
+        equal_to: "skal være lik %{count}"
+        less_than: "skal være mindre enn %{count}"
+        less_than_or_equal_to: "skal være mindre enn eller lik %{count}"
+        odd: "skal være ulik"
+        even: "skal være lik"
+        record_invalid: "Valideringsfeil: %{errors}"
+        content_type: "fileformatet er ikke støttet"
+  activerecord: *activemodel
+

data/test/generators/test_admin_app_generator.rb

@@ -90,5 +90,24 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_match_in_file 'class Admin < Padrino::Application', "#{@apptmp}/sample_project/admin/app.rb"
       assert_match_in_file 'role.project_module :accounts, "/accounts"', "#{@apptmp}/sample_project/admin/app.rb"
     end
+    
+    should 'not conflict with existing seeds file' do
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') } }
+      
+      # Add seeds file
+      FileUtils.mkdir_p @apptmp + '/sample_project/db' unless File.exist?(@apptmp + '/sample_project/db')
+      File.open(@apptmp + '/sample_project/db/seeds.rb', 'w+') do |seeds_rb|
+        seeds_rb.puts "# Old Seeds Content"
+      end
+
+      silence_logger do
+        $stdout.expects(:print).with { |value| value =~ /Overwrite\s.*?\/db\/seeds.rb/ }.never
+        $stdin.stubs(:gets).returns('y')
+        generate(:admin_app, "--root=#{@apptmp}/sample_project") 
+      end
+      
+      assert_match_in_file '# Old Seeds Content', "#{@apptmp}/sample_project/db/seeds.rb"
+      assert_match_in_file 'Account.create(', "#{@apptmp}/sample_project/db/seeds.rb"
+    end
   end
 end

data/test/generators/test_admin_page_generator.rb

@@ -52,6 +52,8 @@ class TestAdminPageGenerator < Test::Unit::TestCase
         assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.haml"
       end
       assert_match_in_file 'role.project_module :people, "/people"', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file "elsif Padrino.env == :development && params[:bypass]", "#{@apptmp}/sample_project/admin/controllers/sessions.rb"
+      assert_match_in_file "check_box_tag :bypass", "#{@apptmp}/sample_project/admin/views/sessions/new.haml"
     end
 
     should 'correctly generate a new padrino admin application with erb renderer' do
@@ -69,6 +71,8 @@ class TestAdminPageGenerator < Test::Unit::TestCase
         assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.erb"
       end
       assert_match_in_file 'role.project_module :people, "/people"', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file "elsif Padrino.env == :development && params[:bypass]", "#{@apptmp}/sample_project/admin/controllers/sessions.rb"
+      assert_match_in_file "check_box_tag :bypass", "#{@apptmp}/sample_project/admin/views/sessions/new.erb"
     end
 
     should 'correctly generate a new padrino admin application with multiple models' do
@@ -101,4 +105,4 @@ class TestAdminPageGenerator < Test::Unit::TestCase
       assert_match_in_file 'role.project_module :pages, "/pages"', "#{@apptmp}/sample_project/admin/app.rb"
     end
   end
-end
+end

data/test/helper.rb

@@ -7,6 +7,7 @@ require 'rack/test'
 require 'uuid'
 require 'rack'
 require 'shoulda'
+require 'mocha'
 require 'thor/group'
 require 'padrino-core/support_lite' unless defined?(SupportLite)
 require 'padrino-admin'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 9
-  - 18
-  version: 0.9.18
+  - 19
+  version: 0.9.19
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -07:00
+date: 2010-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 0
         - 9
-        - 18
-        version: 0.9.18
+        - 19
+        version: 0.9.19
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 0
         - 9
-        - 18
-        version: 0.9.18
+        - 19
+        version: 0.9.19
   type: :runtime
   version_requirements: *id002
 description: Admin View for Padrino applications
@@ -123,6 +123,7 @@ files:
 - lib/padrino-admin/locale/admin/fr.yml
 - lib/padrino-admin/locale/admin/it.yml
 - lib/padrino-admin/locale/admin/nl.yml
+- lib/padrino-admin/locale/admin/no.yml
 - lib/padrino-admin/locale/admin/pl.yml
 - lib/padrino-admin/locale/admin/pt_br.yml
 - lib/padrino-admin/locale/admin/ru.yml
@@ -136,6 +137,7 @@ files:
 - lib/padrino-admin/locale/orm/fr.yml
 - lib/padrino-admin/locale/orm/it.yml
 - lib/padrino-admin/locale/orm/nl.yml
+- lib/padrino-admin/locale/orm/no.yml
 - lib/padrino-admin/locale/orm/pl.yml
 - lib/padrino-admin/locale/orm/pt_br.yml
 - lib/padrino-admin/locale/orm/ru.yml