hot-glue 0.3.9 → 0.4.3

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

@@ -2,19 +2,20 @@ 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
-      case type
-      when :integer
-        if col.to_s.ends_with?("_id")
-          assoc = "#{col.to_s.gsub('_id','')}"
-          "let!(:#{assoc}1) {create(:#{assoc}, name: FFaker::Name.name)}"
-        end
-      else
+  <%= (@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})}"
       end
-    }.compact.join("\n")
-          %>
+    else
+    end
+  }.compact.join("\n")
+        %>
   <% item1_addOns = ""
    if (eval(@singular_class).instance_methods.include?(display_class.to_s))
     item1_addOns << "#{display_class}: FFaker::Name.name"
@@ -24,7 +25,7 @@ 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("  ")"
 
@@ -40,7 +41,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     "#{col}: DateTime.current + rand(1000).seconds"
   when :integer
     if col.to_s.ends_with?("_id")
-      # shoould the assoication be on here
+      "#{col.to_s.gsub('_id','')}: #{col.to_s.gsub('_id','')}1"
     else
      "#{col}: rand(100)"
     end
@@ -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")
@@ -79,9 +82,16 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       expect(page).to have_selector(:xpath, './/h3[contains(., "New <%= singular.titlecase %>")]')
 
 <%=
-  @columns.map { |col|
+  (@columns - @show_only).map { |col|
     type = eval("#{singular_class}.columns_hash['#{col}']").type
     case type
+    when :date
+      "      " + "new_#{col} = Date.current + (rand(100).days) \n" +
+      '      ' + "find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+    when :time
+      # "      " + "new_#{col} = DateTime.current + (rand(100).days) \n" +
+      # '      ' + "find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
     when :datetime
       "      " + "new_#{col} = DateTime.current + (rand(100).days) \n" +
       '      ' + "find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
@@ -106,9 +116,18 @@ 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
+    when :text
+      "      " + "new_#{col} = FFaker::Lorem.paragraphs(1).join("") \n" +
+      "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
     end
 
   }.join("\n")
@@ -116,17 +135,17 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
         %>
       click_button "Save"
       expect(page).to have_content("Successfully created")
+<%="      " +
 
-      <%=
-  @columns.map { |col|
+  (@columns - @show_only).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
@@ -139,28 +158,29 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 
   }.compact.join("\n      ")
   %>
-
     end
   end<% end %>
 
-
+<% unless @no_edit %>
   describe "edit & update" do
     it "should return an editable form" do
       visit <%= path_helper_plural %>
       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  %> || "(no name)"}")
+      expect(page).to have_content("Editing #{<%= singular %>1.<%= @display_class %>.squish || "(no name)"}")
 <%=
-    @columns.map { |col|
+    (@columns - @show_only).map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type
       limit = eval("#{singular_class}.columns_hash['#{col}']").limit
       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 +192,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" +
@@ -186,11 +211,15 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
         "     new_#{col} = rand(1)*5000 \n" +
         "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s })"
       when :date
-        "     new_#{col} = Date.current + rand(100).days \n" +
-        "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s })"
+        "      new_#{col} = Date.current + rand(100).days \n" +
+        "      find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s })"
       when :time
         "     new_#{col} = Time.current + rand(144).hours \n" +
         "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s })"
+      when :datetime
+        "     new_#{col} = DateTime.current + rand(1000).minutes \n" +
+        "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s })"
+
       when :enum
         "      list_of_#{col.to_s} = #{singular_class}.defined_enums['#{col.to_s}'].keys \n" +
         "      " + "new_#{col.to_s} = list_of_#{col.to_s}[rand(list_of_#{col.to_s}.length)].to_s \n" +
@@ -205,10 +234,8 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     %>
       click_button "Save"
       within("turbo-frame#<%= singular %>__#{<%= singular %>1.id} ") do
-
-
 <%=
-    @columns.map { |col|
+    (@columns - @show_only).map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type
       case type
       when :datetime
@@ -226,10 +253,9 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       end
     }.compact.join("\n")
     %>
-
       end
     end
-  end
+  end <% end %>
 
 <% unless @no_delete %>  describe "destroy" do
     it "should destroy" do
@@ -237,8 +263,6 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       accept_alert do
         find("form[action='<%= namespace_with_dash %>/<%= plural %>/#{<%= singular %>1.id}'] > input.delete-<%= singular %>-button").click
       end
-#      find("form[action='<%= namespace_with_dash %>/<%= plural %>/#{<%= singular %>1.id}'] > input.delete-<%= singular %>-button").click
-
       expect(page).to_not have_content(<%= singular %>1.<%= @display_class %>)
       expect(<%= singular_class %>.where(id: <%= singular %>1.id).count).to eq(0)
     end

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.3.9'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.3
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2022-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '5.1'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.1'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -44,20 +44,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: turbo-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -107,14 +93,11 @@ files:
 - app/views/layouts/_flash_notices.erb
 - bin/rails
 - config/database.yml
-- db/migrate/20210306212711_create_abcs.rb
-- db/migrate/20210306223300_create_defs.rb
-- db/migrate/20210306223305_create_ghis.rb
-- db/migrate/20210306223309_create_jkls.rb
-- db/migrate/20210306223701_devise_create_users.rb
-- db/migrate/20210306225506_create_xyzs.rb
+- config/hot_glue.yml
 - db/schema.rb
+- lib/generators/hot_glue/helpers.rb
 - lib/generators/hot_glue/install_generator.rb
+- lib/generators/hot_glue/layout/builder.rb
 - lib/generators/hot_glue/markup_templates/base.rb
 - lib/generators/hot_glue/markup_templates/erb.rb
 - lib/generators/hot_glue/markup_templates/haml.rb
@@ -164,7 +147,7 @@ files:
 - lib/hotglue/version.rb
 homepage: https://jasonfleetwoodboldt.com/hot-glue/
 licenses:
-- Nonstandard
+- Commercial with free option
 metadata:
   source_code_uri: https://github.com/jasonfb/hot-glue
   tutorial: https://jfbcodes.com/hot-glue-tutorial

data/db/migrate/20210306212711_create_abcs.rb

@@ -1,11 +0,0 @@
-class CreateAbcs < ActiveRecord::Migration[6.1]
-  def change
-    create_table :abcs do |t|
-      t.integer :xxx
-      t.string :yyy
-      t.integer :def_id
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210306223300_create_defs.rb

@@ -1,9 +0,0 @@
-class CreateDefs < ActiveRecord::Migration[6.1]
-  def change
-    create_table :defs do |t|
-      t.integer :user_id
-      t.string :name
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210306223305_create_ghis.rb

@@ -1,9 +0,0 @@
-class CreateGhis < ActiveRecord::Migration[6.1]
-  def change
-    create_table :ghis do |t|
-      t.integer :def_id
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210306223309_create_jkls.rb

@@ -1,9 +0,0 @@
-class CreateJkls < ActiveRecord::Migration[6.1]
-  def change
-    create_table :jkls do |t|
-      t.integer :hgi_id
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210306223701_devise_create_users.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-class DeviseCreateUsers < ActiveRecord::Migration[6.1]
-  def change
-    create_table :users do |t|
-      ## Database authenticatable
-      t.string :email,              null: false, default: ""
-      t.string :encrypted_password, null: false, default: ""
-
-      ## Recoverable
-      t.string   :reset_password_token
-      t.datetime :reset_password_sent_at
-
-      ## Rememberable
-      t.datetime :remember_created_at
-
-      ## Trackable
-      # t.integer  :sign_in_count, default: 0, null: false
-      # t.datetime :current_sign_in_at
-      # t.datetime :last_sign_in_at
-      # t.string   :current_sign_in_ip
-      # t.string   :last_sign_in_ip
-
-      ## Confirmable
-      # t.string   :confirmation_token
-      # t.datetime :confirmed_at
-      # t.datetime :confirmation_sent_at
-      # t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
-      # t.string   :unlock_token # Only if unlock strategy is :email or :both
-      # t.datetime :locked_at
-
-
-      t.timestamps null: false
-    end
-
-    add_index :users, :email,                unique: true
-    add_index :users, :reset_password_token, unique: true
-    # add_index :users, :confirmation_token,   unique: true
-    # add_index :users, :unlock_token,         unique: true
-  end
-end

data/db/migrate/20210306225506_create_xyzs.rb

@@ -1,9 +0,0 @@
-class CreateXyzs < ActiveRecord::Migration[6.1]
-  def change
-    create_table :xyzs do |t|
-      t.integer :nothing_id
-
-      t.timestamps
-    end
-  end
-end