padrino-admin 0.9.15 → 0.9.16

data/lib/padrino-admin.rb

@@ -1,5 +1,4 @@
 require 'padrino-core'
-require 'padrino-gen'
 require 'padrino-helpers'
 
 FileSet.glob_require('padrino-admin/*.rb', __FILE__)
@@ -30,4 +29,9 @@ I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-admin/locale/**/*.yml"]
 ##
 # Now we need to add admin generators to padrino-gen
 #
-Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/padrino-admin/generators/{actions,orm,admin_app,admin_page}.rb']
+begin
+  require 'padrino-gen'
+  Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/padrino-admin/generators/{actions,orm,admin_app,admin_page}.rb']
+rescue LoadError
+
+end

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

@@ -46,10 +46,15 @@ module Padrino
           directory "templates/app",     destination_root("admin")
           directory "templates/assets",  destination_root("public", "admin")
 
-          Padrino::Generators::Model.start([
+          account_params = [
             "account", "name:string", "surname:string", "email:string", "crypted_password:string", "salt:string", "role:string",
-            "-r=#{options[:root]}", "-s=#{options[:skip_migration]}", "-d=#{options[:destroy]}"
-          ])
+            "-r=#{options[:root]}"
+          ]
+
+          account_params << "-s" if options[:skip_migration]
+          account_params << "-d" if options[:destroy]
+
+          Padrino::Generators::Model.start(account_params)
 
           column = Struct.new(:name, :type)
           columns = [:id, :name, :surname, :email].map { |col| column.new(col) }
@@ -95,4 +100,4 @@ module Padrino
       end
     end # AdminApp
   end # Generators
-end # Padrino
+end # Padrino

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

@@ -7,14 +7,14 @@ module Padrino
 
         def initialize(name, orm, columns=nil, column_fields=nil)
           name            = name.to_s
-          @klass_name     = name.classify
-          @klass          = name.classify.constantize rescue nil
+          @klass_name     = name.camelize
+          @klass          = @klass_name.constantize rescue nil
           @name_plural    = name.underscore.pluralize
           @name_singular  = name.underscore
           @orm            = orm.to_sym
           @columns        = columns
           @column_fields  = column_fields
-          raise OrmError, "Model '#{name}' could not be found!" if @columns.nil? && @klass.nil?
+          raise OrmError, "Model '#{klass_name}' could not be found!" if @columns.nil? && @klass.nil?
         end
 
         def field_type(type)

data/padrino-admin.gemspec

@@ -16,6 +16,5 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = "lib"
   s.add_dependency("padrino-core", Padrino.version)
-  s.add_dependency("padrino-gen",   Padrino.version)
   s.add_dependency("padrino-helpers", Padrino.version)
-end
+end

data/test/generators/test_admin_app_generator.rb

@@ -3,85 +3,92 @@ require File.expand_path(File.dirname(__FILE__) + '/../helper')
 class TestAdminAppGenerator < Test::Unit::TestCase
 
   def setup
-    `rm -rf /tmp/sample_project`
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    `mkdir -p #{@apptmp}`
+  end
+
+  def teardown
+    `rm -rf #{@apptmp}`
   end
 
   context 'the admin app generator' do
 
     should 'fail outside app root' do
-      output = silence_logger { generate(:admin_app, '-r=/tmp/sample_project') }
+      output = silence_logger { generate(:admin_app, "-r=#{@apptmp}") }
       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 { generate(:project, 'sample_project', '--root=/tmp') } }
-      assert_raise(SystemExit) { silence_logger { generate(:admin_app, '-r=/tmp/sample_project') } }
+    should 'fail if we don\'t specify an orm' do
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}") } }
+      assert_raise(SystemExit) { silence_logger { generate(:admin_app, "-r=#{@apptmp}/sample_project") } }
     end
 
-    should 'fail if we don\'t a valid theme' do
-      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=activerecord') } }
-      assert_raise(SystemExit) { silence_logger { generate(:admin_app, '-r=/tmp/sample_project', '--theme=foo') } }
+    should 'fail if we don\'t specify a valid theme' do
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') } }
+      assert_raise(SystemExit) { silence_logger { generate(:admin_app, "-r=#{@apptmp}/sample_project", '--theme=foo') } }
     end
 
-    should 'correctyl generate a new padrino admin application with default renderer' do
-      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=activerecord', '-e=haml') } }
-      assert_nothing_raised { silence_logger { generate(:admin_app, '--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/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/index.haml')
-      assert_file_exists('/tmp/sample_project/admin/views/accounts/new.haml')
-      assert_file_exists('/tmp/sample_project/admin/views/base/index.haml')
-      assert_file_exists('/tmp/sample_project/admin/views/sessions/new.haml')
-      assert_file_exists('/tmp/sample_project/admin/views/base/_sidebar.haml')
-      assert_file_exists('/tmp/sample_project/admin/views/base/index.haml')
-      assert_file_exists('/tmp/sample_project/admin/views/layouts/application.haml')
-      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/stylesheets')
-      assert_file_exists('/tmp/sample_project/app/models/account.rb')
-      assert_file_exists('/tmp/sample_project/db/seeds.rb')
-      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'
-      assert_match_in_file 'role.project_module :accounts, "/accounts"', '/tmp/sample_project/admin/app.rb'
+    should 'correctly generate a new padrino admin application with default renderer' do
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') } }
+      assert_nothing_raised { silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") } }
+      assert_file_exists("#{@apptmp}/sample_project")
+      assert_file_exists("#{@apptmp}/sample_project/admin")
+      assert_file_exists("#{@apptmp}/sample_project/admin/app.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/accounts.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/base.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/sessions.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/new.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/index.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/_sidebar.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/index.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/layouts/application.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.haml")
+      assert_file_exists("#{@apptmp}/sample_project/public/admin")
+      assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
+      assert_file_exists("#{@apptmp}/sample_project/app/models/account.rb")
+      assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
+      assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
+      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"
     end
 
-    should 'correctyl generate a new padrino admin application with erb renderer' do
-      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=activerecord', '-e=erb') } }
-      assert_nothing_raised { silence_logger { generate(:admin_app, '--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/sessions.rb')
-      assert_file_exists('/tmp/sample_project/admin/views')
-      assert_file_exists('/tmp/sample_project/admin/views/accounts/_form.erb')
-      assert_file_exists('/tmp/sample_project/admin/views/accounts/edit.erb')
-      assert_file_exists('/tmp/sample_project/admin/views/accounts/index.erb')
-      assert_file_exists('/tmp/sample_project/admin/views/accounts/new.erb')
-      assert_file_exists('/tmp/sample_project/admin/views/base/index.erb')
-      assert_file_exists('/tmp/sample_project/admin/views/sessions/new.erb')
-      assert_file_exists('/tmp/sample_project/admin/views/base/_sidebar.erb')
-      assert_file_exists('/tmp/sample_project/admin/views/base/index.erb')
-      assert_file_exists('/tmp/sample_project/admin/views/layouts/application.erb')
-      assert_file_exists('/tmp/sample_project/admin/views/sessions/new.erb')
-      assert_file_exists('/tmp/sample_project/public/admin')
-      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 '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'
-      assert_match_in_file 'role.project_module :accounts, "/accounts"', '/tmp/sample_project/admin/app.rb'
+    should 'correctly generate a new padrino admin application with erb renderer' do
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') } }
+      assert_nothing_raised { silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") } }
+      assert_file_exists("#{@apptmp}/sample_project")
+      assert_file_exists("#{@apptmp}/sample_project/admin")
+      assert_file_exists("#{@apptmp}/sample_project/admin/app.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/accounts.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/base.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/sessions.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.erb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.erb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.erb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/new.erb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/index.erb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.erb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/_sidebar.erb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/index.erb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/layouts/application.erb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.erb")
+      assert_file_exists("#{@apptmp}/sample_project/public/admin")
+      assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
+      assert_file_exists("#{@apptmp}/sample_project/app/models/account.rb")
+      assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
+      assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
+      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"
     end
   end
-end
+end

data/test/generators/test_admin_page_generator.rb

@@ -15,85 +15,90 @@ end
 class TestAdminPageGenerator < Test::Unit::TestCase
 
   def setup
-    `rm -rf /tmp/sample_project`
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    `mkdir -p #{@apptmp}`
+  end
+
+  def teardown
+    `rm -rf #{@apptmp}`
   end
 
   context 'the admin page generator' do
 
     should 'fail outside app root' do
-      output = silence_logger { generate(:admin_page, 'foo', '-r=/tmp/sample_project') }
+      output = silence_logger { generate(:admin_page, 'foo', "-r=#{@apptmp}/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 { generate(:project, 'sample_project', '--root=/tmp', '-d=activerecord') }
-      silence_logger { generate(:admin_app, '--root=/tmp/sample_project') }
-      assert_raise(Padrino::Admin::Generators::OrmError) { generate(:admin_page, 'foo', '-r=/tmp/sample_project') }
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+      silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      assert_raise(Padrino::Admin::Generators::OrmError) { generate(:admin_page, 'foo', "-r=#{@apptmp}/sample_project") }
     end
 
     should 'correctly generate a new padrino admin application default renderer' do
-      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=datamapper','-e=haml') }
-      silence_logger { generate(:admin_app, '--root=/tmp/sample_project') }
-      silence_logger { generate(:model, 'person', "name:string", "age:integer", "email:string", '-root=/tmp/sample_project') }
-      silence_logger { generate(:admin_page, '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/index.haml'
-      assert_file_exists '/tmp/sample_project/admin/views/people/new.haml'
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+      silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+      silence_logger { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
+      assert_file_exists "#{@apptmp}/sample_project/admin/controllers/people.rb"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.haml"
       %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'
+        assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.haml"
+        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"', '/tmp/sample_project/admin/app.rb'
+      assert_match_in_file 'role.project_module :people, "/people"', "#{@apptmp}/sample_project/admin/app.rb"
     end
 
     should 'correctly generate a new padrino admin application with erb renderer' do
-      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=datamapper', '-e=erb') }
-      silence_logger { generate(:admin_app, '--root=/tmp/sample_project') }
-      silence_logger { generate(:model, 'person', "name:string", "age:integer", "email:string", '-root=/tmp/sample_project') }
-      silence_logger { generate(:admin_page, '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.erb'
-      assert_file_exists '/tmp/sample_project/admin/views/people/edit.erb'
-      assert_file_exists '/tmp/sample_project/admin/views/people/index.erb'
-      assert_file_exists '/tmp/sample_project/admin/views/people/new.erb'
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper', '-e=erb') }
+      silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'person', "name:string", "age:integer", "email:string", "-root=#{@apptmp}/sample_project") }
+      silence_logger { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
+      assert_file_exists "#{@apptmp}/sample_project/admin/controllers/people.rb"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.erb"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.erb"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.erb"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.erb"
       %w(name age email).each do |field|
-        assert_match_in_file "label :#{field}", '/tmp/sample_project/admin/views/people/_form.erb'
-        assert_match_in_file "text_field :#{field}", '/tmp/sample_project/admin/views/people/_form.erb'
+        assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.erb"
+        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"', '/tmp/sample_project/admin/app.rb'
+      assert_match_in_file 'role.project_module :people, "/people"', "#{@apptmp}/sample_project/admin/app.rb"
     end
 
     should 'correctly generate a new padrino admin application with multiple models' do
-      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=datamapper','-e=haml') }
-      silence_logger { generate(:admin_app, '--root=/tmp/sample_project') }
-      silence_logger { generate(:model, 'person', "name:string", "age:integer", "email:string", '-root=/tmp/sample_project') }
-      silence_logger { generate(:model, 'page', "name:string", "body:string", '-root=/tmp/sample_project') }
-      silence_logger { generate(:admin_page, 'person', 'page', '--root=/tmp/sample_project') }
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+      silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'person', "name:string", "age:integer", "email:string", "-root=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'page', "name:string", "body:string", "-root=#{@apptmp}/sample_project") }
+      silence_logger { generate(:admin_page, 'person', 'page', "--root=#{@apptmp}/sample_project") }
       # For Person
-      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/index.haml'
-      assert_file_exists '/tmp/sample_project/admin/views/people/new.haml'
+      assert_file_exists "#{@apptmp}/sample_project/admin/controllers/people.rb"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.haml"
       %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'
+        assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.haml"
+        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"', '/tmp/sample_project/admin/app.rb'
+      assert_match_in_file 'role.project_module :people, "/people"', "#{@apptmp}/sample_project/admin/app.rb"
       # For Page
-      assert_file_exists '/tmp/sample_project/admin/controllers/pages.rb'
-      assert_file_exists '/tmp/sample_project/admin/views/pages/_form.haml'
-      assert_file_exists '/tmp/sample_project/admin/views/pages/edit.haml'
-      assert_file_exists '/tmp/sample_project/admin/views/pages/index.haml'
-      assert_file_exists '/tmp/sample_project/admin/views/pages/new.haml'
+      assert_file_exists "#{@apptmp}/sample_project/admin/controllers/pages.rb"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/pages/_form.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/pages/edit.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/pages/index.haml"
+      assert_file_exists "#{@apptmp}/sample_project/admin/views/pages/new.haml"
       %w(name body).each do |field|
-        assert_match_in_file "label :#{field}", '/tmp/sample_project/admin/views/pages/_form.haml'
-        assert_match_in_file "text_field :#{field}", '/tmp/sample_project/admin/views/pages/_form.haml'
+        assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/pages/_form.haml"
+        assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/pages/_form.haml"
       end
-      assert_match_in_file 'role.project_module :pages, "/pages"', '/tmp/sample_project/admin/app.rb'
+      assert_match_in_file 'role.project_module :pages, "/pages"', "#{@apptmp}/sample_project/admin/app.rb"
     end
   end
 end

data/test/helper.rb

@@ -4,6 +4,7 @@ PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 require File.expand_path('../../../load_paths', __FILE__)
 require 'test/unit'
 require 'rack/test'
+require 'uuid'
 require 'rack'
 require 'shoulda'
 require 'thor/group'
@@ -53,17 +54,11 @@ class Test::Unit::TestCase
     Rack::Lint.new(@app)
   end
 
-  # generate(:admin_app, '-r=/tmp/sample_project')
+  # generate(:admin_app, "-r=#{@apptmp}/sample_project")
   def generate(name, *params)
     "Padrino::Generators::#{name.to_s.camelize}".constantize.start(params)
   end
 
-  # Asserts that a file matches the pattern
-  def assert_match_in_file(pattern, file)
-    assert File.exist?(file), "File '#{file}' does not exist!"
-    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!"
@@ -93,4 +88,4 @@ class Test::Unit::TestCase
   end
 
   alias :response :last_response
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 9
-  - 15
-  version: 0.9.15
+  - 16
+  version: 0.9.16
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +02:00
+date: 2010-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,46 +29,30 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 27
         segments: 
         - 0
         - 9
-        - 15
-        version: 0.9.15
+        - 16
+        version: 0.9.16
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: padrino-gen
+  name: padrino-helpers
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 27
         segments: 
         - 0
         - 9
-        - 15
-        version: 0.9.15
+        - 16
+        version: 0.9.16
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: padrino-helpers
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 0
-        - 9
-        - 15
-        version: 0.9.15
-  type: :runtime
-  version_requirements: *id003
 description: Admin View for Padrino applications
 email: padrinorb@gmail.com
 executables: []