padrino-admin 0.7.9 → 0.8.0

data/lib/padrino-admin/locale/extjs/it.yml

@@ -44,11 +44,11 @@ it:
         nameText: "Nome"
         valueText: "Valore"
         dateFormat: "j/m/Y"
-      search:
-        searchText: "Cerca"
-        searchTipText: "Inserisci una parola o premi cerca"
-        selectAllText: "Seleziona Tutto"
-        minCharsTipText: "Inserisci almeno {0} caratteri"
+    search:
+      searchText: "Cerca"
+      searchTipText: "Inserisci una parola o premi cerca"
+      selectAllText: "Seleziona Tutto"
+      minCharsTipText: "Inserisci almeno {0} caratteri"
     pagingToolbar:
       beforePageText: "Pagina"
       afterPageText: "di {0}"

data/lib/padrino-admin/middleware/flash_middleware.rb

@@ -4,18 +4,11 @@ module Padrino
   module Admin
     module Middleware
       ##
-      # FlashSessionCookieMiddleware
-      #   passing your session in the URI, when it should be in the cookie
-      #
-      # This code only works in following cases:
-      # - passing the session as the variable for 'session_key' (it is best to set this to your app's session cookie name
-      # - the value is URI escaped once, (don't do it explicetally if using rails helpers, they do it for you)
-      # - Loading this middleware before session_store middleware
-      #
-      # Note, this could work also after session_store middleware (or others).
-      # However, these could already have modified the cooky values, and this module
-      # could become unstable because of that, and it's functioning can not be
-      # guaranteed.
+      # FlashMiddleware help you passing your session in the URI, when it should be in the cookie.
+      # 
+      # This code it's only performed when:
+      # 
+      #   env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/
       # 
       class FlashMiddleware
         def initialize(app, session_key = 'session_id')

data/lib/padrino-admin/orm.rb

@@ -11,6 +11,13 @@ module Padrino
     # 
     module Orm
 
+      ##
+      # ExtSearch it's the result of an ext_search
+      # 
+      #   result = Account.ext_search(..)
+      #   result.count
+      #   result.records
+      # 
       class ExtSearch < Struct.new(:count, :records); end
 
       ##

data/padrino-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
-  s.version = "0.7.9"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-02-11}
+  s.date = %q{2010-02-14}
   s.description = %q{Admin View for Padrino applications}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -318,8 +318,8 @@ Gem::Specification.new do |s|
      "lib/padrino-admin/generators/templates/uploader/lib/uploader.rb",
      "lib/padrino-admin/generators/templates/uploader/views/grid.js.erb",
      "lib/padrino-admin/generators/templates/uploader/views/store.jml",
-     "lib/padrino-admin/helpers/authentication.rb",
-     "lib/padrino-admin/helpers/view.rb",
+     "lib/padrino-admin/helpers/authentication_helpers.rb",
+     "lib/padrino-admin/helpers/view_helpers.rb",
      "lib/padrino-admin/locale/admin/de.yml",
      "lib/padrino-admin/locale/admin/en.yml",
      "lib/padrino-admin/locale/admin/it.yml",
@@ -342,11 +342,15 @@ Gem::Specification.new do |s|
      "test/fixtures/data_mapper.rb",
      "test/fixtures/mongo_mapper.rb",
      "test/fixtures/test_column_store.jml",
+     "test/generators/test_admin_app_generator.rb",
+     "test/generators/test_admin_page_generator.rb",
+     "test/generators/test_admin_uploader_generator.rb",
      "test/helper.rb",
      "test/test_access_control.rb",
      "test/test_active_record.rb",
      "test/test_admin_application.rb",
      "test/test_column_store.rb",
+     "test/test_config.rb",
      "test/test_data_mapper.rb",
      "test/test_mongo_mapper.rb"
   ]
@@ -363,9 +367,9 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.9"])
-      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.7.9"])
-      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.7.9"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.8.0"])
+      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.8.0"])
+      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.8.0"])
       s.add_runtime_dependency(%q<tilt>, [">= 0.4"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -374,9 +378,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
       s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_dependency(%q<padrino-core>, ["= 0.7.9"])
-      s.add_dependency(%q<padrino-gen>, ["= 0.7.9"])
-      s.add_dependency(%q<padrino-helpers>, ["= 0.7.9"])
+      s.add_dependency(%q<padrino-core>, ["= 0.8.0"])
+      s.add_dependency(%q<padrino-gen>, ["= 0.8.0"])
+      s.add_dependency(%q<padrino-helpers>, ["= 0.8.0"])
       s.add_dependency(%q<tilt>, [">= 0.4"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -386,9 +390,9 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-    s.add_dependency(%q<padrino-core>, ["= 0.7.9"])
-    s.add_dependency(%q<padrino-gen>, ["= 0.7.9"])
-    s.add_dependency(%q<padrino-helpers>, ["= 0.7.9"])
+    s.add_dependency(%q<padrino-core>, ["= 0.8.0"])
+    s.add_dependency(%q<padrino-gen>, ["= 0.8.0"])
+    s.add_dependency(%q<padrino-helpers>, ["= 0.8.0"])
     s.add_dependency(%q<tilt>, [">= 0.4"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])

data/test/generators/test_admin_app_generator.rb

@@ -0,0 +1,67 @@
+require File.dirname(__FILE__) + '/../helper'
+require 'thor/group'
+require 'fakeweb'
+require 'padrino-gen/generators/actions'
+Dir[File.dirname(__FILE__) + '/generators/{components}/**/*.rb'].each { |lib| require lib }
+
+class TestAdminAppGenerator < Test::Unit::TestCase
+  
+  def setup
+    `rm -rf /tmp/sample_project`
+    @project = Padrino::Generators::Project.dup
+    @admin   = Padrino::Generators::AdminApp.dup
+  end
+
+  context 'the admin app generator' do
+
+    should 'fail outside app root' do
+      output = silence_logger { @admin.start(['-r=/tmp/sample_project']) }
+      assert_match(/not at the root/, output)
+      assert_no_file_exists('/tmp/admin')
+    end
+
+    should 'fail if we don\'t an orm' do
+      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp']) } }
+      assert_raise(SystemExit) { silence_logger { @admin.start(['-r=/tmp/sample_project']) } }
+    end
+
+    should 'fail if we don\'t avalid orm' do
+      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=sequel']) } }
+      assert_raise(SystemExit) { silence_logger { @admin.start(['-r=/tmp/sample_project']) } }
+    end
+
+    should 'correctyl generate a new padrino admin application' do
+      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=activerecord']) } }
+      assert_nothing_raised { silence_logger { @admin.start(['--root=/tmp/sample_project']) } }
+      assert_file_exists('/tmp/sample_project')
+      assert_file_exists('/tmp/sample_project/admin')
+      assert_file_exists('/tmp/sample_project/admin/app.rb')
+      assert_file_exists('/tmp/sample_project/admin/controllers')
+      assert_file_exists('/tmp/sample_project/admin/controllers/accounts.rb')
+      assert_file_exists('/tmp/sample_project/admin/controllers/base.rb')
+      assert_file_exists('/tmp/sample_project/admin/controllers/javascripts.rb')
+      assert_file_exists('/tmp/sample_project/admin/controllers/sessions.rb')
+      assert_file_exists('/tmp/sample_project/admin/views')
+      assert_file_exists('/tmp/sample_project/admin/views/accounts/_form.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/accounts/edit.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/accounts/grid.js.erb')
+      assert_file_exists('/tmp/sample_project/admin/views/accounts/new.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/accounts/store.jml')
+      assert_file_exists('/tmp/sample_project/admin/views/base/dashboard.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/base/index.haml')
+      assert_file_exists('/tmp/sample_project/admin/views/javascripts/admin.js.erb')
+      assert_file_exists('/tmp/sample_project/admin/views/javascripts/locale.js.erb')
+      assert_file_exists('/tmp/sample_project/admin/views/sessions/new.haml')
+      assert_file_exists('/tmp/sample_project/public/admin')
+      assert_file_exists('/tmp/sample_project/public/admin/flash')
+      assert_file_exists('/tmp/sample_project/public/admin/images')
+      assert_file_exists('/tmp/sample_project/public/admin/javascripts')
+      assert_file_exists('/tmp/sample_project/public/admin/stylesheets')
+      assert_file_exists('/tmp/sample_project/app/models/account.rb')
+      assert_file_exists('/tmp/sample_project/db/seeds.rb')
+      assert_match_in_file "gem 'haml'", '/tmp/sample_project/Gemfile'
+      assert_match_in_file 'Padrino.mount("Admin").to("/admin")', '/tmp/sample_project/config/apps.rb'
+      assert_match_in_file 'class Admin < Padrino::Application', '/tmp/sample_project/admin/app.rb'
+    end
+  end
+end

data/test/generators/test_admin_page_generator.rb

@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + '/../helper'
+require 'thor/group'
+require 'fakeweb'
+require 'padrino-gen/generators/actions'
+Dir[File.dirname(__FILE__) + '/generators/{components}/**/*.rb'].each { |lib| require lib }
+
+class Person
+  def self.properties
+    [:id, :name, :age, :email].map { |c| OpenStruct.new(:name => c) }
+  end
+end
+
+class TestAdminPageGenerator < Test::Unit::TestCase
+
+  def setup
+    `rm -rf /tmp/sample_project`
+    @project   = Padrino::Generators::Project.dup
+    @admin     = Padrino::Generators::AdminApp.dup
+    @page      = Padrino::Generators::AdminPage.dup
+    @model     = Padrino::Generators::Model.dup
+  end
+
+  context 'the admin page generator' do
+    
+    should 'fail outside app root' do
+      output = silence_logger { @page.start(['foo', '-r=/tmp/sample_project']) }
+      assert_match(/not at the root/, output)
+      assert_no_file_exists('/tmp/admin')
+    end
+
+    should 'fail without argument and model' do
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=activerecord']) }
+      silence_logger { @admin.start(['--root=/tmp/sample_project']) }
+      assert_raise(NameError) { @page.start(['foo', '-r=/tmp/sample_project']) }
+    end
+
+    should 'correctyl generate a new padrino admin application' do
+      'Person'.classify.constantize
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=datamapper']) }
+      silence_logger { @admin.start(['--root=/tmp/sample_project']) }
+      silence_logger { @model.start(['person', "name:string", "age:integer", "email:string", '-root=/tmp/sample_project']) }
+      silence_logger { @page.start(['person', '--root=/tmp/sample_project']) }
+      assert_file_exists '/tmp/sample_project/admin/controllers/people.rb'
+      assert_file_exists '/tmp/sample_project/admin/views/people/_form.haml'
+      assert_file_exists '/tmp/sample_project/admin/views/people/edit.haml'
+      assert_file_exists '/tmp/sample_project/admin/views/people/grid.js.erb'
+      assert_file_exists '/tmp/sample_project/admin/views/people/new.haml'
+      assert_file_exists '/tmp/sample_project/admin/views/people/store.jml'
+      %w(name age email).each do |field|
+        assert_match_in_file "label :#{field}", '/tmp/sample_project/admin/views/people/_form.haml'
+        assert_match_in_file "text_field :#{field}", '/tmp/sample_project/admin/views/people/_form.haml'
+      end
+      assert_match_in_file 'role.project_module :people do |project|
+        project.menu :list, "/admin/people.js"
+        project.menu :new,  "/admin/people/new"
+      end', '/tmp/sample_project/admin/app.rb'
+    end
+  end
+end

data/test/generators/test_admin_uploader_generator.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/../helper'
+require 'thor/group'
+require 'fakeweb'
+require 'padrino-gen/generators/actions'
+Dir[File.dirname(__FILE__) + '/generators/{components}/**/*.rb'].each { |lib| require lib }
+
+class TestAdminUploaderGenerator < Test::Unit::TestCase
+  
+  def setup
+    `rm -rf /tmp/sample_project`
+    @project  = Padrino::Generators::Project.dup
+    @admin    = Padrino::Generators::AdminApp.dup
+    @uploader = Padrino::Generators::AdminUploader.dup
+  end
+
+  context 'the admin uploader generator' do
+
+    should 'fail outside app root' do
+      output = silence_logger { @uploader.start(['-r=/tmp/sample_project']) }
+      assert_match(/not at the root/, output)
+      assert_no_file_exists('/tmp/admin')
+    end
+
+    should 'fail if we don\'t have admin application' do
+      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp']) } }
+      assert_raise(SystemExit) { silence_logger { @uploader.start(['-r=/tmp/sample_project']) } }
+    end
+
+    should 'correctyl generate a new padrino admin application for activerecord' do
+      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=activerecord']) } }
+      assert_nothing_raised { silence_logger { @admin.start(['--root=/tmp/sample_project']) } }
+      assert_nothing_raised { silence_logger { @uploader.start(['--root=/tmp/sample_project']) } }
+      assert_file_exists '/tmp/sample_project/admin/controllers/uploads.rb'
+      assert_file_exists '/tmp/sample_project/admin/views/uploads/grid.js.erb'
+      assert_file_exists '/tmp/sample_project/admin/views/uploads/store.jml'
+      assert_file_exists '/tmp/sample_project/lib/uploader.rb'
+      assert_match_in_file 'mount_uploader :file, Uploader', '/tmp/sample_project/app/models/upload.rb'
+      assert_match_in_file "\n# Uploader requirements\n# gem 'mini_magick'\ngem 'carrierwave'\n", "/tmp/sample_project/Gemfile"
+      assert_match_in_file "role.project_module :uploads, \"/admin/uploads.js\"", '/tmp/sample_project/admin/app.rb'
+    end
+
+    should 'correctyl generate a new padrino admin application for datamapper' do
+      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp', '-d=datamapper']) } }
+      assert_nothing_raised { silence_logger { @admin.start(['--root=/tmp/sample_project']) } }
+      assert_nothing_raised { silence_logger { @uploader.start(['--root=/tmp/sample_project']) } }
+      assert_file_exists '/tmp/sample_project/admin/controllers/uploads.rb'
+      assert_file_exists '/tmp/sample_project/admin/views/uploads/grid.js.erb'
+      assert_file_exists '/tmp/sample_project/admin/views/uploads/store.jml'
+      assert_file_exists '/tmp/sample_project/lib/uploader.rb'
+      assert_match_in_file 'property :file, String, :auto_validation => false', '/tmp/sample_project/app/models/upload.rb'
+      assert_match_in_file 'mount_uploader :file, Uploader', '/tmp/sample_project/app/models/upload.rb'
+      assert_match_in_file "\n# Uploader requirements\n# gem 'mini_magick'\ngem 'carrierwave'\n", "/tmp/sample_project/Gemfile"
+      assert_match_in_file "role.project_module :uploads, \"/admin/uploads.js\"", '/tmp/sample_project/admin/app.rb'
+    end
+  end
+end

data/test/helper.rb

@@ -16,6 +16,9 @@ end
 
 require 'padrino-admin'
 
+Padrino::Generators.setup!
+Padrino::Generators.lockup!
+
 module Kernel
   # Silences the output by redirecting to stringIO
   # silence_logger { ...commands... } => "...output..."
@@ -49,6 +52,7 @@ class Test::Unit::TestCase
   # the application.
   def mock_app(base=Padrino::Application, &block)
     @app = Sinatra.new(base, &block)
+    @app.send :include, Test::Unit::Assertions
     @app.use Rack::Session::Cookie if Sinatra::VERSION =~ /0\.9\.\d+/ # Need this because Sinatra 0.9.x have use Rack::Session::Cookie if sessions? && !test?
   end
 
@@ -62,6 +66,25 @@ class Test::Unit::TestCase
     assert_match pattern, File.read(file)
   end
 
+  # Assert_file_exists('/tmp/app')
+  def assert_file_exists(file_path)
+    assert File.exist?(file_path), "File at path '#{file_path}' does not exist!"
+  end
+
+  # Assert_no_file_exists('/tmp/app')
+  def assert_no_file_exists(file_path)
+    assert !File.exist?(file_path), "File should not exist at path '#{file_path}' but was found!"
+  end
+
+  # Asserts that a file matches the pattern
+  def assert_match_in_file(pattern, file)
+    File.exist?(file) ? assert_match(pattern, File.read(file)) : assert_file_exists(file)
+  end
+
+  def assert_no_match_in_file(pattern, file)
+    File.exists?(file) ? !assert_match(pattern, File.read(file)) : assert_file_exists(file)
+  end
+
   # Delegate other missing methods to response.
   def method_missing(name, *args, &block)
     if response && response.respond_to?(name)

data/test/test_access_control.rb

@@ -31,6 +31,7 @@ class TestAccessControl < Test::Unit::TestCase
         account.categories.each do |category|
           project.menu category.name, "/admin/categories/#{category.id}.js"
         end
+        project.menu :foo
       end
     end
   end
@@ -86,8 +87,8 @@ class TestAccessControl < Test::Unit::TestCase
     end
 
     should 'check a module config' do
-      menu = Account.editor.categories.collect { |c| { :text => c.name, :handler => "function(){ Admin.app.load('/admin/categories/#{c.id}.js') }" } }
-      assert_equal [{ :text => "Categories", :menu => menu }], @access.auths(Account.editor).project_modules.collect(&:config)
+      menu = Account.editor.categories.map { |c| { :text => c.name, :handler => "function(){ Admin.app.load('/admin/categories/#{c.id}.js') }" } }
+      assert_equal [{ :text => "Categories", :menu => menu + ["Foo"] }], @access.auths(Account.editor).project_modules.collect(&:config)
     end
 
     should 'check config handlers' do

data/test/test_active_record.rb

@@ -39,6 +39,8 @@ class TestActiveRecord < Test::Unit::TestCase
       assert_respond_to Account, :properties
       assert_respond_to Account, :count
       assert_respond_to Account, :orm
+      assert_equal "Name", Account.human_local_attribute_name(:name)
+      assert_equal "Account", Account.human_local_name
     end
 
     should 'have errors_keys' do

data/test/test_admin_application.rb

@@ -6,33 +6,84 @@ class TestAdminApplication < Test::Unit::TestCase
     load_fixture 'data_mapper'
   end
 
-  should 'set basic roles' do
+  should 'require correctly login' do
     mock_app do
       enable :authentication
       set    :app_name, :test_me
-      set    :use_orm, :datamapper
+      set    :use_orm,  :datamapper
 
       # Do a simple mapping
       access_control.roles_for :any do |role| 
         role.allow "/"
-        role.deny  "/foo"
+        role.require_login  "/foo"
+      end
+
+      get "/foo", :respond_to => [:html, :js] do
+        "foo"
+      end
+    end
+
+    get "/foo"
+    assert_equal "You don't have permission for this resource", body
+
+    get "/foo.js"
+    assert_equal "alert('Protected resource')", body
+  end
+
+  should 'set basic roles with store location and login page' do
+    mock_app do
+      enable :authentication
+      enable :store_location
+      set    :login_page, "/login"
+      set    :app_name, :test_me
+      set    :use_orm,  :datamapper
+
+      # Do a simple mapping
+      access_control.roles_for :any do |role| 
+        role.allow "/"
+        role.require_login "/foo"
       end
 
       # Prepare a basic page
-      get("/login") do
+      get "/login" do
+        assert_equal "[]", admin_menu
+        redirect_back_or_default("/foo") if logged_in?
         set_current_account(Account.admin)
+        "login page"
       end
 
-      get("/foo") do
+      get "/foo" do
         "foo"
       end
     end
-    
-    get "/login"
-    assert_equal 200, status
-    
+
     get "/foo"
-    assert_not_equal "foo", body
+    follow_redirect!
+    assert_equal "login page", body
+
+    get "/login"
+    follow_redirect!
+    assert_equal "foo", body
+  end
+
+  should 'use correclty flash middleware' do
+    mock_app do
+      use Padrino::Admin::Middleware::FlashMiddleware, :session_id
+
+      get "/set_session_id" do
+        params[:session_id]
+      end
+
+      get "/get_session_id" do
+        session[:session_id]
+      end
+    end
+
+    get "/set_session_id", { :session_id => 24 }, 'HTTP_USER_AGENT' => 'Adobe Flash'
+    assert_equal "24", body
+
+    get "/get_session_id"
+    assert_equal "24", body
   end
 
 end