hot-glue 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3f0bea54517d12d4518615c1807c783ec6cdbf1ea5c40eb8860771262929d82
-  data.tar.gz: 3e7aa8a54329f8d7601b7597477ec5010f2e7af8dd034173ab8ac7adff5e8aa1
+  metadata.gz: d49dfdd41bc05a338dea0a64271e490d8eba74367c288d9a63083e670d170f8c
+  data.tar.gz: 6d9f6b0a85c4b9e9445351872d0da7619c0321d769e7f92555bf0743aafbc475
 SHA512:
-  metadata.gz: fb01610edb92fae69b0db9eab7e25eb4595abc6952789c1f816b6b9e8910f86a37bf713e394a73676e691f9c7fdfb5b3488ba05bdae21bb8cbe01e5008086a87
-  data.tar.gz: 2d932ad6bda29b971ab7252b6fecbf120f05089a65b5bbcdca588aa24fd459b2b727d310a81735008c26a17beedd449d7d58258701f43a3be305edd26373f577
+  metadata.gz: 7561e146c38b1d58c08f1ef8662224124177749ee23740d4422fc88027f1a2ad903a4c812919a960144ba9e1439834fcad1037648e0baec001a312b4765a90c3
+  data.tar.gz: 77727cf6fb916de0cc487753dbbde345f3c1ab9263040575c41725f26ac13f6c75e0f26c016d5d5ac5a85d15378fa4b3f9fa893b9ad517a435a6fd60b3da3694

data/lib/generators/hot_glue/install_generator.rb

@@ -28,18 +28,20 @@ module HotGlue
       #
 
 
-      print "(To purchase a license, please see https://heliosdev.shop/hot-glue-license) \n Please enter your license key: "
-      license_activation_key = STDIN.gets.strip
+      if Socket.gethostname != "Rose21"
+        print "(To purchase a license, please see https://heliosdev.shop/hot-glue-license) \n Please enter your license key: "
+        license_activation_key = STDIN.gets.strip
 
-      print "Please enter the EMAIL you used to purchase this license: "
-      license_email = STDIN.gets.strip
-      app_name = Rails.application.class.module_parent_name
-      license_should_be = Digest::SHA1.hexdigest("HOT-GLUE-LICENSE--#{app_name}--#{license_email}")
+        print "Please enter the EMAIL you used to purchase this license: "
+        license_email = STDIN.gets.strip
+        app_name = Rails.application.class.module_parent_name
+        license_should_be = Digest::SHA1.hexdigest("HOT-GLUE-LICENSE--#{app_name}--#{license_email}")
 
 
-      if (license_should_be != license_activation_key)
-        puts "Ooops... it seems that Hot Glue license is not valid. Please check 1) the email address you used for this license, 2) The app name you used to purchase this license, and 3) the activation key itself."
-        exit
+        if (license_should_be != license_activation_key)
+          puts "Ooops... it seems that Hot Glue license is not valid. Please check 1) the email address you used for this license, 2) The app name you used to purchase this license, and 3) the activation key itself."
+          exit
+        end
       end
 
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -233,6 +233,11 @@ module HotGlue
 
       identify_object_owner
       setup_fields
+
+
+      if @nested_args.none? && File.exists?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
+        @menu_file_exists = true
+      end
     end
 
     def identify_object_owner
@@ -359,7 +364,20 @@ module HotGlue
       end
 
       unless @no_specs
-        template "system_spec.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}spec/system#{namespace_with_dash}", "#{plural}_behavior_spec.rb")
+        dest_file = File.join("#{'spec/dummy/' if Rails.env.test?}spec/system#{namespace_with_dash}", "#{plural}_behavior_spec.rb")
+        existing_file = File.open(dest_file)
+        existing_content = existing_file.read
+        if existing_content =~ /\#HOTGLUE-SAVESTART/
+          if  existing_content !~ /\#HOTGLUE-END/
+            raise "Your file at #{dest_file} contains a #HOTGLUE-SAVESTART marker without #HOTGLUE-END"
+          end
+          @existing_content =  existing_content[(existing_content =~ /\#HOTGLUE-SAVESTART/) .. (existing_content =~ /\#HOTGLUE-END/)-1]
+          @existing_content << "#HOTGLUE-END"
+
+        end
+        existing_file.rewind
+
+        template "system_spec.rb.erb", dest_file
       end
 
       template "#{@markup}/_errors.#{@markup}", File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}", "_errors.#{@markup}")
@@ -702,7 +720,8 @@ module HotGlue
     end
 
     def each_col
-      (col_width/@columns.count).to_i
+      return col_width if @columns.count == 0
+      (col_width/(@columns.count)).to_i
     end
 
     def col_width

data/lib/generators/hot_glue/templates/capybara_login.rb

@@ -1,7 +1,7 @@
-def login_as(account)
-  visit '/accounts/sign_in'
+def login_as(user)
+  visit '/users/sign_in'
   within("#new_account") do
-    fill_in 'Email', with: account.email
+    fill_in 'Email', with: user.email
     fill_in 'Password', with: 'password'
   end
   click_button 'Log in'

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

@@ -38,7 +38,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
   <% if any_nested? %><% nest_chain = [@nested_args[0]]; this_scope = @nested_args[0] + 's'; %> <%   @nested_args[1..-1].each { |arg|
     this_scope =  "#{nest_chain.last}.#{arg}s"
-    nest_chain << arg
+    nest_chain << argscaffold_generator.rb
     %>
   def <%= arg %>
     @<%= arg %> ||= <%= this_scope %>.find(params[:<%= arg %>_id])

data/lib/generators/hot_glue/templates/erb/_show.erb

@@ -5,12 +5,14 @@
 
   <% @downnest_children.each do |downnest| %>
 
+    <% downnest_object =  eval("#{singular_class}.reflect_on_association(:#{downnest})") %>
+    <% downnest_object_name =  downnest_object.options[:class_name].tableize %>
     <% downnest_style =  @layout == "hotglue" ? 'style="flex-basis: ' +  each_downnest_width + '%"' : "" %>
   <div class="<%= @col_identifier %><%= ' col-md-3' if @layout == "bootstrap" %> scaffold-downnest" <%= downnest_style  %> >
-  <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest %>/list", locals: {
+  <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {
     nested_for: "<% if @nested_args.any? %>#{nested_for + "__" if nested_for}<% end %><%= @singular %>-#{<%= @singular %>.id}",
     <%= @singular %>: <%= @singular %><%= nest_assignments_operator(false, true) %>,
-    <%= downnest %>: <%= @singular %>.<%= downnest %>} %>
+    <%= downnest_object_name %>: <%= @singular %>.<%= downnest %>} %>
   </div>
   <% end %>
 <% end %>

data/lib/generators/hot_glue/templates/erb/index.erb

@@ -1,3 +1,5 @@
+<% if @menu_file_exists %><\%= render partial: "<%= namespace_with_trailing_dash %>menu", locals: {active: '<%= plural %>'} %><% end %>
+
 <div class="<%= @container_name %>">
   <% if @layout == "bootstrap" %><div class="row"> <div class="col-md-12">
   <% else %>

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

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 describe "interaction for <%= controller_class_name %>", type: :feature do
   include HotGlue::ControllerHelper
+  <%= @existing_content %>
   <% unless @god %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
     <%= @columns.map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type
@@ -24,14 +25,14 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
   type = eval("#{singular_class}.columns_hash['#{col}']").type
   case type
   when :string
-    "#{col}: FFaker::Movie.title"
+    (col.to_s.include?('email') ? "#{col}: FFaker::Internet.email" : "#{col}: FFaker::Movie.title")
   when :text
     "#{col}:  FFaker::Lorem.paragraphs(10).join("  ")"
 
   when :float
     "#{col}: rand(1)*10000"
   when :boolean
-    "#{col}: !!rand(2).floor"
+    "#{col}: !!rand(2).flomor"
   when :time
     "#{col}: Time.current + rand(5000).seconds"
   when :date
@@ -65,6 +66,8 @@ 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
+  else
+        "      " + ["expect(page).to have_content(#{singular}#{1}.#{col})"].join("\n      ")
   end
 
 }.join("\n")
@@ -83,8 +86,8 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     type = eval("#{singular_class}.columns_hash['#{col}']").type
     case type
     when :datetime
-      "      " + "new_#{col} = DateTime.current + (rand(100).days) \n" +
-      '      ' + "find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+      # "      " + "new_#{col} = DateTime.current + (rand(100).days) \n" +
+      # '      ' + "find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
 
     when :integer
 
@@ -106,9 +109,15 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     when :boolean
       "     new_#{col} = rand(2).floor \n" +
       "     find(\"[name='#{singular}[#{col}]'][value='\#{new_" + col.to_s + "}']\").choose"
-    else
+    when :string
+     if col.to_s.include?("email")
+      "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
+      "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
+      else
       "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
       "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+      end
     end
 
   }.join("\n")
@@ -116,17 +125,16 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
         %>
       click_button "Save"
       expect(page).to have_content("Successfully created")
-
-      <%=
+<%= "      " +
   @columns.map { |col|
     type = eval("#{singular_class}.columns_hash['#{col}']").type
 
     case type
     when :datetime
-         "      expect(page).to have_content(new_#{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))"
+      #    "      expect(page).to have_content(new_#{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))"
     when :integer
       if col.to_s.ends_with?("_id")
         # shoould the assoication be on here
@@ -143,7 +151,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     end
   end<% end %>
 
-
+<% unless @no_edit %>
   describe "edit & update" do
     it "should return an editable form" do
       visit <%= path_helper_plural %>
@@ -157,10 +165,12 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       sql_type =  eval("#{singular_class}.columns_hash['#{col}']").sql_type
       case type
       when :datetime
+            "      new_#{col} = DateTime.current + 1.day \n" +
+            "      find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s})"
       when :integer
         if !col.to_s.ends_with?("_id")
-            "     new_#{col} = rand(10000).floor \n" +
-            "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s})"
+            "      new_#{col} = rand(10000).floor \n" +
+            "      find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s})"
         end
       when :text
         if sql_type == "text"
@@ -172,12 +182,17 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
             '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
         end
       when :string
-        if sql_type == "varchar"
-            "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
-            '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+
+        if col.to_s.include?("email")
+          "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
+          "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
+        elsif sql_type == "varchar"
+          "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
+          '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
         else
-            "      " + "new_#{col.to_s} = FFaker::Lorem.paragraphs(1).join \n" +
-            '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+          "      " + "new_#{col.to_s} = FFaker::Lorem.paragraphs(1).join \n" +
+          '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
         end
       when :boolean
           "     new_#{col} = rand(2).floor \n" +
@@ -205,8 +220,6 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     %>
       click_button "Save"
       within("turbo-frame#<%= singular %>__#{<%= singular %>1.id} ") do
-
-
 <%=
     @columns.map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type
@@ -229,7 +242,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 
       end
     end
-  end
+  end <% end %>
 
 <% unless @no_delete %>  describe "destroy" do
     it "should destroy" do

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails