padrino-gen 0.10.5 → 0.10.6.a

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

@@ -306,7 +306,7 @@ module Padrino
       # @api public
       def initializer(name, data=nil)
         @_init_name, @_init_data = name, data
-        register = data.present? ? "  register #{name.to_s.camelize}Initializer\n" : "  register #{name}\n"
+        register = data.present? ? "  register #{name.to_s.underscore.camelize}Initializer\n" : "  register #{name}\n"
         inject_into_file destination_root("/app/app.rb"), register, :after => "Padrino::Application\n"
         template "templates/initializer.rb.tt", destination_root("/lib/#{name}_init.rb") if data.present?
       end

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

@@ -31,8 +31,8 @@ module Padrino
             field_tuples.map! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] } # fix datetime
             column_declarations = field_tuples.map(&options[:column_format]).join("\n      ")
             contents = options[:base].dup.gsub(/\s{4}!UP!\n/m, options[:up]).gsub(/!DOWN!\n/m, options[:down])
-            contents = contents.gsub(/!NAME!/, model_name.camelize).gsub(/!TABLE!/, model_name.underscore)
-            contents = contents.gsub(/!FILENAME!/, filename.underscore).gsub(/!FILECLASS!/, filename.camelize)
+            contents = contents.gsub(/!NAME!/, model_name.underscore.camelize).gsub(/!TABLE!/, model_name.underscore)
+            contents = contents.gsub(/!FILENAME!/, filename.underscore).gsub(/!FILECLASS!/, filename.underscore.camelize)
             current_migration_number = return_last_migration_number
             contents = contents.gsub(/!FIELDS!/, column_declarations).gsub(/!VERSION!/, (current_migration_number + 1).to_s)
             migration_filename = "#{format("%03d", current_migration_number+1)}_#{filename.underscore}.rb"
@@ -67,7 +67,7 @@ module Padrino
           else
             return if migration_exist?(filename)
             change_format = options[:change_format]
-            migration_scan = filename.camelize.scan(/(Add|Remove)(?:.*?)(?:To|From)(.*?)$/).flatten
+            migration_scan = filename.underscore.camelize.scan(/(Add|Remove)(?:.*?)(?:To|From)(.*?)$/).flatten
             direction, table_name = migration_scan[0].downcase, migration_scan[1].downcase.pluralize if migration_scan.any?
             tuples = direction ? columns.map { |value| value.split(":") } : []
             tuples.map! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] } # fix datetime
@@ -77,7 +77,7 @@ module Padrino
             back_text    = change_format.gsub(/!TABLE!/, table_name).gsub(/!COLUMNS!/, remove_columns) if tuples.any?
             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.camelize)
+            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"

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

@@ -29,8 +29,15 @@ ActiveRecord::Base.configurations[:test] = {
 # Setup our logger
 ActiveRecord::Base.logger = logger
 
+# Raise exception on mass assignment protection for Active Record models
+ActiveRecord::Base.mass_assignment_sanitizer = :strict
+
+# Log the query plan for queries taking more than this (works
+# with SQLite, MySQL, and PostgreSQL)
+ActiveRecord::Base.auto_explain_threshold_in_seconds = 0.5
+
 # Include Active Record class name as root for JSON serialized output.
-ActiveRecord::Base.include_root_in_json = true
+ActiveRecord::Base.include_root_in_json = false
 
 # Store the full class name (including module namespace) in STI type column.
 ActiveRecord::Base.store_full_sti_class = true
@@ -46,7 +53,7 @@ ActiveSupport.escape_html_entities_in_json = false
 ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Padrino.env])
 AR
 
-MYSQL = (<<-MYSQL)
+MYSQL = (<<-MYSQL) unless defined?(MYSQL)
   :adapter   => 'mysql',
   :encoding  => 'utf8',
   :reconnect => true,
@@ -58,7 +65,7 @@ MYSQL = (<<-MYSQL)
   :socket    => '/tmp/mysql.sock'
 MYSQL
 
-MYSQL2 = (<<-MYSQL2)
+MYSQL2 = (<<-MYSQL2) unless defined?(MYSQL2)
   :adapter   => 'mysql2',
   :encoding  => 'utf8',
   :reconnect => true,
@@ -70,7 +77,7 @@ MYSQL2 = (<<-MYSQL2)
   :socket    => '/tmp/mysql.sock'
 MYSQL2
 
-POSTGRES = (<<-POSTGRES)
+POSTGRES = (<<-POSTGRES) unless defined?(POSTGRES)
   :adapter   => 'postgresql',
   :database  => !DB_NAME!,
   :username  => 'root',
@@ -79,7 +86,7 @@ POSTGRES = (<<-POSTGRES)
   :port      => 5432
 POSTGRES
 
-SQLITE = (<<-SQLITE)
+SQLITE = (<<-SQLITE) unless defined?(SQLITE)
   :adapter => 'sqlite3',
   :database => !DB_NAME!
 SQLITE
@@ -90,24 +97,24 @@ def setup_orm
   db = @app_name.underscore
   case options[:adapter]
   when 'mysql'
-    ar.gsub! /!DB_DEVELOPMENT!/, MYSQL.gsub(/!DB_NAME!/,"\"#{db}_development\"")
-    ar.gsub! /!DB_PRODUCTION!/, MYSQL.gsub(/!DB_NAME!/,"\"#{db}_production\"")
-    ar.gsub! /!DB_TEST!/, MYSQL.gsub(/!DB_NAME!/,"\"#{db}_test\"")
+    ar.gsub! /!DB_DEVELOPMENT!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_development'")
+    ar.gsub! /!DB_PRODUCTION!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_production'")
+    ar.gsub! /!DB_TEST!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_test'")
     require_dependencies 'mysql'
   when 'mysql2'
-    ar.gsub! /!DB_DEVELOPMENT!/, MYSQL2.gsub(/!DB_NAME!/,"\"#{db}_development\"")
-    ar.gsub! /!DB_PRODUCTION!/, MYSQL2.gsub(/!DB_NAME!/,"\"#{db}_production\"")
-    ar.gsub! /!DB_TEST!/, MYSQL2.gsub(/!DB_NAME!/,"\"#{db}_test\"")
+    ar.gsub! /!DB_DEVELOPMENT!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_development'")
+    ar.gsub! /!DB_PRODUCTION!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_production'")
+    ar.gsub! /!DB_TEST!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_test'")
     require_dependencies 'mysql2'
   when 'postgres'
-    ar.gsub! /!DB_DEVELOPMENT!/, POSTGRES.gsub(/!DB_NAME!/,"\"#{db}_development\"")
-    ar.gsub! /!DB_PRODUCTION!/, POSTGRES.gsub(/!DB_NAME!/,"\"#{db}_production\"")
-    ar.gsub! /!DB_TEST!/, POSTGRES.gsub(/!DB_NAME!/,"\"#{db}_test\"")
-    require_dependencies 'pg', :require => 'postgres'
+    ar.gsub! /!DB_DEVELOPMENT!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_development'")
+    ar.gsub! /!DB_PRODUCTION!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_production'")
+    ar.gsub! /!DB_TEST!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_test'")
+    require_dependencies 'pg'
   else
-    ar.gsub! /!DB_DEVELOPMENT!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', \"#{db}_development.db\")")
-    ar.gsub! /!DB_PRODUCTION!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', \"#{db}_production.db\")")
-    ar.gsub! /!DB_TEST!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', \"#{db}_test.db\")")
+    ar.gsub! /!DB_DEVELOPMENT!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_development.db')")
+    ar.gsub! /!DB_PRODUCTION!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_production.db')")
+    ar.gsub! /!DB_TEST!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_test.db')")
     require_dependencies 'sqlite3'
   end
   require_dependencies 'activerecord', :require => 'active_record'
@@ -123,7 +130,7 @@ MODEL
 # 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 = AR_MODEL.gsub(/!NAME!/, name.to_s.camelize)
+  model_contents = AR_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
   create_file(model_path, model_contents,:skip => true)
 end
 

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

@@ -41,7 +41,7 @@ def create_model_file(name, options={})
   model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
   field_tuples = options[:fields].map { |value| value.split(":") }
   column_declarations = field_tuples.map { |field, kind| "property :#{field}" }.join("\n  ")
-  model_contents = CR_MODEL.gsub(/!NAME!/, name.to_s.camelize)
+  model_contents = CR_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
   model_contents.gsub!(/!FIELDS!/, column_declarations)
   create_file(model_path, model_contents)
 end

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

@@ -66,10 +66,10 @@ MODEL
 # 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 = DM_MODEL.gsub(/!NAME!/, name.to_s.camelize)
+  model_contents = DM_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
   field_tuples = options[:fields].map { |value| value.split(":") }
   field_tuples.map! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] } # fix datetime
-  column_declarations = field_tuples.map { |field, kind|"property :#{field}, #{kind.camelize}" }.join("\n  ")
+  column_declarations = field_tuples.map { |field, kind|"property :#{field}, #{kind.underscore.camelize}" }.join("\n  ")
   model_contents.gsub!(/!FIELDS!/, column_declarations)
   create_file(model_path, model_contents)
 end

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

@@ -0,0 +1,131 @@
+MR = (<<-MR) unless defined?(MR)
+ActiveRecord::Base.configurations[:development] = {
+!DB_DEVELOPMENT!
+}
+
+ActiveRecord::Base.configurations[:production] = {
+!DB_PRODUCTION!
+}
+
+ActiveRecord::Base.configurations[:test] = {
+!DB_TEST!
+}
+
+# Setup our logger
+ActiveRecord::Base.logger = logger
+
+# Raise exception on mass assignment protection for Active Record models
+ActiveRecord::Base.mass_assignment_sanitizer = :strict
+
+# Log the query plan for queries taking more than this (works
+# with SQLite, MySQL, and PostgreSQL)
+ActiveRecord::Base.auto_explain_threshold_in_seconds = 0.5
+
+# Doesn't include Active Record class name as root for JSON serialized output.
+ActiveRecord::Base.include_root_in_json = false
+
+# Store the full class name (including module namespace) in STI type column.
+ActiveRecord::Base.store_full_sti_class = true
+
+# Use ISO 8601 format for JSON serialized times and dates.
+ActiveSupport.use_standard_json_time_format = true
+
+# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
+# if you're including raw json in an HTML page.
+ActiveSupport.escape_html_entities_in_json = false
+
+# Now we can estabilish connection with our db
+ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Padrino.env])
+MR
+
+MYSQL = (<<-MYSQL) unless defined?(MYSQL)
+  :adapter   => 'mysql',
+  :encoding  => 'utf8',
+  :reconnect => true,
+  :database  => !DB_NAME!,
+  :pool      => 5,
+  :username  => 'root',
+  :password  => '',
+  :host      => 'localhost',
+  :socket    => '/tmp/mysql.sock'
+MYSQL
+
+MYSQL2 = (<<-MYSQL2) unless defined?(MYSQL2)
+  :adapter   => 'mysql2',
+  :encoding  => 'utf8',
+  :reconnect => true,
+  :database  => !DB_NAME!,
+  :pool      => 5,
+  :username  => 'root',
+  :password  => '',
+  :host      => 'localhost',
+  :socket    => '/tmp/mysql.sock'
+MYSQL2
+
+POSTGRES = (<<-POSTGRES) unless defined?(POSTGRES)
+  :adapter   => 'postgresql',
+  :database  => !DB_NAME!,
+  :username  => 'root',
+  :password  => '',
+  :host      => 'localhost',
+  :port      => 5432
+POSTGRES
+
+SQLITE = (<<-SQLITE) unless defined?(SQLITE)
+  :adapter => 'sqlite3',
+  :database => !DB_NAME!
+SQLITE
+def setup_orm
+  ar = MR
+  db = @app_name.underscore
+  case options[:adapter]
+  when 'mysql'
+    ar.gsub! /!DB_DEVELOPMENT!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_development'")
+    ar.gsub! /!DB_PRODUCTION!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_production'")
+    ar.gsub! /!DB_TEST!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_test'")
+    require_dependencies 'mysql'
+  when 'mysql2'
+    ar.gsub! /!DB_DEVELOPMENT!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_development'")
+    ar.gsub! /!DB_PRODUCTION!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_production'")
+    ar.gsub! /!DB_TEST!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_test'")
+    require_dependencies 'mysql2'
+  when 'postgres'
+    ar.gsub! /!DB_DEVELOPMENT!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_development'")
+    ar.gsub! /!DB_PRODUCTION!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_production'")
+    ar.gsub! /!DB_TEST!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_test'")
+    require_dependencies 'pg'
+  else
+    ar.gsub! /!DB_DEVELOPMENT!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_development.db')")
+    ar.gsub! /!DB_PRODUCTION!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_production.db')")
+    ar.gsub! /!DB_TEST!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_test.db')")
+    require_dependencies 'sqlite3'
+  end
+  require_dependencies 'mini_record'
+  create_file('config/database.rb', ar)
+  insert_hook('ActiveRecord::Base.descendants.each(&:auto_upgrade!)', :after_load)
+end
+
+MR_MODEL = (<<-MODEL) unless defined?(MR_MODEL)
+class !NAME! < ActiveRecord::Base
+  # Fields
+  !FIELDS!
+end
+MODEL
+
+# 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")
+  field_tuples = options[:fields].map { |value| value.split(":") }
+  column_declarations = field_tuples.map { |field, kind| "field :#{field}, :as => :#{kind}" }.join("\n  ")
+  model_contents = MR_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
+  model_contents.gsub!(/!FIELDS!/, column_declarations)
+  create_file(model_path, model_contents)
+end
+
+def create_model_migration(migration_name, name, columns)
+  # NO MIGRATION NEEDED
+end
+
+def create_migration_file(migration_name, name, columns)
+  # NO MIGRATION NEEDED
+end

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

@@ -53,8 +53,8 @@ MODEL
 def create_model_file(name, options={})
   model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
   field_tuples = options[:fields].map { |value| value.split(":") }
-  column_declarations = field_tuples.map { |field, kind| "field :#{field}, :type => #{kind.camelize}" }.join("\n  ")
-  model_contents = MONGOID_MODEL.gsub(/!NAME!/, name.to_s.camelize)
+  column_declarations = field_tuples.map { |field, kind| "field :#{field}, :type => #{kind.underscore.camelize}" }.join("\n  ")
+  model_contents = MONGOID_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
   model_contents.gsub!(/!FIELDS!/, column_declarations)
   create_file(model_path, model_contents)
 end

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

@@ -29,8 +29,8 @@ MODEL
 def create_model_file(name, options={})
   model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
   field_tuples = options[:fields].map { |value| value.split(":") }
-  column_declarations = field_tuples.map { |field, kind| "key :#{field}, #{kind.camelize}" }.join("\n  ")
-  model_contents = MM_MODEL.gsub(/!NAME!/, name.to_s.camelize)
+  column_declarations = field_tuples.map { |field, kind| "key :#{field}, #{kind.underscore.camelize}" }.join("\n  ")
+  model_contents = MM_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
   model_contents.gsub!(/!FIELDS!/, column_declarations)
   create_file(model_path, model_contents)
 end

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

@@ -69,7 +69,7 @@ def create_model_file(name, options={})
     column_declarations = field_tuples.map { |field, kind| "be_present self['#{field}'], '#{field} cannot be blank'" }.join("\n      ")
     # Really ugly oneliner
     integers = field_tuples.select { |col, type| type =~ /[Ii]nteger/ }.map { |field, kind| "be_a_number self['#{field}'], '#{field} must be a number'" }.join("\n ")
-    model_contents = MONGOMATIC_MODEL.gsub(/!NAME!/, name.to_s.camelize)
+    model_contents = MONGOMATIC_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
     model_contents.gsub!(/!FIELDS!/, column_declarations)
     model_contents.gsub!(/!INTEGERS!/, integers)
     create_file(model_path, model_contents)

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

@@ -56,8 +56,8 @@ MODEL
 def create_model_file(name, options={})
     model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
     field_tuples = options[:fields].map { |value| value.split(":") }
-    column_declarations = field_tuples.map { |field, kind| "attribute :#{field}, #{kind.camelize}" }.join("\n  ")
-    model_contents = OHM_MODEL.gsub(/!NAME!/, name.to_s.camelize)
+    column_declarations = field_tuples.map { |field, kind| "attribute :#{field}, #{kind.underscore.camelize}" }.join("\n  ")
+    model_contents = OHM_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
     model_contents.gsub!(/!FIELDS!/, column_declarations)
     create_file(model_path, model_contents)
 end

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

@@ -60,8 +60,8 @@ MODEL
 def create_model_file(name, options={})
   model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
   field_tuples = options[:fields].map { |value| value.split(":") }
-  column_declarations = field_tuples.map { |field, kind| "property :#{field}, #{kind.camelize}" }.join("\n  ")
-  model_contents = RIPPLE_MODEL.gsub(/!NAME!/, name.to_s.camelize)
+  column_declarations = field_tuples.map { |field, kind| "property :#{field}, #{kind.underscore.camelize}" }.join("\n  ")
+  model_contents = RIPPLE_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
   model_contents.gsub!(/!FIELDS!/, column_declarations)
   create_file(model_path, model_contents)
 end

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

@@ -42,17 +42,17 @@ MODEL
 # 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.camelize)
+  model_contents = SQ_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
   create_file(model_path, model_contents)
 end
 
 SQ_MIGRATION = (<<-MIGRATION) unless defined?(SQ_MIGRATION)
-class !FILECLASS! < Sequel::Migration
-  def up
+Sequel.migration do
+  up do
     !UP!
   end
 
-  def down
+  down do
     !DOWN!
   end
 end
@@ -71,7 +71,7 @@ MIGRATION
 
 def create_model_migration(migration_name, name, columns)
   output_model_migration(migration_name, name, columns,
-         :column_format => Proc.new { |field, kind| "#{kind.camelize} :#{field}" },
+         :column_format => Proc.new { |field, kind| "#{kind.underscore.camelize} :#{field}" },
          :base => SQ_MIGRATION, :up => SQ_MODEL_UP_MG, :down => SQ_MODEL_DOWN_MG)
 end
 
@@ -84,7 +84,7 @@ MIGRATION
 def create_migration_file(migration_name, name, columns)
   output_migration_file(migration_name, name, columns,
     :base => SQ_MIGRATION, :change_format => SQ_CHANGE_MG,
-    :add => Proc.new { |field, kind| "add_column :#{field}, #{kind.camelize}"  },
+    :add => Proc.new { |field, kind| "add_column :#{field}, #{kind.underscore.camelize}"  },
     :remove => Proc.new { |field, kind| "drop_column :#{field}" }
   )
 end

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

@@ -62,13 +62,13 @@ end
 
 # Generates a controller test given the controllers name
 def generate_controller_test(name)
-  bacon_contents       = BACON_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+  bacon_contents       = BACON_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
   create_file destination_root(controller_test_path), bacon_contents, :skip => true
 end
 
 def generate_model_test(name)
-  bacon_contents  = BACON_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  bacon_contents  = BACON_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
   path = options[:app] == '.' ? '/..' : '/../..'
   bacon_contents.gsub!(/!PATH!/,path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")

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

@@ -64,13 +64,13 @@ end
 
 # Generates a controller test given the controllers name
 def generate_controller_test(name)
-  minitest_contents = MINITEST_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+  minitest_contents = MINITEST_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
   create_file destination_root(controller_test_path), minitest_contents, :skip => true
 end
 
 def generate_model_test(name)
-  minitest_contents = MINITEST_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  minitest_contents = MINITEST_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
   path = options[:app] == '.' ? '/..' : '/../..'
   minitest_contents.gsub!(/!PATH!/,path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")

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

@@ -88,13 +88,13 @@ end
 
 # Generates a controller test given the controllers name
 def generate_controller_test(name)
-  riot_contents = RIOT_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+  riot_contents = RIOT_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
   create_file destination_root(controller_test_path), riot_contents, :skip => true
 end
 
 def generate_model_test(name)
-  riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize)
+  riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   path = options[:app] == '.' ? '/..' : '/../..'
   riot_contents.gsub!(/!PATH!/,path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")

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

@@ -64,13 +64,13 @@ end
 
 # Generates a controller test given the controllers name
 def generate_controller_test(name)
-  rspec_contents = RSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+  rspec_contents = RSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_spec_path = File.join('spec',options[:app],'controllers',"#{name.to_s.underscore}_controller_spec.rb")
   create_file destination_root(controller_spec_path), rspec_contents, :skip => true
 end
 
 def generate_model_test(name)
-  rspec_contents = RSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  rspec_contents = RSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
   model_spec_path = File.join('spec',options[:app],'models',"#{name.to_s.underscore}_spec.rb")
   create_file destination_root(model_spec_path), rspec_contents, :skip => true
 end

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

@@ -71,13 +71,13 @@ end
 
 # Generates a controller test given the controllers name
 def generate_controller_test(name)
-  shoulda_contents = SHOULDA_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+  shoulda_contents = SHOULDA_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
   create_file destination_root(controller_test_path), shoulda_contents, :skip => true
 end
 
 def generate_model_test(name)
-  shoulda_contents = SHOULDA_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  shoulda_contents = SHOULDA_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
   path = options[:app] == '.' ? '/..' : '/../..'
   shoulda_contents.gsub!(/!PATH!/,path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")

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

@@ -61,13 +61,13 @@ end
 
 # Generates a controller test given the controllers name
 def generate_controller_test(name)
-  testspec_contents = TESTSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+  testspec_contents = TESTSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
   create_file destination_root(controller_test_path), testspec_contents, :skip => true
 end
 
 def generate_model_test(name)
-  tests_contents = TESTSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  tests_contents = TESTSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
   path = options[:app] == '.' ? '/..' : '/../..'
   tests_contents.gsub!(/!PATH!/,path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")

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

@@ -40,9 +40,9 @@ module Padrino
           self.behavior = :revoke if options[:destroy]
           @app_name = fetch_app_name(app)
           @actions = actions.map{|a| a.to_sym}
-          @short_name = name.to_s.gsub(/mailer/i, '').underscore.downcase
+          @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")
+          template "templates/mailer.rb.tt", destination_root(app, 'mailers', "#{@mailer_basename}.rb")
           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)"

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

@@ -1,5 +1,5 @@
 # Defines our constants
-PADRINO_ENV  = ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= "development"  unless defined?(PADRINO_ENV)
+PADRINO_ENV  = ENV['PADRINO_ENV'] ||= ENV['RACK_ENV'] ||= 'development'  unless defined?(PADRINO_ENV)
 PADRINO_ROOT = File.expand_path('../..', __FILE__) unless defined?(PADRINO_ROOT)
 
 # Load our dependencies
@@ -11,7 +11,7 @@ Bundler.require(:default, PADRINO_ENV)
 # Enable devel logging
 #
 # Padrino::Logger::Config[:development] = { :log_level => :devel, :stream => :stdout }
-# Padrino::Logger.log_static = true
+# Padrino::Logger::Config[:development][:log_static] = true
 #
 
 ##

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

@@ -35,7 +35,7 @@ module Padrino
       class_option :template,     :desc => "Generate project from template",                        :aliases => '-p', :default => nil,      :type => :string
 
       # Definitions for the available customizable components
-      component_option :orm,        "database engine",    :aliases => '-d', :choices => [:activerecord, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest, :ohm, :mongomatic, :ripple], :default => :none
+      component_option :orm,        "database engine",    :aliases => '-d', :choices => [:activerecord, :mini_record, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest, :ohm, :mongomatic, :ripple], :default => :none
       component_option :test,       "testing framework",  :aliases => '-t', :choices => [:rspec, :shoulda, :cucumber, :bacon, :testspec, :riot, :minitest], :default => :none
       component_option :mock,       "mocking library",    :aliases => '-m', :choices => [:mocha, :rr], :default => :none
       component_option :script,     "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs, :mootools, :extcore, :dojo], :default => :none

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

@@ -93,16 +93,11 @@ module Padrino
       #   git :commit, "hello world"
       #
       # @api public
-      def git(action, arguments=nil)
+      def git(*args)
         FileUtils.cd(destination_root) do
-          require 'grit' unless defined?(::Grit)
-          if action.to_s == 'init'
-            ::Grit::Repo.init(arguments || destination_root)
-            say "Git repo has been initialized", :green
-          else
-            @_git ||= ::Grit::Repo.new(destination_root)
-            @_git.method(action).call(arguments)
-          end
+          cmd = "git %s" % args.join(' ')
+          say cmd, :green
+          system cmd
         end
       end
 

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

@@ -1,4 +1,4 @@
-module <%= "#{@_init_name.to_s.camelize}Initializer" %>
+module <%= "#{@_init_name.to_s.underscore.camelize}Initializer" %>
   def self.registered(app)
 <%= @_init_data %>
   end

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

@@ -304,6 +304,9 @@ if defined?(ActiveRecord)
           # 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}")

data/lib/padrino-gen.rb

@@ -1,25 +1,9 @@
 require 'padrino-core/support_lite'
 require 'padrino-core/tasks'
-require 'padrino-core/command'
+require 'padrino-gen/command'
 require 'active_support/ordered_hash'
 
 module Padrino
-  ##
-  # This method return the correct location of padrino-gen bin or
-  # exec it using Kernel#system with the given args
-  #
-  # @param [Array<String>] args
-  #   Splat of arguments to pass to padrino-gen
-  #
-  # @example
-  #   Padrino.bin_gen(:app, name.to_s, "-r=#{destination_root}")
-  #
-  # @api semipublic
-  def self.bin_gen(*args)
-    @_padrino_gen_bin ||= [Padrino.ruby_command, File.expand_path("../../bin/padrino-gen", __FILE__)]
-    args.empty? ? @_padrino_gen_bin : system(args.unshift(@_padrino_gen_bin).join(" "))
-  end
-
   ##
   # This module it's used for register generators
   #

data/padrino-gen.gemspec

@@ -24,5 +24,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency("padrino-core", Padrino.version)
   s.add_dependency("bundler", "~> 1.0")
-  s.add_dependency("grit", "~> 2.4.1")
 end

data/test/fixtures/git_template.rb

@@ -1,4 +1,4 @@
 project :test => :rspec, :orm => :activerecord
 git :init
 git :add, "."
-git :commit, "hello"
+git :commit, "-m 'hello'"

data/test/test_migration_generator.rb

@@ -50,9 +50,9 @@ describe "MigrationGenerator" do
       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(/class AddEmailToPerson/m, "#{@apptmp}/sample_project/db/migrate/001_add_email_to_person.rb")
-      assert_match_in_file(/class AddNameToPerson/m, "#{@apptmp}/sample_project/db/migrate/002_add_name_to_person.rb")
-      assert_match_in_file(/class AddAgeToUser/m, "#{@apptmp}/sample_project/db/migrate/003_add_age_to_user.rb")
+      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
 
@@ -141,9 +141,9 @@ describe "MigrationGenerator" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb"
-      assert_match_in_file(/class ModifyUserFields/m, migration_file_path)
-      assert_match_in_file(/def\sup\s+end/m, migration_file_path)
-      assert_match_in_file(/def\sdown\s+end/m, migration_file_path)
+      assert_match_in_file(/Sequel\.migration/m, migration_file_path)
+      assert_match_in_file(/up do\s+end/m, migration_file_path)
+      assert_match_in_file(/down do\s+end/m, migration_file_path)
     end
 
     should "generate migration for adding columns" do
@@ -151,7 +151,7 @@ describe "MigrationGenerator" do
       migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb"
-      assert_match_in_file(/class AddEmailToUsers/m, migration_file_path)
+      assert_match_in_file(/Sequel\.migration/m, migration_file_path)
       assert_match_in_file(/alter_table :users.*?add_column :email, String/m, migration_file_path)
       assert_match_in_file(/add_column :age, Integer/m, migration_file_path)
       assert_match_in_file(/alter_table :users.*?drop_column :email/m, migration_file_path)
@@ -163,7 +163,7 @@ describe "MigrationGenerator" do
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb"
-      assert_match_in_file(/class RemoveEmailFromUsers/m, migration_file_path)
+      assert_match_in_file(/Sequel\.migration/m, migration_file_path)
       assert_match_in_file(/alter_table :users.*?drop_column :email/m, migration_file_path)
       assert_match_in_file(/drop_column :age/m, migration_file_path)
       assert_match_in_file(/alter_table :users.*?add_column :email, String/m, migration_file_path)

data/test/test_model_generator.rb

@@ -117,6 +117,33 @@ describe "ModelGenerator" do
     end
   end
 
+  # MINIRECORD
+  context "model generator using mini_record" do
+    should "generate hooks for auto upgrade" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=mini_record') }
+      assert_match_in_file(
+        "Padrino.after_load do\n  ActiveRecord::Base.descendants.each(&:auto_upgrade!)",
+        "#{@apptmp}/sample_project/config/boot.rb"
+      )
+    end
+
+    should "generate model file" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=mini_record') }
+      capture_io { generate(:model, 'user', 'name:string', 'surname:string', 'age:integer', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/field :name, :as => :string/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/field :surname, :as => :string/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/field :age, :as => :integer/m, "#{@apptmp}/sample_project/models/user.rb")
+    end
+
+    should "generate model file with camelized name" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=mini_record') }
+      capture_io { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class ChunkyBacon < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/chunky_bacon.rb")
+      assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/models/chunky_bacon_test.rb")
+    end
+  end
+
   # COUCHREST
   context "model generator using couchrest" do
     should "generate model file with no properties" do
@@ -210,7 +237,7 @@ describe "ModelGenerator" do
       capture_io { generate(:model, 'person', "name:string", "age:integer", "created:datetime", "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb"
       assert_match_in_file(/class Person < Sequel::Model/m, "#{@apptmp}/sample_project/models/person.rb")
-      assert_match_in_file(/class CreatePeople < Sequel::Migration/m, migration_file_path)
+      assert_match_in_file(/Sequel\.migration do/m, migration_file_path)
       assert_match_in_file(/create_table :people/m, migration_file_path)
       assert_match_in_file(/String :name/m,   migration_file_path)
       assert_match_in_file(/Integer :age/m,   migration_file_path)

data/test/test_plugin_generator.rb

@@ -84,12 +84,13 @@ describe "PluginGenerator" do
 
   context "with git commands" do
     should "generate a repository correctly" do
+      skip 'Change stubs here'
       expects_generated_project :test => :rspec, :orm => :activerecord, :name => 'sample_git', :root => "#{@apptmp}"
       expects_git :init, :root => "#{@apptmp}/sample_git"
       expects_git :add, :arguments => '.', :root => "#{@apptmp}/sample_git"
       expects_git :commit, :arguments => 'hello', :root => "#{@apptmp}/sample_git"
       git_template_path = File.join(File.dirname(__FILE__), 'fixtures', 'git_template.rb')
-      capture_io { generate(:project, 'sample_git', "-p=#{git_template_path}", "-r=#{@apptmp}", '> /dev/null') }
+      capture_io { generate(:project, 'sample_git', "-p=#{git_template_path}", "-r=#{@apptmp}", '2>&1 /dev/null') }
     end
   end
 

data/test/test_project_generator.rb

@@ -240,7 +240,7 @@ describe "ProjectGenerator" do
 
       should "properly generate postgres" do
         out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=activerecord', '--adapter=postgres') }
-        assert_match_in_file(/gem 'pg', :require => "postgres"/, "#{@apptmp}/sample_project/Gemfile")
+        assert_match_in_file(/gem 'pg'$/, "#{@apptmp}/sample_project/Gemfile")
         assert_match_in_file(/sample_project_development/, "#{@apptmp}/sample_project/config/database.rb")
         assert_match_in_file(%r{:adapter   => 'postgresql'}, "#{@apptmp}/sample_project/config/database.rb")
       end

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.10.5
+  hash: 98
+  prerelease: 7
+  segments: 
+  - 0
+  - 10
+  - 6
+  - a
+  version: 0.10.6.a
 platform: ruby
 authors: 
 - Padrino Team
@@ -13,8 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 -07:00
-default_executable: 
+date: 2012-01-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
@@ -24,7 +29,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.5
+        hash: 98
+        segments: 
+        - 0
+        - 10
+        - 6
+        - a
+        version: 0.10.6.a
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,20 +46,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: grit
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.4.1
-  type: :runtime
-  version_requirements: *id003
 description: Generators for easily creating and building padrino applications from the console
 email: padrinorb@gmail.com
 executables: 
@@ -77,6 +81,7 @@ files:
 - lib/padrino-gen/generators/components/orms/activerecord.rb
 - lib/padrino-gen/generators/components/orms/couchrest.rb
 - lib/padrino-gen/generators/components/orms/datamapper.rb
+- lib/padrino-gen/generators/components/orms/mini_record.rb
 - lib/padrino-gen/generators/components/orms/mongoid.rb
 - lib/padrino-gen/generators/components/orms/mongomapper.rb
 - lib/padrino-gen/generators/components/orms/mongomatic.rb
@@ -159,7 +164,6 @@ files:
 - lib/padrino-gen/generators/templates/static/ujs/mootools.js
 - lib/padrino-gen/generators/templates/static/ujs/prototype.js
 - lib/padrino-gen/generators/templates/static/ujs/right.js
-has_rdoc: true
 homepage: http://www.padrinorb.com
 licenses: []
 
@@ -173,17 +177,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: 1.3.6
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: padrino-gen
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Generators for easily creating and building padrino applications
@@ -203,3 +215,4 @@ test_files:
 - test/test_model_generator.rb
 - test/test_plugin_generator.rb
 - test/test_project_generator.rb
+has_rdoc: