hot-glue 0.5.2 → 0.5.3

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -130,8 +130,8 @@ module HotGlue
 
 
     # determines if the labels show up BEFORE or AFTER on the NEW/EDIT (form)
-    class_option :form_labels_position, default: 'after' #  choices are before, after, omit
-    class_option :form_placeholder_labels, default: false # puts the field names into the placeholder labels
+    class_option :form_labels_position, type: :string, default: 'after' #  choices are before, after, omit
+    class_option :form_placeholder_labels, type: :boolean,  default: false # puts the field names into the placeholder labels
 
 
     # NOT YET IMPLEMENTED
@@ -627,7 +627,7 @@ module HotGlue
     end
 
     def objest_nest_factory_setup
-      res = ""
+      res = "  "
       if @auth
         last_parent = ", #{@auth_identifier}: #{@auth}"
       end
@@ -653,6 +653,10 @@ module HotGlue
       @singular
     end
 
+    def testing_name
+      singular_class_name.gsub("::","_").downcase
+    end
+
     def singular_class_name
       @singular_class
     end
@@ -665,6 +669,59 @@ module HotGlue
       @auth_identifier
     end
 
+    def test_capybara_block
+      (@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='#{testing_name}[#{ 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='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
+        when :integer
+
+          if col.to_s.ends_with?("_id")
+            assoc = col.to_s.gsub('_id','')
+            "      #{col}_selector = find(\"[name='#{singular}[#{col}]']\").click \n" +
+              "      #{col}_selector.first('option', text: #{assoc}1.name).select_option"
+          else
+            "      new_#{col} = rand(10) \n" +
+              "      find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
+          end
+
+        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" +
+            '      find("select[name=\'' + singular + '[' + col.to_s + ']\']  option[value=\'#{new_' + col.to_s + '}\']").select_option'
+
+        when :boolean
+          "     new_#{col} = rand(2).floor \n" +
+            "     find(\"[name='#{testing_name}[#{col}]'][value='\#{new_" + col.to_s + "}']\").choose"
+        when :string
+          if col.to_s.include?("email")
+            "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
+              "      find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
+          else
+            "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
+              "      find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+          end
+        when :text
+          "      " + "new_#{col} = FFaker::Lorem.paragraphs(1).join("") \n" +
+            "      find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+        end
+
+      }.join("\n")
+    end
+
+
     def path_helper_args
       if @nested_set.any? && @nested
         [(@nested_set).collect{|a| "#{a[:singular]}"} , singular].join(",")

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

@@ -122,11 +122,11 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% end %><% if @build_update_action %>  def update
-    modified_params = modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>)<%= controller_update_params_tap_away_magic_buttons %>
-<% if @hawk_keys.any? %>    modified_params = hawk_params( {<%= hawk_to_ruby %>}, modified_params)<% end %>
-      <%= controller_magic_button_update_actions %>    if @<%= singular_name %>.update(modified_params)
+    modified_params = modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>)<%= controller_update_params_tap_away_magic_buttons %><% if @hawk_keys.any? %>
+    modified_params = hawk_params( {<%= hawk_to_ruby %>}, modified_params)<% end %>
+      <%= controller_magic_button_update_actions %> if @<%= singular_name %>.update(modified_params)
       flash[:notice] = (flash[:notice] || "") << "Saved #{@<%= singular %>.<%= display_class %>}"
-      flash[:alert] = @hawk_alarm  if !@hawk_alarm.empty?
+      flash[:alert] = @hawk_alarm if @hawk_alarm
     else
       flash[:alert] = (flash[:alert] || "") << "<%= singular_name.titlecase %> could not be saved. #{@hawk_alarm}"
 
@@ -152,7 +152,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %>
 
   def <%=singular_name%>_params
-    params.require(:<%=singular_name%>).permit( <%= (@columns - @show_only) + @magic_buttons.collect(&:to_sym) %> )
+    params.require(:<%= testing_name %>).permit( <%= (@columns - @show_only) + @magic_buttons.collect(&:to_sym) %> )
   end
 
   def namespace

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

@@ -4,13 +4,13 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
   include HotGlue::ControllerHelper
   <%= @existing_content %>
   <% unless @god %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
-  <%= (@columns - @show_only).map { |col|
+<%= (@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}": "")   + ")}"
+        "  let!(:#{assoc}1) {create(:#{assoc}" +  (@hawk_keys["#{assoc}_id".to_sym] ? ", #{@auth.gsub('current_', '')}: #{@auth}": "")   + ")}"
       end
     else
     end
@@ -46,10 +46,10 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
      "#{col}: rand(100)"
     end
   end
-}.compact.join(", \n      ")
+}.compact.join(", ")
   %>let!(:<%= singular %>1) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> <%= item1_addOns %> )}
   <%= objest_nest_factory_setup %> <% unless @god %>
-  before(:each) do
+  before do
     login_as(<%= @auth %>)
   end <% end %>
 
@@ -78,61 +78,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 <%= singular.titlecase %>"
-      expect(page).to have_selector(:xpath, './/h3[contains(., "New <%= singular.titlecase %>")]')
-
-<%=
-  (@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})"
-
-    when :integer
-
-      if col.to_s.ends_with?("_id")
-        assoc = col.to_s.gsub('_id','')
-        "      #{col}_selector = find(\"[name='#{singular}[#{col}]']\").click \n" +
-        "      #{col}_selector.first('option', text: #{assoc}1.name).select_option"
-      else
-        "      new_#{col} = rand(10) \n" +
-        "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
-
-      end
-
-    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" +
-        '      find("select[name=\'' + singular + '[' + col.to_s + ']\']  option[value=\'#{new_' + col.to_s + '}\']").select_option'
-
-    when :boolean
-      "     new_#{col} = rand(2).floor \n" +
-      "     find(\"[name='#{singular}[#{col}]'][value='\#{new_" + col.to_s + "}']\").choose"
-    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")
-
-        %>
+      click_link "New <%= thing_label %>"
+      expect(page).to have_selector(:xpath, './/h3[contains(., "New <%= thing_label %>")]')
+<%= test_capybara_block %>
       click_button "Save"
       expect(page).to have_content("Successfully created")
 <%="      " +
@@ -168,70 +116,7 @@ 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)"}")
-<%=
-    (@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})"
-        end
-      when :text
-        if sql_type == "text"
-            "      " + "new_#{col.to_s} = FFaker::Lorem.paragraphs(3).join \n" +
-            '      find("textarea[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
-
-        else # unreachable?
-            "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
-            '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
-        end
-      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})"
-
-        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 + ')'
-        end
-      when :boolean
-          "     new_#{col} = rand(2).floor \n" +
-          "     find(\"[name='#{singular}[#{col}]'][value='\#{new_#{col}}']\").choose"
-      when :float
-        "     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 })"
-      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" +
-        '      find("select[name=\'' + singular + '[' + col.to_s + ']\']  option[value=\'#{new_' + col.to_s + '}\']").select_option'
-
-      else
-        "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
-        '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
-
-      end
-    }.join("\n")
-    %>
+<%= test_capybara_block %>
       click_button "Save"
       within("turbo-frame#<%= singular %>__#{<%= singular %>1.id} ") do
 <%=

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.2'
+    CURRENT = '0.5.3'
   end
 end

data/script/clean_generated_code

@@ -0,0 +1,20 @@
+#!/bin/bash
+rm dummy/app/controllers/ghis_controller.rb
+rm dummy/app/controllers/abcs_controller.rb
+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 -rf dummy/app/views/cantelopes/*
+rm -rf dummy/app/views/jkls/*
+rm -rf dummy/app/views/ghis/*
+rm -rf dummy/app/views/abcs/*
+rm -rf dummy/app/views/dfgs/*
+rm -rf dummy/app/views/users/*
+
+/bin/rm -rf dummy/spec/system/
+
+
+# !("application_controller.rb"|"welcome_controller.rb")
+#find dummy/app/views/ -type f ! -name "application.html.erb" ! -name "welcome/index.erb" -delete

data/script/test

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+clean_generated_code() {
+./clean_generated_code
+}
+
+echo "Internal test suite for Hot Glue  (install, basic commands)..."
+# the internal specs test only Hot Glue's command line usage
+rspec spec
+
+script/clean_generated_code
+
+echo "Integration test suite for Hot Glue..."
+# note that the dummy/ is in the root of the repository
+# these specs generate several controllers & specs and then run the generated
+# specs to test the generated code
+
+cd dummy
+
+echo "Setting up database..."
+
+bundle install
+rake db:create db:reset db:test:prepare
+
+echo "Generating all code for testing..."
+rails generate hot_glue:scaffold Abc --gd
+
+rails generate hot_glue:scaffold Ghi --gd
+
+rails generate hot_glue:scaffold Dfg --auth=current_user
+
+rails generate hot_glue:scaffold Fruits::Cantelope --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
+
+
+rspec spec || exit
+
+cd ../
+
+script/clean_generated_code
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,21 +59,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/FUNDING.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - README2.md
-- Rakefile
 - app/assets/config/manifest.js
 - app/helpers/hot_glue/controller_helper.rb
 - app/helpers/hot_glue_helper.rb
 - app/views/layouts/_flash_notices.erb
-- bin/rails
 - config/database.yml
 - config/hot_glue.yml
 - db/schema.rb
@@ -124,11 +122,15 @@ files:
 - lib/hot-glue.rb
 - lib/hotglue/engine.rb
 - lib/hotglue/version.rb
+- script/clean_generated_code
+- script/test
 homepage: https://heliosdev.shop/p/hot-glue?utm_source=rubygems.org&utm_campaign=rubygems_link
 licenses:
-- Commercial with free option
+- Nonstandard
 metadata:
   source_code_uri: https://github.com/jasonfb/hot-glue
+  homepage: https://heliosdev.shop/hot-glue
+  funding: https://tekduds.com
 post_install_message: |
   ---------------------------------------------
   Welcome to Hot Glue - A Scaffold Building Companion for Hotwire + Turbo-Rails
@@ -148,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A gem to build Tubro Rails scaffolding.

data/.circleci/config.yml

@@ -1,71 +0,0 @@
-# Use the latest 2.1 version of CircleCI pipeline process engine.
-# See: https://circleci.com/docs/2.0/configuration-reference
-version: 2.1
-
-# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
-# See: https://circleci.com/docs/2.0/orb-intro/
-orbs:
-  ruby: circleci/ruby@1.4.0
-
-# Define a job to be invoked later in a workflow.
-# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
-jobs:
-  build:
-    docker:
-      - image: cimg/ruby:2.7.5-browsers
-    executor: ruby/default
-    steps:
-      - checkout
-      - ruby/install-deps # use the ruby orb to install dependencies
-
-      - run:
-          name: Which bundler?
-          command: bundle -v
-  test:  # our next job, called "test"
-    parallelism: 1
-    # here we set TWO docker images.
-    docker:
-
-      - image: cimg/ruby:2.7.5-browsers # this is our primary docker image, where step commands run.
-        auth:
-          username: mydockerhub-user
-          password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
-      - image: redis:6.2.6
-      - image: circleci/postgres:9.5-alpine
-        auth:
-          username: mydockerhub-user
-          password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
-        environment: # add POSTGRES environment variables.
-          POSTGRES_USER: circleci-demo-ruby
-          POSTGRES_DB: hot-glue-test
-          POSTGRES_PASSWORD: ""
-    # environment variables specific to Ruby/Rails, applied to the primary container.
-    environment:
-      BUNDLE_JOBS: "3"
-      BUNDLE_RETRY: "3"
-      PGHOST: 127.0.0.1
-      PGUSER: circleci-demo-ruby
-      PGPASSWORD: ""
-      RAILS_ENV: test
-    # A series of steps to run, some are similar to those in "build".
-    steps:
-      - checkout
-      - ruby/install-deps
-      # Here we make sure that the secondary container boots
-      # up before we run operations on the database.
-      - run:
-          name: Wait for DB
-          command: dockerize -wait tcp://localhost:5432 -timeout 1m
-      # Run rspec in parallel
-      - run: bundle exec rspec --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec/results.xml --format progress
-
-# We use workflows to orchestrate the jobs that we declared above.
-workflows:
-  version: 2
-  build_and_test:     # The name of our workflow is "build_and_test"
-    jobs:             # The list of jobs we run as part of this workflow.
-      - build         # Run build first.
-      - test:         # Then run test,
-          requires:   # Test requires that build passes for it to run.
-            - build   # Finally, run the build job.
-