kirei 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bde9dc5680f9744ab2eb1d0fce8fce8019f2177ee263d1b8d6d82bb9c6fff73
-  data.tar.gz: 48732a443adf3d134fcf0fcdabc5e191b794f31a7966e36c1f83e80a9fe9585f
+  metadata.gz: 0e16807cffd59ce38ba7cb3e8a0474e26fff5c4d6598ee63ac745382d0c4d30f
+  data.tar.gz: 180c00ecc9ad0668cffcf3f1448779acbe2e5fb35c8f7632159358d8637734c3
 SHA512:
-  metadata.gz: f5a4a532eb8181cf02d7725bed41c8492eb11e0b879e4a51ad430674e220dbb5b26c1b5a44aa29790f6af8f7a1b9ccc132262bb239815f3c290c75c2e7edaaea
-  data.tar.gz: 604c5d622a63e5817e39b99d3029d2e15caa1c90a370cb44e9b2a0a321db8317c8da1686543a7267beef957abb149501c200fd0c5d2a148513210c7ab03e9ae5
+  metadata.gz: 780e826760bd7ff48e1decf31446c7f9d5b3fc9504c5b3674af04b746cda67f1bba61fe27658fdec5993e1c2c0bba3030a45557f32d8cc0465342a85da1fd6db
+  data.tar.gz: 7e32df47ece711cc97471801bad3085e2f1008abca7f0be1af8acf402c8569199018284bbeb6ece672a6745cd06957f30e29802218372ef1816c64e431813b36

data/lib/cli/commands/new_app/files/app.rb

@@ -29,8 +29,8 @@ module Cli
               Dir[File.join(__dir__, "config/initializers", "*.rb")].each { require(_1) }
 
               # Fourth: load all application code
-              loader = Zeitwerk::Loader.new
-              loader.tag = File.basename(__FILE__, ".rb")
+              APP_LOADER = Zeitwerk::Loader.new
+              APP_LOADER.tag = File.basename(__FILE__, ".rb")
               [
                 "/app",
                 "/app/models",
@@ -38,9 +38,9 @@ module Cli
               ].each do |root_namespace|
                 # a root namespace skips the auto-infered module for this folder
                 # so we don't have to write e.g. `Models::` or `Services::`
-                loader.push_dir("\#{File.dirname(__FILE__)}\#{root_namespace}")
+                APP_LOADER.push_dir("\#{File.dirname(__FILE__)}\#{root_namespace}")
               end
-              loader.setup
+              APP_LOADER.setup
 
               # Fifth: load configs
               Dir[File.join(__dir__, "config", "**", "*.rb")].each do |cnf|
@@ -52,7 +52,7 @@ module Cli
                 config.app_name = "#{snake_case_app_name}"
               end
 
-              loader.eager_load
+              APP_LOADER.eager_load
             RUBY
           end
         end

data/lib/cli/commands/new_app/files/db_rake.rb

@@ -173,24 +173,23 @@ module Cli
                     next if !model_file_name.nil? && model_file == model_file_name
 
                     model_path = File.expand_path(model_file, app_root_dir)
-                    loader = Zeitwerk::Registry.loaders.find { |l| l.tag == "app" }
 
                     full_path = File.expand_path(model_file, app_root_dir)
-                    klass_constant_name = loader.inflector.camelize(File.basename(model_file, ".rb"), full_path)
+                    klass_constant_name = APP_LOADER.inflector.camelize(File.basename(model_file, ".rb"), full_path)
 
                     #
                     # root namespaces in Zeitwerk are flattend, e.g. if "app/models" is a root namespace
                     # then a file "app/models/airport.rb" is loaded as "::Airport".
                     # if it weren't a root namespace, it would be "::Models::Airport".
                     #
-                    root_dir_namespaces = loader.dirs.filter_map { |dir| dir == app_dir ? nil : Pathname.new(dir).relative_path_from(Pathname.new(app_dir)).to_s }
+                    root_dir_namespaces = APP_LOADER.dirs.filter_map { |dir| dir == app_dir ? nil : Pathname.new(dir).relative_path_from(Pathname.new(app_dir)).to_s }
                     relative_path = Pathname.new(full_path).relative_path_from(Pathname.new(app_dir)).to_s
                     root_dir_of_model = root_dir_namespaces.find { |root_dir| relative_path.start_with?(root_dir) }
                     relative_path.sub!("\#{root_dir_of_model}/", "") unless root_dir_of_model.nil? || root_dir_of_model.empty?
 
                     namespace_parts = relative_path.split("/")
                     namespace_parts.pop
-                    namespace_parts.map! { |part| loader.inflector.camelize(part, full_path) }
+                    namespace_parts.map! { |part| APP_LOADER.inflector.camelize(part, full_path) }
 
                     constant_name = "\#{namespace_parts.join('::')}::\#{klass_constant_name}"
 
@@ -231,6 +230,7 @@ module Cli
                   name, info = column
                   type = "\#{info[:db_type]}(\#{info[:max_length]})" if info[:max_length]
                   type ||= info[:db_type]
+                  type = "\#{type}, " if type.size >= 20 \# e.g. "timestamp without time zone" exceeds 20 characters
                   null = info[:allow_null] ? 'null' : 'not null'
                   primary_key = info[:primary_key] ? ', primary key' : ''
                   lines << "#  \#{name.to_s.ljust(20)}:\#{type.to_s.ljust(20)}\#{null}\#{primary_key}"

data/lib/kirei/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Kirei
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kirei
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ludwig Reinmiedl