padrino-gen 0.11.0 → 0.11.1

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

@@ -78,9 +78,9 @@ module Padrino
             contents = options[:base].dup.gsub(/\s{4}!UP!\n/m,   (direction == 'add' ? forward_text.to_s : back_text.to_s))
             contents.gsub!(/\s{4}!DOWN!\n/m, (direction == 'add' ? back_text.to_s : forward_text.to_s))
             contents = contents.gsub(/!FILENAME!/, filename.underscore).gsub(/!FILECLASS!/, filename.underscore.camelize)
-            current_migration_number = return_last_migration_number
-            contents.gsub!(/!VERSION!/, (current_migration_number + 1).to_s)
-            migration_filename = "#{format("%03d", current_migration_number+1)}_#{filename.underscore}.rb"
+            migration_number = current_migration_number
+            contents.gsub!(/!VERSION!/, migration_number)
+            migration_filename = "#{format("%03d", migration_number)}_#{filename.underscore}.rb"
             create_file(destination_root('db/migrate/', migration_filename), contents, :skip => true)
           end
         end
@@ -95,6 +95,19 @@ module Padrino
           }.max.to_i || 0
         end
 
+        # For migration files
+        # returns the number of the migration that is being created
+        # returna timestamp instead if :migration_format: in .components is "timestamp"
+				#
+        # @api private
+        def current_migration_number
+          if fetch_component_choice(:migration_format).to_s == 'timestamp'
+            Time.now.utc.strftime("%Y%m%d%H%M%S")
+          else
+            return_last_migration_number + 1
+          end.to_s
+        end
+
         # Return true if the migration already exist
         #
         # @param [String] filename
@@ -185,9 +198,9 @@ module Padrino
         def controller_actions(fields)
           field_tuples = fields.map { |value| value.split(":") }
           action_declarations = field_tuples.map do |request, name|
-            "#{request} :#{name} do\n  end\n"
+            "#{request} :#{name} do\n\nend\n"
           end
-          action_declarations.join("\n  ")
+          action_declarations.join("\n").gsub(/^/, " " * 2).gsub(/^\s*$/, "")
         end
       end # Actions
     end # Components

data/lib/padrino-gen/generators/components/mocks/rr.rb

@@ -8,6 +8,6 @@ def setup_mock
     when 'minitest'
       insert_mocking_include "RR::Adapters::MiniTest", :path => "test/test_config.rb"
     else # default include
-      insert_mocking_include "RR::Adapters::RRMethods", :path => "test/test_config.rb"
+      insert_mocking_include "RR::Adapters::TestUnit", :path => "test/test_config.rb"
   end
 end

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

@@ -149,7 +149,7 @@ class !FILECLASS! < ActiveRecord::Migration
 end
 MIGRATION
 
-AR_MODEL_UP_MG = (<<-MIGRATION) unless defined?(AR_MODEL_UP_MG)
+AR_MODEL_UP_MG = (<<-MIGRATION).gsub(/^/,'    ') unless defined?(AR_MODEL_UP_MG)
 create_table :!TABLE! do |t|
   !FIELDS!
   t.timestamps

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

@@ -2,6 +2,8 @@ SHOULDA_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(SHOULDA_SETUP)
 PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 
+require "test/unit"
+
 class Test::Unit::TestCase
   include Rack::Test::Methods
 
@@ -63,9 +65,6 @@ def setup_test
   require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'shoulda', :group => 'test'
   insert_test_suite_setup SHOULDA_SETUP
-  if options[:orm] == "activerecord"
-    inject_into_file destination_root("test/test_config.rb"), "require 'shoulda/active_record'\n\n", :before => /class.*?\n/
-  end
   create_file destination_root("test/test.rake"), SHOULDA_RAKE
 end
 

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

@@ -26,6 +26,9 @@ module Padrino
       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 :namespace, :desc => 'The name space of your padrino project', :aliases => '-n', :default => '',     :type => :string
+      class_option :layout,    :desc => 'The layout for the controller',          :aliases => '-l', :default => '',     :type => :string
+      class_option :parent,    :desc => 'The parent of the controller',           :aliases => '-p', :default => '',     :type => :string
+      class_option :provides,  :desc => 'the formats provided by the controller', :aliases => '-f', :default => '',     :type => :string
 
       # Show help if no argv given
       require_arguments!
@@ -43,6 +46,13 @@ module Padrino
           @app_name     = fetch_app_name(app)
           @actions      = controller_actions(fields)
           @controller   = name.to_s.underscore
+          @layout       = options[:layout] if options[:layout] && !options[:layout].empty?
+          
+          block_opts = []
+          block_opts << ":parent => :#{options[:parent]}" if options[:parent] && !options[:parent].empty?
+          block_opts << ":provides => [#{options[:provides]}]" if options[:provides] && !options[:provides].empty?
+          @block_opts_string = block_opts.join(', ') unless block_opts.empty?
+
           self.behavior = :revoke if options[:destroy]
           template 'templates/controller.rb.tt', destination_root(app, 'controllers', "#{name.to_s.underscore}.rb")
           template 'templates/helper.rb.tt',     destination_root(app, 'helpers', "#{name.to_s.underscore}_helper.rb")

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

@@ -39,9 +39,9 @@ module Padrino
         if options[:list] || plugin_file.nil? # list method ran here
           list_plugins
         else # executing the plugin instructions
+          self.destination_root = options[:root]
           if in_app_root?
             self.behavior = :revoke if options[:destroy]
-            self.destination_root = options[:root]
             execute_runner(:plugin, plugin_file)
           else
             say "You are not at the root of a Padrino application! (config/boot.rb not found)"

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

@@ -26,14 +26,15 @@ module Padrino
 
       argument :name, :desc => 'The name of your padrino project'
 
-      class_option :app ,         :desc => 'The application name',                                  :aliases => '-n', :default => nil,      :type => :string
-      class_option :bundle,       :desc => 'Run bundle install',                                    :aliases => '-b', :default => false,    :type => :boolean
-      class_option :root,         :desc => 'The root destination',                                  :aliases => '-r', :default => '.',      :type => :string
-      class_option :dev,          :desc => 'Use padrino from a git checkout',                                         :default => false,    :type => :boolean
-      class_option :tiny,         :desc => 'Generate tiny app skeleton',                            :aliases => '-i', :default => false,    :type => :boolean
-      class_option :adapter,      :desc => 'SQL adapter for ORM (sqlite, mysql, mysql2, mysql-gem, postgres)', :aliases => '-a', :default => 'sqlite', :type => :string
-      class_option :template,     :desc => 'Generate project from template',                        :aliases => '-p', :default => nil,      :type => :string
-      class_option :gem,          :desc => 'Generate project as a gem',                             :aliases => '-g', :default => false,    :type => :boolean
+      class_option :app ,             :desc => 'The application name',                                             :aliases => '-n', :default => nil,         :type => :string
+      class_option :bundle,           :desc => 'Run bundle install',                                               :aliases => '-b', :default => false,       :type => :boolean
+      class_option :root,             :desc => 'The root destination',                                             :aliases => '-r', :default => '.',         :type => :string
+      class_option :dev,              :desc => 'Use padrino from a git checkout',                                                    :default => false,       :type => :boolean
+      class_option :tiny,             :desc => 'Generate tiny app skeleton',                                       :aliases => '-i', :default => false,       :type => :boolean
+      class_option :adapter,          :desc => 'SQL adapter for ORM (sqlite, mysql, mysql2, mysql-gem, postgres)', :aliases => '-a', :default => 'sqlite',    :type => :string
+      class_option :template,         :desc => 'Generate project from template',                                   :aliases => '-p', :default => nil,         :type => :string
+      class_option :gem,              :desc => 'Generate project as a gem',                                        :aliases => '-g', :default => false,       :type => :boolean
+      class_option :migration_format, :desc => 'Filename format for migrations (number, timestamp)',                                 :default => 'number',    :type => :string
 
       # Definitions for the available customizable components
       component_option :orm,        'database engine',    :aliases => '-d', :choices => [:activerecord, :minirecord, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest, :ohm, :mongomatic, :ripple], :default => :none
@@ -89,6 +90,7 @@ module Padrino
         end
         store_component_config('.components')
         store_component_choice(:namespace, @project_name)
+        store_component_choice(:migration_format, options[:migration_format])
       end
 
       # Bundle all required components using bundler and Gemfile

data/lib/padrino-gen/generators/templates/Rakefile.tt

@@ -1,7 +1,7 @@
 require 'bundler/setup'
 require 'padrino-core/cli/rake'
 
-<%- if options[:orm] -%>
+<%- if options[:orm] && options[:orm] != :none -%>
 PadrinoTasks.use(:database)
 PadrinoTasks.use(<%= options[:orm].to_sym.inspect %>)
 <%- end -%>

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

@@ -1,4 +1,5 @@
-<%= @project_name %>::<%= @app_name %>.controllers <%= ":#{@controller}" if @controller %> do
+<%= @project_name %>::<%= @app_name %>.controllers <%= ":#{@controller}" if @controller %><%= ", #{@block_opts_string}" if @block_opts_string %> do
+  <%= "layout :#{@layout}" if @layout %>
   # get :index, :map => '/foo/bar' do
   #   session[:foo] = 'bar'
   #   render 'index'

data/lib/padrino-gen/generators/templates/gem/lib/libname.tt

@@ -2,5 +2,5 @@ require 'padrino-core'
 
 module <%=name.camelcase%>
   extend Padrino::Module
-  gem! <%=name.inspect%>
+  gem! <%=name.downcase.inspect%>
 end

data/lib/padrino-gen/generators/templates/static/ujs/jquery.js

@@ -8,16 +8,18 @@
 **/
 
 $(function(){
-    $('form[data-remote=true]').on('submit', function(e) {
-      e.preventDefault(); e.stopped = true;
+    $('form').on('submit', function(e) {
       var element = $(this), message = element.data('confirm');
       if (message && !confirm(message)) { return false; }
-      JSAdapter.sendRequest(element, { 
-        verb: element.data('method') || element.attr('method') || 'post', 
-        url: element.attr('action'), 
-        dataType: element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType) || 'script',
-        params: element.serializeArray()
-      });
+      if (element.data('remote') == true) {
+        e.preventDefault(); e.stopped = true;
+        JSAdapter.sendRequest(element, {
+          verb: element.data('method') || element.attr('method') || 'post',
+          url: element.attr('action'),
+          dataType: element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType) || 'script',
+          params: element.serializeArray()
+        });
+      }
     });
 
     /* Confirmation Support
@@ -29,22 +31,22 @@ $(function(){
       if (!confirm(message)) { e.preventDefault(); e.stopped = true; }
     });
 
-    /* 
-     * Link Remote Support 
+    /*
+     * Link Remote Support
      * link_to 'add item', '/create', :remote => true
     **/
 
     $('a[data-remote=true]').on('click', function(e) {
-      var element = $(this); 
+      var element = $(this);
       if (e.stopped) return;
       e.preventDefault(); e.stopped = true;
-      JSAdapter.sendRequest(element, { 
-        verb: element.data('method') || 'get', 
+      JSAdapter.sendRequest(element, {
+        verb: element.data('method') || 'get',
         url: element.attr('href')
       });
     });
 
-    /* 
+    /*
      * Link Method Support
      * link_to 'delete item', '/destroy', :method => :delete
     **/

data/lib/padrino-gen/padrino-tasks/activerecord.rb

@@ -289,48 +289,46 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       end
     end
 
-    if defined?(I18n)
-      desc "Generates .yml files for I18n translations"
-      task :translate => :environment do
-        models = Dir["#{Padrino.root}/{app,}/models/**/*.rb"].map { |m| File.basename(m, ".rb") }
-
-        models.each do |m|
-          # Get the model class
-          klass = m.camelize.constantize
-
-          # Avoid non ActiveRecord models
-          next unless klass.ancestors.include?(ActiveRecord::Base)
-
-          # Init the processing
-          print "Processing #{m.humanize}: "
-          FileUtils.mkdir_p("#{Padrino.root}/app/locale/models/#{m}")
-          langs = Array(I18n.locale) # for now we use only one
-
-          # Create models for it and en locales
-          langs.each do |lang|
-            filename   = "#{Padrino.root}/app/locale/models/#{m}/#{lang}.yml"
-            columns    = klass.columns.map(&:name)
-            # If the lang file already exist we need to check it
-            if File.exist?(filename)
-              locale = File.open(filename).read
-              columns.each do |c|
-                locale += "\n        #{c}: #{klass.human_attribute_name(c)}" unless locale.include?("#{c}:")
-              end
-              print "Lang #{lang.to_s.upcase} already exist ... "; $stdout.flush
-              # Do some ere
-            else
-              locale     = "#{lang}:" + "\n" +
-                           "  models:" + "\n" +
-                           "    #{m}:" + "\n" +
-                           "      name: #{klass.model_name.human}" + "\n" +
-                           "      attributes:" + "\n" +
-                           columns.map { |c| "        #{c}: #{klass.human_attribute_name(c)}" }.join("\n")
-              print "created a new for #{lang.to_s.upcase} Lang ... "; $stdout.flush
+    desc "Generates .yml files for I18n translations"
+    task :translate => :environment do
+      models = Dir["#{Padrino.root}/{app,}/models/**/*.rb"].map { |m| File.basename(m, ".rb") }
+
+      models.each do |m|
+        # Get the model class
+        klass = m.camelize.constantize
+
+        # Avoid non ActiveRecord models
+        next unless klass.ancestors.include?(ActiveRecord::Base)
+
+        # Init the processing
+        print "Processing #{m.humanize}: "
+        FileUtils.mkdir_p("#{Padrino.root}/app/locale/models/#{m}")
+        langs = Array(I18n.locale) # for now we use only one
+
+        # Create models for it and en locales
+        langs.each do |lang|
+          filename   = "#{Padrino.root}/app/locale/models/#{m}/#{lang}.yml"
+          columns    = klass.columns.map(&:name)
+          # If the lang file already exist we need to check it
+          if File.exist?(filename)
+            locale = File.open(filename).read
+            columns.each do |c|
+              locale += "\n        #{c}: #{klass.human_attribute_name(c)}" unless locale.include?("#{c}:")
             end
-            File.open(filename, "w") { |f| f.puts locale }
+            print "Lang #{lang.to_s.upcase} already exist ... "; $stdout.flush
+            # Do some ere
+          else
+            locale     = "#{lang}:" + "\n" +
+                         "  models:" + "\n" +
+                         "    #{m}:" + "\n" +
+                         "      name: #{klass.model_name.human}" + "\n" +
+                         "      attributes:" + "\n" +
+                         columns.map { |c| "        #{c}: #{klass.human_attribute_name(c)}" }.join("\n")
+            print "created a new for #{lang.to_s.upcase} Lang ... "; $stdout.flush
           end
-          puts
+          File.open(filename, "w") { |f| f.puts locale }
         end
+        puts
       end
     end
   end

data/lib/padrino-gen/padrino-tasks/mongomapper.rb

@@ -11,45 +11,43 @@ if defined?(MongoMapper)
       MongoMapper.database.collections.select {|c| c.name !~ /system/ }.each(&:drop)
     end
 
-    if defined?(I18n)
-      desc "Generates .yml files for I18n translations"
-      task :translate => :environment do
-        models = Dir["#{Padrino.root}/{app,}/models/**/*.rb"].map { |m| File.basename(m, ".rb") }
+    desc "Generates .yml files for I18n translations"
+    task :translate => :environment do
+      models = Dir["#{Padrino.root}/{app,}/models/**/*.rb"].map { |m| File.basename(m, ".rb") }
 
-        models.each do |m|
-          # Get the model class
-          klass = m.camelize.constantize
+      models.each do |m|
+        # Get the model class
+        klass = m.camelize.constantize
 
-          # Init the processing
-          print "Processing #{m.humanize}: "
-          FileUtils.mkdir_p("#{Padrino.root}/app/locale/models/#{m}")
-          langs = Array(I18n.locale) # for now we use only one
+        # Init the processing
+        print "Processing #{m.humanize}: "
+        FileUtils.mkdir_p("#{Padrino.root}/app/locale/models/#{m}")
+        langs = Array(I18n.locale) # for now we use only one
 
-          # Create models for it and en locales
-          langs.each do |lang|
-            filename   = "#{Padrino.root}/app/locale/models/#{m}/#{lang}.yml"
-            columns    = klass.keys.values.map(&:name).reject { |name| name =~ /id/i }
-            # If the lang file already exist we need to check it
-            if File.exist?(filename)
-              locale = File.open(filename).read
-              columns.each do |c|
-                locale += "\n        #{c}: #{c.humanize}" unless locale.include?("#{c}:")
-              end
-              print "Lang #{lang.to_s.upcase} already exist ... "; $stdout.flush
-              # Do some ere
-            else
-              locale     = "#{lang}:" + "\n" +
-                           "  models:" + "\n" +
-                           "    #{m}:" + "\n" +
-                           "      name: #{klass.human_name}" + "\n" +
-                           "      attributes:" + "\n" +
-                           columns.map { |c| "        #{c}: #{c.humanize}" }.join("\n")
-              print "created a new for #{lang.to_s.upcase} Lang ... "; $stdout.flush
+        # Create models for it and en locales
+        langs.each do |lang|
+          filename   = "#{Padrino.root}/app/locale/models/#{m}/#{lang}.yml"
+          columns    = klass.keys.values.map(&:name).reject { |name| name =~ /id/i }
+          # If the lang file already exist we need to check it
+          if File.exist?(filename)
+            locale = File.open(filename).read
+            columns.each do |c|
+              locale += "\n        #{c}: #{c.humanize}" unless locale.include?("#{c}:")
             end
-            File.open(filename, "w") { |f| f.puts locale }
+            print "Lang #{lang.to_s.upcase} already exist ... "; $stdout.flush
+            # Do some ere
+          else
+            locale     = "#{lang}:" + "\n" +
+                         "  models:" + "\n" +
+                         "    #{m}:" + "\n" +
+                         "      name: #{klass.human_name}" + "\n" +
+                         "      attributes:" + "\n" +
+                         columns.map { |c| "        #{c}: #{c.humanize}" }.join("\n")
+            print "created a new for #{lang.to_s.upcase} Lang ... "; $stdout.flush
           end
-          puts
+          File.open(filename, "w") { |f| f.puts locale }
         end
+        puts
       end
     end
   end

data/test/test_controller_generator.rb

@@ -46,7 +46,43 @@ describe "ControllerGenerator" do
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
 
-    should 'not fail if we don\'t have test component' do
+    should "generate controller with specified layout" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-l=xyzlayout') }
+      assert_match_in_file(/layout :xyzlayout/m, @controller_path)
+    end
+
+    should "generate controller without specified layout if empty" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-l=') }
+      assert_no_match_in_file(/layout/m, @controller_path)
+    end
+
+    should "generate controller with specified parent" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-p=user') }
+      assert_match_in_file(/SampleProject::App.controllers :demo_items, :parent => :user do/m, @controller_path)
+    end
+
+    should "generate controller without specified parent" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-p=') }
+      assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
+    end
+
+    should "generate controller with specified providers" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-f=:html, :js') }
+      assert_match_in_file(/SampleProject::App.controllers :demo_items, :provides => \[:html, :js\] do/m, @controller_path)
+    end
+
+    should "generate controller without specified providers" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-f=') }
+      assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
+    end
+
+    should "not fail if we don't have test component" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=none') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
@@ -125,8 +161,8 @@ describe "ControllerGenerator" do
     should "generate actions for get:test post:yada" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda') }
       capture_io { generate(:controller, 'demo_items', "get:test", "post:yada","-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/get :test do\n  end\n/m, @controller_path)
-      assert_match_in_file(/post :yada do\n  end\n/m, @controller_path)
+      assert_match_in_file(/get :test do\n\n  end\n/m, @controller_path)
+      assert_match_in_file(/post :yada do\n\n  end\n/m, @controller_path)
     end
   end
 

data/test/test_migration_generator.rb

@@ -45,14 +45,27 @@ describe "MigrationGenerator" do
       assert_match_in_file(/t.remove :email/, migration_file_path)
     end
 
-    should "properly calculate version number" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
-      capture_io { generate(:migration, 'add_email_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:migration, 'add_name_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:migration, 'add_age_to_user', "email:string", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/Sequel\.migration do/m, "#{@apptmp}/sample_project/db/migrate/001_add_email_to_person.rb")
-      assert_match_in_file(/Sequel\.migration do/m, "#{@apptmp}/sample_project/db/migrate/002_add_name_to_person.rb")
-      assert_match_in_file(/Sequel\.migration do/m, "#{@apptmp}/sample_project/db/migrate/003_add_age_to_user.rb")
+    context "the default migration numbering" do
+      should "properly calculate version number" do
+        capture_io { generate(:project, 'sample_project', "--migration_format=number", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+        capture_io { generate(:migration, 'add_email_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
+        capture_io { generate(:migration, 'add_name_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
+        capture_io { generate(:migration, 'add_age_to_user', "email:string", "-r=#{@apptmp}/sample_project") }
+        assert_match_in_file(/Sequel\.migration do/m, "#{@apptmp}/sample_project/db/migrate/001_add_email_to_person.rb")
+        assert_match_in_file(/Sequel\.migration do/m, "#{@apptmp}/sample_project/db/migrate/002_add_name_to_person.rb")
+        assert_match_in_file(/Sequel\.migration do/m, "#{@apptmp}/sample_project/db/migrate/003_add_age_to_user.rb")
+      end
+    end
+
+    context "the timestamped migration numbering" do
+      should "properly calculate version number" do
+        capture_io { generate(:project, 'sample_project', "--migration_format=timestamp", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+
+        time = stop_time_for_test.utc.strftime("%Y%m%d%H%M%S")
+
+        capture_io { generate(:migration, 'add_gender_to_person', "gender:string", "-r=#{@apptmp}/sample_project") }
+        assert_match_in_file(/Sequel\.migration do/m, "#{@apptmp}/sample_project/db/migrate/#{time}_add_gender_to_person.rb")
+      end
     end
   end
 

data/test/test_model_generator.rb

@@ -82,11 +82,11 @@ describe "ModelGenerator" do
       capture_io { generate(:model, 'person', "name", "age:integer", "email", "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb"
       assert_match_in_file(/class CreatePeople < ActiveRecord::Migration/m, migration_file_path)
-      assert_match_in_file(/create_table :people/m, migration_file_path)
-      assert_match_in_file(/t.string :name/m,   migration_file_path)
-      assert_match_in_file(/t.integer :age/m,   migration_file_path)
-      assert_match_in_file(/t.string :email/m,  migration_file_path)
-      assert_match_in_file(/drop_table :people/m, migration_file_path)
+      assert_match_in_file(/    create_table :people/m, migration_file_path)
+      assert_match_in_file(/      t.string :name/m,   migration_file_path)
+      assert_match_in_file(/      t.integer :age/m,   migration_file_path)
+      assert_match_in_file(/      t.string :email/m,  migration_file_path)
+      assert_match_in_file(/    drop_table :people/m, migration_file_path)
     end
   end
 
@@ -116,8 +116,8 @@ describe "ModelGenerator" do
       capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_users.rb"
       assert_match_in_file(/class CreateUsers < ActiveRecord::Migration/m, migration_file_path)
-      assert_match_in_file(/create_table :users/m, migration_file_path)
-      assert_match_in_file(/drop_table :users/m, migration_file_path)
+      assert_match_in_file(/    create_table :users/m, migration_file_path)
+      assert_match_in_file(/    drop_table :users/m, migration_file_path)
     end
 
     should "generate migration file with given fields" do
@@ -126,11 +126,11 @@ describe "ModelGenerator" do
       capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb"
       assert_match_in_file(/class CreatePeople < ActiveRecord::Migration/m, migration_file_path)
-      assert_match_in_file(/create_table :people/m, migration_file_path)
-      assert_match_in_file(/t.string :name/m,   migration_file_path)
-      assert_match_in_file(/t.integer :age/m,   migration_file_path)
-      assert_match_in_file(/t.string :email/m,  migration_file_path)
-      assert_match_in_file(/drop_table :people/m, migration_file_path)
+      assert_match_in_file(/    create_table :people/m, migration_file_path)
+      assert_match_in_file(/      t.string :name/m,   migration_file_path)
+      assert_match_in_file(/      t.integer :age/m,   migration_file_path)
+      assert_match_in_file(/      t.string :email/m,  migration_file_path)
+      assert_match_in_file(/    drop_table :people/m, migration_file_path)
     end
   end
 

data/test/test_plugin_generator.rb

@@ -10,6 +10,15 @@ describe "PluginGenerator" do
     `rm -rf #{@apptmp}`
   end
 
+  context "the plugin generator" do
+    should "respect --root option" do
+      path = File.expand_path('../fixtures/plugin_template.rb', __FILE__)
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      out, err = capture_io { generate(:plugin, path, "--root=#{@apptmp}/sample_project") }
+      refute_match /You are not at the root/, out
+    end
+  end
+
   context "the plugin destroy option" do
     should "remove the plugin instance" do
       path = File.expand_path('../fixtures/plugin_template.rb', __FILE__)

data/test/test_project_generator.rb

@@ -62,6 +62,16 @@ describe "ProjectGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/public/favicon.ico")
     end
 
+    should "add database's tasks to Rakefile if an ORM is defined" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--app=base_app', '--orm=activerecord') }
+      assert_match_in_file('PadrinoTasks.use(:database)',"#{@apptmp}/sample_project/Rakefile")
+    end
+
+    should "avoid add database's tasks on Rakefile if no ORM is specified" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--app=base_app') }
+      assert_no_match_in_file('PadrinoTasks.use(:database)',"#{@apptmp}/sample_project/Rakefile")
+    end
+
     should "generate tiny skeleton" do
       capture_io { generate(:project,'sample_project', '--tiny',"--root=#{@apptmp}") }
       assert_file_exists("#{@apptmp}/sample_project")
@@ -166,7 +176,7 @@ describe "ProjectGenerator" do
       out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--mock=rr', '--test=bacon', '--script=none') }
       assert_match(/applying.*?rr.*?mock/, out)
       assert_match_in_file(/gem 'rr'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/include RR::Adapters::RRMethods/m, "#{@apptmp}/sample_project/test/test_config.rb")
+      assert_match_in_file(/include RR::Adapters::TestUnit/m, "#{@apptmp}/sample_project/test/test_config.rb")
     end
 
     should "properly generate for rr and rspec" do

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
+  prerelease: 
 platform: ruby
 authors:
 - Padrino Team
@@ -11,25 +12,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -37,6 +41,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -160,27 +165,31 @@ files:
 - lib/padrino-gen/generators/templates/static/ujs/right.js
 homepage: http://www.padrinorb.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1271294022320842473
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-gen
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Generators for easily creating and building padrino applications
 test_files:
 - test/fixtures/admin_template.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 7a6a1654d8ee352072e435cb364d88153983be16
-  data.tar.gz: 42ca8996ee141fa779627859b7d95e454d5ef3b9
-SHA512:
-  metadata.gz: 1ac55f683cba6782dc31abcb5e8732f45ced510600415b0ee2d0681b32cdfcd703526ff2136651bb2d70192db37dd47a02ebfa3624a956766b33fbcae27e2ff3
-  data.tar.gz: 95d1e97c9a31b4d25290305f6fc45ca8ca14afe03e20949a14eecd203100fbdd1d3952238fea09a71d9e28f3637ed59641f0cda8e508c97d2fbecb7699fc716a