padrino-admin 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1238e9f669ced57bc85bc0a563318fcfc3143684
-  data.tar.gz: cef952fcecae26cc6721ce66d17fc4a59ce98165
+  metadata.gz: 6aa5241218d4e62f8664281acaf75964a7b5b662
+  data.tar.gz: 089b931c4d3e737172ef6232a9c93ac620197e36
 SHA512:
-  metadata.gz: a7c1af2bf490cc4239a838b0f7f3b4b5b3aeef7a070ac131454c401d0a55de39ee0b59242b9bc3fd8e2c7165805f7b8f9dce32b9e609218c5b04a34764247a63
-  data.tar.gz: 7a84f878e10d037f99fbe0a4ff3cdcc260e833466da8c698008cd7fc8cb9fc248a03b4c24108fffe6dc73557bd24cb1e8382ea2977a560bb68a42c62bddbf083
+  metadata.gz: b5945cd2a39ba565ed28e72162f60f697f6d80e6614127bf2fca30a7ab699eb70d4a856f334c2534528e35b571308a5cb6871eeed0be75345181bfc76978a58d
+  data.tar.gz: c937c3b00babd88d49325a6edc47d98ba9637343c958c2c98155fd063f48ad36c541471ac8b93c217e0d3477acf2e20d75bbe666263434a55420dd133bc19ee3

data/README.rdoc

@@ -4,7 +4,7 @@
 
 Padrino has a beautiful Admin management dashboard with these features:
 
-Orm Agnostic:: Data Adapters for Datamapper, Activerecord, Sequel, Mongomapper, Mongoid, Couchrest
+Orm Agnostic:: Data Adapters for Datamapper, Activerecord, Sequel, Mongomapper, Mongoid, Couchrest, Dynamoid
 Template Agnostic:: Erb, Erubis and Haml Renderer
 Authentication:: Support for Account authentication, Account Permission management
 Scaffold:: You can simply create a new "admin interface" by providing a Model

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

@@ -27,7 +27,7 @@ module Padrino
         # Tell us for now which orm we support
         #
         def supported_orm
-          [:minirecord, :datamapper, :activerecord, :mongomapper, :mongoid, :couchrest, :sequel, :ohm]
+          [:minirecord, :datamapper, :activerecord, :mongomapper, :mongoid, :couchrest, :sequel, :ohm, :dynamoid]
         end
 
         ##

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

@@ -34,7 +34,7 @@ module Padrino
       # class_option :models_path,     :desc => 'The models destination path', :default => '.', :type => :string
       class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
-      class_option :renderer, :aliases => '-e', :desc => "Rendering engine (erb, haml)", :type => :string
+      class_option :renderer, :aliases => '-e', :desc => "Rendering engine (erb, haml, slim)", :type => :string
       class_option :admin_model, :aliases => '-m', :desc => "The name of model for access controlling", :default => 'Account', :type => :string
       class_option :admin_name,  :aliases => '-a', :desc => 'The admin application name and path', :default => 'admin', :type => :string
 
@@ -131,7 +131,7 @@ module Padrino
 
           unless options[:destroy]
             add_project_module @model_plural
-            require_dependencies('bcrypt-ruby', :require => 'bcrypt')
+            require_dependencies('bcrypt')
           end
 
           # A nicer select box.
@@ -144,7 +144,10 @@ module Padrino
 
           instructions = []
           instructions << "Run 'bundle'"
-          instructions << "Run 'bundle exec rake db:migrate'" if (orm == :activerecord || orm == :datamapper || orm == :sequel)
+          if [:activerecord, :datamapper, :sequel].include?(orm)
+            instructions << "Run 'bundle exec rake db:create' if you have not created a database yet"
+            instructions << "Run 'bundle exec rake db:migrate'"
+          end
           instructions << "Now repeat after me... 'ohm mani padme hum', 'ohm mani padme hum'... :)" if orm == :ohm
           instructions << "Run 'bundle exec rake db:seed'"
           instructions << "Visit the admin panel in the browser at '/#{@admin_path}'"

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

@@ -56,6 +56,7 @@ module Padrino
             when :mongomapper  then @klass.keys.values.reject { |key| key.name == "_id" } # On MongoMapper keys are an hash
             when :sequel       then @klass.db_schema.map { |k,v| v[:type] = :text if v[:db_type] =~ /^text/i; Column.new(k, v[:type]) }
             when :ohm          then @klass.attributes.map { |a| Column.new(a.to_s, :string) } # ohm has strings
+            when :dynamoid     then @klass.attributes.map { |k,v| Column.new(k.to_s, v[:type]) }
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
@@ -99,7 +100,7 @@ module Padrino
 
         def find(params=nil)
           case orm
-            when :activerecord, :minirecord, :mongomapper, :mongoid then "#{klass_name}.find(#{params})"
+            when :activerecord, :minirecord, :mongomapper, :mongoid, :dynamoid then "#{klass_name}.find(#{params})"
             when :datamapper, :couchrest then "#{klass_name}.get(#{params})"
             when :sequel, :ohm then "#{klass_name}[#{params}]"
             else raise OrmError, "Adapter #{orm} is not yet supported!"
@@ -123,7 +124,7 @@ module Padrino
 
         def update_attributes(params=nil)
           case orm
-            when :activerecord, :minirecord, :mongomapper, :mongoid, :couchrest then "@#{name_singular}.update_attributes(#{params})"
+            when :activerecord, :minirecord, :mongomapper, :mongoid, :couchrest, :dynamoid then "@#{name_singular}.update_attributes(#{params})"
             when :datamapper, :ohm then "@#{name_singular}.update(#{params})"
             when :sequel then "@#{name_singular}.modified! && @#{name_singular}.update(#{params})"
             else raise OrmError, "Adapter #{orm} is not yet supported!"
@@ -144,6 +145,7 @@ module Padrino
             when :sequel then "#{klass_name}.where(:id => #{params})"
             when :mongoid then "#{klass_name}.find(#{params})"
             when :couchrest then "#{klass_name}.all(:keys => #{params})"
+            when :dynamoid then "#{klass_name}.find(#{params})"
             else find(params)
           end
         end
@@ -153,7 +155,7 @@ module Padrino
             when :ohm then "#{params}.each(&:delete)"
             when :sequel then  "#{params}.destroy"
             when :datamapper then "#{params}.destroy"
-            when :couchrest, :mongoid, :mongomapper then "#{params}.each(&:destroy)"
+            when :couchrest, :mongoid, :mongomapper, :dynamoid then "#{params}.each(&:destroy)"
             else "#{klass_name}.destroy #{params}"
           end
         end

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

@@ -0,0 +1,55 @@
+class <%= @model_name %>
+  include Dynamoid::Document
+  attr_accessor :password, :password_confirmation
+
+  # Fields
+  field :name
+  field :surname
+  field :email
+  field :crypted_password
+  field :role
+
+  # Validations
+  validates_presence_of     :email, :role
+  validates_presence_of     :password,                   :if => :password_required
+  validates_presence_of     :password_confirmation,      :if => :password_required
+  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_format_of       :email,    :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
+  validates_format_of       :role,     :with => /[A-Za-z]/
+
+  # Callbacks
+  before_save :encrypt_password, :if => :password_required
+
+  ##
+  # This method is for authentication purpose.
+  #
+  def self.authenticate(email, password)
+    account = find_by_email(email) if email.present?
+    account && account.has_password?(password) ? account : nil
+  end
+
+  ##
+  # This method is used by AuthenticationHelper.
+  #
+  def self.find_by_id(id, options = {})
+    id ? super(id, options) : nil
+  end
+
+  def has_password?(password)
+    ::BCrypt::Password.new(crypted_password) == password
+  end
+
+  private
+
+  def encrypt_password
+    value = ::BCrypt::Password.create(password)
+    value = value.force_encoding(Encoding::UTF_8) if value.encoding == Encoding::ASCII_8BIT
+    self.crypted_password = value
+  end
+
+  def password_required
+    crypted_password.blank? || password.present?
+  end
+end

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

@@ -1,6 +1,5 @@
 module <%= @app_name %>
   class <%= @admin_name %> < Padrino::Application
-    register Padrino::Rendering
     register Padrino::Mailer
     register Padrino::Helpers
     register Padrino::Admin::AccessControl

data/lib/padrino-admin/generators/templates/assets/stylesheets/application.css

@@ -209,6 +209,12 @@ footer p {
   font-size: 2.5em;
   line-height: 1em;
 }
+.navbar .navbar-nav > .active > a,
+.navbar .navbar-nav > .active > a:hover,
+.navbar .navbar-nav > .active > a:focus {
+  color: #555;
+  background-color: #e7e7e7;
+}
 /* --- End Application::TopBar --- */
 
 /* --- Begin Application::List --- */

data/test/generators/test_account_model_generator.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../helper')
 
 describe "AccountModelGenerator" do
   before do
-    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     %x[mkdir -p #{@apptmp}]
   end
 

data/test/generators/test_admin_app_generator.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../helper')
 
 describe "AdminAppGenerator" do
   before do
-    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
   end
 
@@ -11,6 +11,12 @@ describe "AdminAppGenerator" do
   end
 
   describe 'the admin app generator' do
+    before do
+      # Account gets created by Datamapper's migration and then gets
+      # rejected by model generator as already defined
+      Object.send(:remove_const, :Account) if defined?(Account)
+    end
+
     it 'should fail outside app root' do
       out, err = capture_io { generate(:admin_app, "-r=#{@apptmp}") }
       assert_match(/not at the root/, out)

data/test/generators/test_admin_page_generator.rb

@@ -14,7 +14,7 @@ end
 
 describe "AdminPageGenerator" do
   before do 
-    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
   end
 

data/test/helper.rb

@@ -2,12 +2,12 @@ ENV['RACK_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
 require File.expand_path('../../../load_paths', __FILE__)
-require File.join(File.dirname(__FILE__), '..', '..', 'padrino-core', 'test', 'mini_shoulda')
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'mocha/setup'
 require 'rack/test'
 require 'rack'
-require 'uuid'
 require 'thor/group'
-require 'padrino-core/support_lite' unless defined?(SupportLite)
 require 'padrino-admin'
 require 'dm-core'
 require 'dm-migrations'
@@ -25,11 +25,6 @@ module Kernel
   end
 end
 
-class Class
-  # Allow assertions in request context
-  include MiniTest::Assertions
-end
-
 class MiniTest::Spec
   include Rack::Test::Methods
 
@@ -38,7 +33,6 @@ class MiniTest::Spec
   # the application.
   def mock_app(base=Padrino::Application, &block)
     @app = Sinatra.new(base, &block)
-    @app.send :include, MiniTest::Assertions
     @app.register Padrino::Helpers
   end
 
@@ -67,7 +61,7 @@ class MiniTest::Spec
   end
 
   def assert_no_match_in_file(pattern, file)
-    File.exist?(file) ? assert_no_match(pattern, File.read(file)) : assert_file_exists(file)
+    File.exist?(file) ? refute_match(pattern, File.read(file)) : assert_file_exists(file)
   end
 
   # Delegate other missing methods to response.

data/test/test_admin_application.rb

@@ -108,16 +108,6 @@ describe "AdminApplication" do
         role.project_module :posts, "/posts"
       end
 
-      assert access_control.allowed?(Account.admin, "/login")
-      assert access_control.allowed?(Account.admin, "/any")
-      assert access_control.allowed?(Account.admin, "/settings")
-      assert ! access_control.allowed?(Account.admin, "/posts")
-
-      assert access_control.allowed?(Account.editor, "/login")
-      assert access_control.allowed?(Account.editor, "/any")
-      assert ! access_control.allowed?(Account.editor, "/settings")
-      assert access_control.allowed?(Account.editor, "/posts")
-
       # Prepare a basic page
       get "/login(/:role)" do
         set_current_account(Account.send(params[:role])) if params[:role]
@@ -129,6 +119,16 @@ describe "AdminApplication" do
       get "/posts"    do; "posts";    end
     end
 
+    assert @app.access_control.allowed?(Account.admin, "/login")
+    assert @app.access_control.allowed?(Account.admin, "/any")
+    assert @app.access_control.allowed?(Account.admin, "/settings")
+    assert ! @app.access_control.allowed?(Account.admin, "/posts")
+
+    assert @app.access_control.allowed?(Account.editor, "/login")
+    assert @app.access_control.allowed?(Account.editor, "/any")
+    assert ! @app.access_control.allowed?(Account.editor, "/settings")
+    assert @app.access_control.allowed?(Account.editor, "/posts")
+
     get "/login"
     assert_equal "logged as any", body
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-admin
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ files:
 - lib/padrino-admin/generators/templates/account/activerecord.rb.tt
 - lib/padrino-admin/generators/templates/account/couchrest.rb.tt
 - lib/padrino-admin/generators/templates/account/datamapper.rb.tt
+- lib/padrino-admin/generators/templates/account/dynamoid.rb.tt
 - lib/padrino-admin/generators/templates/account/minirecord.rb.tt
 - lib/padrino-admin/generators/templates/account/mongoid.rb.tt
 - lib/padrino-admin/generators/templates/account/mongomapper.rb.tt