padrino-gen 0.9.10 → 0.9.11

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

@@ -1,32 +1,52 @@
-SEQUEL = (<<-SEQUEL).gsub(/^ {10}/, '') unless defined?(SEQUEL)
+SEQUEL = (<<-SEQUEL) unless defined?(SEQUEL)
 Sequel::Model.plugin(:schema)
+Sequel::Model.raise_on_save_failure = false # Do not throw exceptions on failure
 DB = case Padrino.env
-  when :development then Sequel.connect("sqlite://" + Padrino.root('db', "development.db"), :loggers => [logger])
-  when :production  then Sequel.connect("sqlite://" + Padrino.root('db', "production.db"),  :loggers => [logger])
-  when :test        then Sequel.connect("sqlite://" + Padrino.root('db', "test.db"),        :loggers => [logger])
+  when :development then Sequel.connect(!DB_DEVELOPMENT!, :loggers => [logger])
+  when :production  then Sequel.connect(!DB_PRODUCTION!,  :loggers => [logger])
+  when :test        then Sequel.connect(!DB_TEST!,        :loggers => [logger])
 end
 SEQUEL
 
 def setup_orm
-  require_dependencies 'sequel', 'sqlite3-ruby'
-  create_file("config/database.rb", SEQUEL)
+  sequel = SEQUEL
+  require_dependencies 'sequel'  
+  require_dependencies case options[:adapter]
+  when 'mysql'
+    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"mysql://localhost/#{name}_development\"")
+    sequel.gsub!(/!DB_PRODUCTION!/, "\"mysql://localhost/#{name}_production\"")
+    sequel.gsub!(/!DB_TEST!/,"\"mysql://localhost/#{name}_test\"")
+    'mysql'
+  when 'postgres'
+    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"postgres://localhost/#{name}_development\"")
+    sequel.gsub!(/!DB_PRODUCTION!/, "\"postgres://localhost/#{name}_production\"")
+    sequel.gsub!(/!DB_TEST!/,"\"postgres://localhost/#{name}_test\"")
+    'pg'
+  else
+    sequel.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite://\" + Padrino.root('db', \"#{name}_development.db\")")
+    sequel.gsub!(/!DB_PRODUCTION!/,"\"sqlite://\" + Padrino.root('db', \"#{name}_production.db\")")
+    sequel.gsub!(/!DB_TEST!/,"\"sqlite://\" + Padrino.root('db', \"#{name}_test.db\")")
+    'sqlite3-ruby'
+  end
+  create_file("config/database.rb", sequel)
   empty_directory('app/models')
   empty_directory('db/migrate')
 end
 
-SQ_MODEL = (<<-MODEL).gsub(/^ {10}/, '') unless defined?(SQ_MODEL)
+SQ_MODEL = (<<-MODEL) unless defined?(SQ_MODEL)
 class !NAME! < Sequel::Model
 
 end
 MODEL
 
-def create_model_file(name, fields)
-  model_path = destination_root('app/models/', "#{name.to_s.underscore}.rb")
+# options => { :fields => ["title:string", "body:string"], :app => 'app' }
+def create_model_file(name, options={})
+  model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
   model_contents = SQ_MODEL.gsub(/!NAME!/, name.to_s.downcase.camelize)
   create_file(model_path, model_contents)
 end
 
-SQ_MIGRATION = (<<-MIGRATION).gsub(/^ {10}/, '') unless defined?(SQ_MIGRATION)
+SQ_MIGRATION = (<<-MIGRATION) unless defined?(SQ_MIGRATION)
 class !FILECLASS! < Sequel::Migration
   def up
     !UP!
@@ -38,15 +58,14 @@ class !FILECLASS! < Sequel::Migration
 end
 MIGRATION
 
-SQ_MODEL_UP_MG = (<<-MIGRATION).gsub(/^ {6}/, '') unless defined?(SQ_MODEL_UP_MG)
+SQ_MODEL_UP_MG = (<<-MIGRATION).gsub(/^/, '    ') unless defined?(SQ_MODEL_UP_MG)
 create_table :!TABLE! do
   primary_key :id
-  # <type> <name>
   !FIELDS!
 end
 MIGRATION
 
-SQ_MODEL_DOWN_MG = (<<-MIGRATION).gsub(/^ {10}/, '') unless defined?(SQ_MODEL_DOWN_MG)
+SQ_MODEL_DOWN_MG = (<<-MIGRATION) unless defined?(SQ_MODEL_DOWN_MG)
 drop_table :!TABLE!
 MIGRATION
 
@@ -56,7 +75,7 @@ def create_model_migration(migration_name, name, columns)
          :base => SQ_MIGRATION, :up => SQ_MODEL_UP_MG, :down => SQ_MODEL_DOWN_MG)
 end
 
-SQ_CHANGE_MG = (<<-MIGRATION).gsub(/^ {6}/, '') unless defined?(SQ_CHANGE_MG)
+SQ_CHANGE_MG = (<<-MIGRATION).gsub(/^/, '    ') unless defined?(SQ_CHANGE_MG)
 alter_table :!TABLE! do
   !COLUMNS!
 end
@@ -68,4 +87,4 @@ def create_migration_file(migration_name, name, columns)
     :add => Proc.new { |field, kind| "add_column :#{field}, #{kind.camelize}"  },
     :remove => Proc.new { |field, kind| "drop_column :#{field}" }
   )
-end
+end

data/lib/padrino-gen/generators/components/scripts/dojo.rb

@@ -0,0 +1,4 @@
+def setup_script
+  copy_file('templates/scripts/dojo.js', destination_root("/public/javascripts/dojo.js"))
+  create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
+end

data/lib/padrino-gen/generators/components/stylesheets/compass/application.scss

@@ -0,0 +1,43 @@
+// This import applies a global reset to any page that imports this stylesheet.
+@import "blueprint/reset";
+
+// To configure blueprint, edit the partials/base.sass file.
+@import "partials/base";
+
+// Import all the default blueprint modules so that we can access their mixins.
+@import "blueprint";
+
+// Import the non-default scaffolding module.
+@import "blueprint/scaffolding";
+
+// To generate css equivalent to the blueprint css but with your
+// configuration applied, uncomment:
+// @include blueprint
+
+// But Compass recommends that you scope your blueprint styles
+// So that you can better control what pages use blueprint
+// when stylesheets are concatenated together.
+@include blueprint-scaffolding("body.bp");
+
+body.bp {
+  @include blueprint-typography(true);
+  @include blueprint-utilities;
+  @include blueprint-debug;
+  @include blueprint-interaction;
+  // Remove the scaffolding when you're ready to start doing visual design.
+  // Or leave it in if you're happy with how blueprint looks out-of-the-box
+}
+
+form.bp {
+  @include blueprint-form; 
+}
+
+.two-col {
+  @include container;
+  background-color: #cccccc;
+  #header, #footer {
+    @include column(24); }
+  #sidebar {
+    @include column(3); }
+  #content {
+    @include column(21, true); } }

data/lib/padrino-gen/generators/components/stylesheets/compass/partials/_base.scss

@@ -0,0 +1,10 @@
+// Here is where you can define your constants for your application and to configure the blueprint framework.
+// Feel free to delete these if you want keep the defaults:
+
+$blueprint-grid-columns: 24;
+$blueprint-container-size: 950px;
+$blueprint-grid-margin: 10px;
+
+// Use this to calculate the width based on the total width.
+// Or you can set !blueprint_grid_width to a fixed value and unset !blueprint_container_size -- it will be calculated for you.
+$blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin;

data/lib/padrino-gen/generators/components/stylesheets/compass.rb

@@ -0,0 +1,39 @@
+COMPASS_INIT = (<<-COMPASS).gsub(/^ {10}/, '') unless defined?(COMPASS_INIT)
+# Enables support for Compass, a stylesheet authoring framework based on SASS.
+# See http://compass-style.org/ for more details.
+# Store Compass/SASS files (by default) within 'app/stylesheets'
+
+module CompassInitializer
+  def self.registered(app)
+    require 'sass/plugin/rack'
+    
+    Compass.configuration do |config|
+      config.project_path = Padrino.root
+      config.sass_dir = "app/stylesheets"
+      config.project_type = :stand_alone
+      config.http_path = "/"
+      config.css_dir = "public/stylesheets"
+      config.images_dir = "public/images"
+      config.javascripts_dir = "public/javascripts"
+      config.output_style = :compressed
+    end
+    
+    Compass.configure_sass_plugin!
+    Compass.handle_configuration_change!
+    
+    app.use Sass::Plugin::Rack
+  end
+end
+COMPASS
+
+COMPASS_REGISTER = (<<-COMPASSR).gsub(/^ {10}/, '') unless defined?(COMPASS_REGISTER)
+  register CompassInitializer\n
+COMPASSR
+
+def setup_stylesheet
+  require_dependencies 'compass'
+  create_file destination_root('/lib/compass_plugin.rb'), COMPASS_INIT
+  inject_into_file destination_root('/app/app.rb'), COMPASS_REGISTER, :after => "register Padrino::Helpers\n"
+
+  directory "components/stylesheets/compass/", destination_root('/app/stylesheets')
+end

data/lib/padrino-gen/generators/components/stylesheets/less.rb

@@ -22,12 +22,12 @@ end
 LESS
 
 LESS_REGISTER = (<<-LESSR).gsub(/^ {10}/, '') unless defined?(LESS_REGISTER)
-    register LessInitializer\n
+  register LessInitializer\n
 LESSR
 
 def setup_stylesheet
   require_dependencies 'less', 'rack-less'
   create_file destination_root('/lib/less_plugin.rb'), LESS_INIT
-  inject_into_file destination_root('/app/app.rb'), LESS_REGISTER, :after => "configure do\n"
+  inject_into_file destination_root('/app/app.rb'), LESS_REGISTER, :after => "register Padrino::Helpers\n"
   empty_directory destination_root('/app/stylesheets')
 end

data/lib/padrino-gen/generators/components/stylesheets/sass.rb

@@ -14,12 +14,12 @@ end
 SASS
 
 SASS_REGISTER = (<<-SASSR).gsub(/^ {10}/, '') unless defined?(SASS_REGISTER)
-    register SassInitializer\n
+  register SassInitializer\n
 SASSR
 
 def setup_stylesheet
   require_dependencies 'haml'
   create_file destination_root('/lib/sass_plugin.rb'), SASS_INIT
-  inject_into_file destination_root('/app/app.rb'), SASS_REGISTER, :after => "configure do\n"
+  inject_into_file destination_root('/app/app.rb'), SASS_REGISTER, :after => "register Padrino::Helpers\n"
   empty_directory destination_root('/app/stylesheets')
 end

data/lib/padrino-gen/generators/components/tests/bacon.rb

@@ -29,7 +29,7 @@ BACON_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(BACON_RAKE)
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |test|
-  test.pattern = '**/*_test.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 TEST
@@ -47,6 +47,7 @@ TEST
 
 # Setup the testing configuration helper and dependencies
 def setup_test
+  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'bacon', :group => 'test'
   insert_test_suite_setup BACON_SETUP, :path => 'test/test_config.rb'
   create_file destination_root("test/test.rake"), BACON_RAKE

data/lib/padrino-gen/generators/components/tests/cucumber.rb

@@ -1,6 +1,6 @@
 apply_component_for(:rspec, :test)
 
-CUCUMBER_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(CUCUMBER_SETUP)
+CUCUMBER_SETUP = (<<-TEST) unless defined?(CUCUMBER_SETUP)
 PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../../config/boot")
 
@@ -13,12 +13,12 @@ require 'spec/expectations'
 Capybara.app = CLASS_NAME.tap { |app|  }
 TEST
 
-CUCUMBER_YML = (<<-TEST).gsub(/^ {10}/, '') unless defined?(CUCUMBER_YML)
+CUCUMBER_YML = (<<-TEST) unless defined?(CUCUMBER_YML)
 default: --tags ~@wip --strict features
 html_report: --tags ~@wip --strict --format html --out=features_report.html features
 TEST
 
-CUCUMBER_FEATURE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(CUCUMBER_FEATURE)
+CUCUMBER_FEATURE = (<<-TEST) unless defined?(CUCUMBER_FEATURE)
 Feature: Addition
   In order to avoid silly mistakes
   As a math idiot
@@ -32,7 +32,7 @@ Feature: Addition
     Then I should see 'Answer: 120'
 TEST
 
-CUCUMBER_STEP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(CUCUMBER_STEP)
+CUCUMBER_STEP = (<<-TEST) unless defined?(CUCUMBER_STEP)
 Given /^I visit the calculator page$/ do
   visit '/add'
 end
@@ -50,10 +50,32 @@ Then /^I should see '(.*)'$/ do |text|
 end
 TEST
 
+CUCUMBER_URL = (<<-TEST) unless defined?(CUCUMBER_URL)
+module Cucumber
+  module Web
+    module URLs
+      def url_for(*names)
+        Capybara.app.url_for(*names)
+      end
+      alias_method :url, :url_for
+
+      def absolute_url_for(*names)
+        "http://www.example.com" + Capybara.app.url_for(*names)
+      end
+      alias_method :absolute_url, :absolute_url_for
+    end
+  end
+end
+
+World(Cucumber::Web::URLs)
+TEST
+
 def setup_test
+  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'cucumber', :group => 'test'
   require_dependencies 'capybara', :group => 'test'
   insert_test_suite_setup CUCUMBER_SETUP, :path => "features/support/env.rb"
+  create_file destination_root("features/support/url.rb"), CUCUMBER_URL
   create_file destination_root("features/add.feature"), CUCUMBER_FEATURE
   create_file destination_root("features/step_definitions/add_steps.rb"), CUCUMBER_STEP
   create_file destination_root("cucumber.yml"), CUCUMBER_YML

data/lib/padrino-gen/generators/components/tests/riot.rb

@@ -2,16 +2,51 @@ RIOT_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(RIOT_SETUP)
 PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 
+# Specify your app using the #app helper inside a context.
+# If you don't specify one, Riot::Rack will recursively look for a config.ru file.
+# Takes either an app class or a block argument.
+# app { Padrino.application }
+# app { CLASS_NAME.tap { |app| } }
+
 class Riot::Situation
   include Rack::Test::Methods
 
+  # The Rack app under test.
   def app
-    ##
-    # You can handle all padrino applications using instead:
-    #   Padrino.application
-    CLASS_NAME.tap { |app|  }
+    defined?(@app) ? @app : build_app
+  end
+
+  private
+
+  def build_app
+    config_file = File.read(find_config_file)
+    Rack::Builder.new { instance_eval(config_file) }.to_app
+  end
+
+  def find_config_file
+    if Dir.glob("config.ru").length > 0
+      File.join(Dir.pwd,"config.ru")
+    elsif Dir.pwd != "/"
+      Dir.chdir("..") { find_config_file }
+    else
+      raise "Cannot find config.ru"
+    end
+  end
+end
+
+class Riot::Context
+  # Set the Rack app which is to be tested.
+  #
+  #   context "MyApp" do
+  #     app { [200, {}, "Hello!"] }
+  #     setup { get '/' }
+  #     asserts(:status).equals(200)
+  #   end
+  def app(app=nil, &block)
+    setup { @app = (app || block) }
   end
 end
+
 TEST
 
 RIOT_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(RIOT_CONTROLLER_TEST)
@@ -32,7 +67,7 @@ RIOT_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(RIOT_RAKE)
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |test|
-  test.pattern = '**/*_test.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 TEST
@@ -43,15 +78,16 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
 context "!NAME! Model" do
   context 'can be created' do
     setup do
-      @!DNAME! = !NAME!.new
+      !NAME!.new
     end
 
-    asserts("that record is not nil") { !@!DNAME!.nil? }
+    asserts("that record is not nil") { !topic.nil? }
   end
 end
 TEST
 
 def setup_test
+  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'riot', :group => 'test'
   insert_test_suite_setup RIOT_SETUP
   create_file destination_root("test/test.rake"), RIOT_RAKE
@@ -64,6 +100,6 @@ def generate_controller_test(name)
 end
 
 def generate_model_test(name)
-  riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize)
   create_file destination_root("test/models/#{name.to_s.underscore}_test.rb"), riot_contents, :skip => true
-end
+end

data/lib/padrino-gen/generators/components/tests/rspec.rb

@@ -32,7 +32,7 @@ RSPEC_RAKE = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_RAKE)
 require 'spec/rake/spectask'
 
 Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = Dir['**/*_spec.rb']
+  t.spec_files = Dir['spec/**/*_spec.rb']
   t.spec_opts  = %w(-fs --color)
 end
 TEST
@@ -49,6 +49,7 @@ end
 TEST
 
 def setup_test
+  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'rspec', :require => 'spec', :group => 'test'
   insert_test_suite_setup RSPEC_SETUP, :path => "spec/spec_helper.rb"
   create_file destination_root("spec/spec.rake"), RSPEC_RAKE

data/lib/padrino-gen/generators/components/tests/shoulda.rb

@@ -34,7 +34,7 @@ SHOULDA_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(SHOULDA_RAKE)
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |test|
-  test.pattern = '**/*_test.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 TEST
@@ -53,6 +53,7 @@ end
 TEST
 
 def setup_test
+  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'shoulda', :group => 'test'
   insert_test_suite_setup SHOULDA_SETUP
   create_file destination_root("test/test.rake"), SHOULDA_RAKE

data/lib/padrino-gen/generators/components/tests/testspec.rb

@@ -29,7 +29,7 @@ TESTSPEC_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTSPEC_RAKE)
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |test|
-  test.pattern = '**/*_test.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 TEST
@@ -46,6 +46,7 @@ end
 TEST
 
 def setup_test
+  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'test-spec', :require => 'test/spec', :group => 'test'
   insert_test_suite_setup TESTSPEC_SETUP
   create_file destination_root("test/test.rake"), TESTSPEC_RAKE

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

@@ -20,7 +20,7 @@ module Padrino
       argument :name, :desc => "The name of your padrino controller"
       argument :fields, :desc => "The fields for the controller", :type => :array, :default => []
       class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
-      class_option :app, :desc => "The application destination", :aliases => '-a', :default => "/app", :type => :string
+      class_option :app, :desc => "The application destination path", :aliases => '-a', :default => "/app", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Show help if no argv given
@@ -29,7 +29,7 @@ module Padrino
       def create_controller
         self.destination_root = options[:root]
         if in_app_root?
-          app = options[:app].underscore
+          app = options[:app]
           check_app_existence(app)
           @app_name = fetch_app_name(app)
           @actions  = controller_actions(fields)

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

@@ -19,7 +19,7 @@ module Padrino
 
       argument :name, :desc => "The name of your padrino mailer"
       class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
-      class_option :app, :desc => "The application destination", :aliases => '-a', :default => "/app", :type => :string
+      class_option :app, :desc => "The application destination path", :aliases => '-a', :default => "/app", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Show help if no argv given
@@ -28,16 +28,14 @@ module Padrino
       def create_mailer
         self.destination_root = options[:root]
         if in_app_root?
-          app = options[:app].underscore
+          app = options[:app]
           check_app_existence(app)
           self.behavior = :revoke if options[:destroy]
-          simple_name = name.to_s.gsub(/mailer/i, '')
-          @mailer_basename = "#{simple_name.downcase.underscore}_mailer"
-          @mailer_klass    = "#{simple_name.downcase.camelize}Mailer"
-          template "templates/mailer_initializer.rb.tt", destination_root("lib/mailer.rb"), :skip => true
+          @app_name = fetch_app_name(app)
+          @short_name = name.to_s.gsub(/mailer/i, '').underscore.downcase
+          @mailer_basename = @short_name.underscore
           template "templates/mailer.rb.tt", destination_root(app, "mailers", "#{@mailer_basename}.rb")
-          inject_into_file(destination_root(app, "app.rb"), "    register MailerInitializer\n", :after => "configure do\n")
-          empty_directory destination_root(app, 'views', @mailer_basename)
+          empty_directory destination_root(app, 'views', 'mailers', @mailer_basename)
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
         end

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

@@ -20,6 +20,7 @@ module Padrino
       argument :name, :desc => "The name of your padrino model"
       argument :fields, :desc => "The fields for the model", :type => :array, :default => []
       class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
+      class_option :app, :desc => "The application destination path", :aliases => '-a', :default => "/app", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
       class_option :skip_migration, :aliases => "-s", :default => false, :type => :boolean
 
@@ -29,14 +30,21 @@ module Padrino
       def create_model
         self.destination_root = options[:root]
         if in_app_root?
+          app = options[:app]
+          check_app_existence(app)
           self.behavior = :revoke if options[:destroy]
+          if invalids = invalid_fields(fields)
+            say "Invalid field name:", :red
+            say " #{invalids.join(", ")}"
+            return
+          end
           unless include_component_module_for(:orm)
             say "<= You need an ORM adapter for run this generator. Sorry!"
             raise SystemExit
           end
           include_component_module_for(:test)
           migration_name = "create_#{name.pluralize.underscore}"
-          create_model_file(name, fields)
+          create_model_file(name, :fields => fields, :app => app)
           generate_model_test(name) if test?
           create_model_migration(migration_name, name, fields) unless options[:skip_migration]
         else

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

@@ -1,28 +1,26 @@
-=begin
-
-This file mounts each application within the Padrino project to a specific path.
-You can mount additional applications using any of these below:
-
-  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')
-
-You can map also apps to a specified host:
-
-  Padrino.mount_core("Blog").host("blog.example.org")
-  Padrino.mount("Admin").host("admin.example.org")
-  Padrino.mount("WebSite").host(/.*\.?example.org/)
-  Padrino.mount("Foo").to("/foo").host("bar.example.org")
-
-Note 1: that mounted apps by default should be placed into 'apps/app_name'.
-Note 2: if you use host match remember that it's important respect order.
-
-By default, this file simply mounts the core app which was generated with this project.
-However, the mounted core can be modified as needed:
-
-  Padrino.mount_core(:app_file => "/path/to/file", :app_class => "Blog")
-
-=end
+##
+# This file mounts each app in the Padrino project to a specified sub-uri.
+# You can mount additional applications using any of these commands below:
+#
+#   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')
+#
+# You can also map apps to a specified host:
+#
+#   Padrino.mount_core("Blog").host("blog.example.org")
+#   Padrino.mount("Admin").host("admin.example.org")
+#   Padrino.mount("WebSite").host(/.*\.?example.org/)
+#   Padrino.mount("Foo").to("/foo").host("bar.example.org")
+#
+# Note 1: Mounted apps (by default) should be placed into the project root at '/app_name'.
+# Note 2: If you use the host matching remember to respect the order of the rules.
+#
+# By default, this file mounts the core app which was generated with this project.
+# However, the mounted core can be modified as needed:
+#
+#   Padrino.mount_core(:app_file => "/path/to/file", :app_class => "Blog")
+#
 
 # Mounts the core application for this project
-Padrino.mount_core("<%= @class_name %>")
+Padrino.mount_core("<%= @app_name %>")

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

@@ -1,6 +1,6 @@
 # Defines our constants
-PADRINO_ENV  = ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= "development" unless defined?(PADRINO_ENV)
-PADRINO_ROOT = File.dirname(__FILE__) + '/..' unless defined? PADRINO_ROOT
+PADRINO_ENV  = ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= "development"  unless defined?(PADRINO_ENV)
+PADRINO_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unless defined?(PADRINO_ROOT)
 
 begin
   # Require the preresolved locked set of gems.