padrino-gen 0.16.0.pre4 → 0.16.0

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

@@ -1,59 +1,61 @@
-OHM = (<<-OHM) unless defined?(OHM)
-# Ohm does not have the concept of namespaces.
-# This means that you will not be able to have
-# a distinct test, development, or production database.
-#
-# You can, however, run multiple redis servers on the same host
-# and point to them based on the environment:
-#
-# case Padrino.env
-#  when :development then Ohm.connect(:port => 6379)
-#  when :production then Ohm.connect(:port => 6380)
-#  when :test then Ohm.connect(:port => 6381)
-# end
+OHM = <<~OHM unless defined?(OHM)
+  # Ohm does not have the concept of namespaces.
+  # This means that you will not be able to have
+  # a distinct test, development, or production database.
+  #
+  # You can, however, run multiple redis servers on the same host
+  # and point to them based on the environment:
+  #
+  # case Padrino.env
+  #  when :development then Ohm.connect(port: 6379)
+  #  when :production then Ohm.connect(port: 6380)
+  #  when :test then Ohm.connect(port: 6381)
+  # end
 
-# Alternatively, you can try specifying a difference :db
-# which, outside of confirmation, appears to provide distinct
-# namespaces from testing:
-# case Padrino.env
-#  when :development then Ohm.connect(:db => 0)
-#  when :production then Ohm.connect(:db => 1)
-#  when :test then Ohm.connect(:db => 2)
-# end
+  # Alternatively, you can try specifying a difference :db
+  # which, outside of confirmation, appears to provide distinct
+  # namespaces from testing:
+  # case Padrino.env
+  #  when :development then Ohm.connect(db: 0)
+  #  when :production then Ohm.connect(db: 1)
+  #  when :test then Ohm.connect(db: 2)
+  # end
 OHM
 
 def setup_orm
-  require_dependencies 'ohm', :version => "~> 1.3.0"
-  create_file("config/database.rb", OHM)
+  require_dependencies 'ohm', version: '~> 1.3.0'
+  create_file('config/database.rb', OHM)
 end
 
-OHM_MODEL = (<<-MODEL) unless defined?(OHM_MODEL)
-class !NAME! < Ohm::Model
-  # Examples:
-  # attribute :name
-  # attribute :email
-  # reference :venue, Venue
-  # set :participants, Person
-  # counter :votes
-  #
-  # index :name
-  #
-  # def validate
-  #   assert_present :name
-  # end
+OHM_MODEL = <<~MODEL unless defined?(OHM_MODEL)
+  class !NAME! < Ohm::Model
+    # Examples:
+    # attribute :name
+    # attribute :email
+    # reference :venue, Venue
+    # set :participants, Person
+    # counter :votes
+    #
+    # index :name
+    #
+    # def validate
+    #   assert_present :name
+    # end
 
-  !FIELDS!
-end
+    !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| "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)
+# 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")
+  column_declarations = options[:fields].map do |value|
+    "attribute :#{value.split(':').first}"
+  end
+
+  model_contents = OHM_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
+  model_contents.gsub!(/!FIELDS!/, column_declarations.join("\n  "))
+  create_file(model_path, model_contents)
 end
 
 def create_model_migration(filename, name, fields)

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

@@ -1,65 +1,65 @@
-RIPPLE_DB = (<<-RIAK) unless defined?(RIPPLE_DB)
-development:
-  http_port: 8098
-  pb_port: 8087
-  host: localhost
+RIPPLE_DB = <<~RIAK unless defined?(RIPPLE_DB)
+  development:
+    http_port: 8098
+    pb_port: 8087
+    host: localhost
 
-# The test environment has additional keys for configuring the
-# Riak::TestServer for your test/spec suite:
-#
-# * bin_dir specifies the path to the "riak" script that you use to
-#           start Riak (just the directory)
-# * js_source_dir specifies where your custom Javascript functions for
-#           MapReduce should be loaded from. Usually app/mapreduce.
-test:
-  http_port: 9000
-  pb_port: 9002
-  host: localhost
-  bin_dir: /usr/local/bin   # Default for Homebrew.
-  js_source_dir: <%%= Padrino.root + "app/mapreduce" %>
+  # The test environment has additional keys for configuring the
+  # Riak::TestServer for your test/spec suite:
+  #
+  # * bin_dir specifies the path to the "riak" script that you use to
+  #           start Riak (just the directory)
+  # * js_source_dir specifies where your custom Javascript functions for
+  #           MapReduce should be loaded from. Usually app/mapreduce.
+  test:
+    http_port: 9000
+    pb_port: 9002
+    host: localhost
+    bin_dir: /usr/local/bin   # Default for Homebrew.
+    js_source_dir: <%%= Padrino.root + 'app/mapreduce' %>
 
-production:
-  http_port: 8098
-  pb_port: 8087
-  host: localhost
+  production:
+    http_port: 8098
+    pb_port: 8087
+    host: localhost
 RIAK
-RIPPLE_CFG = (<<RIAK) unless defined?(RIPPLE_CFG)
-# encoding: utf-8
+RIPPLE_CFG = <<~RIAK unless defined?(RIPPLE_CFG)
+  # encoding: utf-8
 
-require 'ripple'
+  require 'ripple'
 
-if File.exist?(Padrino.root + "config/riak.yml")
-  Ripple.load_configuration Padrino.root.join('config', 'riak.yml'), [Padrino.env]
-end
+  if File.exist?(Padrino.root + 'config/riak.yml')
+    Ripple.load_configuration Padrino.root.join('config', 'riak.yml'), [Padrino.env]
+  end
 RIAK
 
 def setup_orm
   require_dependencies 'ripple'
-  create_file("config/riak.yml", RIPPLE_DB.gsub(/!NAME!/, @project_name.underscore))
-  create_file("config/database.rb", RIPPLE_CFG)
+  create_file('config/riak.yml', RIPPLE_DB.gsub(/!NAME!/, @project_name.underscore))
+  create_file('config/database.rb', RIPPLE_CFG)
 end
 
-RIPPLE_MODEL = (<<-MODEL) unless defined?(RIPPLE_MODEL)
-# encoding: utf-8
+RIPPLE_MODEL = <<~MODEL unless defined?(RIPPLE_MODEL)
+  # encoding: utf-8
 
-class !NAME!
-  include Ripple::Document
+  class !NAME!
+    include Ripple::Document
 
-  # Standart properties
-  # property :name, String
-  !FIELDS!
+    # Standart properties
+    # property :name, String
+    !FIELDS!
 
-  # Relations
-  # many :addresses
-  # many :friends, :class_name => "Person"
-  # one :account
-end
+    # Relations
+    # many :addresses
+    # many :friends, class_name: 'Person'
+    # one :account
+  end
 
 MODEL
-# options => { :fields => ["title:string", "body:string"], :app => 'app' }
-def create_model_file(name, options={})
+# 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(":") }
+  field_tuples = options[:fields].map { |value| value.split(':') }
   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)

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

@@ -1,10 +1,10 @@
-SEQUEL = (<<-SEQUEL) unless defined?(SEQUEL)
-Sequel::Model.raise_on_save_failure = false # Do not throw exceptions on failure
-Sequel::Model.db = case Padrino.env
-  when :development then Sequel.connect(!DB_DEVELOPMENT!, :loggers => [logger])
-  when :production  then Sequel.connect(!DB_PRODUCTION!,  :loggers => [logger])
-  when :test        then Sequel.connect(!DB_TEST!,        :loggers => [logger])
-end
+SEQUEL = <<~SEQUEL unless defined?(SEQUEL)
+  Sequel::Model.raise_on_save_failure = false # Do not throw exceptions on failure
+  Sequel::Model.db = case Padrino.env
+    when :development then Sequel.connect(!DB_DEVELOPMENT!, loggers: [logger])
+    when :production  then Sequel.connect(!DB_PRODUCTION!,  loggers: [logger])
+    when :test        then Sequel.connect(!DB_TEST!,        loggers: [logger])
+  end
 SEQUEL
 
 def setup_orm
@@ -17,88 +17,93 @@ def setup_orm
     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"
+      sequel.gsub!(/!DB_TEST!/, "\"mysql://localhost/#{db}_test\"")
+      require_dependencies 'mysql', version: '~> 2.8.1'
     when 'mysql', 'mysql2'
       sequel.gsub!(/!DB_DEVELOPMENT!/, "\"mysql2://localhost/#{db}_development\"")
       sequel.gsub!(/!DB_PRODUCTION!/, "\"mysql2://localhost/#{db}_production\"")
-      sequel.gsub!(/!DB_TEST!/,"\"mysql2://localhost/#{db}_test\"")
+      sequel.gsub!(/!DB_TEST!/, "\"mysql2://localhost/#{db}_test\"")
       require_dependencies '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\"")
+      sequel.gsub!(/!DB_TEST!/, "\"postgres://localhost/#{db}_test\"")
       require_dependencies 'pg'
     when 'sqlite'
-      sequel.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite://db/#{db}_development.db\"")
+      sequel.gsub!(/!DB_DEVELOPMENT!/, "\"sqlite://db/#{db}_development.db\"")
       sequel.gsub!(/!DB_PRODUCTION!/, "\"sqlite://db/#{db}_production.db\"")
       sequel.gsub!(/!DB_TEST!/,       "\"sqlite://db/#{db}_test.db\"")
       require_dependencies 'sqlite3'
     else
       say "Failed to generate `config/database.rb` for ORM adapter `#{options[:adapter]}`", :red
-      fail ArgumentError
+      raise ArgumentError
     end
   rescue ArgumentError
-    adapter = ask("Please, choose a proper adapter:", :limited_to => %w[mysql mysql2 mysql-gem postgres sqlite])
+    adapter = ask('Please, choose a proper adapter:', limited_to: %w[mysql mysql2 mysql-gem postgres sqlite])
     retry
   end
 
-  create_file("config/database.rb", sequel)
+  create_file('config/database.rb', sequel)
   empty_directory('db/migrate')
 end
 
-SQ_MODEL = (<<-MODEL) unless defined?(SQ_MODEL)
-class !NAME! < Sequel::Model
+SQ_MODEL = <<~MODEL unless defined?(SQ_MODEL)
+  class !NAME! < Sequel::Model
 
-end
+  end
 MODEL
 
-# options => { :fields => ["title:string", "body:string"], :app => 'app' }
-def create_model_file(name, options={})
+# 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.underscore.camelize)
   create_file(model_path, model_contents)
 end
 
-SQ_MIGRATION = (<<-MIGRATION) unless defined?(SQ_MIGRATION)
-Sequel.migration do
-  up do
-    !UP!
-  end
+SQ_MIGRATION = <<~MIGRATION unless defined?(SQ_MIGRATION)
+  Sequel.migration do
+    up do
+      !UP!
+    end
 
-  down do
-    !DOWN!
+    down do
+      !DOWN!
+    end
   end
-end
 MIGRATION
 
-SQ_MODEL_UP_MG = (<<-MIGRATION).gsub(/^/, '    ') unless defined?(SQ_MODEL_UP_MG)
-create_table :!TABLE! do
-  primary_key :id
-  !FIELDS!
-end
+SQ_MODEL_UP_MG = <<~MIGRATION.gsub(/^/, '    ') unless defined?(SQ_MODEL_UP_MG)
+  create_table :!TABLE! do
+    primary_key :id
+    !FIELDS!
+  end
 MIGRATION
 
-SQ_MODEL_DOWN_MG = (<<-MIGRATION) unless defined?(SQ_MODEL_DOWN_MG)
-drop_table :!TABLE!
+SQ_MODEL_DOWN_MG = <<~MIGRATION unless defined?(SQ_MODEL_DOWN_MG)
+  drop_table :!TABLE!
 MIGRATION
 
 def create_model_migration(migration_name, name, columns)
-  output_model_migration(migration_name, name, columns,
-         :column_format => Proc.new { |field, kind| "#{kind.underscore.camelize} :#{field}" },
-         :base => SQ_MIGRATION, :up => SQ_MODEL_UP_MG, :down => SQ_MODEL_DOWN_MG)
+  output_model_migration(
+    migration_name, name, columns,
+    column_format: proc { |field, kind| "#{kind.underscore.camelize} :#{field}" },
+    base: SQ_MIGRATION,
+    up: SQ_MODEL_UP_MG,
+    down: SQ_MODEL_DOWN_MG
+  )
 end
 
-SQ_CHANGE_MG = (<<-MIGRATION).gsub(/^/, '    ') unless defined?(SQ_CHANGE_MG)
-alter_table :!TABLE! do
-  !COLUMNS!
-end
+SQ_CHANGE_MG = <<~MIGRATION.gsub(/^/, '    ') unless defined?(SQ_CHANGE_MG)
+  alter_table :!TABLE! do
+    !COLUMNS!
+  end
 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.underscore.camelize}"  },
-    :remove => Proc.new { |field, kind| "drop_column :#{field}" }
+  output_migration_file(
+    migration_name, name, columns,
+    base: SQ_MIGRATION, change_format: SQ_CHANGE_MG,
+    add: proc { |field, kind| "add_column :#{field}, #{kind.underscore.camelize}" },
+    remove: proc { |field, _kind| "drop_column :#{field}" }
   )
 end

data/lib/padrino-gen/generators/components/renderers/erb.rb

@@ -1,3 +1,3 @@
 def setup_renderer
-  require_dependencies 'erubi', :version => '~> 1.6'
+  require_dependencies 'erubi', version: '~> 1.6'
 end

data/lib/padrino-gen/generators/components/renderers/liquid.rb

@@ -1,4 +1,4 @@
 def setup_renderer
-  require_dependencies 'liquid', :version => "= 2.1.2"
+  require_dependencies 'liquid', version: '= 2.1.2'
   require_dependencies 'liquify'
 end

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

@@ -1,10 +1,10 @@
 def setup_script
   begin
-    get('https://raw.github.com/padrino/padrino-static/master/js/dojo.js',  destination_root("/public/javascripts/dojo.js"))
-    get('https://raw.github.com/padrino/padrino-static/master/ujs/dojo.js', destination_root("/public/javascripts/dojo-ujs.js"))
-  rescue
-    copy_file('templates/static/js/dojo.js',  destination_root("/public/javascripts/dojo.js"))
-    copy_file('templates/static/ujs/dojo.js', destination_root("/public/javascripts/dojo-ujs.js"))
+    get('https://raw.github.com/padrino/padrino-static/master/js/dojo.js',  destination_root('/public/javascripts/dojo.js'))
+    get('https://raw.github.com/padrino/padrino-static/master/ujs/dojo.js', destination_root('/public/javascripts/dojo-ujs.js'))
+  rescue StandardError
+    copy_file('templates/static/js/dojo.js',  destination_root('/public/javascripts/dojo.js'))
+    copy_file('templates/static/ujs/dojo.js', destination_root('/public/javascripts/dojo-ujs.js'))
   end
-  create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
+  create_file(destination_root('/public/javascripts/application.js'), '// Put your application scripts here')
 end

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

@@ -1,10 +1,10 @@
 def setup_script
   begin
-    get('https://raw.github.com/padrino/padrino-static/master/js/ext.js',  destination_root("/public/javascripts/ext.js"))
-    get('https://raw.github.com/padrino/padrino-static/master/ujs/ext.js', destination_root("/public/javascripts/ext-ujs.js"))
-  rescue
-    copy_file('templates/static/js/ext.js',  destination_root("/public/javascripts/ext.js"))
-    copy_file('templates/static/ujs/ext.js', destination_root("/public/javascripts/ext-ujs.js"))
+    get('https://raw.github.com/padrino/padrino-static/master/js/ext.js',  destination_root('/public/javascripts/ext.js'))
+    get('https://raw.github.com/padrino/padrino-static/master/ujs/ext.js', destination_root('/public/javascripts/ext-ujs.js'))
+  rescue StandardError
+    copy_file('templates/static/js/ext.js',  destination_root('/public/javascripts/ext.js'))
+    copy_file('templates/static/ujs/ext.js', destination_root('/public/javascripts/ext-ujs.js'))
   end
-  create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
+  create_file(destination_root('/public/javascripts/application.js'), '// Put your application scripts here')
 end

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

@@ -1,10 +1,10 @@
 def setup_script
   begin
-    get('https://raw.github.com/padrino/padrino-static/master/js/jquery.js',  destination_root("/public/javascripts/jquery.js"))
-    get('https://raw.github.com/padrino/padrino-static/master/ujs/jquery.js', destination_root("/public/javascripts/jquery-ujs.js"))
-  rescue
-    copy_file('templates/static/js/jquery.js',  destination_root("/public/javascripts/jquery.js"))
-    copy_file('templates/static/ujs/jquery.js', destination_root("/public/javascripts/jquery-ujs.js"))
+    get('https://raw.github.com/padrino/padrino-static/master/js/jquery.js',  destination_root('/public/javascripts/jquery.js'))
+    get('https://raw.github.com/padrino/padrino-static/master/ujs/jquery.js', destination_root('/public/javascripts/jquery-ujs.js'))
+  rescue StandardError
+    copy_file('templates/static/js/jquery.js',  destination_root('/public/javascripts/jquery.js'))
+    copy_file('templates/static/ujs/jquery.js', destination_root('/public/javascripts/jquery-ujs.js'))
   end
-  create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
+  create_file(destination_root('/public/javascripts/application.js'), '// Put your application scripts here')
 end

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

@@ -1,10 +1,10 @@
 def setup_script
   begin
-    get('https://raw.github.com/padrino/padrino-static/master/js/mootools.js',  destination_root("/public/javascripts/mootools.js"))
-    get('https://raw.github.com/padrino/padrino-static/master/ujs/mootools.js', destination_root("/public/javascripts/mootools-ujs.js"))
-  rescue
-    copy_file('templates/static/js/mootools.js',  destination_root("/public/javascripts/mootools.js"))
-    copy_file('templates/static/ujs/mootools.js', destination_root("/public/javascripts/mootools-ujs.js"))
+    get('https://raw.github.com/padrino/padrino-static/master/js/mootools.js',  destination_root('/public/javascripts/mootools.js'))
+    get('https://raw.github.com/padrino/padrino-static/master/ujs/mootools.js', destination_root('/public/javascripts/mootools-ujs.js'))
+  rescue StandardError
+    copy_file('templates/static/js/mootools.js',  destination_root('/public/javascripts/mootools.js'))
+    copy_file('templates/static/ujs/mootools.js', destination_root('/public/javascripts/mootools-ujs.js'))
   end
-  create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
+  create_file(destination_root('/public/javascripts/application.js'), '// Put your application scripts here')
 end

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

@@ -1,12 +1,12 @@
 def setup_script
   begin
-    get('https://raw.github.com/padrino/padrino-static/master/js/protopak.js',   destination_root("/public/javascripts/protopak.js"))
-    get('https://raw.github.com/padrino/padrino-static/master/js/lowpro.js',     destination_root("/public/javascripts/lowpro.js"))
-    get('https://raw.github.com/padrino/padrino-static/master/ujs/prototype.js', destination_root("/public/javascripts/prototype-ujs.js"))
-  rescue
-    copy_file('templates/static/js/protopak.js',   destination_root("/public/javascripts/protopak.js"))
-    copy_file('templates/static/js/lowpro.js',     destination_root("/public/javascripts/lowpro.js"))
-    copy_file('templates/static/ujs/prototype.js', destination_root("/public/javascripts/prototype-ujs.js"))
+    get('https://raw.github.com/padrino/padrino-static/master/js/protopak.js',   destination_root('/public/javascripts/protopak.js'))
+    get('https://raw.github.com/padrino/padrino-static/master/js/lowpro.js',     destination_root('/public/javascripts/lowpro.js'))
+    get('https://raw.github.com/padrino/padrino-static/master/ujs/prototype.js', destination_root('/public/javascripts/prototype-ujs.js'))
+  rescue StandardError
+    copy_file('templates/static/js/protopak.js',   destination_root('/public/javascripts/protopak.js'))
+    copy_file('templates/static/js/lowpro.js',     destination_root('/public/javascripts/lowpro.js'))
+    copy_file('templates/static/ujs/prototype.js', destination_root('/public/javascripts/prototype-ujs.js'))
   end
-  create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
+  create_file(destination_root('/public/javascripts/application.js'), '// Put your application scripts here')
 end

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

@@ -24,5 +24,5 @@ COMPASS
 def setup_stylesheet
   require_dependencies 'compass-blueprint'
   initializer :compass, COMPASS_INIT.chomp
-  directory "components/stylesheets/compass/", destination_root('/app/stylesheets')
+  directory 'components/stylesheets/compass/', destination_root('/app/stylesheets')
 end

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

@@ -10,10 +10,10 @@ LESS_INIT = <<-LESS unless defined?(LESS_INIT)
       # other configs ...
     end
     app.use Rack::Less,
-      :root      => Padrino.root,
-      :source    => 'app/stylesheets',
-      :public    => 'public',
-      :hosted_at => 'stylesheets'
+      root:      Padrino.root,
+      source:    'app/stylesheets',
+      public:    'public',
+      hosted_at: 'stylesheets'
 LESS
 
 def setup_stylesheet