hot-glue 0.5.6 → 0.5.8

data/lib/generators/hot_glue/templates/haml/_form.haml

@@ -1,5 +1,5 @@
 .row
-<%= all_form_fields %>
+<%= form_fields_html %>
   .col
     = link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"}
     = f.submit "Save", class: "btn btn-primary pull-right"

data/lib/generators/hot_glue/templates/system_spec.rb.erb

@@ -1,23 +1,12 @@
 require 'rails_helper'
 
-describe "interaction for <%= controller_class_name %>", type: :feature do
+describe 'interaction for <%= controller_class_name %>' do
   include HotGlue::ControllerHelper
   include ActionView::RecordIdentifier
 
   <%= @existing_content %>
   <% unless @god %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
-<%= (@columns - @show_only).map { |col|
-    type = eval("#{singular_class}.columns_hash['#{col}']").type
-    case type
-    when :integer
-      if col.to_s.ends_with?("_id")
-        assoc = "#{col.to_s.gsub('_id','')}"
-        "  let!(:#{assoc}1) {create(:#{assoc}" +  (@hawk_keys["#{assoc}_id".to_sym] ? ", #{@auth.gsub('current_', '')}: #{@auth}": "")   + ")}"
-      end
-    else
-    end
-  }.compact.join("\n")
-        %>
+<%= spec_related_column_lets %>
   <% item1_addOns = ""
    if (eval(@singular_class).instance_methods.include?(display_class.to_s))
     item1_addOns << "#{display_class}: FFaker::Name.name"
@@ -27,7 +16,16 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
   type = eval("#{singular_class}.columns_hash['#{col}']").type
   case type
   when :string
-    (col.to_s.include?('email') ? "#{col}: FFaker::Internet.email" : "#{col}: FFaker::Movie.title")
+    faker_string =
+    if col.to_s.include?('email')
+      "#{col}: FFaker::Internet.email"
+    elsif  col.to_s.include?('domain')
+      "#{col}: FFaker::Internet.domain_name"
+    elsif col.to_s.include?('ip_address') || col.to_s.ends_with?('_ip')
+      "#{col}: FFaker::Internet.ip_v4_address"
+    else
+      "#{col}: FFaker::Movie.title"
+    end
   when :text
     "#{col}:  FFaker::Lorem.paragraphs(10).join("  ")"
 
@@ -47,10 +45,12 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     else
      "#{col}: rand(100)"
     end
+  when :uuid
+    "#{col.to_s.gsub('_id','')}: #{col.to_s.gsub('_id','')}1"
   end
 }.compact.join(", ")
   %>let!(:<%= singular %>1) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> <%= item1_addOns %> )}
-  <%= objest_nest_factory_setup %> <% unless @god %>
+<%= objest_nest_factory_setup %> <% unless @god || @existing_content.include?("login_as")%>
   before do
     login_as(<%= @auth %>)
   end <% end %>
@@ -61,6 +61,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 <%=
 @columns.map { |col|
   type = eval("#{singular_class}.columns_hash['#{col}']").type
+
   case type
   when :datetime
     "      " + ["expect(page).to have_content(#{singular}#{1}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub('  ', ' ') + timezonize(current_timezone)  )"].join("\n      ")
@@ -68,6 +69,19 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     if !col.ends_with?("_id")
       "      " + ["expect(page).to have_content(#{singular}#{1}.#{col})"].join("\n      ")
     end
+  when :uuid
+    assoc_name = col.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      ")
+  when :enum
+    if(eval("#{singular_class}.respond_to?(:#{col}_labels)"))
+     "      " + "expect(page).to have_content(#{singular_class}.#{col}_labels[#{singular}#{1}.#{col}])"
+    else
+     "      " + "expect(page).to have_content(new_#{col})"
+    end
+
+  when :boolean
+    "      " + ["expect(page).to have_content(#{singular}#{1}.#{col} ? 'YES' : 'NO')"].join("\n      ")
   else
         "      " + ["expect(page).to have_content(#{singular}#{1}.#{col})"].join("\n      ")
   end
@@ -80,9 +94,9 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 <% unless @no_create %>  describe "new & create" do
     it "should create a new <%= singular.titlecase %>" do
       visit <%= path_helper_plural %>
-      click_link "New <%= thing_label %>"
-      expect(page).to have_selector(:xpath, './/h3[contains(., "New <%= thing_label %>")]')
-<%= test_capybara_block %>
+      click_link "<%= @new_button_label %>"
+      expect(page).to have_selector(:xpath, './/h3[contains(., "<%= @new_button_label %>")]')
+<%= test_capybara_block(:create) %>
       click_button "Save"
       expect(page).to have_content("Successfully created")
 <%="      " +
@@ -92,7 +106,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 
     case type
     when :datetime
-      #    "      expect(page).to have_content(new_#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y')  + \" @ \" +
+      #    "      expect(page).to have_content(#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y')  + \" @ \" +
       # new_#{col}.in_time_zone(current_timezone).strftime('%l').strip + \":\" +
       # new_#{col}.in_time_zone(current_timezone).strftime('%M %p').strip + \" \" +
       # timezonize(current_timezone))"
@@ -102,6 +116,15 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       else
          "expect(page).to have_content(new_#{col})"
       end
+
+    when :boolean
+        ["expect(page).to have_content(#{singular}#{1}.#{col} ? 'YES' : 'NO')"].join("\n      ")
+    when :enum
+      if(eval("#{singular_class}.respond_to?(:#{col}_labels)"))
+        "expect(page).to have_content(#{singular_class}.#{col}_labels[new_#{col}])"
+      else
+        "expect(page).to have_content(new_#{col})"
+      end
     else
       "expect(page).to have_content(new_#{col})"
     end
@@ -118,25 +141,24 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       find("a.edit-<%= singular %>-button[href='/<%= namespace_with_slash %><%= plural %>/#{<%= singular %>1.id}/edit']").click
 
       expect(page).to have_content("Editing #{<%= singular %>1.<%= @display_class %>.squish || "(no name)"}")
-<%= test_capybara_block %>
+<%= test_capybara_block(:update) %>
       click_button "Save"
       within("turbo-frame#<%= @namespace %>__#{dom_id(<%= singular %>1)} ") do
-<%=
-    (@columns - @show_only).map { |col|
+<%= (@columns - @show_only).map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type
-      case type
-      when :datetime
-        # TODO: implement me
-      when :time
-        # TODO: implement me
-      when :date
-        # TODO: implement me
-      when :boolean
-        # TODO: implement me
+
+      if type == :uuid || (type == :integer && col.to_s.ends_with?("_id"))
+        assoc = col.to_s.gsub('_id', '')
+        class_name = eval("#{@singular_class}.reflect_on_association(:#{assoc})").class_name
+      "        expect(page).to have_content(#{assoc}1.#{HotGlue.derrive_reference_name(class_name)})"
+
+      elsif type == :boolean
+      '        expect(page).to have_content(new_' + col.to_s + ' ? "YES" : "NO")'
+
+      elsif type == :enum && eval("#{singular_class}.respond_to?(:#{col}_labels)")
+       "        expect(page).to have_content(#{singular_class}.#{col}_labels[new_#{col}])"
       else
-        unless type==:integer && col.to_s.ends_with?("_id")
-        '        expect(page).to have_content(new_' + col.to_s + ')'
-        end
+      '        expect(page).to have_content(new_' + col.to_s + ')'
       end
     }.compact.join("\n")
     %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.6'
+    CURRENT = '0.5.8'
   end
 end

data/script/clean_generated_code

@@ -5,6 +5,9 @@ rm dummy/app/controllers/dfgs_controller.rb
 rm dummy/app/controllers/cantelopes_controller.rb
 rm dummy/app/controllers/jkls_controller.rb
 rm dummy/app/controllers/users_controller.rb
+rm dummy/app/controllers/humans_controller.rb
+rm dummy/app/controllers/pets_controller.rb
+
 
 rm -rf dummy/app/views/cantelopes/*
 rm -rf dummy/app/views/jkls/*
@@ -12,6 +15,8 @@ rm -rf dummy/app/views/ghis/*
 rm -rf dummy/app/views/abcs/*
 rm -rf dummy/app/views/dfgs/*
 rm -rf dummy/app/views/users/*
+rm -rf dummy/app/views/humans/*
+rm -rf dummy/app/views/pets/*
 
 /bin/rm -rf dummy/spec/system/
 

data/script/test

@@ -31,13 +31,21 @@ rails generate hot_glue:scaffold Dfg --auth=current_user
 
 rails generate hot_glue:scaffold Fruits::Cantelope --gd
 
+rails generate hot_glue:scaffold Pet --gd
+
+rails generate hot_glue:scaffold Human --gd
+
 #rails generate hot_glue:scaffold User --no-create --self-auth
 #rails generate hot_glue:scaffold Jkl --gd
-#rails generate hot_glue:scaffold Pet --gd
 #rails generate hot_glue:scaffold Appointment --hawk=pets --gd
-#rails generate hot_glue:scaffold Humen --gd
 #rails generate hot_glue:scaffold Family --gd
 
+# TODO: test these
+# --update-show-only
+# --alt-lookup-foreign-keys
+# --factory-creation
+
+
 
 rspec spec || exit
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.8
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-02 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails