hot-glue 0.0.8 → 0.2.0

data/lib/generators/hot_glue/templates/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
 
@@ -81,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/erb/_errors.erb

@@ -0,0 +1,11 @@
+<\%= turbo_frame_tag "errors" do %>
+  <\% if resource.errors.any? %>
+    <div id="error_explanation">
+      <\% resource.errors.full_messages.each do |message| %>
+        <div class="alert alert-danger">
+          <\%= message %>
+        </div>
+      <\% end %>
+    </div>
+  <\% end %>
+<\% end %>

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

@@ -0,0 +1,12 @@
+<%= turbo_frame_tag "flash_notices" do %>
+  <% unless notice.nil? %>
+    <div class="alert alert-notice alert-dismissible">
+      <%= notice %>
+    </div>
+  <% end %>
+  <% unless alert.nil? %>
+    <div class="alert alert-danger alert-dismissible">
+      <%= alert %>
+    </div>
+  <% end %>
+<% end %>

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

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

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

@@ -0,0 +1,10 @@
+
+<\%= turbo_frame_tag "<%= singular %>__#{ <%= singular %>.id }" do  %>
+  <div class='row' data-id='<\%= <%= singular  %>.id %>' data-edit='false'>
+    <\%= render partial: '<%=  show_path_partial %>', locals: { <%= singular %>: <%= singular %>} %>
+  </div>
+<\% end %>
+
+
+
+

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

@@ -0,0 +1,19 @@
+<\%= turbo_frame_tag "<%= plural %>-list" do %>
+  <div class="container-fluid "><%= singular %>-table
+    <div class="row">
+      <%= list_column_headings %>
+      <div class='col buttons-col'></div>
+    </div>
+
+      <\% if <%= plural %>.empty? %>
+        <div>
+            None
+        </div>
+      <\% end %>
+      <\% <%= plural %>.each do |<%= singular %>| %>
+        <\%= render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %> <%= nested_assignments_with_leading_comma %> } %>
+      <\% end %>
+
+    <%=  @no_paginate ? "" : paginate %>
+  </div>
+<\% end %>

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

@@ -0,0 +1,3 @@
+<\%= turbo_frame_tag "<%= singular %>-new" do %>
+  <\%= link_to "New <%= singular.titlecase %>",  <%= new_path_name %>, disable_with: "Loading...", class: "new-<%= singular %>-button btn btn-primary pull-right" %>
+<\% end %>

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

@@ -0,0 +1,8 @@
+<\%= turbo_frame_tag "<%=  singular %>-new" do %>
+<h3>
+  New <%= singular.titlecase %>
+  </h3>
+  <\%= 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} %>
+  <\% end %>
+<\% end %>

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

@@ -0,0 +1,8 @@
+<%= all_line_fields %>
+<div class="col">
+  <% if destroy_action %>
+    <\%= 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_singular %>(<%= path_helper_args %>), <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary " %>
+</div>

data/lib/generators/hot_glue/templates/erb/create.turbo_stream.erb

@@ -0,0 +1,18 @@
+<\% if @<%= singular %>.errors.none? %>
+  <\%= turbo_stream.replace "<%= plural %>-list" do %>
+  <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %>} %>
+  <\% end %>
+  <\% end %>
+  <\%= turbo_stream.replace "<%= singular %>-new" do %>
+  <\% if @<%= singular %>.errors.none? %>
+  <\%= render partial: "new_button" %>
+  <\% else %>
+  <\%= render partial: "new_form", locals: {<%= singular %>: @<%= singular %>} %>
+  <\% end %>
+  <\% end %>
+  <\%= turbo_stream.replace "flash_notices" do %>
+  <\%= render partial: "layouts/flash_notices" %>
+  <\% if @<%= singular %>.errors.any? %>
+  <\%= render partial: "errors", locals: {resource: @<%= singular %>} %>
+  <\% end %>
+<\% end %>

data/lib/generators/hot_glue/templates/erb/destroy.turbo_stream.erb

@@ -0,0 +1,3 @@
+<\%= turbo_stream.replace "<%=plural%>-list" do %>
+  <\%= render partial: "list", locals: {<%=plural%>: @<%=plural%>}  %>
+<\% end %>

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

@@ -0,0 +1,30 @@
+<\%= 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  %>
+
+  <div class="cell editable" style="position: relative;">
+
+    <\% if @<%= singular %>.errors.any? %>
+      <\%= render(partial: "#{controller.namespace}errors", locals: {resource: @<%= singular%> }) %>
+    <\% end %>
+
+    <h2>Editing</h2>
+    <% if eval("@" + singular).try(:to_label) %>
+    <%="@" + singular%>.to_label
+    <%  elsif eval("@" + singular).try(:name)  %>
+   <%="@" + singular%>.name %>
+    <% else %>
+    (no name)
+      <% end %>
+    <\%= form_with model: <%= "@" + singular%>, url: <%= path_helper_singular %>(<%= path_arity %>) do |f| %>
+    <\%=  render partial: "form",  locals: {:<%=  singular  %> => <%= "@" + singular%>, f: f} %>
+    <\% end %>
+    <i class='fa fa-times-circle fa-2x'
+       data-name='close-<%=  singular  %>__<\% <%= "@" + singular %>.id %> }'
+       data-row-id=<%= "@" + singular %>.id,
+       data-role='close-button'></i>
+  </div>
+
+<\% end %>
+
+

data/lib/generators/hot_glue/templates/erb/edit.turbo_stream.erb

@@ -0,0 +1,3 @@
+<\%= turbo_stream.replace "<%= singular%>__#{@<%= singular %>.id}" do %>
+  <\%= render 'edit' %>
+<\% end %>

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

@@ -0,0 +1,10 @@
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-12">
+      <\%= render partial: "new_button" %>
+      <div class="clearfix"></div>
+      <\%= render partial: '<%= list_path_partial %>',
+              locals: {<%=  plural %>: @<%= plural %>} \%>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1 @@
+<\%= render partial: "new_form", locals: {<%= singular %>: @<%=singular%>} %>

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

@@ -0,0 +1,10 @@
+<\%= turbo_stream.replace "<%= singular%>__#{@<%= singular %>.id}" do %>
+  <\%= render partial: 'line', locals: {<%= singular %>: @<%= singular %> <%= nested_assignments_with_leading_comma %> } %>
+<\% end %>
+
+<\%= turbo_stream.replace "flash_notices" do %>
+  <\%= render partial: "layouts/flash_notices" %>
+  <\% if @<%= singular %>.errors.any? %>
+  <\%= render partial: "errors", locals: {resource: @<%= singular %>} %>
+  <\% end %>
+<\% end %>

data/lib/generators/hot_glue/templates/{_form.haml → haml/_form.haml}

@@ -1,4 +1,5 @@
 .row
 <%= all_form_fields %>
   .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/{_new_form.haml → haml/_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/haml/_show.haml

@@ -0,0 +1,7 @@
+<%= all_line_fields %>
+.col
+  <% if destroy_action %>
+  = 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_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/haml/update.turbo_stream.haml

@@ -0,0 +1,9 @@
+
+= turbo_stream.replace "<%= singular%>__#{@<%= singular %>.id}" do
+  = 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/generators/hot_glue/templates/system_spec.rb.erb

@@ -1,108 +1,147 @@
 require 'rails_helper'
 
 describe "interaction for <%= controller_class_name %>", type: :feature do
-  <% unless @auth.nil? %>  let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
-  let(:<%= singular %>) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
+  include HotGlue::ControllerHelper
+  <% unless @auth.nil? %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
 
-<%= objest_nest_factory_setup %>
+  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 %> )}
 
-  before(:each) do
-    @request.env["devise.mapping"] = Devise.mappings[:account]
+  <%= objest_nest_factory_setup %>
 
-    sign_in <%= @auth %>, scope: :<%= @auth %>
+  before(:each) do
+    login_as(<%= @auth %>)
   end
 
   describe "index" do
-    it "should respond" do
-      get :index, xhr: true, format: 'js', params: {
-          <%= objest_nest_params_by_id_for_specs %>
-      }
-    end
+    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
 
-  describe "new" do
-    it "should show form" do
-      get :new, xhr: true, format: 'js', params: {
-          <%= objest_nest_params_by_id_for_specs %>
-      }
+}.join("\n")
+     
+      %>
+
     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
+  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 %>")]')
 
-    # it "should not create if there are errors" do
-    #   post :create, xhr: true, format: 'js',  params: {id: <%= singular %>.id,
-    #                                                    <%= singular %>: {skin_id: nil}}
+<%=
+  @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
     #
-    #   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
+    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
-      get :show, xhr: true, format: 'js',  params: {
-          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
-          id: <%= singular %>.id
-        }
-      assert_response :ok
+      visit <%= path_helper_plural %>
+
     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
+  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
 
-    # 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
+      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
+  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)
+      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