hot-glue 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61d066f183e4a0563768d26589b1fcf140c4867ea540458fea8e084ef3903b03
-  data.tar.gz: 32361a4068d3b9808f2d9caa2a9e1c22d484e1c23d3196fdde6e0939d6b6ce60
+  metadata.gz: b466a03ce8d764332b3f3d8673bc29b6071308cb976706632a70713b6efb53b4
+  data.tar.gz: 03f8580d7266c767b1bed6a1e325c515bc09a5d9886356250ed9a4d936bab452
 SHA512:
-  metadata.gz: 3ca1797468a13ade3f508d5fb8fc8799532bc9ec010ff0adffad7702bc569c42d6eb5926ee6682474d8b9ea3f4aeadaabe7e721a5ce3dc03996573767d04ff1c
-  data.tar.gz: 7ec34f2f77fa45740e521ec867bec02c712cbd80f4f91a59a8011a76f10e5595ea91bdf3cb3c48770d8959606b7d9a6424ad13d0f0aa2e80fa7821000e66d272
+  metadata.gz: 3e0b66aa6cbab6a813a810f6bee04503c0f7437f53dc2a7a2f27aadad8b09a559a1d540f7c6ce850c5a25f641ab847edeb6c5b26fc83c6b6728bb52278bbc3bb
+  data.tar.gz: 5bcc706e9ad0a620c33a5815fc5160fe7afef6b9468d1d920032d1daffbfc3bc304816dc661d1c359b1002fdc854d1757869844e7afe1efa2f0eb021df408827

data/.github/workflows/test.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
         with:
           # Not needed with a .ruby-version file
           # runs 'bundle install' and caches installed gems automatically

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.5.15)
+    hot-glue (0.5.16)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)

data/README.md

@@ -663,9 +663,22 @@ The syntax is `--modify=cost{$},price{$}`
 
 Here, the `cost` and `price` fields will be displayed as wrapped in `number_to_currency()` when displayed on the list view and when displayed as show-only.
 
-(You will need to separately specify them as show-only if you want them to be non-editable.)
+You can also use a binary modifier, which can apply to booleans, datetimes, times, dates or anything else. When using the binary modify, a specific value is displayed if the field is truthy and another one is display if the field is falsy.
+You specify it using a pipe | character like so:
 
-The availabel modifiers are:
+`--modify=paid_at{paid|unpaid}`
+
+here, even though `paid_at` is a datetime field, it will display as-if it is a binary -- showing either the truthy 
+label or the falsy label depending on if `paid_at` is or is not null in the database.  
+For all fields except booleans, this affects only the viewable output — 
+what you see on the list page and on the edit page for show-only fields.  
+For booleans, it affects those outputs as well as the normal edit output: 
+The labels you specify are used as the labels for the radio buttons that the user can select.
+
+
+You will need to separately specify them as show-only if you want them to be non-editable.
+
+The available modifiers are:
 
 | modifier                  | what it does                                                                                                                                                         | can be used on                |   |   |
 |---------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------|---|---|
@@ -1165,7 +1178,29 @@ Always:
 
 Don't include this last line in your factory code. 
 
+## Nav Templates
+At the namespace level, you can have a file called `_nav.html.erb` to create tabbed bootstrap nav (you'll need to create this file manually).
 
+To create the default template, start by running
+```
+bin/rails generate hot_glue:nav_template --namespace=xyz
+
+```
+this will append the file `_nav.html.erb` to the views folder at `views/xyz`
+
+```
+<ul class='nav nav-tabs'>
+</ul>
+```
+
+Once the file is present, any further builds in this namespace will:
+
+1) Append to the `_nav.html.erb` file, adding a tab for the new built scaffold
+2) Add render to the list view of the built scaffold to include the partial:
+```
+<%= render partial: "owner/nav", locals: {nav: "things"} %>
+```
+(in this example `owner/` is the namespace and `things` is the name of the scaffold being built)
 
 ## Automatic Base Controller
 
@@ -1271,6 +1306,37 @@ end
 
 # VERSION HISTORY
 
+#### 2023-08-18 - v0.5.17
+
+• Nav templates (`_nav.html.erb`) are now automatically appended to if they exist. Remember nav template live in the views folder at the root of the *namespace*, which is one folder up from whatever folder is being built.
+If a file exists `_nav.html.erb`, it will get appnded to with content like this:
+
+```
+<li class="nav-item">
+    <%= link_to "Domains", domains_path, class: "nav-link #{'active' if nav == 'domains'}" %>
+  </li>
+```
+
+This append to the `_nav.html.erb` template happens in addition to the partial itself being included from the layout.
+(Also only if it exists, so be sure create it before running the scaffold generators for the namespace. Of course, you only need to create it once for each namespace)
+
+• To create a new `_nav.html.erb` template use
+
+```
+bin/rails generate hot_glue:nav_template --namespace=xyz
+```
+
+Here, you give only the namespace. It will create an empty nav template:
+```
+<ul class='nav nav-tabs'>
+</ul>
+```
+
+• Fixes to specs for datetimes
+
+• Fixes way the flash notices where created that violated frozen string literal
+
+
 #### 2023-08-17 - v0.5.16
 
 - Adds `--modidy` flag to turn numbers into currency and apply binary labels (see docs for `--modify` flag)

data/lib/generators/hot_glue/fields/date_time_field.rb

@@ -30,7 +30,7 @@ class DateTimeField < Field
   end
 
   def spec_list_view_natural_assertion
-    "expect(page).to have_content(#{singular}#{1}.#{name}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub(' ', ' ') + timezonize(current_timezone) )"
+    "expect(page).to have_content(#{singular}#{1}.#{name}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub('  ', ' ') + timezonize(current_timezone) )"
   end
 
   def form_field_output

data/lib/generators/hot_glue/fields/uuid_field.rb

@@ -5,7 +5,7 @@ class UUIDField < AssociationField
 
   def spec_list_view_assertion
     assoc_name = name.to_s.gsub('_id','')
-    association = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
+    association = eval("#{class_name}.reflect_on_association(:#{assoc_name})")
     "expect(page).to have_content(#{singular}#{1}.#{assoc_name}.#{HotGlue.derrive_reference_name(association.class_name)})"
   end
 end

data/lib/generators/hot_glue/nav_template_generator.rb

@@ -0,0 +1,22 @@
+module HotGlue
+  class NavTemplateGenerator < Rails::Generators::Base
+    source_root File.expand_path('templates', __dir__)
+    class_option :namespace, type: :string, default: nil
+
+    def filepath_prefix
+      # todo: inject the context
+      'spec/dummy/' if $INTERNAL_SPECS
+    end
+
+
+    def initialize(*args) #:nodoc:
+      super
+      @namespace = options['namespace']
+      copy_file "erb/_nav.html.erb", "#{'spec/dummy/' if $INTERNAL_SPECS}app/views/#{@namespace ? @namespace + "/" : ""}_nav.html.erb"
+
+    end
+  end
+end
+
+
+

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -761,9 +761,14 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     res
   end
 
+  def nested_path
+    @nested_set.collect{| arg| arg[:plural] + "/\#{#{arg[:singular]}.id}/" }.join("/")
+  end
+
+
   def objest_nest_params_by_id_for_specs
     @nested_set.map { |arg|
-      "#{arg[:singular]}_id: #{arg[:singular]}.id"
+      "#{arg[:singular]}_id: #{arg[:singular] }.id"
     }.join(",\n          ")
   end
 
@@ -1023,6 +1028,29 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     end
   end
 
+  def insert_into_nav_template
+    # how does this get called(?)
+    nav_file = "#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}"
+    if include_nav_template
+      append_text = "  <li class='nav-item'>
+    <%= link_to '#{@list_label_heading}', #{path_helper_plural}, class: \"nav-link \#{'active' if nav == '#{plural_name}'}\" %>
+  </li>"
+
+      text = File.read(nav_file)
+      if text.include?(append_text)
+        puts "SKIPPING: Nav link for #{singular_name} already exists in #{nav_file}"
+      else
+        puts "APPENDING: nav link for #{singular_name} #{nav_file}"
+
+        replace = text.gsub(/\<\/ul\>/, append_text + "\n</ul>")
+
+        File.open("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}", "w") { |file|
+          file.puts replace
+        }
+      end
+    end
+  end
+
   def namespace_with_dash
     if @namespace
       "/#{@namespace}"

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

@@ -125,11 +125,11 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
    }.join("/n") %><% end %><%= controller_attachment_orig_filename_pickup_syntax %>
     if @<%= singular_name %>.update(modified_params)
       <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
-      flash[:notice] = (flash[:notice] || "") << "Saved #{@<%= singular %>.<%= display_class %>}"
+      flash[:notice] = "#{flash[:notice]} Saved \#{@<%= singular %>.<%= display_class %>}"
       flash[:alert] = @hawk_alarm if @hawk_alarm
       render :update
     else
-      flash[:alert] = (flash[:alert] || "") << "<%= singular_name.titlecase %> could not be saved. #{@hawk_alarm}"
+      flash[:alert] = "#{flash[:notice]} <%= singular_name.titlecase %> could not be saved. #{@hawk_alarm}"
       render :update, status: :unprocessable_entity
     end
   end

data/lib/generators/hot_glue/templates/erb/_nav.html.erb

@@ -0,0 +1,3 @@
+<ul class='nav nav-tabs'>
+
+</ul>

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

@@ -91,7 +91,7 @@ describe 'interaction for <%= controller_class_name %>' do
     it "should destroy" do
       visit <%= path_helper_plural %>
       accept_alert do
-        find("form[action='<%= namespace_with_dash %>/<%= plural %>/#{<%= singular %>1.id}'] > input.delete-<%= singular %>-button").click
+        find("form[action='<%= namespace_with_dash %>/<%= nested_path %><%= plural %>/#{<%= singular %>1.id}'] > input.delete-<%= singular %>-button").click
       end
       expect(page).to_not have_content(<%= singular %>1.<%= @display_class %>)
       expect(<%= singular_class %>.where(id: <%= singular %>1.id).count).to eq(0)

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.16'
+    CURRENT = '0.5.17'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,6 +104,7 @@ files:
 - lib/generators/hot_glue/layout_strategy/tailwind.rb
 - lib/generators/hot_glue/markup_templates/base.rb
 - lib/generators/hot_glue/markup_templates/erb.rb
+- lib/generators/hot_glue/nav_template_generator.rb
 - lib/generators/hot_glue/scaffold_generator.rb
 - lib/generators/hot_glue/templates/base_controller.rb.erb
 - lib/generators/hot_glue/templates/capybara_login.rb
@@ -114,6 +115,7 @@ files:
 - lib/generators/hot_glue/templates/erb/_form.erb
 - lib/generators/hot_glue/templates/erb/_line.erb
 - lib/generators/hot_glue/templates/erb/_list.erb
+- lib/generators/hot_glue/templates/erb/_nav.html.erb
 - lib/generators/hot_glue/templates/erb/_new_button.erb
 - lib/generators/hot_glue/templates/erb/_new_form.erb
 - lib/generators/hot_glue/templates/erb/_show.erb