padrino-admin 0.9.26 → 0.9.27

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

@@ -45,7 +45,6 @@ module Padrino
           end
 
           store_component_choice(:admin_renderer, tmp_ext)
-          @session_secret = fetch_component_choice(:session_secret)
 
           self.behavior = :revoke if options[:destroy]
 

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

@@ -1,5 +1,4 @@
-class Account < CouchRest::ExtendedDocument
-  include CouchRest::Validation
+class Account < CouchRest::Model::Base
   use_database COUCHDB
 
   attr_accessor :password, :password_confirmation
@@ -22,9 +21,9 @@ class Account < CouchRest::ExtendedDocument
   validates_length_of       :password, :within => 4..40, :if => :password_required
   validates_confirmation_of :password,                   :if => :password_required
   validates_length_of       :email,    :within => 3..100
-  validates_with_method     :email,    :method => :email_is_unique
   validates_format_of       :email,    :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
   validates_format_of       :role,     :with => /[A-Za-z]/
+  validate                  :unique_email_validator
 
   # Callbacks
   before_save :encrypt_password, :if => :password_required
@@ -33,17 +32,8 @@ class Account < CouchRest::ExtendedDocument
   # This method is for authentication purpose
   #
   def self.authenticate(email, password)
-    email_array = self.by_email :key => email
-    account = email_array[0]
-    account && account.has_password?(password) ? account : nil
-  end
-
-  ##
-  # This method is used to retrieve the first record by id without raise errors if not found.
-  #
-  def self.find_by_id(id)
-    id_array = self.by_id :key => id
-    id_array[0]
+    account = find_by_email(email)
+    account if account && account.has_password?(password)
   end
 
   def has_password?(password)
@@ -59,14 +49,15 @@ class Account < CouchRest::ExtendedDocument
       crypted_password.blank? || password.present?
     end
 
-    def email_is_unique
-      account = Account.by_email(:key => self.email, :limit => 1)
-      return true if account.empty? # didn't find email in the database
-      account = account[0]
-      if self.has_key?("_id")
-        # 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"]
+    def unique_email_validator
+      account = Account.find_by_email(email)
+      
+      # didn't find email in the database
+      return if account.nil?
+      
+      # account with same email in database is this account
+      return if has_key?('_id') && self['_id'] == account['_id']
+      
+      errors.add(:email, "is not unique")
     end
 end

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

@@ -7,9 +7,8 @@ class Account
   property :id,               Serial
   property :name,             String
   property :surname,          String
-  property :email,            String, :length => 100
-  # BCrypt gives you a 60 character string
-  property :crypted_password, String, :length => 60
+  property :email,            String
+  property :crypted_password, String
   property :role,             String
 
   # Validations

data/lib/padrino-admin/generators/templates/app.rb.tt

@@ -6,17 +6,18 @@ class Admin < Padrino::Application
   ##
   # Application configuration options
   #
-  # set :raise_errors, true     # Raise exceptions (will stop application) (default true for development)
-  # set :show_exceptions, true  # Show a stack trace in browser (default is true)
+  # set :raise_errors, true     # Raise exceptions (will stop application) (default for test)
+  # set :dump_errors, true      # Exception backtraces are written to STDERR (default for production/development)
+  # set :show_exceptions, true  # Shows a stack trace in browser (default for development)
+  # set :logging, true          # Logging in STDOUT for development and file for production (default only for development)
   # set :public, "foo/bar"      # Location for static assets (default root/public)
   # set :reload, false          # Reload application files (default in development)
   # set :default_builder, "foo" # Set a custom form builder (default 'StandardFormBuilder')
   # set :locale_path, "bar"     # Set path for I18n translations (default your_app/locales)
-  # disable :sessions           # Enabled by default
-  # disable :flash              # Disables rack-flash (enabled by default if sessions)
+  # disable :sessions           # Disabled sessions by default (enable if needed)
+  # disable :flash              # Disables rack-flash (enabled by default if Rack::Flash is defined)
   # layout  :my_layout          # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
   #
-  set :session_secret, "<%= @session_secret %>"
   set :login_page, "/admin/sessions/new"
   disable :store_location
 

data/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt

@@ -12,7 +12,7 @@ html lang="en" xmlns="http://www.w3.org/1999/xhtml"
         #user-navigation
           ul.wat-cf
             li==link_to pat(:profile), url(:accounts, :edit, :id => current_account.id)
-            li==link_to pat(:logout), url(:sessions, :destroy), :method => :delete
+            li==button_to pat(:logout), url(:sessions, :destroy), :method => :delete, :class => :button_to
         #main-navigation
           ul.wat-cf
             -project_modules.each do |project_module|

data/test/generators/test_account_model_generator.rb

@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '/../helper')
+
+class TestAccountModelGenerator < Test::Unit::TestCase
+  def setup
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    `mkdir -p #{@apptmp}`
+  end
+
+  def teardown
+    `rm -rf #{@apptmp}`
+  end
+  
+  # COUCHREST
+  context 'account model using couchrest' do
+    setup do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=couchrest') }
+      silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      
+      @model = "#{@apptmp}/sample_project/app/models/account.rb"
+    end
+    
+    should 'be a couchrest model instance' do
+      assert_match_in_file(/class Account < CouchRest::Model::Base/m, @model)
+    end
+    
+    should 'not require additional validations' do
+      assert_no_match_in_file(/include CouchRest::Validation/m, @model)
+    end
+    
+    should 'no longer have validates_with_method' do
+      assert_no_match_in_file(/validates_with_method/m, @model)
+    end
+    
+    should 'validate report errors using ActiveModel errors method' do
+      assert_match_in_file(/errors\.add\(:email, "is not unique"\)/m, @model)
+    end
+  end
+end

data/test/generators/test_admin_app_generator.rb

@@ -58,7 +58,7 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_match_in_file 'Padrino.mount("Admin").to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
       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"
-      assert_match_in_file 'set :session_secret, "', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file 'button_to pat(:logout)', "#{@apptmp}/sample_project/admin/views/layouts/application.haml"
     end
 
     should 'correctly generate a new padrino admin application with erb renderer' do
@@ -90,7 +90,7 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_match_in_file 'Padrino.mount("Admin").to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
       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"
-      assert_match_in_file 'set :session_secret, "', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file 'button_to pat(:logout)', "#{@apptmp}/sample_project/admin/views/layouts/application.erb"
     end
 
     should 'correctly generate a new padrino admin application with slim renderer' do
@@ -122,7 +122,7 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_match_in_file 'Padrino.mount("Admin").to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
       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"
-      assert_match_in_file 'set :session_secret, "', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file 'button_to pat(:logout)', "#{@apptmp}/sample_project/admin/views/layouts/application.slim"
     end
 
     should 'not conflict with existing seeds file' do
@@ -143,5 +143,12 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       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
+
+    should "navigate completely inside an app with activerecord" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", "-d=activerecord", "-e=haml", "--dev") }
+      silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      # bundle(:install, :gemfile => "#{@apptmp}/sample_project/Gemfile", :path => "#{@apptmp}/bundle")
+      # cli(:rake, '-T', "-c=#{@apptmp}/sample_project")
+    end
   end
 end

data/test/generators/test_admin_page_generator.rb

@@ -58,12 +58,7 @@ class TestAdminPageGenerator < Test::Unit::TestCase
 
     should "store and apply session_secret" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
-      silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-      assert_match_in_file(/session_secret:.+/, "#{@apptmp}/sample_project/.components")
-      session_secret = YAML.load_file("#{@apptmp}/sample_project/.components")[:session_secret]
-      assert_not_equal "", session_secret
-      assert_match_in_file(/#{session_secret}/, "#{@apptmp}/sample_project/app/app.rb")
-      assert_match_in_file(/#{session_secret}/, "#{@apptmp}/sample_project/admin/app.rb")
+      assert_match_in_file(/set :session_secret, '[0-9A-z]*'/, "#{@apptmp}/sample_project/config/apps.rb")
     end
 
     should 'correctly generate a new padrino admin application with erb renderer' do

data/test/test_admin_application.rb

@@ -243,4 +243,4 @@ class TestAdminApplication < Test::Unit::TestCase
     get "/modules"
     assert_equal "admin => /admin", body
   end
-end unless RUBY_PLATFORM =~ /java/ # DM seems to have some problems on JRuby
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 9
-  - 26
-  version: 0.9.26
+  - 27
+  version: 0.9.27
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 Z
+date: 2011-05-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 0
         - 9
-        - 26
-        version: 0.9.26
+        - 27
+        version: 0.9.27
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,12 +44,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 0
         - 9
-        - 26
-        version: 0.9.26
+        - 27
+        version: 0.9.27
   type: :runtime
   version_requirements: *id002
 description: Admin View for Padrino applications
@@ -159,6 +159,7 @@ files:
 - lib/padrino-admin/utils/crypt.rb
 - padrino-admin.gemspec
 - test/fixtures/data_mapper.rb
+- test/generators/test_account_model_generator.rb
 - test/generators/test_admin_app_generator.rb
 - test/generators/test_admin_page_generator.rb
 - test/helper.rb
@@ -200,6 +201,7 @@ specification_version: 3
 summary: Admin Dashboard for Padrino
 test_files: 
 - test/fixtures/data_mapper.rb
+- test/generators/test_account_model_generator.rb
 - test/generators/test_admin_app_generator.rb
 - test/generators/test_admin_page_generator.rb
 - test/helper.rb