hot-glue 0.0.5 → 0.1.0

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

@@ -5,6 +5,3 @@
   = form_with model: <%= singular %>, url: <%= path_helper_plural %>(<%= nested_objects_arity %>), method: "post" do  |f|
     = render partial: "<%=namespace_with_slash%><%= @plural %>/form", locals: {<%= singular %>: <%= singular %>, f: f}
 
-    .row
-      .col-md-12
-        = f.submit "Save", class: "btn btn-primary pull-right"

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

@@ -1,7 +1,7 @@
 <%= all_line_fields %>
 .col
   <% if destroy_action %>
-  = link_to "Delete <i class='fa fa-1x fa-remove'></i>".html_safe, <%= path_helper_full %>(<%= path_helper_args %>), method: :delete, data: {confirm: 'Are you sure?'},  disable_with: "Loading...", class: "delete-<%= singular %>-button btn btn-primary "
+  = link_to "Delete <i class='fa fa-1x fa-remove'></i>".html_safe, <%= path_helper_singular %>(<%= path_helper_args %>), method: :delete, data: {confirm: 'Are you sure?'},  disable_with: "Loading...", class: "delete-<%= singular %>-button btn btn-primary "
   <% end %>
   &nbsp;
-  = link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_full %>(<%= path_helper_args %>),  disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary "
+  = link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_singular %>(<%= path_helper_args %>), <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary "

data/lib/generators/hot_glue/templates/{controller.rb → controller.rb.erb}

@@ -1,7 +1,6 @@
 class <%= controller_class_name %> < <%= controller_descends_from %>
 <% unless @auth_identifier == '' || @auth.nil? %>before_action :authenticate_<%= @auth_identifier %>!<% end %>
-<% if any_nested? %> <% @nested_args.each do |arg| %>
-  before_action :load_<%= arg %><% end %> <% end %>
+
   before_action :load_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
   helper :hot_glue
   include HotGlue::ControllerHelper
@@ -11,22 +10,23 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 <% end %>
 
   <% if any_nested? %><% nest_chain = [] %> <% @nested_args.each { |arg|
-    this_scope =   nest_chain.empty? ?  "#{@auth ? auth_object : class_name}.#{arg}s" : "@#{nest_chain.last}.#{arg}s"
-      nest_chain << arg %>def load_<%= arg %>
-    @<%= arg %> = <%= this_scope %>.find(params[:<%= arg %>_id])
+    this_scope =   nest_chain.empty? ?  "#{@auth ? auth_object : class_name}.#{arg}s" : "#{nest_chain.last}.#{arg}s"
+      nest_chain << arg %>
+  def <%= arg %>
+    @<%= arg %> ||= <%= this_scope %>.find(params[:<%= arg %>_id])
   end<% } %><% end %>
 
 <% if !@self_auth %>
   def load_<%= singular_name %>
-    @<%= singular_name %> = <%= object_scope %>.find(params[:id])
+    @<%= singular_name %> = <%= object_scope.gsub("@",'') %>.find(params[:id])
   end
   <% else %>
   def load_<%= singular_name %>
-    @<%= singular_name %> = <%= auth_object %>
+    @<%= singular_name %> = <%= auth_object.gsub("@",'') %>
   end<% end %>
 
   def load_all_<%= plural %>
-    <% if !@self_auth %>@<%= plural_name %> = <%= object_scope %><% if model_has_strings? %>.where(<%=class_name %>.arel_table[:email].matches("%#{@__general_string}%"))<% end %>.page(params[:page])
+    <% if !@self_auth %>@<%= plural_name %> = <%= object_scope.gsub("@",'') %><% if model_has_strings? %>.where(<%=class_name %>.arel_table[:email].matches("%#{@__general_string}%"))<% end %>.page(params[:page])
     <% else %>@<%= plural_name %> = [<%= auth_object %>]<% end %>
   end
 
@@ -46,6 +46,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       format.html
     end
   end
+
   def create
     modified_params = modify_date_inputs_on_params(<%=singular_name %>_params.dup<% if !@object_owner_sym.empty? %>.merge!(<%= @object_owner_sym %>: <%= @object_owner_eval %> )<% end %> <%= @auth ? ', ' + @auth : '' %>)
     @<%=singular_name %> = <%=class_name %>.create(modified_params)
@@ -80,8 +81,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
   def update
-    if !@<%= singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>))
-        flash[:alert] = "<%= singular_name.titlecase %> could not be saved"
+    if @<%= singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>))
+      flash[:notice] = "Saved #{@<%= singular %>.<%= display_class %>}"
+    else
+      flash[:alert] = "<%= singular_name.titlecase %> could not be saved."
     end
     respond_to do |format|
       format.turbo_stream

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

@@ -1,3 +1,5 @@
+= link_to "<i class='fa fa-arrow-circle-left  2x'></i> Back to list".html_safe, <%= path_helper_plural %>
+
 = turbo_frame_tag "<%= singular %>__#{<%= "@" + singular %>.id}" do
   .cell.editable{style: "position: relative;"}
     - if <%="@" + singular%>.errors.any?

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

@@ -0,0 +1,148 @@
+require 'rails_helper'
+
+describe "interaction for <%= controller_class_name %>", type: :feature do
+  include HotGlue::ControllerHelper
+  <% unless @auth.nil? %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
+
+  let!(:<%= singular %>1) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
+  let!(:<%= singular %>2) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
+  let!(:<%= singular %>3) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
+
+  <%= objest_nest_factory_setup %>
+
+  before(:each) do
+    login_as(<%= @auth %>)
+  end
+
+  describe "index" do
+    it "should show me the list" do
+      visit <%= path_helper_plural %>
+
+<%=
+@columns.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
+    "      " + ["expect(page).to have_content(#{singular}#{rand(3)+1}.#{col}.in_time_zone(#{ @auth }.timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub('  ', ' ') + timezonize(#{ @auth }.timezone)  )"].join("\n      ")
+
+  else
+    "      " + ["expect(page).to have_content(#{singular}#{rand(3)+1}.#{col})"].join("\n      ")
+
+  end
+
+}.join("\n")
+     
+      %>
+
+    end
+  end
+
+  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.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
+    when :integer
+      "      " + 'find("input#' + singular + '_' + col.to_s + '").fill_in(with: rand(10))'
+    else
+      "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
+      '      ' + 'find("input#' + singular + '_' + col.to_s + '").fill_in(with: new_' + col.to_s + ')'
+    end
+
+  }.join("\n")
+
+        %>
+      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
+    when :integer
+    else
+      "expect(page).to have_content(new_#{col})"
+    end
+
+  }.join("\n")
+  %>
+
+    end
+  end
+
+  describe "show" do
+    it "should return a view form" do
+      visit <%= path_helper_plural %>
+
+    end
+  end
+
+  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.<%= derrive_reference_name(singular_class) %>}")
+<%=
+    @columns.map { |col|
+      type = eval("#{singular_class}.columns_hash['#{col}']").type
+
+      case type
+      when :datetime
+      when :integer
+      else
+        "      " + "new_#{col.to_s} = Faker::Name.new \n" +
+
+        '      find("input[name=\'' + singular + '[' + col.to_s + ']\'").fill_in(with: new_' + col.to_s + ')'
+
+      end
+    }.join("\n")
+    %>
+      click_button "Save"
+      within("turbo-frame#<%= singular %>__#{<%= singular %>1.id} ") do
+
+
+<%=
+    @columns.map { |col|
+      type = eval("#{singular_class}.columns_hash['#{col}']").type
+      case type
+      when :datetime
+      when :integer
+      else
+        '        expect(page).to have_content(new_' + col.to_s + ')'
+      end
+    }.join("\n")
+    %>
+
+      end
+    end
+  end
+
+  describe "destroy" do
+    it "should destroy" do
+      visit <%= path_helper_plural %>
+      accept_alert do
+        find("a.delete-<%= singular %>-button[href='<%= namespace_with_dash %>/<%= plural %>/#{<%= singular %>1.id}']").click
+      end
+      expect(page).to_not have_content(<%= singular %>1.email)
+      expect(<%= singular_class %>.where(id: <%= singular %>1.id).count).to eq(0)
+    end
+  end
+end
+

data/lib/generators/hot_glue/templates/update.turbo_stream.haml

@@ -3,3 +3,7 @@
   = render partial: 'line', locals: {<%= singular %>: @<%= singular %> <%= nested_assignments_with_leading_comma %> }
 
 
+= turbo_stream.replace "flash_notices" do
+  = render partial: "layouts/flash_notices"
+  - if @<%= singular %>.errors.any?
+    = render partial: "errors", locals: {resource: @<%= singular %>}

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,9 +108,18 @@ files:
 - LICENCE
 - README.md
 - Rakefile
+- app/assets/config/manifest.js
 - app/helpers/hot_glue/controller_helper.rb
 - app/helpers/hot_glue_helper.rb
 - 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
+- db/schema.rb
 - lib/generators/hot_glue/install_generator.rb
 - lib/generators/hot_glue/scaffold_generator.rb
 - lib/generators/hot_glue/templates/_errors.haml
@@ -121,15 +130,15 @@ files:
 - lib/generators/hot_glue/templates/_new_button.haml
 - lib/generators/hot_glue/templates/_new_form.haml
 - lib/generators/hot_glue/templates/_show.haml
-- lib/generators/hot_glue/templates/base_controller.rb
-- lib/generators/hot_glue/templates/controller.rb
-- lib/generators/hot_glue/templates/controller_spec.rb
+- lib/generators/hot_glue/templates/base_controller.rb.erb
+- lib/generators/hot_glue/templates/controller.rb.erb
 - lib/generators/hot_glue/templates/create.turbo_stream.haml
 - lib/generators/hot_glue/templates/destroy.turbo_stream.haml
 - lib/generators/hot_glue/templates/edit.haml
 - lib/generators/hot_glue/templates/edit.turbo_stream.haml
 - lib/generators/hot_glue/templates/index.haml
 - lib/generators/hot_glue/templates/new.haml
+- lib/generators/hot_glue/templates/system_spec.rb.erb
 - lib/generators/hot_glue/templates/update.turbo_stream.haml
 - lib/hot-glue.rb
 - lib/hotglue/engine.rb
@@ -139,8 +148,8 @@ licenses:
 - Nonstandard
 metadata:
   source_code_uri: https://github.com/jasonfb/hot-glue
-  documentation_uri: https://jfb.teachable.com/p/gems-by-jason
-  homepage_uri: https://blog.jasonfleetwoodboldt.com/hot-glue/
+  documentation_uri: https://www.instagram.com/jfbcodes/
+  homepage_uri: https://jasonfleetwoodboldt.com/hot-glue/
 post_install_message: |
   ---------------------------------------------
   Welcome to Hot Glue - A Scaffold Building Companion for Hotwire + Turbo-Rails
@@ -149,11 +158,11 @@ post_install_message: |
 
       * Build plug-and-play scaffolding mixing HAML with the power of Hotwire and Turbo-Rails
       * Automatically Reads Your Models (make them before building your scaffolding!)
-      * Excellent for CRUD, lists with pagination, searching, sorting.
-      * Great for prototyping very.
-      * Plays nicely with Devise, Kaminari, Haml-Rails, Rspec.
-      * Create specs automatically along with the controllers.
-      * Nest your routes model-by-model for built-in poor man's authentication
+      * Excellent for CRUD, lists with pagination (coming soon: searching & sorting)
+      * Great for prototyping.
+      * Plays nicely with Devise, Kaminari, Haml-Rails, Rspec, FontAwesome
+      * Create specs automatically along with the generated controllers.
+      * Nest your routes model-by-model for built-in poor man's authentication.
       * Throw the scaffolding away when your app is ready to graduate to its next phase.
 
   see README for complete instructions.

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

@@ -1,110 +0,0 @@
-require 'rails_helper'
-
-describe <%= controller_class_name %> do
-  render_views
-  <% unless @auth.nil? %>  let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
-  let(:<%= singular %>) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
-
-<%= objest_nest_factory_setup %>
-
-  before(:each) do
-    @request.env["devise.mapping"] = Devise.mappings[:account]
-
-    sign_in <%= @auth %>, scope: :<%= @auth %>
-  end
-
-  describe "index" do
-    it "should respond" do
-      get :index, xhr: true, format: 'js', params: {
-          <%= objest_nest_params_by_id_for_specs %>
-      }
-    end
-  end
-
-  describe "new" do
-    it "should show form" do
-      get :new, xhr: true, format: 'js', params: {
-          <%= objest_nest_params_by_id_for_specs %>
-      }
-    end
-  end
-
-  describe "create" do
-    it "should create a new <%= singular %>" do
-      expect {
-        post :create, xhr: true, format: 'js', params: {
-          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
-            <%= singular %>: {
-                <%= columns_spec_with_sample_data %>
-        }}
-      }.to change { <%= @singular_class %>.all.count }.by(1)
-      assert_response :ok
-    end
-
-    # it "should not create if there are errors" do
-    #   post :create, xhr: true, format: 'js',  params: {id: <%= singular %>.id,
-    #                                                    <%= singular %>: {skin_id: nil}}
-    #
-    #   expect(controller).to set_flash.now[:alert].to(/Oops, your <%= singular %> could not be saved/)
-    # end
-  end
-
-  describe "edit" do
-    it "should return an editable form" do
-      get :edit, xhr: true, format: 'js',  params: {
-          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
-          id: <%= singular %>.id
-      }
-      assert_response :ok
-    end
-  end
-
-  describe "show" do
-    it "should return a view form" do
-      get :show, xhr: true, format: 'js',  params: {
-          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
-          id: <%= singular %>.id
-        }
-      assert_response :ok
-    end
-  end
-
-  describe "update" do
-    it "should update" do
-      put :update, xhr: true, format: 'js',
-          params: {
-            <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
-            id: <%= singular %>.id,
-            <%= singular %>: {
-                <%= columns_spec_with_sample_data %>
-            }}
-
-      assert_response :ok
-    end
-
-    # it "should not update if invalid" do
-    #   put :update, xhr: true, format: 'js',
-    #       params: {
-    #         id: <%= singular %>.id,
-    #         <%= singular %>: {
-    #           <%= columns_spec_with_sample_data %>
-    #       }}
-    #
-    #   assert_response :ok
-    #
-    #   expect(controller).to set_flash.now[:alert].to(/Oops, your <%= singular %> could not be saved/)
-    # end
-  end
-
-  describe "#destroy" do
-    it "should destroy" do
-      post :destroy, format: 'js', params: {
-          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
-          id: <%= singular %>.id
-      }
-      assert_response :ok
-      expect(<%= @singular_class %>.count).to be(0)
-    end
-  end
-end
-