padrino-gen 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9897984eee6550c278a48190ada56e7d88d38cec9b6a912ce8136b911a8578f7
-  data.tar.gz: cc0de388292f104d491401feffbf673000b439728696ac4cd012a1fbba668bfd
+  metadata.gz: 4715ef3a71b10c1c828571ecc035af5e589b4f657376fc6c7ee17a5dbd21bcf5
+  data.tar.gz: 6a38e83c98b6db24b9415194fac781daeb477ffac5cafd8bf5bd5283a22898bb
 SHA512:
-  metadata.gz: 1c5f835446e50a8009cf55c37439fb0134faa3b1f2ea5fd14e342fbfe6688b4300a45f49a7efd7281a7af4aebfa471ba5eeac0061c8c2ac3c7d3aba861b664ba
-  data.tar.gz: e3cc0d72979f835fdaf9b04672eb7b0775cff146a65816b8b336bb340763d7f97dd292e46160ac403dc8a07ac294a91b5e5d4fe80a7cd675d2c9bdd0205725b6
+  metadata.gz: ed706f3cd3d2e29c84155019bffb0967ddb35641cb2e2afb84e05bed4dbbd603fc672342f54714d76723de706de1ab4b991f7f39d2384799625e2fba6dd8e5e1
+  data.tar.gz: 41cb109b4e0afeb29150e406416de84bd28a1c403d808ebb4729fb5c4e19f8d15612a549a2fcf87ffaeb5d64006eafaffe504bea39265f7badd44dd6fe543218

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

@@ -2,28 +2,30 @@ AR = (<<-AR) unless defined?(AR)
 ##
 # You can use other adapters like:
 #
-#   ActiveRecord::Base.configurations[:development] = {
-#     :adapter   => 'mysql2',
-#     :encoding  => 'utf8',
-#     :reconnect => true,
-#     :database  => 'your_database',
-#     :pool      => 5,
-#     :username  => 'root',
-#     :password  => '',
-#     :host      => 'localhost',
-#     :socket    => '/tmp/mysql.sock'
+#   ActiveRecord::Base.configurations = {
+#     :development => {
+#       :adapter   => 'mysql2',
+#       :encoding  => 'utf8',
+#       :reconnect => true,
+#       :database  => 'your_database',
+#       :pool      => 5,
+#       :username  => 'root',
+#       :password  => '',
+#       :host      => 'localhost',
+#       :socket    => '/tmp/mysql.sock'
+#     }
 #   }
 #
-ActiveRecord::Base.configurations[:development] = {
+ActiveRecord::Base.configurations = {
+  :development => {
 !DB_DEVELOPMENT!
-}
-
-ActiveRecord::Base.configurations[:production] = {
+  },
+  :production => {
 !DB_PRODUCTION!
-}
-
-ActiveRecord::Base.configurations[:test] = {
+  },
+  :test => {
 !DB_TEST!
+  }
 }
 
 # Setup our logger
@@ -52,48 +54,49 @@ ActiveSupport.use_standard_json_time_format = true
 ActiveSupport.escape_html_entities_in_json = false
 
 # Now we can establish connection with our db.
-ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Padrino.env])
-
-# Timestamps are in the utc by default.
-ActiveRecord::Base.default_timezone = :utc
+if ActiveRecord::VERSION::MAJOR.to_i < 6
+  ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Padrino.env])
+else
+  ActiveRecord::Base.establish_connection(Padrino.env)
+end
 AR
 
 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'
+    :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'
+    :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
+    :adapter   => 'postgresql',
+    :database  => !DB_NAME!,
+    :username  => 'root',
+    :password  => '',
+    :host      => 'localhost',
+    :port      => 5432
 POSTGRES
 
 SQLITE = (<<-SQLITE) unless defined?(SQLITE)
-  :adapter => 'sqlite3',
-  :database => !DB_NAME!
+    :adapter => 'sqlite3',
+    :database => !DB_NAME!
 SQLITE
 
 CONNECTION_POOL_MIDDLEWARE = <<-MIDDLEWARE

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

@@ -126,7 +126,7 @@ module Padrino
           when template_file =~ %r{^https?://} && template_file !~ /gist/
             template_file
           when template_file =~ /gist/ && template_file !~ /raw/
-            raw_link, _ = *open(template_file) { |io| io.read.scan(/<a\s+href\s?\=\"(.*?)\"\>raw/) }
+            raw_link, _ = *URI.open(template_file) { |io| io.read.scan(/<a\s+href\s?\=\"(.*?)\"\>raw/) }
             raw_link ? "https://gist.github.com#{raw_link[0]}" : template_file
           when File.extname(template_file).empty? # referencing official plugin (i.e hoptoad)
             "https://raw.github.com/padrino/padrino-recipes/master/#{kind.to_s.pluralize}/#{template_file}_#{kind}.rb"

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

@@ -420,6 +420,10 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     ActiveRecord.version < Gem::Version.create("6.0.0")
   end
 
+  def less_than_active_record_6_1?
+    ActiveRecord.version < Gem::Version.create("6.1.0")
+  end
+
   def with_database(env_name)
     if less_than_active_record_6_0?
       config = ActiveRecord::Base.configurations.with_indifferent_access[env_name]
@@ -429,7 +433,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       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
+        yield configuration_hash(db_config)
       end
     end
   end
@@ -441,11 +445,17 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       end
     else
       ActiveRecord::Base.configurations.configs_for.each do |db_config|
-        yield db_config.config.with_indifferent_access
+        yield configuration_hash(db_config)
       end
     end
   end
 
+  def configuration_hash(configuration)
+    return configuration if less_than_active_record_6_0?
+    config = less_than_active_record_6_1 ? configuration.config : configuration.configuration_hash
+    config.with_indifferent_access
+  end
+
   task 'db:migrate' => 'ar:migrate'
   task 'db:create'  => 'ar:create'
   task 'db:drop'    => 'ar:drop'

data/test/fixtures/database_template.rb

@@ -0,0 +1,66 @@
+##
+# You can use other adapters like:
+#
+#   ActiveRecord::Base.configurations = {
+#     :development => {
+#       :adapter   => 'mysql2',
+#       :encoding  => 'utf8',
+#       :reconnect => true,
+#       :database  => 'your_database',
+#       :pool      => 5,
+#       :username  => 'root',
+#       :password  => '',
+#       :host      => 'localhost',
+#       :socket    => '/tmp/mysql.sock'
+#     }
+#   }
+#
+ActiveRecord::Base.configurations = {
+  :development => {
+    :adapter => 'sqlite3',
+    :database => Padrino.root('db', 'sample_project_development.db')
+
+  },
+  :production => {
+    :adapter => 'sqlite3',
+    :database => Padrino.root('db', 'sample_project_production.db')
+
+  },
+  :test => {
+    :adapter => 'sqlite3',
+    :database => Padrino.root('db', 'sample_project_test.db')
+
+  }
+}
+
+# Setup our logger
+ActiveRecord::Base.logger = logger
+
+if ActiveRecord::VERSION::MAJOR.to_i < 4
+  # 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
+end
+
+# 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 establish connection with our db.
+if ActiveRecord::VERSION::MAJOR.to_i < 6
+  ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Padrino.env])
+else
+  ActiveRecord::Base.establish_connection(Padrino.env)
+end

data/test/helper.rb

@@ -1,6 +1,5 @@
 require 'minitest/autorun'
 require 'minitest/pride'
-require 'mocha/setup'
 require 'rack/test'
 require 'fakeweb'
 require 'thor/group'
@@ -11,6 +10,7 @@ require 'padrino-helpers'
 
 require 'ext/minitest-spec'
 require 'ext/fakeweb-ruby24'
+require 'mocha/minitest'
 
 Padrino::Generators.load_components!
 

data/test/test_component_generator.rb

@@ -26,6 +26,8 @@ describe "ComponentGenerator" do
       assert_match_in_file(/gem 'activerecord', '>= 3.1', :require => 'active_record'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'sqlite3'/, "#{@apptmp}/sample_project/Gemfile")
       refute_match(/Switch renderer to/, out)
+      database_template_path = File.join(File.dirname(__FILE__), 'fixtures', 'database_template.rb')
+      assert FileUtils.compare_file("#{@apptmp}/sample_project/config/database.rb", database_template_path)
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'activerecord', components_chosen[:orm]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,28 +53,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -184,6 +184,7 @@ files:
 - lib/padrino-gen/padrino-tasks/sql-helpers.rb
 - padrino-gen.gemspec
 - test/fixtures/admin_template.rb
+- test/fixtures/database_template.rb
 - test/fixtures/example_template.rb
 - test/fixtures/git_template.rb
 - test/fixtures/plugin_template.rb
@@ -228,6 +229,7 @@ specification_version: 4
 summary: Generators for easily creating and building padrino applications
 test_files:
 - test/fixtures/admin_template.rb
+- test/fixtures/database_template.rb
 - test/fixtures/example_template.rb
 - test/fixtures/git_template.rb
 - test/fixtures/plugin_template.rb