kadim 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f959d981c5d60f0c0c80e432a6f7a58a83292d26f1832b4ce258b8bda5a917df
-  data.tar.gz: 27b80989c051e87fb519993d303f371d5a82a22d4addbaa22860510c324077fc
+  metadata.gz: bb10d2b3091f4e7bdc49e88058db5b838c97482b6d6ad58fb5c4a422c96a6fe3
+  data.tar.gz: e3004720b218b5096cab2d9e32cd494d4d1107675138a13083f1cef78c22b99e
 SHA512:
-  metadata.gz: 44578c37c3eace77d20d647d455324a935770a9e4234e7683e5ba3b5f7baaa729f6b5d11f20636f8469c825ed4cb8e4a1868eeda52e42678e7b1057e025b6275
-  data.tar.gz: 57d0e0b03de119a5945125cd33156d6e7cbc343f890ba166a9b4e1d9c280cce7cffc972140384bfa1db8997023d766d29875d9a0f196175db75e60f2d73fc937
+  metadata.gz: 74e7820f0b0c11f246fa9e836da1e80d32e3ab910c5ae3ca963895fe07ea83e6c5672eba885fa809ac8ac83a9800dc3ab450aad54a4088bb159b2e011890531c
+  data.tar.gz: e94ae1be0be89d4a255190ce010d0c6c99c203433d52bd967d70ca242cd6468b1d9e069f75fb0729348c29f85abc3dc80f8f42ff1f520462d9e8ce5e68a893a1

data/README.md

@@ -33,8 +33,8 @@ this with the main kadim controller, to add safety rules, etc.
 You also provide two generators to make this task easier.
 
 ```bash
-rails g kadim: host
-rails g kadim: host: scaffold_controller ModelName
+rails g kadim:host
+rails g kadim:host:scaffold_controller ModelName
 ```
 
 The first one copies the basic kadim infrastructure to your application, ie the

data/lib/kadim.rb

@@ -14,16 +14,17 @@ module Kadim
 
   def self.bootstrap_controllers
     cleanup
+    load_app_kadim_consts
     scaffold_controllers
   end
 
   def self.scaffold_attributes(model_klass)
     model_klass.columns
-                .reject { |column| %w[id created_at updated_at].include?(column.name) }
-                .sort_by(&:name)
-                .map { |column| [column.name, column.type] }
-                .to_h
-                .map { |k, v| "#{k}:#{v}" }
+               .reject { |column| %w[id created_at updated_at].include?(column.name) }
+               .sort_by(&:name)
+               .map { |column| [column.name, column.type] }
+               .to_h
+               .map { |k, v| "#{k}:#{v}" }
   end
 
   class << self
@@ -38,16 +39,15 @@ module Kadim
       end
 
       def cleanup_kadim_consts
-        controller_filenames.each do |controller_filename|
-          next if File.exist?(Rails.root.join("app", "controllers", "kadim", "#{controller_filename}.rb"))
-
-          controller_klass = controller_filename.camelize
-          Kadim.send(:remove_const, controller_klass) if Kadim.const_defined?(controller_klass, false)
+        app_model_paths.each do |model_path|
+          controller_klass_name = "#{model_path.pluralize}_controller".camelize
+          Kadim.send(:remove_const, controller_klass_name) if Kadim.const_defined?(controller_klass_name, false)
         end
       end
 
-      def controller_filenames
-        app_model_paths.map { |model_name| "#{model_name.pluralize}_controller" }
+      def load_app_kadim_consts
+        Dir[Rails.root.join("app", "controllers", "kadim", "**", "*_controller.rb")].each { |path| load path }
+        Dir[Rails.root.join("app", "helpers", "kadim", "**", "*_helper.rb")].each { |path| load path }
       end
 
       def scaffold_controllers
@@ -56,7 +56,11 @@ module Kadim
 
         current_namespace = Rails::Generators.namespace
         Rails::Generators.namespace = Kadim
-        app_model_paths.each { |model_name| scaffold_controller(model_name) }
+        app_model_paths.each do |model_name|
+          next if Kadim.const_defined?("#{model_name.pluralize}_controller".camelize, false)
+
+          scaffold_controller(model_name)
+        end
         load_kadim_controllers
         load_kadim_views
       ensure
@@ -78,7 +82,13 @@ module Kadim
       end
 
       def load_kadim_controllers
-        Dir[Rails.root.join("tmp", "kadim", "app", "controllers", "**", "*_controller.rb")].each { |path| load path }
+        Dir[Rails.root.join("tmp", "kadim", "app", "controllers", "**", "*_controller.rb")].each do |path|
+          retries ||= 0
+          load path
+        rescue LoadError
+          retry if (retries += 1) < 3
+          raise "Ops, failed to load kadim controllers, please restart your application!"
+        end
       end
 
       def load_kadim_views

data/lib/kadim/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kadim
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kadim
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kadu Diógenes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2019-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-resumable
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: rails-dom-testing
   requirement: !ruby/object:Gem::Requirement