padrino-gen 0.10.7 → 0.11.0

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

@@ -1,59 +1,61 @@
-class <%= @app_name %> < Padrino::Application
-  register Padrino::Rendering
-  register Padrino::Mailer
-  register Padrino::Helpers
+module <%= @project_name %>
+  class <%= @app_name %> < Padrino::Application
+    register Padrino::Rendering
+    register Padrino::Mailer
+    register Padrino::Helpers
 
-  enable :sessions
+    enable :sessions
 
-  ##
-  # Caching support
-  #
-  # register Padrino::Cache
-  # enable :caching
-  #
-  # You can customize caching store engines:
-  #
-  #   set :cache, Padrino::Cache::Store::Memcache.new(::Memcached.new('127.0.0.1:11211', :exception_retry_limit => 1))
-  #   set :cache, Padrino::Cache::Store::Memcache.new(::Dalli::Client.new('127.0.0.1:11211', :exception_retry_limit => 1))
-  #   set :cache, Padrino::Cache::Store::Redis.new(::Redis.new(:host => '127.0.0.1', :port => 6379, :db => 0))
-  #   set :cache, Padrino::Cache::Store::Memory.new(50)
-  #   set :cache, Padrino::Cache::Store::File.new(Padrino.root('tmp', app_name.to_s, 'cache')) # default choice
-  #
+    ##
+    # Caching support
+    #
+    # register Padrino::Cache
+    # enable :caching
+    #
+    # You can customize caching store engines:
+    #
+    # set :cache, Padrino::Cache::Store::Memcache.new(::Memcached.new('127.0.0.1:11211', :exception_retry_limit => 1))
+    # set :cache, Padrino::Cache::Store::Memcache.new(::Dalli::Client.new('127.0.0.1:11211', :exception_retry_limit => 1))
+    # set :cache, Padrino::Cache::Store::Redis.new(::Redis.new(:host => '127.0.0.1', :port => 6379, :db => 0))
+    # set :cache, Padrino::Cache::Store::Memory.new(50)
+    # set :cache, Padrino::Cache::Store::File.new(Padrino.root('tmp', app_name.to_s, 'cache')) # default choice
+    #
 
-  ##
-  # Application configuration options
-  #
-  # set :raise_errors, true       # Raise exceptions (will stop application) (default for test)
-  # set :dump_errors, true        # Exception backtraces are written to STDERR (default for production/development)
-  # set :show_exceptions, true    # Shows a stack trace in browser (default for development)
-  # set :logging, true            # Logging in STDOUT for development and file for production (default only for development)
-  # set :public_folder, "foo/bar" # Location for static assets (default root/public)
-  # set :reload, false            # Reload application files (default in development)
-  # set :default_builder, "foo"   # Set a custom form builder (default 'StandardFormBuilder')
-  # set :locale_path, "bar"       # Set path for I18n translations (default your_app/locales)
-  # disable :sessions             # Disabled sessions by default (enable if needed)
-  # disable :flash                # Disables sinatra-flash (enabled by default if Sinatra::Flash is defined)
-  # layout  :my_layout            # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
-  #
+    ##
+    # Application configuration options
+    #
+    # set :raise_errors, true       # Raise exceptions (will stop application) (default for test)
+    # set :dump_errors, true        # Exception backtraces are written to STDERR (default for production/development)
+    # set :show_exceptions, true    # Shows a stack trace in browser (default for development)
+    # set :logging, true            # Logging in STDOUT for development and file for production (default only for development)
+    # set :public_folder, 'foo/bar' # Location for static assets (default root/public)
+    # set :reload, false            # Reload application files (default in development)
+    # set :default_builder, 'foo'   # Set a custom form builder (default 'StandardFormBuilder')
+    # set :locale_path, 'bar'       # Set path for I18n translations (default your_app/locales)
+    # disable :sessions             # Disabled sessions by default (enable if needed)
+    # disable :flash                # Disables sinatra-flash (enabled by default if Sinatra::Flash is defined)
+    # layout  :my_layout            # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
+    #
 
-  ##
-  # You can configure for a specified environment like:
-  #
-  #   configure :development do
-  #     set :foo, :bar
-  #     disable :asset_stamp # no asset timestamping for dev
-  #   end
-  #
+    ##
+    # You can configure for a specified environment like:
+    #
+    #   configure :development do
+    #     set :foo, :bar
+    #     disable :asset_stamp # no asset timestamping for dev
+    #   end
+    #
 
-  ##
-  # You can manage errors like:
-  #
-  #   error 404 do
-  #     render 'errors/404'
-  #   end
-  #
-  #   error 505 do
-  #     render 'errors/505'
-  #   end
-  #
+    ##
+    # You can manage errors like:
+    #
+    #   error 404 do
+    #     render 'errors/404'
+    #   end
+    #
+    #   error 505 do
+    #     render 'errors/505'
+    #   end
+    #
+  end
 end

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

@@ -19,12 +19,11 @@ module Padrino
       include Padrino::Generators::Actions
 
       desc "Description:\n\n\tpadrino-gen app generates a new Padrino application"
-
-      argument :name, :desc => "The name of your padrino application"
-
-      class_option :root,    :desc => "The root destination",       :aliases => '-r', :default => ".",   :type => :string
-      class_option :destroy,                                        :aliases => '-d', :default => false, :type => :boolean
-      class_option :tiny,    :desc => "Generate tiny app skeleton", :aliases => '-i', :default => false, :type => :boolean
+      argument     :name,      :desc => 'The name of your padrino application'
+      class_option :root,      :desc => 'The root destination',                   :aliases => '-r', :default => '.',   :type => :string
+      class_option :destroy,                                                      :aliases => '-d', :default => false, :type => :boolean
+      class_option :tiny,      :desc => 'Generate tiny app skeleton',             :aliases => '-i', :default => false, :type => :boolean
+      class_option :namespace, :desc => 'The name space of your padrino project', :aliases => '-n', :default => '',    :type => :string
 
       # Show help if no argv given
       require_arguments!
@@ -34,24 +33,25 @@ module Padrino
       # @api private
       def create_app
         self.destination_root = options[:root]
-        @app_name = name.gsub(/\W/, "_").underscore.camelize
+        @app_folder = name.gsub(/\W/, '_').underscore
+        @app_name   = name.gsub(/\W/, '_').underscore.camelize
         if in_app_root?
+          @project_name = options[:namespace].underscore.camelize
+          @project_name = fetch_project_name(@app_folder) if @project_name.empty?
           self.behavior = :revoke if options[:destroy]
-          app_skeleton(@app_name.downcase, options[:tiny])
-          empty_directory destination_root("public/#{@app_name.downcase}")
-          append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"#{@app_name}\").to(\"/#{@app_name.downcase}\")"
+          app_skeleton(@app_folder.downcase, options[:tiny])
+          empty_directory destination_root("public/#{@app_folder.downcase}")
+          append_file destination_root('config/apps.rb'), "\nPadrino.mount('#{@project_name}::#{@app_name}', :app_file => Padrino.root('#{@app_folder.downcase}/app.rb')).to('/#{@app_folder.downcase}')"
 
           return if self.behavior == :revoke
           say
-          say "="*65, :green
+          say '=' * 65, :green
           say "Your #{@app_name} application has been installed."
-          say "="*65, :green
+          say '='*65, :green
           say "This application has been mounted to /#{@app_name.downcase}"
-          say "You can configure a different path by editing 'config/apps.rb"
-          say "="*65, :green
-          say
+          say "You can configure a different path by editing 'config/apps.rb'"
         else
-          say "You are not at the root of a Padrino application! (config/boot.rb not found)"
+          say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
         end
       end
     end # App

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

@@ -20,8 +20,8 @@ module Padrino
       # @api private
       def load_boot
         begin
-          ENV['PADRINO_LOG_LEVEL'] ||= "test"
-          ENV['BUNDLE_GEMFILE'] = File.join(options[:root], "Gemfile") if options[:root]
+          ENV['PADRINO_LOG_LEVEL'] ||= 'test'
+          ENV['BUNDLE_GEMFILE'] = File.join(options[:root], 'Gemfile') if options[:root]
           boot = options[:root] ? File.join(options[:root], 'config/boot.rb') : 'config/boot.rb'
           if File.exist?(boot)
             require File.expand_path(boot)
@@ -47,7 +47,7 @@ module Padrino
         generator_class = Padrino::Generators.mappings[generator_kind]
 
         if generator_class
-          args = ARGV.empty? && generator_class.require_arguments? ? ["-h"] : ARGV
+          args = ARGV.empty? && generator_class.require_arguments? ? ['-h'] : ARGV
           generator_class.start(args)
         else
           puts "Please specify generator to use (#{Padrino::Generators.mappings.keys.join(", ")})"

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

@@ -139,7 +139,7 @@ module Padrino
         # @api private
         def insert_test_suite_setup(suite_text, options={})
           options.reverse_merge!(:path => "test/test_config.rb")
-          create_file(options[:path], suite_text.gsub(/CLASS_NAME/, @app_name))
+          create_file(options[:path], suite_text.gsub(/CLASS_NAME/, "#{@project_name}::#{@app_name}"))
         end
 
         # For mocking components

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

@@ -3,7 +3,7 @@ AR = (<<-AR) unless defined?(AR)
 # You can use other adapters like:
 #
 #   ActiveRecord::Base.configurations[:development] = {
-#     :adapter   => 'mysql',
+#     :adapter   => 'mysql2',
 #     :encoding  => 'utf8',
 #     :reconnect => true,
 #     :database  => 'your_database',
@@ -29,11 +29,11 @@ ActiveRecord::Base.configurations[:test] = {
 # Setup our logger
 ActiveRecord::Base.logger = logger
 
-# Raise exception on mass assignment protection for Active Record models
+# 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)
+# 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.
@@ -45,11 +45,11 @@ 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.
+# 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
+# Now we can establish connection with our db.
 ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Padrino.env])
 AR
 
@@ -94,14 +94,15 @@ SQLITE
 
 def setup_orm
   ar = AR
-  db = @app_name.underscore
+  db = @project_name.underscore
+  # We're now defaulting to mysql2 since mysql is deprecated
   case options[:adapter]
-  when 'mysql'
+  when 'mysql-gem'
     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'
+    require_dependencies 'mysql', :version => "~> 2.8.1"
+  when 'mysql', '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'")
@@ -117,7 +118,7 @@ def setup_orm
     ar.gsub! /!DB_TEST!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_test.db')")
     require_dependencies 'sqlite3'
   end
-  require_dependencies 'activerecord', :require => 'active_record'
+  require_dependencies 'activerecord', :require => 'active_record', :version => ">= 3.1"
   insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement'
   create_file("config/database.rb", ar)
 end
@@ -148,7 +149,7 @@ class !FILECLASS! < ActiveRecord::Migration
 end
 MIGRATION
 
-AR_MODEL_UP_MG = (<<-MIGRATION).gsub(/^/, '    ') unless defined?(AR_MODEL_UP_MG)
+AR_MODEL_UP_MG = (<<-MIGRATION) unless defined?(AR_MODEL_UP_MG)
 create_table :!TABLE! do |t|
   !FIELDS!
   t.timestamps
@@ -161,9 +162,11 @@ MIGRATION
 
 def create_model_migration(migration_name, name, columns)
   output_model_migration(migration_name, name, columns,
-       :base => AR_MIGRATION,
-       :column_format => Proc.new { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
-       :up => AR_MODEL_UP_MG, :down => AR_MODEL_DOWN_MG)
+    :base          => AR_MIGRATION,
+    :column_format => Proc.new { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
+    :up            => AR_MODEL_UP_MG,
+    :down          => AR_MODEL_DOWN_MG
+  )
 end
 
 AR_CHANGE_MG = (<<-MIGRATION).gsub(/^/, '    ') unless defined?(AR_CHANGE_MG)
@@ -174,8 +177,9 @@ MIGRATION
 
 def create_migration_file(migration_name, name, columns)
   output_migration_file(migration_name, name, columns,
-    :base => AR_MIGRATION, :change_format => AR_CHANGE_MG,
-    :add => Proc.new { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
-    :remove => Proc.new { |field, kind| "t.remove :#{field}" }
+    :base          => AR_MIGRATION,
+    :change_format => AR_CHANGE_MG,
+    :add           => Proc.new { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
+    :remove        => Proc.new { |field, kind| "t.remove :#{field}" }
   )
 end

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

@@ -25,7 +25,7 @@ COUCHREST
 def setup_orm
   require_dependencies 'couchrest_model', :version => '~>1.1.0'
   require_dependencies 'json_pure'
-  create_file("config/database.rb", COUCHREST.gsub(/!NAME!/, @app_name.underscore))
+  create_file("config/database.rb", COUCHREST.gsub(/!NAME!/, @project_name.underscore))
 end
 
 CR_MODEL = (<<-MODEL) unless defined?(CR_MODEL)

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

@@ -22,9 +22,10 @@ DM
 
 def setup_orm
   dm = DM
-  db = @app_name.underscore
+  db = @project_name.underscore
   %w(
     dm-core
+    dm-types
     dm-aggregates
     dm-constraints
     dm-migrations

data/lib/padrino-gen/generators/components/orms/{mini_record.rb → minirecord.rb}

@@ -14,11 +14,11 @@ ActiveRecord::Base.configurations[:test] = {
 # Setup our logger
 ActiveRecord::Base.logger = logger
 
-# Raise exception on mass assignment protection for Active Record models
+# 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)
+# 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.
@@ -30,11 +30,11 @@ 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.
+# 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
+# Now we can establish connection with our db.
 ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Padrino.env])
 MR
 
@@ -77,14 +77,14 @@ SQLITE = (<<-SQLITE) unless defined?(SQLITE)
 SQLITE
 def setup_orm
   ar = MR
-  db = @app_name.underscore
+  db = @project_name.underscore
   case options[:adapter]
-  when 'mysql'
+  when 'mysql-gem'
     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'
+    require_dependencies 'mysql', :version => "~> 2.8.1"
+  when 'mysql', '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'")

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

@@ -1,5 +1,4 @@
 MONGOID = (<<-MONGO) unless defined?(MONGOID)
-
 # Connection.new takes host, port
 host = 'localhost'
 port = Mongo::Connection::DEFAULT_PORT
@@ -23,14 +22,69 @@ Mongoid.database = Mongo::Connection.new(host, port).db(database_name)
 #   ]
 # end
 #
-# More installation and setup notes are on http://mongoid.org/docs/
+# More installation and setup notes are on http://mongoid.org/
+MONGO
+
+MONGOID3 = (<<-MONGO) unless defined?(MONGOID3)
+# Connection.new takes host, port
+
+host = 'localhost'
+port = 27017
+
+database_name = case Padrino.env
+  when :development then '!NAME!_development'
+  when :production  then '!NAME!_production'
+  when :test        then '!NAME!_test'
+end
+
+# Use MONGO_URI if it's set as an environmental variable
+Mongoid::Config.sessions =
+  if ENV['MONGO_URI']
+    {default: {uri: ENV['MONGO_URI'] }}
+  else
+    {default: {hosts: ["#\{host\}:#\{port\}"], database: database_name}}
+  end
+
+# If you want to use a YML file for config, use this instead:
+#
+#   Mongoid.load!(File.join(Padrino.root, 'config', 'database.yml'), Padrino.env)
+#
+# And add a config/database.yml file like this:
+#   development:
+#     sessions:
+#       default:
+#         database: !NAME!_development
+#         hosts:
+#           - localhost:27017 
+#   production:
+#     sessions:
+#       default:
+#         database: !NAME!_production
+#         hosts:
+#           - localhost:27017
+#   test:
+#     sessions:
+#       default:
+#         database: !NAME!_test
+#         hosts:
+#           - localhost:27017
+#
+#
+# More installation and setup notes are on http://mongoid.org/en/mongoid/docs/installation.html#configuration
 MONGO
 
 def setup_orm
-  require_dependencies 'bson_ext', :require => 'mongo'
-  require_dependencies 'mongoid'
-  require_dependencies('SystemTimer', :require => 'system_timer') if RUBY_VERSION =~ /1\.8/ && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby')
-  create_file("config/database.rb", MONGOID.gsub(/!NAME!/, @app_name.underscore))
+  require_dependencies 'mongoid', :version => (RUBY_VERSION >= '1.9' ? '~>3.0.0' : '~>2.0')
+
+  if RUBY_VERSION =~ /1\.8/ && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby')
+    require_dependencies('SystemTimer', :require => 'system_timer')
+  end
+
+  if RUBY_VERSION >= '1.9'
+     create_file('config/database.rb', MONGOID3.gsub(/!NAME!/, @project_name.underscore))
+  else
+    create_file('config/database.rb', MONGOID.gsub(/!NAME!/, @project_name.underscore))
+  end
 end
 
 MONGOID_MODEL = (<<-MODEL) unless defined?(MONGOID_MODEL)

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

@@ -9,10 +9,10 @@ end
 MONGO
 
 def setup_orm
-  require_dependencies 'bson_ext', :require => 'mongo'
   require_dependencies 'mongo_mapper'
+  require_dependencies 'bson_ext', :require => 'mongo'
   require_dependencies('SystemTimer', :require => 'system_timer') if RUBY_VERSION =~ /1\.8/ && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby')
-  create_file("config/database.rb", MONGO.gsub(/!NAME!/, @app_name.underscore))
+  create_file("config/database.rb", MONGO.gsub(/!NAME!/, @project_name.underscore))
 end
 
 MM_MODEL = (<<-MODEL) unless defined?(MM_MODEL)

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

@@ -9,9 +9,9 @@ MONGO
 
 def setup_orm
   mongomatic = MONGOMATIC
-  require_dependencies 'bson_ext', :require => 'mongo'
   require_dependencies 'mongomatic'
-  create_file("config/database.rb", MONGOMATIC.gsub(/!NAME!/, @app_name.underscore))
+  require_dependencies 'bson_ext', :require => 'mongo'
+  create_file("config/database.rb", MONGOMATIC.gsub(/!NAME!/, @project_name.underscore))
 end
 
 MONGOMATIC_MODEL = (<<-MODEL) unless defined?(MONGOMATIC_MODEL)

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

@@ -20,24 +20,71 @@ OHM = (<<-OHM) unless defined?(OHM)
 #  when :production then Ohm.connect(:db => 1)
 #  when :test then Ohm.connect(:db => 2)
 # end
+
+# This monkey patch provides traditional (hash of arrays) error handling for ohm models
+# Also add compatiblity with admin generator.
+module Ohm
+  class Model
+
+    alias_method :old_errors, :errors
+    def errors
+      @errors ||= ErrorsHash.new(self.class.to_reference, self.old_errors)
+    end
+
+    def update_attributes(attrs)
+      attrs.each do |key, value|
+        send(:"\#{key}=", value)
+      end if attrs
+    end
+
+    class << self
+      alias_method :old_attribute, :attribute
+      def attribute(name, cast=nil)
+        attributes << name
+        old_attribute(name, cast)
+      end
+
+      def attributes
+        @_attributes ||= []
+      end
+    end
+
+    class ErrorsHash < Hash
+      def initialize(scope, errors)
+        @scope  = scope
+        self.replace Hash.new { |hash, key| hash[key] = [] }
+
+        errors.each do |key, value|
+          self[key] << value
+        end
+      end
+
+      def push(arr)
+        self[arr[0]] << arr[1]
+      end
+
+      def full_messages
+        self.map do |key, value|
+          value.uniq.map do |reason|
+            I18n::t("ohm.%s.%s.%s" % [@scope, key, reason])
+          end.join(', ')
+        end
+      end
+    end
+  end
+end # unless Ohm::Model.new.errors.is_a?(Hash)
 OHM
 
 def setup_orm
-  ohm = OHM
-  require_dependencies 'json'
-  require_dependencies 'ohm', :require => 'ohm'
-  require_dependencies 'ohm-contrib', :require => 'ohm/contrib'
-  create_file("config/database.rb", ohm)
+  require_dependencies 'ohm'
+  create_file("config/database.rb", OHM)
 end
 
 OHM_MODEL = (<<-MODEL) unless defined?(OHM_MODEL)
 class !NAME! < Ohm::Model
-  include Ohm::Timestamping
-  include Ohm::Typecast
-
   # Examples:
   # attribute :name
-  # attribute :email, String
+  # attribute :email
   # reference :venue, Venue
   # set :participants, Person
   # counter :votes
@@ -56,7 +103,7 @@ 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.underscore.camelize}" }.join("\n  ")
+    column_declarations = field_tuples.map { |field, kind| "attribute :#{field}" }.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)

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

@@ -35,7 +35,7 @@ RIAK
 
 def setup_orm
   require_dependencies 'ripple'
-  create_file("config/riak.yml", RIPPLE_DB.gsub(/!NAME!/, @app_name.underscore))
+  create_file("config/riak.yml", RIPPLE_DB.gsub(/!NAME!/, @project_name.underscore))
   create_file("config/database.rb", RIPPLE_CFG)
 end
 

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

@@ -10,23 +10,32 @@ SEQUEL
 
 def setup_orm
   sequel = SEQUEL
-  db = @app_name.underscore
+  db = @project_name.underscore
   require_dependencies 'sequel'
-  require_dependencies case options[:adapter]
+  case options[:adapter]
+  when 'mysql-gem'
+    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"mysql://localhost/#{db}_development\"")
+    sequel.gsub!(/!DB_PRODUCTION!/, "\"mysql://localhost/#{db}_production\"")
+    sequel.gsub!(/!DB_TEST!/,"\"mysql://localhost/#{db}_test\"")
+    require_dependencies 'mysql', :version => "~> 2.8.1"
+    'mysql'
   when 'mysql', 'mysql2'
-    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"#{options[:adapter]}://localhost/#{db}_development\"")
-    sequel.gsub!(/!DB_PRODUCTION!/, "\"#{options[:adapter]}://localhost/#{db}_production\"")
-    sequel.gsub!(/!DB_TEST!/,"\"#{options[:adapter]}://localhost/#{db}_test\"")
-    options[:adapter]
+    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"mysql2://localhost/#{db}_development\"")
+    sequel.gsub!(/!DB_PRODUCTION!/, "\"mysql2://localhost/#{db}_production\"")
+    sequel.gsub!(/!DB_TEST!/,"\"mysql2://localhost/#{db}_test\"")
+    require_dependencies 'mysql2'
+    'mysql2'
   when 'postgres'
     sequel.gsub!(/!DB_DEVELOPMENT!/, "\"postgres://localhost/#{db}_development\"")
     sequel.gsub!(/!DB_PRODUCTION!/, "\"postgres://localhost/#{db}_production\"")
     sequel.gsub!(/!DB_TEST!/,"\"postgres://localhost/#{db}_test\"")
+    require_dependencies 'pg'
     'pg'
   else
     sequel.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite://\" + Padrino.root('db', \"#{db}_development.db\")")
     sequel.gsub!(/!DB_PRODUCTION!/,"\"sqlite://\" + Padrino.root('db', \"#{db}_production.db\")")
     sequel.gsub!(/!DB_TEST!/,"\"sqlite://\" + Padrino.root('db', \"#{db}_test.db\")")
+    require_dependencies 'sqlite3'
     'sqlite3'
   end
   create_file("config/database.rb", sequel)

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

@@ -27,7 +27,7 @@ end
 COMPASS
 
 COMPASS_REGISTER = <<-COMPASSR unless defined?(COMPASS_REGISTER)
-  register CompassInitializer\n
+    register CompassInitializer\n
 COMPASSR
 
 def setup_stylesheet

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

@@ -19,6 +19,7 @@ LESS
 def setup_stylesheet
   require_dependencies 'less'
   require_dependencies 'rack-less'
+  require_dependencies 'therubyracer'
   initializer :less, LESS_INIT
   empty_directory destination_root('/app/stylesheets')
 end