hot-glue 0.5.14 → 0.5.16

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

@@ -13,6 +13,36 @@ class BooleanField < Field
   end
 
   def spec_list_view_assertion
-    "      " + ["expect(page).to have_content(#{singular}#{1}.#{name} ? 'YES' : 'NO')"].join("\n      ")
+    ["expect(page).to have_content(#{singular}#{1}.#{name} ? 'YES' : 'NO')"].join("\n      ")
+  end
+  
+  
+  def form_field_output
+    (form_labels_position == 'before' ?  " <br />"  : "") +
+      "  <%= f.radio_button(:#{name},  '0', checked: #{singular}.#{name}  ? '' : 'checked') %>\n" +
+      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify[:binary][:falsy] || 'No'}', for: '#{singular}_#{name}_0') %>\n" +
+      " <br /> <%= f.radio_button(:#{name}, '1',  checked: #{singular}.#{name}  ? 'checked' : '') %>\n" +
+      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify[:binary][:truthy] || 'Yes'}', for: '#{singular}_#{name}_1') %>\n" +
+      (form_labels_position == 'after' ?  " <br />"  : "")
+  end
+
+  def line_field_output
+    if modify_binary?
+      "<% if #{singular}.#{name}.nil? %>
+        <span class='alert-danger'>MISSING</span>
+    <% elsif #{singular}.#{name} %>
+      #{modify[:binary][:truthy]}
+    <% else %>
+      #{modify[:binary][:falsy]}
+    <% end %>"
+    else
+      "<% if #{singular}.#{name}.nil? %>
+        <span class='alert-danger'>MISSING</span>
+    <% elsif #{singular}.#{name} %>
+      YES
+    <% else %>
+      NO
+    <% end %>"
+    end
   end
 end

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

@@ -7,4 +7,17 @@ class DateField < Field
   def spec_setup_let_arg
     "#{name}: Date.current + rand(50).days"
   end
+
+
+  def form_field_output
+    "<%= date_field_localized(f, :#{name}, #{singular}.#{name}, '#{ name.to_s.humanize  }', #{auth ? auth+'.timezone' : 'nil'}) %>"
+  end
+
+  def line_field_output
+    "<% unless #{singular}.#{name}.nil? %>
+      <%= #{singular}.#{name} %>
+    <% else %>
+      <span class='alert-danger'>MISSING</span>
+    <% end %>"
+  end
 end

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

@@ -10,8 +10,11 @@ class DateTimeField < Field
   end
 
   def spec_make_assertion
-
-    "expect(page).to have_content(new_#{name}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone))"
+    if !modify_binary?
+      "expect(page).to have_content(new_#{name}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone))"
+    else
+      "expect(page).to have_content('#{modify[:binary][:truthy]}'"
+    end
   end
 
   def spec_setup_let_arg
@@ -19,6 +22,30 @@ class DateTimeField < Field
   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)  )"
+    if modify_binary?
+      "expect(page).to have_content('#{modify[:binary][:truthy]}')"
+    else
+      spec_list_view_natural_assertion
+    end
+  end
+
+  def spec_list_view_natural_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) )"
+  end
+
+  def form_field_output
+    "<%= datetime_field_localized(f, :#{name}, #{singular}.#{name}, '#{ name.to_s.humanize }', #{auth ? auth+'.timezone' : 'nil'}) %>"
+  end
+
+  def line_field_output
+    if modify_binary?
+      modified_display_output
+    else
+      "<% unless #{singular}.#{name}.nil? %>
+  <%= #{singular}.#{name}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone) %>
+  <% else %>
+  <span class='alert-danger'>MISSING</span>
+  <% end %>"
+    end
   end
 end

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

@@ -1,12 +1,17 @@
 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'
+    # what is the enum name
+    "      list_of_#{enum_type} = #{class_name}.defined_enums['#{enum_type}'].keys \n" +
+      "      " + "new_#{name} = list_of_#{enum_type}[rand(list_of_#{enum_type}.length)].to_s \n" +
+      '      find("select[name=\'' + singular + '[' + name + ']\']  option[value=\'#{new_' + name + '}\']").select_option'
+  end
+
+  def enum_type
+    eval("#{class_name}.columns.select{|x| x.name == '#{name}'}[0].sql_type")
   end
 
   def spec_make_assertion
-    if(eval("#{singular_class}.respond_to?(:#{name}_labels)"))
+    if(eval("#{class_name}.respond_to?(:#{name}_labels)"))
       "expect(page).to have_content(#{singular_class}.#{name}_labels[new_#{name}])"
     else
       "expect(page).to have_content(new_#{name})"
@@ -18,10 +23,38 @@ class EnumField < Field
   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}])"
+    if(eval("#{class_name}.respond_to?(:#{name}_labels)"))
+      "expect(page).to have_content(#{class_name}.#{name}_labels[#{singular}#{1}.#{name}])"
     else
       "expect(page).to have_content(#{singular}1.#{name})"
     end
   end
+
+  def form_field_output
+    enum_type = eval("#{class_name}.columns.select{|x| x.name == '#{name}'}[0].sql_type")
+
+    if eval("defined? #{class_name}.#{enum_type}_labels") == "method"
+      enum_definer = "#{class_name}.#{enum_type}_labels"
+    else
+      enum_definer = "#{class_name}.defined_enums['#{enum_type}']"
+    end
+    return "<%= f.collection_select(:#{name},  enum_to_collection_select(#{enum_definer}), :key, :value, {selected: #{singular}.#{name} }, class: 'form-control') %>"
+  end
+
+  def line_field_output
+    enum_type = eval("#{class_name}.columns.select{|x| x.name == '#{name}'}[0].sql_type")
+
+    if eval("defined? #{class_name}.#{enum_type}_labels") == "method"
+      enum_definer = "#{class_name}.#{enum_type}_labels"
+    else
+      enum_definer = "#{class_name}.defined_enums['#{enum_type}']"
+    end
+    "
+    <% if #{singular}.#{name}.nil? %>
+        <span class='alert-danger'>MISSING</span>
+    <% else %>
+      <%=  #{enum_definer}[#{singular}.#{name}.to_sym] %>
+    <% end %>
+"
+  end
 end

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

@@ -1,13 +1,28 @@
 class Field
-  attr_accessor :name, :object, :singular_class, :class_name, :singular,
+  attr_accessor :assoc_model, :assoc_name, :assoc_class, :associations, :alt_lookups, :auth,
+                :assoc_label,  :class_name,  :form_placeholder_labels, :form_labels_position,
+                :hawk_keys,   :layout_strategy, :limit, :modify, :name, :object, :sample_file_path,
+                :singular_class,  :singular, :sql_type, :ownership_field,
                 :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, attachment_data: nil )
+  def initialize(
+    auth: ,
+    alt_lookups: ,
+    attachment_data: nil,
+    class_name: ,
+    form_labels_position:,
+    form_placeholder_labels: ,
+    hawk_keys: nil,
+    layout_strategy:  ,
+    modify: ,
+    name: ,
+    ownership_field: ,
+    sample_file_path: nil,
+    singular: ,
+    update_show_only:
+  )
     @name = name
+    @layout_strategy = layout_strategy
     @alt_lookups = alt_lookups
     @singular = singular
     @class_name = class_name
@@ -15,12 +30,26 @@ class Field
     @hawk_keys = hawk_keys
     @auth = auth
     @sample_file_path = sample_file_path
+    @form_placeholder_labels = form_placeholder_labels
+    @ownership_field = ownership_field
+    @form_labels_position = form_labels_position
+    @modify = modify
+
+    # TODO: remove knowledge of subclasses from Field
+    unless self.class == AttachmentField
+      @sql_type = eval("#{class_name}.columns_hash['#{name}']").sql_type
+      @limit = eval("#{class_name}.columns_hash['#{name}']").limit
+    end
   end
 
   def getName
     @name
   end
 
+  def field_error_name
+    name
+  end
+
   def spec_random_data
 
   end
@@ -33,19 +62,74 @@ class Field
     ""
   end
 
+
   def spec_make_assertion
-    "expect(page).to have_content(new_#{name})"
+    if !modify_binary?
+      "expect(page).to have_content(new_#{name})"
+    else
+      "expect(page).to have_content('#{modify[:binary][:truthy]}'"
+    end
   end
 
+
   def spec_setup_let_arg
 
   end
 
-  def spec_list_view_assertion
+  def spec_list_view_natural_assertion
     "expect(page).to have_content(#{singular}#{1}.#{name})"
   end
 
+  def spec_list_view_assertion
+    if modify_binary?
+      "expect(page).to have_content('#{modify[:binary][:truthy]}'"
+    else
+      spec_list_view_natural_assertion
+    end
+  end
+
+
   def spec_related_column_lets
     ""
   end
+
+  def line_field_output
+    viewable_output
+  end
+
+  def form_show_only_output
+    viewable_output
+  end
+
+  def viewable_output
+    if modify
+      modified_display_output
+    else
+      "<%= #{singular}.#{name} %>"
+    end
+  end
+
+  def modified_display_output
+    if  modify[:cast] && modify[:cast] == "$"
+      "<%= number_to_currency(#{singular}.#{name}) %>"
+    elsif modify[:binary]
+      "<%= #{singular}.#{name} ? '#{modify[:binary][:truthy]}' : '#{modify[:binary][:falsy]}' %>"
+    end
+  end
+
+  def field_output(type = nil, width )
+    "  <%= f.text_field :#{name}, value: #{singular}.#{name}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}'"  + (form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "")  +  " %>\n " + "\n"
+  end
+
+  def text_area_output(field_length )
+    lines = field_length % 40
+    if lines > 5
+      lines = 5
+    end
+    "<%= f.text_area :#{name}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}'"  + ( form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "") + " %>"
+  end
+
+  def modify_binary? # safe
+    !!(modify && modify[:binary])
+  end
 end

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

@@ -5,7 +5,18 @@ class FloatField < Field
 
   end
 
+
   def spec_setup_let_arg
     "#{name}: rand(1)*10000"
   end
+
+  def form_field_output
+    field_output(nil, 5)
+  end
+
+  # def line_field_output
+  #   width = (limit && limit < 40) ? limit : (40)
+  #
+  #   "<%= #{singular}.#{name} %>"
+  # end
 end

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

@@ -23,4 +23,8 @@ class IntegerField < Field
   def spec_list_view_assertion
     "expect(page).to have_content(#{singular}#{1}.#{name})"
   end
+
+  def form_field_output
+    "  <%= f.text_field :#{name}, value: #{singular}.#{name}, autocomplete: 'off', size: 4, class: 'form-control', type: 'number'"  + (form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "")  +  " %>\n " + "\n"
+  end
 end

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

@@ -30,4 +30,21 @@ class StringField < Field
       "#{name}: FFaker::Movie.title"
     end
   end
+
+  def form_field_output
+    if sql_type == "varchar" || sql_type == "character varying"
+      field_output(nil, limit || 40)
+    else
+      text_area_output( 65536)
+    end
+  end
+
+  # TODO: dry with text_field.rb
+  def text_result(col, sql_type, limit)
+    if sql_type == "varchar"
+      field_output( nil, limit)
+    else
+      text_area_output( 65536)
+    end
+  end
 end

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

@@ -11,4 +11,21 @@ class TextField < Field
   def spec_setup_let_arg
     "#{name}:  FFaker::Lorem.paragraphs(10).join("  ")"
   end
+
+  def form_field_output
+    if sql_type == "varchar" || sql_type == "character varying"
+      field_output( nil, limit || 40)
+    else
+      text_area_output( 65536)
+    end
+  end
+
+  # TODO: dry with string_field.rb
+  def text_result( sql_type, limit)
+    if sql_type == "varchar"
+      field_output( nil, limit)
+    else
+      text_area_output( 65536)
+    end
+  end
 end

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

@@ -3,4 +3,24 @@ class TimeField < Field
   def spec_setup_let_arg
     "#{name}: Time.current + rand(5000).seconds"
   end
+
+  def form_field_output
+    "<%= time_field_localized(f, :#{name}, #{singular}.#{name},  '#{ name.to_s.humanize  }', #{auth ? auth+'.timezone' : 'nil'}) %>"
+  end
+
+  def line_field_output
+    "<% unless #{singular}.#{name}.nil? %>
+      <%= #{singular}.#{name}.in_time_zone(current_timezone).strftime('%l:%M %p ') + timezonize(current_timezone) %>
+     <% else %>
+    <span class='alert-danger'>MISSING</span>
+    <% end %>"
+  end
+
+  def spec_make_assertion
+    "#expect(page).to have_content(new_#{name} .in_time_zone(current_timezone).strftime('%l:%M %p ') + timezonize(current_timezone))"
+  end
+
+  def spec_list_view_assertion
+    "#expect(page).to have_content(#{singular}#{1}.#{name})"
+  end
 end

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

@@ -1,4 +1,4 @@
-class UUIDField < Field
+class UUIDField < AssociationField
   def spec_setup_let_arg
     "#{name.to_s.gsub('_id','')}: #{name.to_s.gsub('_id','')}1"
   end

data/lib/generators/hot_glue/flash_notices_install_generator.rb

@@ -4,7 +4,7 @@ module HotGlue
 
     def filepath_prefix
       # todo: inject the context
-      'spec/dummy/' if Rails.env.test?
+      'spec/dummy/' if $INTERNAL_SPECS
     end
 
 

data/lib/generators/hot_glue/install_generator.rb

@@ -13,6 +13,12 @@ module HotGlue
 
 
 
+
+    def filepath_prefix
+      'spec/dummy/' if $INTERNAL_SPECS
+    end
+
+
     def initialize(*args) #:nodoc:
       super
       layout = options['layout'] || "hotglue"
@@ -28,7 +34,7 @@ module HotGlue
 
 
       @markup = options['markup'] || "erb"
-      copy_file "erb/_flash_notices.erb", "#{'spec/dummy/' if Rails.env.test?}app/views/layouts/_flash_notices.erb"
+      copy_file "erb/_flash_notices.erb", "#{filepath_prefix}app/views/layouts/_flash_notices.erb"
 
       begin
         if Rails.version.split(".")[0].to_i == 6
@@ -51,7 +57,7 @@ module HotGlue
 
 
       begin
-        rails_helper_contents = File.read("#{'spec/dummy/' if Rails.env.test?}spec/rails_helper.rb")
+        rails_helper_contents = File.read("#{filepath_prefix}spec/rails_helper.rb")
         if !rails_helper_contents.include?("Capybara.default_driver =")
           rails_helper_contents << "\nCapybara.default_driver = :selenium_chrome_headless "
           puts "  HOTGLUE --> added to spec/rails_helper.rb: `Capybara.default_driver = :selenium_chrome_headless`  "
@@ -61,14 +67,14 @@ module HotGlue
           rails_helper_contents.gsub!("RSpec.configure do |config|", "RSpec.configure do |config| \n
     config.include FactoryBot::Syntax::Methods
   ")
-          puts "  HOTGLUE --> added to #{'spec/dummy/' if Rails.env.test?}spec/rails_helper.rb: `config.include FactoryBot::Syntax::Methods`  "
+          puts "  HOTGLUE --> added to #{filepath_prefix}spec/rails_helper.rb: `config.include FactoryBot::Syntax::Methods`  "
         end
 
         if ! rails_helper_contents.include?("require 'support/capybara_login.rb'")
           rails_helper_contents.gsub!("require 'rspec/rails'","require 'rspec/rails' \nrequire 'support/capybara_login.rb'")
           puts "  HOTGLUE --> added to spec/rails_helper.rb: `require 'support/capybara_login.rb'`  "
         end
-        File.write("#{'spec/dummy/' if Rails.env.test?}spec/rails_helper.rb", rails_helper_contents)
+        File.write("#{filepath_prefix}spec/rails_helper.rb", rails_helper_contents)
 
       rescue StandardError => e
         puts "WARNING: error writing to spec/rails_helper --- #{e.message}"
@@ -95,7 +101,7 @@ module HotGlue
           theme_location = "themes/hotglue_scaffold_#{@theme}.scss"
           theme_file = "hotglue_scaffold_#{@theme}.scss"
 
-          copy_file theme_location, "#{'spec/dummy/' if Rails.env.test?}app/assets/stylesheets/#{theme_file}"
+          copy_file theme_location, "#{filepath_prefix}app/assets/stylesheets/#{theme_file}"
 
           application_scss = File.read("app/assets/stylesheets/application.scss")
 
@@ -114,10 +120,10 @@ module HotGlue
 
 
       begin
-        if !File.exist?("#{'spec/dummy/' if Rails.env.test?}config/hot_glue.yml")
+        if !File.exist?("#{filepath_prefix}config/hot_glue.yml")
           yaml = {layout: layout,
                   markup: @markup}.to_yaml
-          File.write("#{'spec/dummy/' if Rails.env.test?}config/hot_glue.yml", yaml)
+          File.write("#{filepath_prefix}config/hot_glue.yml", yaml)
 
         end
       rescue StandardError => e
@@ -126,8 +132,8 @@ module HotGlue
 
 
       begin
-        if !File.exist?("#{'spec/dummy/' if Rails.env.test?}spec/support/capybara_login.rb")
-          copy_file "capybara_login.rb", "#{'spec/dummy/' if Rails.env.test?}spec/support/capybara_login.rb"
+        if !File.exist?("#{filepath_prefix}spec/support/capybara_login.rb")
+          copy_file "capybara_login.rb", "#{filepath_prefix}spec/support/capybara_login.rb"
         end
       rescue StandardError => e
         puts "WARNING: error writing to #{Rails.env.test? ? 'spec/dummmy/' : ''}spec/support/capybara_login.rb --- #{e.message}"

data/lib/generators/hot_glue/layout/builder.rb

@@ -16,6 +16,7 @@ module HotGlue
 
         @generator = generator
 
+        @modify = generator.modify
         @columns = generator.columns
         @smart_layout = generator.smart_layout
         @stacked_downnesting = generator.stacked_downnesting || false
@@ -39,7 +40,8 @@ module HotGlue
           portals:  {
 
           },
-          buttons: { size: @buttons_width}
+          buttons: { size: @buttons_width},
+          modify: @modify
         }
 
         # downnest_object.each do |child, size|
@@ -68,7 +70,7 @@ module HotGlue
           raise "Cannot build layout -- too few columns"
         end
 
-        # smart layout: bootstrap_column_width columns per field; 4 column for EACH downnested portals, 2 column for buttons
+        # smart layout: bootstrap_column_width columns per field; 4 column for EACH downnested portal, 2 column for buttons
         if smart_layout
           # automatic control
           #