padrino-gen 0.9.13 → 0.9.14

data/bin/padrino-gen

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'rubygems' unless defined?(Gem)
 
 # We load padrino-gen
 padrino_gen_path = File.expand_path('../../lib', __FILE__)

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

@@ -128,10 +128,10 @@ module Padrino
         unless File.exist?(destination_root(app))
           say
           say "================================================================="
-          say "We didn't found #{app.underscore.classify}! Available apps are:"
+          say "We didn't found #{app.underscore.camelize}! Available apps are:"
           say "================================================================="
           Padrino.mounted_apps.each do |app|
-            say " - #{app.app_object}"
+            say " - #{app.app_class}"
           end
           say "================================================================="
           say

data/lib/padrino-gen/generators/app.rb

@@ -28,9 +28,10 @@ module Padrino
       # Copies over the Padrino base admin application
       def create_app
         self.destination_root = options[:root]
-        @app_name = name.gsub(/\W/, "_").underscore.classify
+        @app_name = name.gsub(/\W/, "_").underscore.camelize
         if in_app_root?
           app_skeleton(name, options[:tiny])
+          empty_directory destination_root("public/#{name}")
           append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"#{@app_name}\").to(\"/#{name.underscore}\")"
 
           return if self.behavior == :revoke

data/lib/padrino-gen/generators/components/orms/mongomapper.rb

@@ -9,7 +9,7 @@ end
 MONGO
 
 def setup_orm
-  require_dependencies 'mongo_ext', :require => 'mongo'
+  require_dependencies 'bson_ext', :require => 'mongo'
   require_dependencies 'mongo_mapper'
   create_file("config/database.rb", MONGO.gsub(/!NAME!/, name.underscore))
   empty_directory('app/models')

data/lib/padrino-gen/generators/project/config/apps.rb.tt

@@ -4,7 +4,7 @@
 #
 #   Padrino.mount("blog").to('/blog')
 #   Padrino.mount("blog", :app_class => "BlogApp").to('/blog')
-#   Padrino.mount("blog", :app_file =>  "/path/to/blog/app.rb").to('/blog')
+#   Padrino.mount("blog", :app_file =>  "path/to/blog/app.rb").to('/blog')
 #
 # You can also map apps to a specified host:
 #
@@ -18,7 +18,7 @@
 # By default, this file mounts the parimary app which was generated with this project.
 # However, the mounted app can be modified as needed:
 #
-#   Padrino.mount(:app_file => "/path/to/file", :app_class => "Blog").to('/')
+#   Padrino.mount(:app_file => "path/to/file", :app_class => "Blog").to('/')
 #
 
 # Mounts the core application for this project

data/lib/padrino-gen/generators/project.rb

@@ -40,7 +40,7 @@ module Padrino
 
       # Copies over the Padrino base application App
       def setup_project
-        @app_name = (options[:app] || name).gsub(/\W/, "_").underscore.classify
+        @app_name = (options[:app] || name).gsub(/\W/, "_").underscore.camelize
         self.destination_root = File.join(options[:root], name)
         directory("project/", destination_root)
         app_skeleton('app', options[:tiny])

data/test/test_app_generator.rb

@@ -22,6 +22,7 @@ class TestAppGenerator < Test::Unit::TestCase
       assert_file_exists('/tmp/sample_project/demo/helpers')
       assert_file_exists('/tmp/sample_project/demo/views')
       assert_file_exists('/tmp/sample_project/demo/views/layouts')
+      assert_dir_exists('/tmp/sample_project/public/demo')
       assert_match_in_file 'Padrino.mount("Demo").to("/demo")', '/tmp/sample_project/config/apps.rb'
       assert_match_in_file 'class Demo < Padrino::Application', '/tmp/sample_project/demo/app.rb'
     end
@@ -35,6 +36,7 @@ class TestAppGenerator < Test::Unit::TestCase
       assert_file_exists('/tmp/sample_project/demo/controllers.rb')
       assert_file_exists('/tmp/sample_project/demo/mailers.rb')
       assert_dir_exists('/tmp/sample_project/demo/views/mailers')
+      assert_dir_exists('/tmp/sample_project/public/demo')
       assert_match_in_file(/:notifier/,'/tmp/sample_project/demo/mailers.rb')
       assert_no_file_exists('/tmp/sample_project/demo/helpers')
       assert_no_file_exists('/tmp/sample_project/demo/controllers')

data/test/test_controller_generator.rb

@@ -5,6 +5,7 @@ class TestControllerGenerator < Test::Unit::TestCase
     @controller_path = '/tmp/sample_project/app/controllers/demo_items.rb'
     @controller_test_path = '/tmp/sample_project/test/controllers/demo_items_controller_test.rb'
     `rm -rf /tmp/sample_project`
+    `rm -rf /tmp/warepedia`
   end
 
   context 'the controller generator' do
@@ -14,6 +15,22 @@ class TestControllerGenerator < Test::Unit::TestCase
       assert_no_file_exists('/tmp/app/controllers/demo.rb')
     end
 
+    should "generate controller within existing project" do
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
+      assert_match_in_file(/SampleProject.controllers :demo_items do/m, @controller_path)
+      assert_match_in_file(/SampleProject.helpers do/m, '/tmp/sample_project/app/helpers/demo_items_helper.rb')
+      assert_file_exists('/tmp/sample_project/app/views/demo_items')
+    end
+
+    should "generate controller within existing project with weird name" do
+      silence_logger { generate(:project, 'warepedia', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/warepedia') }
+      assert_match_in_file(/Warepedia.controllers :demo_items do/m, "/tmp/warepedia/app/controllers/demo_items.rb")
+      assert_match_in_file(/Warepedia.helpers do/m, '/tmp/warepedia/app/helpers/demo_items_helper.rb')
+      assert_file_exists('/tmp/warepedia/app/views/demo_items')
+    end
+
     should "generate controller in specified app" do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
       silence_logger { generate(:app, 'subby', '-r=/tmp/sample_project') }
@@ -33,14 +50,6 @@ class TestControllerGenerator < Test::Unit::TestCase
       assert_no_file_exists("/tmp/sample_project/test")
     end
 
-    should "generate controller within existing application" do
-      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
-      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
-      assert_match_in_file(/SampleProject.controllers :demo_items do/m, @controller_path)
-      assert_match_in_file(/SampleProject.helpers do/m, '/tmp/sample_project/app/helpers/demo_items_helper.rb')
-      assert_file_exists('/tmp/sample_project/app/views/demo_items')
-    end
-
     should "generate controller test for bacon" do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
       silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }

data/test/test_generator.rb

@@ -6,7 +6,7 @@ class TestGenerator < Test::Unit::TestCase
     should "have default generators" do
       %w{controller mailer migration model app}.each do |gen|
         assert Padrino::Generators.mappings.has_key?(gen.to_sym)
-        assert_equal "Padrino::Generators::#{gen.classify}", Padrino::Generators.mappings[gen.to_sym].name
+        assert_equal "Padrino::Generators::#{gen.camelize}", Padrino::Generators.mappings[gen.to_sym].name
         assert Padrino::Generators.mappings[gen.to_sym].respond_to?(:start)
       end
     end

data/test/test_project_generator.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 class TestProjectGenerator < Test::Unit::TestCase
   def setup
     `rm -rf /tmp/sample_project`
+    `rm -rf /tmp/warepedia`
   end
 
   context 'the project generator' do
@@ -48,9 +49,9 @@ class TestProjectGenerator < Test::Unit::TestCase
     end
 
     should "place app specific names into correct files" do
-      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none') }
-      assert_match_in_file(/class SampleProject < Padrino::Application/m, '/tmp/sample_project/app/app.rb')
-      assert_match_in_file(/Padrino.mount\("SampleProject"\).to\('\/'\)/m, '/tmp/sample_project/config/apps.rb')
+      silence_logger { generate(:project, 'warepedia', '--root=/tmp', '--script=none') }
+      assert_match_in_file(/class Warepedia < Padrino::Application/m, '/tmp/warepedia/app/app.rb')
+      assert_match_in_file(/Padrino.mount\("Warepedia"\).to\('\/'\)/m, '/tmp/warepedia/config/apps.rb')
     end
 
     should "create components file containing options chosen with defaults" do
@@ -229,6 +230,7 @@ class TestProjectGenerator < Test::Unit::TestCase
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=mongomapper', '--script=none') }
       assert_match /Applying.*?mongomapper.*?orm/, buffer
       assert_match_in_file(/gem 'mongo_mapper'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'bson_ext'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/MongoMapper.database/, '/tmp/sample_project/config/database.rb')
       assert_dir_exists('/tmp/sample_project/app/models')
     end
@@ -237,6 +239,7 @@ class TestProjectGenerator < Test::Unit::TestCase
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=mongoid', '--script=none') }
       assert_match /Applying.*?mongoid.*?orm/, buffer
       assert_match_in_file(/gem 'mongoid'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'bson_ext'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/Mongoid.database/, '/tmp/sample_project/config/database.rb')
       assert_dir_exists('/tmp/sample_project/app/models')
     end
@@ -313,7 +316,9 @@ class TestProjectGenerator < Test::Unit::TestCase
     should "properly default generate for bacon" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=bacon', '--script=none') }
       assert_match /Applying.*?bacon.*?test/, buffer
-      assert_match_in_file(/gem 'rack-test'.*?:require => "rack\/test".*?:group => "test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/gem 'bacon'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/test/test_config.rb')
       assert_match_in_file(/Bacon::Context/, '/tmp/sample_project/test/test_config.rb')
@@ -323,7 +328,9 @@ class TestProjectGenerator < Test::Unit::TestCase
     should "properly generate for riot" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=riot', '--script=none') }
       assert_match /Applying.*?riot.*?test/, buffer
-      assert_match_in_file(/gem 'rack-test'.*?:require => "rack\/test".*?:group => "test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/gem 'riot'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/include Rack::Test::Methods/, '/tmp/sample_project/test/test_config.rb')
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/test/test_config.rb')
@@ -335,7 +342,9 @@ class TestProjectGenerator < Test::Unit::TestCase
     should "properly generate for rspec" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=rspec', '--script=none') }
       assert_match /Applying.*?rspec.*?test/, buffer
-      assert_match_in_file(/gem 'rack-test'.*?:require => "rack\/test".*?:group => "test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/gem 'rspec'.*?:require => "spec"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/spec/spec_helper.rb')
       assert_match_in_file(/Spec::Runner/, '/tmp/sample_project/spec/spec_helper.rb')
@@ -345,7 +354,9 @@ class TestProjectGenerator < Test::Unit::TestCase
     should "properly generate for shoulda" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=shoulda', '--script=none') }
       assert_match /Applying.*?shoulda.*?test/, buffer
-      assert_match_in_file(/gem 'rack-test'.*?:require => "rack\/test".*?:group => "test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/gem 'shoulda'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/test/test_config.rb')
       assert_match_in_file(/Test::Unit::TestCase/, '/tmp/sample_project/test/test_config.rb')
@@ -355,7 +366,9 @@ class TestProjectGenerator < Test::Unit::TestCase
     should "properly generate for testspec" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=testspec', '--script=none') }
       assert_match /Applying.*?testspec.*?test/, buffer
-      assert_match_in_file(/gem 'rack-test'.*?:require => "rack\/test".*?:group => "test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/gem 'test-spec'.*?:require => "test\/spec"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/test/test_config.rb')
       assert_match_in_file(/Test::Unit::TestCase/, '/tmp/sample_project/test/test_config.rb')
@@ -365,7 +378,9 @@ class TestProjectGenerator < Test::Unit::TestCase
     should "properly generate for cucumber" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=cucumber', '--script=none') }
       assert_match /Applying.*?cucumber.*?test/, buffer
-      assert_match_in_file(/gem 'rack-test'.*?:require => "rack\/test".*?:group => "test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/gem 'rspec'.*?:require => "spec"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/gem 'cucumber'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/gem 'capybara'/, '/tmp/sample_project/Gemfile')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 39
   prerelease: false
   segments: 
   - 0
   - 9
-  - 13
-  version: 0.9.13
+  - 14
+  version: 0.9.14
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-19 00:00:00 +02:00
+date: 2010-06-30 00:00:00 -07:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 39
         segments: 
         - 0
         - 9
-        - 13
-        version: 0.9.13
+        - 14
+        version: 0.9.14
   type: :runtime
   name: padrino-core
   prerelease: false