padrino-gen 0.16.0.pre4 → 0.16.0

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

@@ -1,46 +1,46 @@
-COUCHREST = (<<-COUCHREST) unless defined?(COUCHREST)
-case Padrino.env
-  when :development then db_name = '!NAME!_development'
-  when :production  then db_name = '!NAME!_production'
-  when :test        then db_name = '!NAME!_test'
-end
+COUCHREST = <<~COUCHREST unless defined?(COUCHREST)
+  case Padrino.env
+    when :development then db_name = '!NAME!_development'
+    when :production  then db_name = '!NAME!_production'
+    when :test        then db_name = '!NAME!_test'
+  end
 
-CouchRest::Model::Base.configure do |conf|
-  conf.model_type_key = 'type' # compatibility with CouchModel 1.1
-  conf.database = CouchRest.database!(db_name)
-  conf.environment = Padrino.env
-  # conf.connection = {
-  #   :protocol => 'http',
-  #   :host     => 'localhost',
-  #   :port     => '5984',
-  #   :prefix   => 'padrino',
-  #   :suffix   => nil,
-  #   :join     => '_',
-  #   :username => nil,
-  #   :password => nil
-  # }
-end
+  CouchRest::Model::Base.configure do |conf|
+    conf.model_type_key = 'type' # compatibility with CouchModel 1.1
+    conf.database = CouchRest.database!(db_name)
+    conf.environment = Padrino.env
+    # conf.connection = {
+    #   protocol: 'http',
+    #   host:     'localhost',
+    #   port:     '5984',
+    #   prefix:   'padrino',
+    #   suffix:   nil,
+    #   join:     '_',
+    #   username: nil,
+    #   password: nil
+    # }
+  end
 COUCHREST
 
 def setup_orm
-  require_dependencies 'couchrest_model', :version => '~>1.1.0'
+  require_dependencies 'couchrest_model', version: '~>1.1.0'
   require_dependencies 'json_pure'
-  create_file("config/database.rb", COUCHREST.gsub(/!NAME!/, @project_name.underscore))
+  create_file('config/database.rb', COUCHREST.gsub(/!NAME!/, @project_name.underscore))
 end
 
-CR_MODEL = (<<-MODEL) unless defined?(CR_MODEL)
-class !NAME! < CouchRest::Model::Base
-  unique_id :id
-  # property <name>
-  !FIELDS!
-end
+CR_MODEL = <<~MODEL unless defined?(CR_MODEL)
+  class !NAME! < CouchRest::Model::Base
+    unique_id :id
+    # property <name>
+    !FIELDS!
+  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(":") }
-  column_declarations = field_tuples.map { |field, kind| "property :#{field}" }.join("\n  ")
+  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.underscore.camelize)
   model_contents.gsub!(/!FIELDS!/, column_declarations)
   create_file(model_path, model_contents)

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

@@ -1,65 +1,65 @@
-DM = (<<-DM) unless defined?(DM)
-##
-# A MySQL connection:
-# DataMapper.setup(:default, 'mysql://user:password@localhost/the_database_name')
-#
-# # A Postgres connection:
-# DataMapper.setup(:default, 'postgres://user:password@localhost/the_database_name')
-#
-# # A Sqlite3 connection
-# DataMapper.setup(:default, "sqlite3://" + Padrino.root('db', "development.db"))
-#
-# # Setup DataMapper using config/database.yml
-# DataMapper.setup(:default, YAML.load_file(Padrino.root('config/database.yml'))[RACK_ENV])
-#
-# config/database.yml file:
-#
-# ---
-# development: &defaults
-#   adapter: mysql
-#   database: example_development
-#   username: user
-#   password: Pa55w0rd
-#   host: 127.0.0.1
-#
-# test:
-#   <<: *defaults
-#   database: example_test
-#
-# production:
-#   <<: *defaults
-#   database: example_production
-#
-
-DataMapper.logger = logger
-DataMapper::Property::String.length(255)
-
-case Padrino.env
-  when :development then DataMapper.setup(:default, !DB_DEVELOPMENT!)
-  when :production  then DataMapper.setup(:default, !DB_PRODUCTION!)
-  when :test        then DataMapper.setup(:default, !DB_TEST!)
-end
+DM = <<~DM unless defined?(DM)
+  ##
+  # A MySQL connection:
+  # DataMapper.setup(:default, 'mysql://user:password@localhost/the_database_name')
+  #
+  # # A Postgres connection:
+  # DataMapper.setup(:default, 'postgres://user:password@localhost/the_database_name')
+  #
+  # # A Sqlite3 connection
+  # DataMapper.setup(:default, "sqlite3://" + Padrino.root('db', "development.db"))
+  #
+  # # Setup DataMapper using config/database.yml
+  # DataMapper.setup(:default, YAML.load_file(Padrino.root('config/database.yml'))[RACK_ENV])
+  #
+  # config/database.yml file:
+  #
+  # ---
+  # development: &defaults
+  #   adapter: mysql
+  #   database: example_development
+  #   username: user
+  #   password: Pa55w0rd
+  #   host: 127.0.0.1
+  #
+  # test:
+  #   <<: *defaults
+  #   database: example_test
+  #
+  # production:
+  #   <<: *defaults
+  #   database: example_production
+  #
+
+  DataMapper.logger = logger
+  DataMapper::Property::String.length(255)
+
+  case Padrino.env
+    when :development then DataMapper.setup(:default, !DB_DEVELOPMENT!)
+    when :production  then DataMapper.setup(:default, !DB_PRODUCTION!)
+    when :test        then DataMapper.setup(:default, !DB_TEST!)
+  end
 DM
 
-IDENTITY_MAP_MIDDLEWARE = <<-MIDDLEWARE
-class IdentityMap
-  def initialize(app, name = :default)
-    @app = app
-    @name = name.to_sym
-  end
+IDENTITY_MAP_MIDDLEWARE = <<~MIDDLEWARE
+  class IdentityMap
+    def initialize(app, name = :default)
+      @app = app
+      @name = name.to_sym
+    end
 
-  def call(env)
-    ::DataMapper.repository(@name) do
-      @app.call(env)
+    def call(env)
+      ::DataMapper.repository(@name) do
+        @app.call(env)
+      end
     end
   end
-end
 MIDDLEWARE
 
 def setup_orm
   dm = DM
   db = @project_name.underscore
-  %w(
+  %w[
     dm-core
     dm-types
     dm-aggregates
@@ -67,99 +67,104 @@ def setup_orm
     dm-migrations
     dm-timestamps
     dm-validations
-  ).each { |dep| require_dependencies dep }
+  ].each { |dep| require_dependencies dep }
 
   begin
     case adapter ||= options[:adapter]
     when 'mysql', 'mysql2'
-      dm.gsub!(/!DB_DEVELOPMENT!/,"\"mysql://root@localhost/#{db}_development\"")
-      dm.gsub!(/!DB_PRODUCTION!/,"\"mysql://root@localhost/#{db}_production\"")
-      dm.gsub!(/!DB_TEST!/,"\"mysql://root@localhost/#{db}_test\"")
+      dm.gsub!(/!DB_DEVELOPMENT!/, "\"mysql://root@localhost/#{db}_development\"")
+      dm.gsub!(/!DB_PRODUCTION!/, "\"mysql://root@localhost/#{db}_production\"")
+      dm.gsub!(/!DB_TEST!/, "\"mysql://root@localhost/#{db}_test\"")
       require_dependencies 'dm-mysql-adapter'
     when 'postgres'
-      dm.gsub!(/!DB_DEVELOPMENT!/,"\"postgres://root@localhost/#{db}_development\"")
-      dm.gsub!(/!DB_PRODUCTION!/,"\"postgres://root@localhost/#{db}_production\"")
-      dm.gsub!(/!DB_TEST!/,"\"postgres://root@localhost/#{db}_test\"")
+      dm.gsub!(/!DB_DEVELOPMENT!/, "\"postgres://root@localhost/#{db}_development\"")
+      dm.gsub!(/!DB_PRODUCTION!/, "\"postgres://root@localhost/#{db}_production\"")
+      dm.gsub!(/!DB_TEST!/, "\"postgres://root@localhost/#{db}_test\"")
       require_dependencies 'dm-postgres-adapter'
     when 'sqlite'
-      dm.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite3://\" + Padrino.root('db', \"#{db}_development.db\")")
-      dm.gsub!(/!DB_PRODUCTION!/,"\"sqlite3://\" + Padrino.root('db', \"#{db}_production.db\")")
-      dm.gsub!(/!DB_TEST!/,"\"sqlite3://\" + Padrino.root('db', \"#{db}_test.db\")")
+      dm.gsub!(/!DB_DEVELOPMENT!/, "\"sqlite3://\" + Padrino.root('db', \"#{db}_development.db\")")
+      dm.gsub!(/!DB_PRODUCTION!/, "\"sqlite3://\" + Padrino.root('db', \"#{db}_production.db\")")
+      dm.gsub!(/!DB_TEST!/, "\"sqlite3://\" + Padrino.root('db', \"#{db}_test.db\")")
       require_dependencies 'dm-sqlite-adapter'
     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 postgres sqlite])
+    adapter = ask('Please, choose a proper adapter:', limited_to: %w[mysql mysql2 postgres sqlite])
     retry
   end
 
-  create_file("config/database.rb", dm)
-  insert_hook("DataMapper.finalize", :after_load)
+  create_file('config/database.rb', dm)
+  insert_hook('DataMapper.finalize', :after_load)
   middleware :identity_map, IDENTITY_MAP_MIDDLEWARE
 end
 
-DM_MODEL = (<<-MODEL) unless defined?(DM_MODEL)
-class !NAME!
-  include DataMapper::Resource
+DM_MODEL = <<~MODEL unless defined?(DM_MODEL)
+  class !NAME!
+    include DataMapper::Resource
 
-  # property <name>, <type>
-  property :id, Serial
-  !FIELDS!
-end
+    # property <name>, <type>
+    property :id, Serial
+    !FIELDS!
+  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 = DM_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
-  field_tuples = options[:fields].map { |value| value.split(":") }
+  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.underscore.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
 
-DM_MIGRATION = (<<-MIGRATION) unless defined?(DM_MIGRATION)
-migration !VERSION!, :!FILENAME! do
-  up do
-    !UP!
-  end
+DM_MIGRATION = <<~MIGRATION unless defined?(DM_MIGRATION)
+  migration !VERSION!, :!FILENAME! do
+    up do
+      !UP!
+    end
 
-  down do
-    !DOWN!
+    down do
+      !DOWN!
+    end
   end
-end
 MIGRATION
 
-DM_MODEL_UP_MG =  (<<-MIGRATION).gsub(/^/, '    ') unless defined?(DM_MODEL_UP_MG)
-create_table :!TABLE! do
-  column :id, Integer, :serial => true
-  !FIELDS!
-end
+DM_MODEL_UP_MG = <<~MIGRATION.gsub(/^/, '    ') unless defined?(DM_MODEL_UP_MG)
+  create_table :!TABLE! do
+    column :id, Integer, serial: true
+    !FIELDS!
+  end
 MIGRATION
 
-DM_MODEL_DOWN_MG =  (<<-MIGRATION) unless defined?(DM_MODEL_DOWN_MG)
-drop_table :!TABLE!
+DM_MODEL_DOWN_MG = <<~MIGRATION unless defined?(DM_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| "column :#{field}, DataMapper::Property::#{kind.classify}#{', :length => 255' if kind =~ /string/i}" },
-       :base => DM_MIGRATION, :up => DM_MODEL_UP_MG, :down => DM_MODEL_DOWN_MG)
+  output_model_migration(
+    migration_name, name, columns,
+    column_format: proc { |field, kind| "column :#{field}, DataMapper::Property::#{kind.classify}#{', length: 255' if kind =~ /string/i}" },
+    base: DM_MIGRATION,
+    up: DM_MODEL_UP_MG,
+    down: DM_MODEL_DOWN_MG
+  )
 end
 
-DM_CHANGE_MG = (<<-MIGRATION).gsub(/^/, '    ') unless defined?(DM_CHANGE_MG)
-modify_table :!TABLE! do
-  !COLUMNS!
-end
+DM_CHANGE_MG = <<~MIGRATION.gsub(/^/, '    ') unless defined?(DM_CHANGE_MG)
+  modify_table :!TABLE! do
+    !COLUMNS!
+  end
 MIGRATION
 
 def create_migration_file(migration_name, name, columns)
-  output_migration_file(migration_name, name, columns,
-    :base => DM_MIGRATION, :change_format => DM_CHANGE_MG,
-    :add => Proc.new { |field, kind| "add_column :#{field}, #{kind.classify}" },
-    :remove => Proc.new { |field, kind| "drop_column :#{field}" }
+  output_migration_file(
+    migration_name, name, columns,
+    base: DM_MIGRATION, change_format: DM_CHANGE_MG,
+    add: proc { |field, kind| "add_column :#{field}, #{kind.classify}" },
+    remove: proc { |field, _kind| "drop_column :#{field}" }
   )
 end

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

@@ -1,57 +1,57 @@
-DYNAMOID = (<<-DYNAMOID) unless defined?(DYNAMOID)
+DYNAMOID = <<~DYNAMOID unless defined?(DYNAMOID)
 
-AWS.config({
-  :access_key_id => ENV['AWS_ACCESS_KEY'],
-  :secret_access_key => ENV['AWS_SECRET_KEY'],
-  :dynamo_db_endpoint => 'dynamodb.ap-southeast-1.amazonaws.com'
-})
+  AWS.config(
+    access_key_id: ENV['AWS_ACCESS_KEY'],
+    secret_access_key: ENV['AWS_SECRET_KEY'],
+    dynamo_db_endpoint: 'dynamodb.ap-southeast-1.amazonaws.com'
+  )
 
-Dynamoid.configure do |config|
-  config.adapter = 'aws_sdk' # This adapter establishes a connection to the DynamoDB servers using Amazon's own AWS gem.
-  config.read_capacity = 100 # Read capacity for your tables
-  config.write_capacity = 20 # Write capacity for your tables
-end
+  Dynamoid.configure do |config|
+    config.adapter = 'aws_sdk' # This adapter establishes a connection to the DynamoDB servers using Amazon's own AWS gem.
+    config.read_capacity = 100 # Read capacity for your tables
+    config.write_capacity = 20 # Write capacity for your tables
+  end
 
-# If you use mock in testing [for example in case of using fake_dynamo],
-# the way is as following:
-#
-#   - install fake_dynamo
-#     gem install fake_dynamo --version 0.1.3
-#   - run
-#     fake_dynamo --port 4567
-# 
-# And then setting for AWS.config is as following:
-# 
-#   AWS.config({
-#     :access_key_id => 'xxx', # everything is ok
-#     :secret_access_key => 'xxx', # everything is ok
-#     :dynamo_db_endpoint => 'localhost', # fake_dynamo runs hostname
-#     :dynamo_db_port => 4567, # fake_dynamo listens port
-#     :use_ssl => false # fake_dynamo don't speak ssl
-#   })
-#
-# Additional information on https://github.com/ananthakumaran/fake_dynamo
+  # If you use mock in testing [for example in case of using fake_dynamo],
+  # the way is as following:
+  #
+  #   - install fake_dynamo
+  #     gem install fake_dynamo --version 0.1.3
+  #   - run
+  #     fake_dynamo --port 4567
+  ##{' '}
+  # And then setting for AWS.config is as following:
+  ##{' '}
+  #   AWS.config({
+  #     access_key_id:      'xxx', # everything is ok
+  #     secret_access_key:  'xxx', # everything is ok
+  #     dynamo_db_endpoint: 'localhost', # fake_dynamo runs hostname
+  #     dynamo_db_port:     4567, # fake_dynamo listens port
+  #     use_ssl:            false # fake_dynamo don't speak ssl
+  #   })
+  #
+  # Additional information on https://github.com/ananthakumaran/fake_dynamo
 DYNAMOID
 
 def setup_orm
   require_dependencies 'aws-sdk'
-  require_dependencies 'dynamoid', :version => '~>0.7.1'
-  create_file("config/database.rb", DYNAMOID.gsub(/!NAME!/, @project_name.underscore))
+  require_dependencies 'dynamoid', version: '~>0.7.1'
+  create_file('config/database.rb', DYNAMOID.gsub(/!NAME!/, @project_name.underscore))
 end
 
-DYNAMOID_MODEL = (<<-MODEL) unless defined?(DYNAMOID_MODEL)
-class !NAME!
-  include Dynamoid::Document
+DYNAMOID_MODEL = <<~MODEL unless defined?(DYNAMOID_MODEL)
+  class !NAME!
+    include Dynamoid::Document
 
-  !FIELDS!
+    !FIELDS!
 
-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")
-  field_tuples = options[:fields].map { |value| value.split(":") }
+  field_tuples = options[:fields].map { |value| value.split(':') }
   column_declarations = field_tuples.map { |field, kind| "field :#{field}, :#{kind}" }.join("\n  ")
   model_contents = DYNAMOID_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
   model_contents.gsub!(/!FIELDS!/, column_declarations)