padrino-gen 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c449949c0295889166784c7a75e8229cfa8e7a11f80ab5193d71e71977b9fd16
-  data.tar.gz: 10fca63d349d79e817191fe41a1ab6471989b58a68fe12603f918eb2daf69aa7
+  metadata.gz: 52d53bb4bdb519cda6e7b532caae6464e273d671bb2e026535b54b86e7f01ebe
+  data.tar.gz: 668f36bc2fcb2def4d49a24f1d061f977e7c508d09b7c5cb838fbead55d68d23
 SHA512:
-  metadata.gz: a380bfd0aac1774a49a4acc2253d43bc1f2369802a3acefa09ae62987831c858c03696c15f95d55e0245c8c53777ffc194437e25ad4af69bce15c35f22cea2fb
-  data.tar.gz: 458d7dba850cb8d798654f0ae39dbc4063e5fbca88604e605537c1bfdc12d65050869d637de65757376eb4c3816d3138b111d18a364eaef8b74af00ce7b6843d
+  metadata.gz: fccd728a0d2061d38541cac0983ba7d384428a8a5376501c6033d68b48306d2b21bcc6a533bfb468a871c0878aa5f51c53d0100d978746edfaa5addfd8ee7e5b
+  data.tar.gz: ba118e0fbf0cbdd5f148edfd2712966ff2039d543ea64afcdee89dfc4f74cd5a383a823ec1635f4d98165f3fe605a89175114c9095d262378e4183de0e6fd8f2

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

@@ -71,8 +71,8 @@ module Padrino
             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] }
-            add_columns    = tuples.map(&options[:add]).join("\n    ")
-            remove_columns = tuples.map(&options[:remove]).join("\n    ")
+            add_columns    = tuples.map(&options[:add]).join("\n      ")
+            remove_columns = tuples.map(&options[:remove]).join("\n      ")
             forward_text = change_format.gsub(/!TABLE!/, table_name).gsub(/!COLUMNS!/, add_columns) if tuples.any?
             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))

data/lib/padrino-gen/generators/components/tests/testunit 2.rb

@@ -0,0 +1,112 @@
+TESTUNIT_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_SETUP)
+RACK_ENV = 'test' unless defined?(RACK_ENV)
+require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+Dir[File.expand_path(File.dirname(__FILE__) + "/../app/helpers/**/*.rb")].each(&method(:require))
+
+class Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  # You can use this method to custom specify a Rack app
+  # you want rack-test to invoke:
+  #
+  #   app CLASS_NAME
+  #   app CLASS_NAME.tap { |a| }
+  #   app(CLASS_NAME) do
+  #     set :foo, :bar
+  #   end
+  #
+  def app(app = nil, &blk)
+    @app ||= block_given? ? app.instance_eval(&blk) : app
+    @app ||= Padrino.application
+  end
+end
+TEST
+
+TESTUNIT_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_RAKE)
+require 'rake/testtask'
+
+test_tasks = Dir['test/*/'].map { |d| File.basename(d) }
+
+test_tasks.each do |folder|
+  Rake::TestTask.new("test:\#{folder}") do |test|
+    test.pattern = "test/\#{folder}/**/*_test.rb"
+    test.verbose = true
+  end
+end
+
+desc "Run application test suite"
+task 'test' => test_tasks.map { |f| "test:\#{f}" }
+
+task :default => :test
+TEST
+
+TESTUNIT_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_CONTROLLER_TEST)
+require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
+
+class !NAME!ControllerTest < Test::Unit::TestCase
+  def setup
+    get "/"
+  end
+
+  def test_returns_hello_world_text
+    assert_equal "Hello World", last_response.body
+  end
+end
+TEST
+
+TESTUNIT_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_MODEL_TEST)
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
+
+class !NAME!Test < Test::Unit::TestCase
+  def test_constructs_a_new_instance
+    @!DNAME! = !NAME!.new
+    refute_nil @!DNAME!
+  end
+end
+TEST
+
+TESTUNIT_HELPER_TEST = (<<-TEST) unless defined?(TESTUNIT_HELPER_TEST)
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
+
+class !NAME!Test < Test::Unit::TestCase
+  def self.setup
+    @helpers = Class.new
+    @helpers.extend !CONSTANT_NAME!
+  end
+
+  def helpers
+    @helpers
+  end
+
+  def test_foo_helper
+    assert_equal nil, helpers.foo
+  end
+end
+TEST
+
+def setup_test
+  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
+  require_dependencies 'test-unit', :require => 'test/unit', :group => 'test'
+  insert_test_suite_setup TESTUNIT_SETUP
+  create_file destination_root("test/test.rake"), TESTUNIT_RAKE
+end
+
+def generate_controller_test(name, path)
+  test_unit_contents = TESTUNIT_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), test_unit_contents, :skip => true
+end
+
+def generate_model_test(name)
+  test_unit_contents = TESTUNIT_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  test_unit_contents.gsub!(/!PATH!/, recognize_path)
+  model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
+  create_file destination_root(model_test_path), test_unit_contents, :skip => true
+end
+
+def generate_helper_test(name, project_name, app_name)
+  test_unit_contents = TESTUNIT_HELPER_TEST.gsub(/!NAME!/, name).gsub(/!CONSTANT_NAME!/, "#{project_name}::#{app_name}::#{name}")
+  test_unit_contents.gsub!(/!PATH!/, recognize_path)
+  helper_spec_path = File.join('test', options[:app], 'helpers', "#{name.underscore}_test.rb")
+  create_file destination_root(helper_spec_path), test_unit_contents, :skip => true
+end

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

@@ -12,7 +12,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     namespace :create do
       desc "Create all the local databases defined in config/database.yml"
       task :all => :skeleton do
-        ActiveRecord::Base.configurations.each_value do |config|
+        with_all_databases do |config|
           # Skip entries that don't have a database key, such as the first entry here:
           #
           #  defaults: &defaults
@@ -33,7 +33,9 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
     desc "Creates the database defined in config/database.yml for the current Padrino.env"
     task :create => :skeleton do
-      create_database(ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env])
+      with_database(Padrino.env) do |config|
+        create_database(config)
+      end
     end
 
     def create_database(config)
@@ -90,7 +92,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     namespace :drop do
       desc "Drops all the local databases defined in config/database.yml"
       task :all => :skeleton do
-        ActiveRecord::Base.configurations.each_value do |config|
+        with_all_databases do |config|
           # Skip entries that don't have a database key
           next unless config[:database]
           begin
@@ -105,11 +107,12 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
     desc "Drops the database for the current Padrino.env"
     task :drop => :skeleton do
-      config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env || :development]
-      begin
-        drop_database(config)
-      rescue StandardError => e
-        catch_error(:drop, e, config)
+      with_database(Padrino.env || :development) do |config|
+        begin
+          drop_database(config)
+        rescue StandardError => e
+          catch_error(:drop, e, config)
+        end
       end
     end
 
@@ -127,8 +130,10 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
       if less_than_active_record_5_2?
         ActiveRecord::Migrator.migrate("db/migrate/", env_migration_version)
-      else
+      elsif less_than_active_record_6_0?
         ActiveRecord::MigrationContext.new("db/migrate/").migrate(env_migration_version)
+      else
+        ActiveRecord::MigrationContext.new("db/migrate/", ActiveRecord::SchemaMigration).migrate(env_migration_version)
       end
 
       Rake::Task["ar:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
@@ -167,28 +172,30 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
     desc "Retrieves the charset for the current environment's database"
     task :charset => :skeleton do
-      config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env || :development]
-      case config[:adapter]
-      when 'mysql', 'mysql2', 'em_mysql2', 'jdbcmysql'
-        ActiveRecord::Base.establish_connection(config)
-        puts ActiveRecord::Base.connection.charset
-      when 'postgresql'
-        ActiveRecord::Base.establish_connection(config)
-        puts ActiveRecord::Base.connection.encoding
-      else
-        puts 'Sorry, your database adapter is not supported yet, feel free to submit a patch.'
+      with_database(Padrino.env || :development) do |config|
+        case config[:adapter]
+        when 'mysql', 'mysql2', 'em_mysql2', 'jdbcmysql'
+          ActiveRecord::Base.establish_connection(config)
+          puts ActiveRecord::Base.connection.charset
+        when 'postgresql'
+          ActiveRecord::Base.establish_connection(config)
+          puts ActiveRecord::Base.connection.encoding
+        else
+          puts 'Sorry, your database adapter is not supported yet, feel free to submit a patch.'
+        end
       end
     end
 
     desc "Retrieves the collation for the current environment's database."
     task :collation => :skeleton do
-      config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env || :development]
-      case config[:adapter]
-      when 'mysql', 'mysql2', 'em_mysql2', 'jdbcmysql'
-        ActiveRecord::Base.establish_connection(config)
-        puts ActiveRecord::Base.connection.collation
-      else
-        puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+      with_database(Padrino.env || :development) do |config|
+        case config[:adapter]
+        when 'mysql', 'mysql2', 'em_mysql2', 'jdbcmysql'
+          ActiveRecord::Base.establish_connection(config)
+          puts ActiveRecord::Base.connection.collation
+        else
+          puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+        end
       end
     end
 
@@ -203,8 +210,10 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
         pending_migrations =
           if less_than_active_record_5_2?
             ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations
-          else
+          elsif less_than_active_record_6_0?
             ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).open.pending_migrations
+          else
+            ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration).open.pending_migrations
           end
 
         if pending_migrations.any?
@@ -244,36 +253,37 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     namespace :structure do
       desc "Dump the database structure to a SQL file."
       task :dump => :skeleton do
-        config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env]
-        case config[:adapter]
-        when "mysql", "mysql2", 'em_mysql2', "oci", "oracle", 'jdbcmysql'
-          config = config.inject({}){|result, (key, value)| result[key.to_s] = value; result }
-          ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, resolve_structure_sql)
-        when "postgresql"
-          ENV['PGHOST']     = config[:host] if config[:host]
-          ENV['PGPORT']     = config[:port].to_s if config[:port]
-          ENV['PGPASSWORD'] = config[:password].to_s if config[:password]
-          search_path = config[:schema_search_path]
-          if search_path
-            search_path = search_path.split(",").map{|search_path| "--schema=#{search_path.strip}" }.join(" ")
+        with_database(Padrino.env) do |config|
+          case config[:adapter]
+          when "mysql", "mysql2", 'em_mysql2', "oci", "oracle", 'jdbcmysql'
+            config = config.inject({}){|result, (key, value)| result[key.to_s] = value; result }
+            ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, resolve_structure_sql)
+          when "postgresql"
+            ENV['PGHOST']     = config[:host] if config[:host]
+            ENV['PGPORT']     = config[:port].to_s if config[:port]
+            ENV['PGPASSWORD'] = config[:password].to_s if config[:password]
+            search_path = config[:schema_search_path]
+            if search_path
+              search_path = search_path.split(",").map{|search_path| "--schema=#{search_path.strip}" }.join(" ")
+            end
+            `pg_dump -U "#{config[:username]}" -s -x -O -f db/#{Padrino.env}_structure.sql #{search_path} #{config[:database]}`
+            raise "Error dumping database" if $?.exitstatus == 1
+          when "sqlite", "sqlite3"
+            dbfile = config[:database] || config[:dbfile]
+            `#{config[:adapter]} #{dbfile} .schema > db/#{Padrino.env}_structure.sql`
+          when "sqlserver"
+            `scptxfr /s #{config[:host]} /d #{config[:database]} /I /f db\\#{Padrino.env}_structure.sql /q /A /r`
+            `scptxfr /s #{config[:host]} /d #{config[:database]} /I /F db\ /q /A /r`
+          when "firebird"
+            set_firebird_env(config)
+            db_string = firebird_db_string(config)
+            sh "isql -a #{db_string} > #{Padrino.root}/db/#{Padrino.env}_structure.sql"
+          else
+            raise "Task not supported by '#{config[:adapter]}'."
           end
-          `pg_dump -U "#{config[:username]}" -s -x -O -f db/#{Padrino.env}_structure.sql #{search_path} #{config[:database]}`
-          raise "Error dumping database" if $?.exitstatus == 1
-        when "sqlite", "sqlite3"
-          dbfile = config[:database] || config[:dbfile]
-          `#{config[:adapter]} #{dbfile} .schema > db/#{Padrino.env}_structure.sql`
-        when "sqlserver"
-          `scptxfr /s #{config[:host]} /d #{config[:database]} /I /f db\\#{Padrino.env}_structure.sql /q /A /r`
-          `scptxfr /s #{config[:host]} /d #{config[:database]} /I /F db\ /q /A /r`
-        when "firebird"
-          set_firebird_env(config)
-          db_string = firebird_db_string(config)
-          sh "isql -a #{db_string} > #{Padrino.root}/db/#{Padrino.env}_structure.sql"
-        else
-          raise "Task not supported by '#{config[:adapter]}'."
         end
 
-        if ActiveRecord::Base.connection.supports_migrations?
+        if !ActiveRecord::Base.connection.respond_to?(:supports_migrations?) || ActiveRecord::Base.connection.supports_migrations?
           File.open(resolve_structure_sql, "a"){|f| f << ActiveRecord::Base.connection.dump_schema_information }
         end
       end
@@ -371,8 +381,10 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
     if less_than_active_record_5_2?
       ActiveRecord::Migrator.run(type, "db/migrate/", version)
-    else
+    elsif less_than_active_record_6_0?
       ActiveRecord::MigrationContext.new('db/migrate/').run(type, version)
+    else
+      ActiveRecord::MigrationContext.new('db/migrate/', ActiveRecord::SchemaMigration).run(type, version)
     end
 
     dump_schema
@@ -383,8 +395,10 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
     if less_than_active_record_5_2?
       ActiveRecord::Migrator.send(type, 'db/migrate/', step)
-    else
+    elsif less_than_active_record_6_0?
       ActiveRecord::MigrationContext.new('db/migrate/').send(type, step)
+    else
+      ActiveRecord::MigrationContext.new('db/migrate/', ActiveRecord::SchemaMigration).send(type, step)
     end
 
     dump_schema
@@ -402,6 +416,36 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     ActiveRecord.version < Gem::Version.create("5.2.0")
   end
 
+  def less_than_active_record_6_0?
+    ActiveRecord.version < Gem::Version.create("6.0.0")
+  end
+
+  def with_database(env_name)
+    if less_than_active_record_6_0?
+      config = ActiveRecord::Base.configurations.with_indifferent_access[env_name]
+
+      yield config
+    else
+      db_configs = ActiveRecord::Base.configurations.configs_for(env_name: env_name.to_s)
+
+      db_configs.each do |db_config|
+        yield db_config.config.with_indifferent_access
+      end
+    end
+  end
+
+  def with_all_databases
+    if less_than_active_record_6_0?
+      ActiveRecord::Base.configurations.each_value do |config|
+        yield config
+      end
+    else
+      ActiveRecord::Base.configurations.configs_for.each do |db_config|
+        yield db_config.config.with_indifferent_access
+      end
+    end
+  end
+
   task 'db:migrate' => 'ar:migrate'
   task 'db:create'  => 'ar:create'
   task 'db:drop'    => 'ar:drop'

data/padrino-gen.gemspec

@@ -5,7 +5,6 @@ require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FIL
 
 Gem::Specification.new do |s|
   s.name = "padrino-gen"
-  s.rubyforge_project = "padrino-gen"
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
   s.email = "padrinorb@gmail.com"
   s.summary = "Generators for easily creating and building padrino applications"
@@ -24,7 +23,7 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-core", Padrino.version)
-  s.add_dependency("bundler", "~> 1.0")
+  s.add_dependency("bundler", ">= 1.0", "< 3")
   s.add_development_dependency("padrino-helpers", Padrino.version)
   s.add_development_dependency("padrino-mailer", Padrino.version)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,56 +19,62 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -127,6 +133,7 @@ files:
 - lib/padrino-gen/generators/components/tests/minitest.rb
 - lib/padrino-gen/generators/components/tests/rspec.rb
 - lib/padrino-gen/generators/components/tests/shoulda.rb
+- lib/padrino-gen/generators/components/tests/testunit 2.rb
 - lib/padrino-gen/generators/components/tests/testunit.rb
 - lib/padrino-gen/generators/controller.rb
 - lib/padrino-gen/generators/helper.rb
@@ -216,9 +223,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: padrino-gen
-rubygems_version: 2.7.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Generators for easily creating and building padrino applications
-test_files: []
+test_files:
+- test/fixtures/admin_template.rb
+- test/fixtures/example_template.rb
+- test/fixtures/git_template.rb
+- test/fixtures/plugin_template.rb
+- test/fixtures/rake_template.rb
+- test/helper.rb
+- test/test_app_generator.rb
+- test/test_cli.rb
+- test/test_component_generator.rb
+- test/test_controller_generator.rb
+- test/test_generator.rb
+- test/test_helper_generator.rb
+- test/test_mailer_generator.rb
+- test/test_migration_generator.rb
+- test/test_model_generator.rb
+- test/test_plugin_generator.rb
+- test/test_project_generator.rb
+- test/test_sql_helpers.rb
+- test/test_task_generator.rb