easy_gen 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c04ab1432a5a0b018928023b51ad5e6b2c106bf459365872754b28888328023
-  data.tar.gz: ebb5079ef9cdc195f1c1260955ce428ebe94a47a19bb3d4c4d594a520025c229
+  metadata.gz: afdc2c7d450b407a19e0b5a82f98940bd963e5c2834d60e21779dfd9d13d957b
+  data.tar.gz: 4fc94179b298f2d5fcf1d86616ff0a97f305f4a0f44251d7a5624087fa5e7969
 SHA512:
-  metadata.gz: ea06ed2048dd9e0a15225009b82fa1f128dd939533c1918a62a2b6397a9f58e38ec80908a6498af7366b603eff956ca24e4c57cf68cd803e4d6b3403fee4dc77
-  data.tar.gz: eaccb356574eb88f88d7cb8b4eb93ed216f3c86de6eb66297ac0974d22dd1826acacb3230afd755a0b630fd98ab8ed1ab51037ee3c7bad86a6e7971cee9ad18b
+  metadata.gz: 30a98e94af6ca028739c7e19ae5eb9e2c830faf35ad2ba55627317cf7ea52dd4e4f7d772ded27626db44771e06c5dc55e9000e0d8a8d98a5e474418a9b6f1084
+  data.tar.gz: eb49eaf5177912c6f5820797523b437435c2c8cf9f36c2d1577199956da1b8e2bf95847f15bf76037d42e47c3d375f536c595b255ec13d3c4884b00b2d6875b1

data/lib/easy_gen/decorator/decorator_generator.rb

@@ -18,21 +18,8 @@ class DecoratorGenerator < Rails::Generators::NamedBase
   class_option :module, type: :string
 
   def main
-    raise "No such model - please check naming" unless model_exists?
+    raise "No such model - #{model_name} - in #{model_path} (#{Dir.pwd})- please check naming" unless model_exists?
     copy_templates
   end
 
-  private
-
-  def model_exists?
-    files = Dir[Rails.root + 'app/models/*.rb']
-    models = files.map{ |m| File.basename(m, '.rb').camelize }
-
-    models.include? model_name.camelize
-  end
-
-  def model_name
-    model == "ERROR" ? class_name : model
-  end
-
 end

data/lib/easy_gen/easy_gen_generator.rb

@@ -49,16 +49,19 @@ module EasyGenGenerator
     @generator_type ||= self.class::TYPE
   end
 
+  def abstract_base_class_count
+    Object.const_defined?("#{self.class}::BASE_CLASSES") ? self.class::BASE_CLASSES : 1
+  end
   def no_files?
-    only_one_file? && file_is_abstract_class? && no_tests?
+    count_of_files_indicates_empty? && files_are_abstract_class? && no_tests?
   end
 
-  def only_one_file?
-    Dir["./app/#{base_location}/**/*"].reject { | path | File.directory?(path) }.length == 1
+  def count_of_files_indicates_empty?
+    Dir["./app/#{base_location}/**/*"].reject { | path | File.directory?(path) }.length == abstract_base_class_count
   end
 
-  def file_is_abstract_class?
-    File.exist?("app/#{base_location}/application_#{generator_type}.rb")
+  def files_are_abstract_class?
+     Dir["app/#{base_location}/application_*.rb"].length == abstract_base_class_count
   end
 
   def no_tests?
@@ -77,13 +80,40 @@ module EasyGenGenerator
     Dir["./app/#{location}/**/*"].reject { | path | File.directory?(path) }.length == 0
   end
 
+  def gem_testing?
+    Rails.root.blank?
+  end
+
+  def application_root_path
+    gem_testing? ? Pathname.new("./") : Rails.root
+  end
+
   def teardown(places)
-    print "Removing directories: "
+    return if (places.blank? || location.blank?)
     places.each do | place |
-      print place + '/' + location + " "
-      FileUtils.rm_rf(Rails.root.join(place,"#{location}"))
+      FileUtils.rm_rf(application_root_path.join(place,"#{location}"))
+    end
+  end
+
+  def model_exists?
+    @files ||= Dir[model_path + '*.rb']
+    @models ||= @files.map{ |m| File.basename(m, '.rb').camelize }
+
+    @models.include? model_name.camelize
+  end
+
+  def model_path
+    Pathname(application_root_path.to_s + '/app/models/')
+  end
+
+  def model_name
+    model == "ERROR" ? class_name : model
+  end
+
+  def eg_debug(message)
+    File.open("/Users/simon/Documents/Personal/Code/easy_gen/tmp/log.txt", "a") do |f|
+      f.write message + "\n"
     end
-    puts "- done"
   end
 
 end

data/lib/easy_gen/null/null_generator.rb

@@ -1,3 +1,4 @@
+require 'rails/all'
 require 'rails/generators'
 require 'fileutils'
 
@@ -35,26 +36,18 @@ class NullGenerator < Rails::Generators::NamedBase
 
   private
 
-  def model_exists?
-    files = Dir[Rails.root + 'app/models/*.rb']
-    models = files.map{ |m| File.basename(m, '.rb').camelize }
 
-    models.include? model_name.camelize
-  end
-
-  def model_name
-    model == "ERROR" ? class_name : model
+  def clazz_columns
+    clazz.columns_hash.reject { | key, value | key == "id" }
   end
 
   def clazz
-    Kernel.const_get(model_name)
+    eg_debug "**** Model: #{model_name} - #{model_name.class} - #{model_name.method(:constantize).source_location} ****"
+
+    model_name.constantize
   end
 
   def default_value(ar_type)
     return AR_DEFAULTS[ar_type.to_sym]
   end
-
-  def clazz_columns
-    clazz.columns_hash.reject { | key, value | key == "id" }
-  end
 end

data/lib/easy_gen/strategy/strategy_generator.rb

@@ -11,6 +11,7 @@ class StrategyGenerator < Rails::Generators::NamedBase
 
   LOCATION = "strategies"
   TYPE = "strategy"
+  BASE_CLASSES = 2
 
   source_root File.expand_path("templates", __dir__)
   argument :strategies, type: :array, default: [], banner: "strategy strategy.."

data/lib/easy_gen/version.rb

@@ -1,3 +1,3 @@
 module EasyGen
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_gen
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Simon Stearn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-03-25 00:00:00.000000000 Z
 dependencies: []
 description: A simple generator for some standard design pattern classes and matching
   minitests.