padrino-admin 0.10.2 → 0.10.3

data/test/generators/test_admin_app_generator.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
 
-class TestAdminAppGenerator < Test::Unit::TestCase
+describe "AdminAppGenerator" do
 
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
@@ -14,24 +14,24 @@ class TestAdminAppGenerator < Test::Unit::TestCase
   context 'the admin app generator' do
 
     should 'fail outside app root' do
-      output = silence_logger { generate(:admin_app, "-r=#{@apptmp}") }
-      assert_match(/not at the root/, output)
+      out, err = capture_io { generate(:admin_app, "-r=#{@apptmp}") }
+      assert_match(/not at the root/, out)
       assert_no_file_exists('/tmp/admin')
     end
 
-    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") } }
+    should "fail if we don't specify an orm" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-e=haml') }
+      assert_raises(SystemExit) { @out, @err = capture_io { generate(:admin_app, "-r=#{@apptmp}/sample_project") } }
     end
 
-    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') } }
+    should "fail if we don't specify a valid theme" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+      assert_raises(SystemExit) { @out, @err = capture_io { generate(:admin_app, "-r=#{@apptmp}/sample_project", '--theme=foo') } }
     end
 
     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") } }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+      capture_io { 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")
@@ -62,8 +62,8 @@ class TestAdminAppGenerator < Test::Unit::TestCase
     end
 
     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") } }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') }
+      capture_io { 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")
@@ -94,8 +94,8 @@ class TestAdminAppGenerator < Test::Unit::TestCase
     end
 
     should 'correctly generate a new padrino admin application with slim renderer' do
-      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') } }
-      assert_nothing_raised { silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") } }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') }
+      capture_io { 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")
@@ -126,8 +126,8 @@ class TestAdminAppGenerator < Test::Unit::TestCase
     end
 
     should 'correctly generate a new padrino admin application with model in non-default application path' do
-      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') } }
-      assert_nothing_raised { silence_logger { generate(:admin_app,"-a=/admin", "--root=#{@apptmp}/sample_project") } }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+      capture_io { generate(:admin_app,"-a=/admin", "--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")
@@ -159,7 +159,7 @@ class TestAdminAppGenerator < Test::Unit::TestCase
     end
 
     should 'not conflict with existing seeds file' do
-      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') } }
+      capture_io { 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')
@@ -167,7 +167,7 @@ class TestAdminAppGenerator < Test::Unit::TestCase
         seeds_rb.puts "# Old Seeds Content"
       end
 
-      silence_logger do
+      capture_io 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")
@@ -178,10 +178,11 @@ class TestAdminAppGenerator < Test::Unit::TestCase
     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")
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", "-d=activerecord", "-e=haml", "--dev") }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      skip "Check bundle install and rake"
+      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

@@ -12,7 +12,7 @@ class Page
   end
 end
 
-class TestAdminPageGenerator < Test::Unit::TestCase
+describe "AdminPageGenerator" do
 
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
@@ -26,22 +26,22 @@ class TestAdminPageGenerator < Test::Unit::TestCase
   context 'the admin page generator' do
 
     should 'fail outside app root' do
-      output = silence_logger { generate(:admin_page, 'foo', "-r=#{@apptmp}/sample_project") }
-      assert_match(/not at the root/, output)
+      out, err = capture_io { generate(:admin_page, 'foo', "-r=#{@apptmp}/sample_project") }
+      assert_match(/not at the root/, out)
       assert_no_file_exists('/tmp/admin')
     end
 
     should 'fail without argument and model' do
-      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") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      assert_raises(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=#{@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") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+      capture_io { 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"
@@ -57,15 +57,15 @@ class TestAdminPageGenerator < Test::Unit::TestCase
     end
 
     should "store and apply session_secret" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
       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
-      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") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper', '-e=erb') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "-root=#{@apptmp}/sample_project") }
+      capture_io { 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"
@@ -81,10 +81,10 @@ class TestAdminPageGenerator < Test::Unit::TestCase
     end
 
     should 'correctly generate a new padrino admin application with slim renderer' do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper', '-e=slim') }
-      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") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper', '-e=slim') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "-root=#{@apptmp}/sample_project") }
+      capture_io { 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.slim"
       assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.slim"
@@ -100,11 +100,11 @@ class TestAdminPageGenerator < Test::Unit::TestCase
     end
 
     should 'correctly generate a new padrino admin application with multiple models' do
-      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") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "-root=#{@apptmp}/sample_project") }
+      capture_io { generate(:model, 'page', "name:string", "body:string", "-root=#{@apptmp}/sample_project") }
+      capture_io { generate(:admin_page, 'person', 'page', "--root=#{@apptmp}/sample_project") }
       # For Person
       assert_file_exists "#{@apptmp}/sample_project/admin/controllers/people.rb"
       assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.haml"

data/test/helper.rb

@@ -2,12 +2,10 @@ ENV['PADRINO_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
 require File.expand_path('../../../load_paths', __FILE__)
-require 'test/unit'
+require File.join(File.dirname(__FILE__), '..', '..', 'padrino-core', 'test', 'mini_shoulda')
 require 'rack/test'
-require 'uuid'
 require 'rack'
-require 'shoulda'
-require 'mocha'
+require 'uuid'
 require 'thor/group'
 require 'padrino-core/support_lite' unless defined?(SupportLite)
 require 'padrino-admin'
@@ -15,31 +13,20 @@ require 'padrino-admin'
 Padrino::Generators.load_components!
 
 module Kernel
-  # Silences the output by redirecting to stringIO
-  # silence_logger { ...commands... } => "...output..."
-  def silence_logger(&block)
-    $stdout = $stderr = log_buffer = StringIO.new
-    block.call
-    $stdout = STDOUT
-    $stderr = STDERR
-    log_buffer.string
-  end
-  alias :silence_stdout :silence_logger
-
   def load_fixture(file)
     Object.send(:remove_const, :Account)  if defined?(Account)
     Object.send(:remove_const, :Category) if defined?(Category)
     file += ".rb" if file !~ /.rb$/
-    silence_stdout { load File.join(File.dirname(__FILE__), "fixtures", file) }
+    capture_io { load File.join(File.dirname(__FILE__), "fixtures", file) }
   end
 end
 
 class Class
   # Allow assertions in request context
-  include Test::Unit::Assertions
+  include MiniTest::Assertions
 end
 
-class Test::Unit::TestCase
+class MiniTest::Spec
   include Rack::Test::Methods
 
   # Sets up a Sinatra::Base subclass defined with the block
@@ -47,7 +34,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.send :include, MiniTest::Assertions
     @app.register Padrino::Helpers
   end
 

data/test/test_admin_application.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
-class TestAdminApplication < Test::Unit::TestCase
+describe "AdminApplication" do
 
   def setup
     load_fixture 'data_mapper'

data/test/test_locale.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
-class TestFilters < Test::Unit::TestCase 
+describe "Filters" do
   Dir[File.expand_path("../../lib/padrino-admin/locale/admin/*.yml", __FILE__)].each do |file|
     name = File.basename(file, '.yml')
     should "have a vaild #{name} locale for admin" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 3
+  version: 0.10.3
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 -07:00
+date: 2011-10-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 49
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 3
+        version: 0.10.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 49
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 3
+        version: 0.10.3
   type: :runtime
   version_requirements: *id002
 description: Admin View for Padrino applications
@@ -64,7 +64,8 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
-- LICENSE
+- .yardopts
+- LICENSE.txt
 - README.rdoc
 - Rakefile
 - lib/padrino-admin.rb
@@ -132,6 +133,7 @@ files:
 - lib/padrino-admin/locale/admin/hu.yml
 - lib/padrino-admin/locale/admin/it.yml
 - lib/padrino-admin/locale/admin/ja.yml
+- lib/padrino-admin/locale/admin/lv.yml
 - lib/padrino-admin/locale/admin/nl.yml
 - lib/padrino-admin/locale/admin/no.yml
 - lib/padrino-admin/locale/admin/pl.yml
@@ -150,6 +152,7 @@ files:
 - lib/padrino-admin/locale/orm/hu.yml
 - lib/padrino-admin/locale/orm/it.yml
 - lib/padrino-admin/locale/orm/ja.yml
+- lib/padrino-admin/locale/orm/lv.yml
 - lib/padrino-admin/locale/orm/nl.yml
 - lib/padrino-admin/locale/orm/no.yml
 - lib/padrino-admin/locale/orm/pl.yml