hot-glue 0.5.9.1 → 0.5.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7250883736f21b7f97d3cb02a6f3a067cecd8ba9bf5f5c517eb02a0e807f5edd
-  data.tar.gz: 68f04916f80d13ea4bb5edd0aab469e0641c62d9d183b8ea47a5207de9d3e903
+  metadata.gz: 2e6af0432f57c7a9e1eb81e0ea878e70fe52e60a4dec6c7e547f31ee5fd6b07a
+  data.tar.gz: c149348621bc279865e726f2284f13df5db53c60f5d8df255dc3f46476169179
 SHA512:
-  metadata.gz: b233a1dae20729ed929a7c631be6a8569ee495a7608c0428f335f1f64896954bdc538b674c8e660d3212af47341523a6eeae396b71818bdef9eea9e00e9a4e0e
-  data.tar.gz: d258473a74370acb5bfb7b26beaa0e653cdbe7010ff66ee2dcb533ebb74b465b757043828bcba1a7a653af11bdfe262d1b28b7f8bb497b0d7e6a7a2a98657578
+  metadata.gz: 7d81e59927e6948fbc613a348516d58a299205e3b94f0fee6252f79e721db38fff62a02d4e7df5f0933d28b200822cdc19412c8ece7ded3f026c5d5485723a2e
+  data.tar.gz: 5098b3b88274766ea64f7dda0eec29ba1ede551b22966811448033a5c44505b02abf5c584ddb899136e85a048c3fcfcf7b1973a794e1fd73666d16ea86769c26

data/.gitignore

@@ -30,5 +30,7 @@ coverage/
 
 spec/dummy/app/controllers/
 spec/dummy/app/views/
+spec/dummy/app/javascript/application.js
+dummy/spec/features/
 
-dummy/spec/system/
+spec/dummy/app/javascript/controllers/dropzone_controller.js

data/README.md

@@ -41,8 +41,6 @@ Other than the opinionated differences and additional features, Hot Glue produce
 ## [GET THE COURSE TODAY](https://school.jasonfleetwoodboldt.com/8188/?utm_source=github.com&utm_campaign=github_hot_glue_readme_page) **only $60 USD!**
 
 
-[![Hot Glue Course](https://user-images.githubusercontent.com/59002/189544503-6edbcd40-1728-4b13-ac9a-c7772ccb8284.jpg)](https://school.jasonfleetwoodboldt.com/8188?utm_source=github.com&utm_campaign=github_hot_glue_readme_page)
-
 ---
 ---
 ## HOW EASY?
@@ -58,7 +56,9 @@ Instantly get a simple CRUD interface
 
 ![hot-glue-4](https://user-images.githubusercontent.com/59002/116405517-c2b2e300-a7fd-11eb-8423-d43e3afc9fa6.gif)
 
-# Getting Started
+
+# Getting Started Video
+[Hot Glue Getting Started (JSBundling)](https://www.youtube.com/watch?v=bzpXOhBkiDk)
 
 _If you are on Rails 6, see [LEGACY SETUP FOR RAILS 6](https://github.com/jasonfb/hot-glue/README2.md) and complete those steps FIRST._
 
@@ -1208,6 +1208,14 @@ Now, your labels will show up on the front-end as defined in the `_labels` ("Is
 
 
 # VERSION HISTORY
+#### 2023-04-08 - v0.5.9.2
+• This begins a refactor of the field knowledge into properly abstracted Field objects
+• No functional changes, except that the specs now contain an `attach_file` for attachments.
+
+#### - v0.5.9.1
+• Fixed issue with ownership fields coming through as associations.
+
+
 
 #### 2023-03-17 - v0.5.9
 - Attachments! You can use Hot Glue to seamlessly create an image, file, or video attachment. Please see the docs in new flag `--atachments` under the "Special Features" section

data/config/hot_glue.yml

@@ -1,3 +1,5 @@
 ---
 :layout: hotglue
 :markup: erb
+
+:sample_file_path: spec/files/computer_code.jpg

data/lib/generators/hot_glue/direct_upload_install_generator.rb

@@ -2,37 +2,38 @@
 
 module HotGlue
   class DirectUploadInstallGenerator < Rails::Generators::Base
-
-
     source_root File.expand_path('templates', __dir__)
 
-
+    def filepath_prefix
+      # todo: inject the context
+      'spec/dummy/' if Rails.env.test?
+    end
 
     def initialize(*args) #:nodoc:
       super
+
       if Gem::Specification.sort_by{ |g| [g.name.downcase, g.version] }.group_by{ |g| g.name }['importmap-rails'] # impomrtmaps
-        file_contents = File.read("app/javascript/application.js")
+
+        file_contents = File.read("#{filepath_prefix}app/javascript/application.js")
 
         if !file_contents.include?("//= require activestorage")
           file_contents << "//= require activestorage"
-          File.write("app/javascript/application.js", file_contents)
-          puts "  HOTGLUE --> added to app/javascript/application.js: `//= require activestorage"
+          File.write("#{filepath_prefix}app/javascript/application.js", file_contents)
+          puts "  HOTGLUE --> added to #{filepath_prefix}app/javascript/application.js: `//= require activestorage"
         else
-          puts "  HOTGLUE --> app/javascript/application.js already contains `//= require activestorage`"
+          puts "  HOTGLUE --> #{filepath_prefix}app/javascript/application.js already contains `//= require activestorage`"
         end
 
       elsif Gem::Specification.sort_by{ |g| [g.name.downcase, g.version] }.group_by{ |g| g.name }['jsbundling-rails']
-
-
-        file_contents = File.read("app/javascript/application.js")
+        file_contents = File.read("#{filepath_prefix}app/javascript/application.js")
 
         if !file_contents.include?("ActiveStorage.start()")
           file_contents << "import * as ActiveStorage from \"@rails/activestorage\"
 ActiveStorage.start()"
-          File.write("app/javascript/application.js", file_contents)
-          puts "  HOTGLUE --> added to app/javascript/application.js: `ActiveStorage.start()"
+          File.write("#{filepath_prefix}app/javascript/application.js", file_contents)
+          puts "  HOTGLUE --> added to #{filepath_prefix}app/javascript/application.js: `ActiveStorage.start()"
         else
-          puts "  HOTGLUE --> app/javascript/application.js already contains `ActiveStorage.start()`"
+          puts "  HOTGLUE --> #{filepath_prefix}app/javascript/application.js already contains `ActiveStorage.start()`"
         end
 
 

data/lib/generators/hot_glue/dropzone_install_generator.rb

@@ -2,19 +2,25 @@ module HotGlue
   class DropzoneInstallGenerator < Rails::Generators::Base
     source_root File.expand_path('templates', __dir__)
 
+    def filepath_prefix
+      # todo: inject the context
+      'spec/dummy/' if Rails.env.test?
+    end
+
+
     def initialize(*args) #:nodoc:
       super
       system("./bin/rails generate stimulus Dropzone")
-      copy_file "javascript/dropzone_controller.js", "app/javascript/controllers/dropzone_controller.js"
+      copy_file "javascript/dropzone_controller.js", "#{filepath_prefix}app/javascript/controllers/dropzone_controller.js"
       puts "HOT GLUE --> copying dropzone stimulus controller into app/javascript/controllers/dropzone_controller.js"
 
 
-      if File.exist?("app/assets/stylesheets/application.bootstrap.scss")
-        scss_file = "app/assets/stylesheets/application.bootstrap.scss"
-      elsif File.exist?("app/assets/stylesheets/application.scss")
-        scss_file = "app/assets/stylesheets/application.scss"
+      if File.exist?("#{filepath_prefix}app/assets/stylesheets/application.bootstrap.scss")
+        scss_file = "#{filepath_prefix}app/assets/stylesheets/application.bootstrap.scss"
+      elsif File.exist?("#{filepath_prefix}app/assets/stylesheets/application.scss")
+        scss_file = "#{filepath_prefix}app/assets/stylesheets/application.scss"
       else
-        raise "Could not detect your stylesheet, aborting..."
+        raise HotGlue::Error, "Could not detect your stylesheet, aborting..."
       end
 
       file_contents = File.read(scss_file)
@@ -24,13 +30,10 @@ module HotGlue
 
 
         File.write(scss_file, file_contents)
-
         puts "  HOTGLUE --> added to #{scss_file}: @import dropzone ... "
       else
         puts "  HOTGLUE --> #{scss_file} already contains @import dropzone"
       end
-
-
     end
   end
 end

data/lib/generators/hot_glue/field_factory.rb

@@ -0,0 +1,57 @@
+require_relative "fields/association_field"
+require_relative "fields/boolean_field"
+require_relative "fields/date_field"
+require_relative "fields/date_time_field"
+require_relative "fields/enum_field"
+require_relative "fields/float_field"
+require_relative "fields/integer_field"
+require_relative "fields/string_field"
+require_relative "fields/text_field"
+require_relative "fields/time_field"
+require_relative "fields/uuid_field"
+require_relative "fields/attachment_field"
+
+
+class FieldFactory
+  attr_accessor :field, :class_name
+  def initialize(type: , name: , generator: )
+    field_class = case type
+             when :integer
+               if name.to_s.ends_with?("_id")
+                 AssociationField
+               else
+                 IntegerField
+               end
+            when :uuid
+              UUIDField
+            when :string
+              StringField
+            when :text
+              TextField
+            when :float
+              FloatField
+            when :datetime
+              DateTimeField
+            when :date
+              DateField
+            when :time
+              TimeField
+            when :boolean
+              BooleanField
+            when :enum
+              EnumField
+            when :attachment
+              AttachmentField
+            end
+    @class_name = class_name
+
+    @field = field_class.new(name: name,
+                             hawk_keys: generator.hawk_keys,
+                             auth: generator.auth,
+                             class_name: generator.singular_class,
+                             alt_lookups: generator.alt_lookups,
+                             singular: generator.singular,
+                             update_show_only: generator.update_show_only,
+                             sample_file_path: generator.sample_file_path)
+  end
+end

data/lib/generators/hot_glue/fields/association_field.rb

@@ -0,0 +1,76 @@
+
+require_relative './field.rb'
+
+class AssociationField < Field
+
+  def initialize(name: , class_name: , alt_lookups: , singular: , update_show_only: ,
+                 hawk_keys: , auth: , sample_file_path: )
+    super
+    assoc_model = eval("#{class_name}.reflect_on_association(:#{assoc})")
+
+    if assoc_model.nil?
+      exit_message = "*** Oops: The model #{class_name} is missing an association for :#{assoc_name} or the model #{assoc_name.titlecase} doesn't exist. TODO: Please implement a model for #{assoc_name.titlecase}; or add to #{class_name} `belongs_to :#{assoc_name}`.  To make a controller that can read all records, specify with --god."
+      puts exit_message
+      raise(HotGlue::Error, exit_message)
+    end
+
+    begin
+      assoc_class = eval(assoc_model.try(:class_name))
+    end
+
+    name_list = [:name, :to_label, :full_name, :display_name, :email]
+
+    if assoc_class && name_list.collect{ |field|
+      assoc_class.respond_to?(field.to_s) || assoc_class.instance_methods.include?(field)
+    }.none?
+      exit_message = "Oops: Missing a label for `#{assoc_class}`. Can't find any column to use as the display label for the #{@assoc_name} association on the #{class_name} model. TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name 5) email. You can implement any of these directly on your`#{assoc_class}` model (can be database fields or model methods) or alias them to field you want to use as your display label. Then RERUN THIS GENERATOR. (Field used will be chosen based on rank here.)"
+      raise(HotGlue::Error, exit_message)
+    end
+
+    # set teh assoc label
+  end
+
+  def assoc_label
+
+  end
+
+  def assoc_name
+    assoc
+  end
+
+  def assoc
+    name.to_s.gsub('_id','')
+  end
+
+  def spec_setup_and_change_act(which_partial)
+    if which_partial == :update && update_show_only.include?(name)
+      # do not update tests
+    elsif alt_lookups.keys.include?(name.to_s)
+      lookup = alt_lookups[name.to_s][:lookup_as]
+      "      find(\"[name='#{singular}[__lookup_#{lookup}]']\").fill_in( with: #{assoc}1.#{lookup} )"
+    else
+      "      #{name}_selector = find(\"[name='#{singular}[#{name}]']\").click \n" +
+      "      #{name}_selector.first('option', text: #{assoc}1.name).select_option"
+    end
+  end
+
+  def spec_make_assertion
+    " expect(page).to have_content(#{assoc}1.name)"
+  end
+
+  def spec_setup_let_arg
+    "#{name.to_s.gsub('_id','')}: #{name.to_s.gsub('_id','')}1"
+  end
+
+  def spec_list_view_assertion
+
+  end
+
+  def spec_related_column_lets
+    the_foreign_class = eval(class_name + ".reflect_on_association(:" + assoc + ")").class_name.split("::").last.underscore
+
+    hawk_keys_on_lets = (hawk_keys["#{assoc}_id".to_sym] ? ", #{auth.gsub('current_', '')}: #{auth}": "")
+
+    "  let!(:#{assoc}1) {create(:#{the_foreign_class}" +  hawk_keys_on_lets + ")}"
+  end
+end

data/lib/generators/hot_glue/fields/attachment_field.rb

@@ -0,0 +1,9 @@
+class AttachmentField < Field
+  def spec_setup_let_arg
+    nil
+  end
+
+  def spec_setup_and_change_act(which_partial = nil)
+    "      attach_file(\"#{singular}[#{name.to_s}]\", \"#{sample_file_path}\")"
+  end
+end

data/lib/generators/hot_glue/fields/boolean_field.rb

@@ -0,0 +1,18 @@
+class BooleanField < Field
+  def spec_setup_and_change_act(which_partial = nil)
+    "      new_#{name} = 1 \n" +
+    "      find(\"[name='#{testing_name}[#{name}]'][value='\#{new_" + name.to_s + "}']\").choose"
+  end
+
+  def spec_make_assertion
+    ["expect(page).to have_content(#{singular}#{1}.#{name} ? 'YES' : 'NO')"].join("\n      ")
+  end
+
+  def spec_setup_let_arg
+    "#{name}: !!rand(2).floor"
+  end
+
+  def spec_list_view_assertion
+    "      " + ["expect(page).to have_content(#{singular}#{1}.#{name} ? 'YES' : 'NO')"].join("\n      ")
+  end
+end

data/lib/generators/hot_glue/fields/date_field.rb

@@ -0,0 +1,10 @@
+class DateField < Field
+  def spec_setup_and_change_act(which_partial = nil)
+    "      " + "new_#{name} = Date.current + (rand(100).days) \n" +
+    '      ' + "find(\"[name='#{testing_name}[#{ name.to_s }]']\").fill_in(with: new_#{name.to_s})"
+  end
+
+  def spec_setup_let_arg
+    "#{name}: Date.current + rand(50).days"
+  end
+end

data/lib/generators/hot_glue/fields/date_time_field.rb

@@ -0,0 +1,23 @@
+class DateTimeField < Field
+  def spec_random_data
+    Time.now + rand(1..5).days
+  end
+
+  def spec_setup_and_change_act(which_partial = nil)
+    "      " + "new_#{name} = DateTime.current + (rand(100).days) \n" +
+    '      ' + "find(\"[name='#{testing_name}[#{ name.to_s }]']\").fill_in(with: new_#{name.to_s})"
+
+  end
+
+  def spec_make_assertion
+    super
+  end
+
+  def spec_setup_let_arg
+    "#{name}: DateTime.current + rand(1000).seconds"
+  end
+
+  def spec_list_view_assertion
+    "      " + ["expect(page).to have_content(#{singular}#{1}.#{name}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub('  ', ' ') + timezonize(current_timezone)  )"].join("\n      ")
+  end
+end

data/lib/generators/hot_glue/fields/enum_field.rb

@@ -0,0 +1,27 @@
+class EnumField < Field
+  def spec_setup_and_change_act(which_partial = nil)
+    "      list_of_#{name.to_s} = #{singular_class}.defined_enums['#{name.to_s}'].keys \n" +
+    "      " + "new_#{name.to_s} = list_of_#{name.to_s}[rand(list_of_#{name.to_s}.length)].to_s \n" +
+    '      find("select[name=\'' + singular + '[' + name.to_s + ']\']  option[value=\'#{new_' + name.to_s + '}\']").select_option'
+  end
+
+  def spec_make_assertion
+    if(eval("#{singular_class}.respond_to?(:#{name}_labels)"))
+      "expect(page).to have_content(#{singular_class}.#{name}_labels[new_#{name}])"
+    else
+      "expect(page).to have_content(new_#{name})"
+    end
+  end
+
+  def spec_setup_let_args
+    super
+  end
+
+  def spec_list_view_assertion
+    if(eval("#{singular_class}.respond_to?(:#{name}_labels)"))
+      "      " + "expect(page).to have_content(#{singular_class}.#{name}_labels[#{singular}#{1}.#{name}])"
+    else
+      "      " + "expect(page).to have_content(#{singular}1.#{name})"
+    end
+  end
+end

data/lib/generators/hot_glue/fields/field.rb

@@ -0,0 +1,51 @@
+class Field
+  attr_accessor :name, :object, :singular_class, :class_name, :singular,
+                :update_show_only
+  attr_accessor :assoc_model, :assoc_name, :assoc_class, :associations, :alt_lookups, :assoc_label
+
+  attr_accessor :hawk_keys, :auth, :sample_file_path
+
+  def initialize(name: , class_name: , alt_lookups: , singular: , update_show_only: ,
+                 hawk_keys: , auth: , sample_file_path: nil)
+    @name = name
+    @alt_lookups = alt_lookups
+    @singular = singular
+    @class_name = class_name
+    @update_show_only = update_show_only
+    @hawk_keys = hawk_keys
+    @auth = auth
+    @sample_file_path = sample_file_path
+  end
+
+  def getName
+    @name
+  end
+
+  def spec_random_data
+
+  end
+
+  def testing_name
+    class_name.to_s.gsub("::","_").underscore
+  end
+
+  def spec_setup_and_change_act(which_partial = nil)
+    ""
+  end
+
+  def spec_make_assertion
+    "expect(page).to have_content(new_#{name})"
+  end
+
+  def spec_setup_let_arg
+
+  end
+
+  def spec_list_view_assertion
+    "      " + ["expect(page).to have_content(#{singular}#{1}.#{name})"].join("\n      ")
+  end
+
+  def spec_related_column_lets
+    ""
+  end
+end

data/lib/generators/hot_glue/fields/float_field.rb

@@ -0,0 +1,11 @@
+class FloatField < Field
+  def spec_setup_and_change_act(which_partial = nil)
+    "      " + "new_#{name} = rand(10) \n" +
+    "      find(\"[name='#{testing_name}[#{ name.to_s }]']\").fill_in(with: new_#{name.to_s})"
+
+  end
+
+  def spec_setup_let_arg
+    "#{name}: rand(1)*10000"
+  end
+end

data/lib/generators/hot_glue/fields/integer_field.rb

@@ -0,0 +1,26 @@
+class IntegerField < Field
+  def spec_random_data
+    rand(1...1000)
+  end
+
+  def spec_setup_and_change_act(which_partial = nil)
+    if name.to_s.ends_with?("_id")
+      capybara_block_for_association(name_name: name, which_partial: which_partial)
+    else
+      "      new_#{name} = rand(10) \n" +
+      "      find(\"[name='#{testing_name}[#{ name.to_s }]']\").fill_in(with: new_#{name.to_s})"
+    end
+  end
+
+  def spec_make_assertion
+    "expect(page).to have_content(new_#{name})"
+  end
+
+  def spec_setup_let_arg
+    "#{name}: rand(100)"
+  end
+
+  def spec_list_view_assertion
+    "      " + ["expect(page).to have_content(#{singular}#{1}.#{name})"].join("\n      ")
+  end
+end

data/lib/generators/hot_glue/fields/string_field.rb

@@ -0,0 +1,33 @@
+class StringField < Field
+  def spec_random_data
+    FFaker::AnimalUS.common_name
+  end
+
+  def spec_setup_and_change_act(which_partial = nil)
+    faker_string =
+      if name.to_s.include?('email')
+        "FFaker::Internet.email"
+      elsif  name.to_s.include?('domain')
+        "FFaker::Internet.domain_name"
+      elsif name.to_s.include?('ip_address') || name.to_s.ends_with?('_ip')
+        "FFaker::Internet.ip_v4_address"
+      else
+        "FFaker::Movie.title"
+      end
+
+    return "      " + "new_#{name} = #{faker_string} \n" +
+    "      find(\"[name='#{testing_name}[#{ name.to_s }]']\").fill_in(with: new_#{name.to_s})"
+  end
+
+  def spec_setup_let_arg
+    if name.to_s.include?('email')
+      "#{name}: FFaker::Internet.email"
+    elsif  name.to_s.include?('domain')
+      "#{name}: FFaker::Internet.domain_name"
+    elsif name.to_s.include?('ip_address') || name.to_s.ends_with?('_ip')
+      "#{name}: FFaker::Internet.ip_v4_address"
+    else
+      "#{name}: FFaker::Movie.title"
+    end
+  end
+end

data/lib/generators/hot_glue/fields/text_field.rb

@@ -0,0 +1,14 @@
+class TextField < Field
+  def spec_random_data
+    FFaker::AnimalUS.common_name
+  end
+
+  def spec_setup_and_change_act(which_partial = nil)
+    "      " + "new_#{name} = FFaker::Lorem.paragraphs(1).join("") \n" +
+    "      find(\"[name='#{testing_name}[#{ name.to_s }]']\").fill_in(with: new_#{name.to_s})"
+  end
+
+  def spec_setup_let_arg
+    "#{name}:  FFaker::Lorem.paragraphs(10).join("  ")"
+  end
+end

data/lib/generators/hot_glue/fields/time_field.rb

@@ -0,0 +1,6 @@
+class TimeField < Field
+
+  def spec_setup_let_arg
+    "#{name}: Time.current + rand(5000).seconds"
+  end
+end

data/lib/generators/hot_glue/fields/uuid_field.rb

@@ -0,0 +1,12 @@
+class UUIDField < Field
+  def spec_setup_let_arg
+    "#{name.to_s.gsub('_id','')}: #{name.to_s.gsub('_id','')}1"
+  end
+
+  def spec_list_view_assertion
+    assoc_name = name.to_s.gsub('_id','')
+    association = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
+    "      " + ["expect(page).to have_content(#{singular}#{1}.#{assoc_name}.#{HotGlue.derrive_reference_name(association.class_name)})"].join("\n      ")
+
+  end
+end

data/lib/generators/hot_glue/markup_templates/erb.rb

@@ -72,24 +72,7 @@ module  HotGlue
     ################################################################
 
 
-    def all_form_fields(layout_strategy: , layout_object: )
-
-      # @show_only = args[0][:show_only]
-      #
-      # @singular_class = args[0][:singular_class]
-      # @ownership_field  = args[0][:ownership_field]
-      # @form_labels_position = args[0][:form_labels_position]
-      # @form_placeholder_labels = args[0][:form_placeholder_labels]
-      # @hawk_keys = args[0][:hawk_keys]
-      # @singular = args[0][:singular]
-      # attachments = args[0][:attachments]
-      #
-      # @alt_lookups = args[0][:alt_lookups]
-      #
-      # column_classes = args[0][:col_identifier]
-      # update_show_only = args[0][:update_show_only] || []
-      # singular = @singular
-
+    def all_form_fields(layout_strategy:, layout_object: )
       column_classes = layout_strategy.column_classes_for_form_fields
       columns = layout_object[:columns][:container]