hot-glue 0.4.9.2 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b96fed7ffa4bfccbe2dbe0d22e4dc784a70304aebf50e0ef672b2fb30c6f4641
-  data.tar.gz: bb0398bf9529ad73c69c7703209a5888081ba0a629376a82880b726d5d74faa6
+  metadata.gz: f420219d9ff451f6fa20c743bef94003726a86c452fba51c8487f4d537d3c258
+  data.tar.gz: c031f7ffe2fb832a17ce13bd78051296baec30ed279de3d6b7b73c04dfdfd3c3
 SHA512:
-  metadata.gz: 5064b5d5432f0f7f518b70b61a21b7d98a0182efd73a7e8784009f1e8d381edfa5f64cd6222214aefaebc1d9d30fd4adb4be870bf854fc2e8896d7bc77e66120
-  data.tar.gz: 6d88a66a54966f7179f4c041d61670fb799c6bcdddc5a0fc5b3d984011ebc3cabbb5b8713fa05fa534b68a1f07f912f8c1ad8b955be3d0f1281618e2b04f3429
+  metadata.gz: f72f3d5376e8b2ca6c50e3a7c8044b83ed6b62b550a91d1c2e76cf6a4b33eeab882ea760f67ee744e6d8e5c844ba1019a51368325eab5d5f4de56bd2edcbd768
+  data.tar.gz: 3299ae7f5aff59f94b65b7fae3af98f31dc935e7aa3c3b132e41c05057ae790c1ee10e8888ef34ebe9d6e8ddf221f5dac7a3d1ce4a8261968bca2b5b59761739

data/.github/FUNDING.yml

@@ -1 +1 @@
-custom: ["https://jfbcodes.com/p/hot-glue-in-depth-tutorial?utm_source=github.com&utm_campaign=github_hot_glue_repo_funding_link"]
+custom: ["https://heliosdev.shop/p/hot-glue/","https://jfbcodes.com/p/hot-glue-in-depth-tutorial?utm_source=github.com&utm_campaign=github_hot_glue_repo_funding_link"]

data/Gemfile

@@ -10,6 +10,7 @@ gem 'sqlite3'
 gem 'byebug'
 gem 'rails'
 gem 'devise', require: true
+# gem 'progress_formatter'
 
 # for testing
 gem "rails-controller-testing", group: [:test]

data/Gemfile.lock

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

data/README.md

@@ -34,12 +34,23 @@ Hot Glue generates functionality that is quick and dirty. It lets you be crafty.
 
 |   |  |  
 | ------------- | ------------- |
-| ![Teachable-225x225](https://user-images.githubusercontent.com/59002/147857335-a919e095-e6de-4718-8513-736d1f283a0b.png)  | Now avaiale on [Teachable](https://jfb.teachable.com/courses/hot-glue-in-depth-tutorial/?utm_source=github.com&utm_campaign=github_hot_glue_readme_page)  |
+| ![Teachable-225x225](https://user-images.githubusercontent.com/59002/147857335-a919e095-e6de-4718-8513-736d1f283a0b.png)  | Now avaiale on [Teachable](https://jfbcodes.com/courses/hot-glue-in-depth-tutorial/?utm_source=github.com&utm_campaign=github_hot_glue_readme_page)  |
 
 
+---
+
+
+## NEW GETTING STARTED VIDEO
+The getting started video is newly updated with an explanation of the options for **`jsbundling-rails`/`cssbudling-rails`** when creating a new Rails 7 app.
+
+Check it out on Youtube at https://www.youtube.com/watch?v=bKjKHMTvzZc
 
+While you're over there could you give my Youtube channel a 'Subscribe'? (look for the RED SUBSCRIBE BUTTON) Thanks so much!
 
 
+---
+ 
+
 ## HOW EASY?
 
 ```
@@ -60,13 +71,13 @@ _If you are on Rails 6, see [LEGACY SETUP FOR RAILS 6](https://github.com/jasonf
 
 ## 1. Rails 7 New App
 
-There are two ways to create new apps on Rails 7: With or without ImportMap. These instructions prefer the **without Importmap** method, but to help you choose [see this post](https://jasonfleetwoodboldt.com/courses/stepping-up-rails/rails-7-do-i-need-importmap-rails/)
+There are two ways to create new apps on Rails 7: With or Without ImportMap. These instructions prefer the **without Importmap** method using ESBuild as the bundler, but to help you choose [see this post](https://jasonfleetwoodboldt.com/courses/stepping-up-rails/rails-7-do-i-need-importmap-rails/)
 
-`rails new --css=bootstrap --javascript=webpack --database=postgresql`
+`rails new --css=bootstrap --javascript=esbuild --database=postgresql`
 
-Confirm that both Stimulus and Turbo are working.
+**If using JSBundling, make sure to use the new `./bin/dev` to start your server instead of the old `rails server` or else your Turbo interactions will not work correctly.** 
 
-**If using JSBundling, make sure to use the new `bin/dev rails` instead of the old `rails server` or else your Webpack will not compile.** 
+Confirm that both Stimulus and Turbo are working.
 
 For the quick step-by-step guide to help you confirm that both Stimulus and Turbo are working for your new JSBundling-Rails/CSSBunlding-Rails setup [see this post](https://jasonfleetwoodboldt.com/courses/stepping-up-rails/rails-7-new-app-with-js-bundling-css-bundling/).
 
@@ -138,18 +149,13 @@ https://github.com/FortAwesome/font-awesome-sass
 
 
 ## 5. Devise
+!!! Warning: as of 2022-03-22, Devise is still not compatible out-of-the-box with Rails 7.
 
-(or only use --gd mode, see below)
-
-Add to your Gemfile
-
-As of now, Devise for Rails 7 is still not released so you must use **main branch**, like so:
+please see https://github.com/heartcombo/devise/issues/5478 or check this README for updated information. 
 
-`gem 'devise', branch: 'main', git: 'https://github.com/heartcombo/devise.git'`
 
 (If you are on Rails 6, you must do ALL of the steps in the Legacy Setup steps. Be sure not to skip **Legacy Step #5** below)
 
-For Rails 7, be sure you are on the main branch of devise above and your logins should work. (The previously necessary step of disabling turbo shown in Legacy Step #5 is no longer needed. )
 
 You MUST run the installer FIRST or else you will put your app into a non-workable state:
 ```
@@ -467,9 +473,49 @@ In this case a controller would be generated that would have NO before_action to
 Please note that this example would produce non-functional code, so you would need to manually fix your controllers to make sure `current_account` is available to the controller.
 
 
+### `--hawk=`
+
+Hawk a foreign key that is not the object's owner to within a specified scope. 
+
+Assuming a Pet belong_to a :human, when building an Appointments scaffold, you can hawk the `pet_id` to the current human's pets. (Whoever is the authentication object.)
+
+`--hawk=pet_id`
+
+This is covered in [Example #3 in the Hot Glue Tutorial](https://jfb.teachable.com/courses/hot-glue-in-depth-tutorial/lectures/38584014)
+
+To hawk to a scope that is not the currently authenticated user, use curly braces `{...}` to specify the scope.
+
+`--hawk=user_id{current_user.family}`
+
+This would hawk the Appointment's `user_id` key to any users who are within the scope of the current_user's family. 
+
+This is covered in [Example #4 in the Hot Glue Tutorial](https://jfb.teachable.com/courses/hot-glue-in-depth-tutorial/lectures/38787505)
+
+
 ### `--plural=`
 
-You don't need this if the pluralized version is just + "s" of the singular version. Only use for non-standard plurlizations, and be sure to pass it as TitleCase (as if you pluralized the model name which is non-standard for Rails)
+You don't need this if the pluralized version is just + "s" of the singular version.
+Only use for non-standard plurlizations, and be sure to pass it as TitleCase (as if you pluralized the model name which is non-standard for Rails)
+
+An better alternative is to define the non-standard plurlizations globally in your app.
+
+Make a file at `config/initializers/inflections.rb`
+
+# Add new inflection rules using the following format
+ActiveSupport::Inflector.inflections do |inflect|
+    inflect.irregular 'clothing', 'clothes'
+    inflect.irregular 'human', 'humans'  
+
+
+    # the standard pluralization is pretty sexist and will pluralize `human` to `humen`
+end
+
+
+### `--form-labels-position` (default: `after`; options are **before**, **after**, and **omit**)
+By default form labels appear after the form inputs. To make them appear before or omit them, use this flag.
+
+See also `--form-placeholder-labels` to use placeolder labels. 
+
 
 
 ### `--exclude=`
@@ -673,13 +719,29 @@ Omits list action. Only makes sense to use this if want to create a view where y
 
 ### `--no-list-label`
 
-Omits list LABEL itself above the list. (Do not confuse with the field labels.)
+Omits list LABEL itself above the list. (Do not confuse with the list heading which contains the field labels.)
 
 (Note that on a per model basis, you can also globally omit the label or set a unique label value using
 `@@table_label_singular` and `@@table_label_plural` on your model objects.)
 
 Note that list labels may  be automatically omitted on downnested scaffolds.
 
+### `--form-placeholder-labels` (default: false)
+
+When set to true, fields, numbers, and text areas will have placeholder labels.
+Will not apply to dates, times, datetimes, dropdowns (enums + foreign keys), or booleans.
+
+See also setting `--form-labels-position` to control position or omit normal labels.
+
+### `--inline-list-labels` (before, after, omit; default: omit)
+
+Determines if field label will appear on the LIST VIEW. Note that because Hot Glue has no separate show route or page, this affects the `_show` template which is rendered as a partial from the LIST view.
+
+Because the labels are already in the heading, this is `omit` by default. (Use with `--no-list-heading` to omit the labels in the list heading.)
+
+Use `before` to make the labels come before or `after` to make them come after. See Version 0.5.1 release notes for an example.
+
+
 ### `--no-list-heading`
 
 Omits the heading of column names that appears above the 1st row of data.
@@ -738,12 +800,41 @@ Child portals have the headings omitted automatically (there is a heading identi
 - Date: displayed as HTML5 date picker
 - Time: displayed as HTML5 time picker
 - Boolean: displayed radio buttons yes/ no
-- Enum - displayed as a drop-down list (defined the enum values on your model). For Rails 6 see https://jasonfleetwoodboldt.com/courses/stepping-up-rails/enumerated-types-in-rails-and-postgres/
+- Enum - displayed as a drop-down list (defined the enum values on your model). 
+  - For Rails 6 see https://jasonfleetwoodboldt.com/courses/stepping-up-rails/enumerated-types-in-rails-and-postgres/
   - AFAIK, you must specify the enum definition both in your model and also in your database migration for both Rails 6 + Rails 7
 
 
 # VERSION HISTORY
 
+#### ???? - v0.5.2 - Hawked Foreign Keys
+
+
+
+
+
+#### 2022-03-12  - v0.5.1 - Inline List Labels
+
+`--inline-list-labels` (default: `after`; options are **before**, **after**, and **omit**)
+
+Determines if field label will appear on the LIST VIEW. Note that because Hot Glue has no separate show route or page, this affects the `_show` template which is rendered as a partial from the LIST view.
+
+Because the labels are already in the heading, this `omit` by default. (Use with `--no-list-heading` to omit the labels in the list heading.)
+
+Use `before` to make the labels come before or `after` to make them come after. See Version 0.5.1 release notes for an example.
+
+#### 2022-03-06 - v0.5.0 - Label options before or after or with placeholder labels
+   `--form-labels-position` (default: `after`; options are **before**, **after**, and **omit**)
+By default, form labels appear after the form inputs. To make them appear before or omit them, use this flag.
+
+   `--form-placeholder-labels` (default: false)
+
+When this flag is set, fields, numbers, and text areas will have placeholder labels.
+Will not apply to dates, times, datetimes, dropdowns (enums + foreign keys), or booleans.
+
+For example see the [release notes](https://github.com/jasonfb/hot-glue/releases/tag/v0.5.0)
+
+
 #### 2022-02-14 - v0.4.9
 • Fixed issue building models with namespaced class names (e.g. `Fruits::Apple` and `Fruits::Bannana`). 
   You can now build against these kinds of models natively (be sure to pass the full model name, with double-colon syntax). 

data/app/helpers/hot_glue/controller_helper.rb

@@ -1,50 +1,28 @@
 module HotGlue
   module ControllerHelper
-
     def timezonize(tz)
       tz = tz.to_i
       (tz >= 0 ? "+" : "-") + sprintf('%02d',tz.abs) + ":00"
     end
 
-
     def datetime_field_localized(form_object, field_name, value, label, timezone = nil )
-      res = form_object.label(label,
-                              field_name,
-                              class: 'small form-text text-muted')
-
-      res << form_object.text_field(field_name, class: 'form-control',
+      form_object.text_field(field_name, class: 'form-control',
                                     type: 'datetime-local',
-                                    value: date_to_current_timezone(value, timezone))
-
-      res << timezonize(timezone)
-      res
+                                    value: date_to_current_timezone(value, timezone))  + timezonize(timezone)
     end
 
 
     def date_field_localized(form_object, field_name, value, label, timezone = nil )
-
-      res = form_object.label(label,
-                              field_name,
-                              class: 'small form-text text-muted')
-
-      res << form_object.text_field(field_name, class: 'form-control',
+      form_object.text_field(field_name, class: 'form-control',
                                     type: 'date',
                                     value: value )
-
-      res
     end
 
     def time_field_localized(form_object, field_name, value, label, timezone = nil )
-      res = form_object.label(label,
-                              field_name,
-                              class: 'small form-text text-muted')
-
-      res << form_object.text_field(field_name, class: 'form-control',
+      form_object.text_field(field_name, class: 'form-control',
                                     type: 'time',
-                                    value: date_to_current_timezone(value, timezone))
+                                    value: date_to_current_timezone(value, timezone)) + timezonize(timezone)
 
-      res << timezonize(timezone)
-      res
     end
 
     def current_timezone
@@ -54,40 +32,30 @@ module HotGlue
         else
           server_timezone
         end
-      elsif true
-        server_timezone
-      # elsif defined?(controller) == "method"
-      #   # controller.try(:current_timezone)
-      # elsif self.class.ancestors.include?(ApplicationController)
-      #   self.try(:current_timezone)
       else
-        puts "no method current_user is available; please implement/override the method current_timezone IN YOUR CONTROLLER"
-        exit
+        server_timezone
       end
     end
 
-    def server_timezone
-      Time.now.strftime("%z").to_i/100
-    end
-
     def date_to_current_timezone(date, timezone = nil)
       # if the timezone is nil, use the server date'
+
       if timezone.nil?
         timezone = Time.now.strftime("%z").to_i/100
       end
 
       return nil if date.nil?
 
-      begin
-        return date.in_time_zone(timezone).strftime("%Y-%m-%dT%H:%M")
-      rescue
-        return nil
-      end
+      return date.in_time_zone(timezone).strftime("%Y-%m-%dT%H:%M")
+      # begin
+      #
+      # rescue
+      #   return nil
+      # end
     end
 
-
-
     def modify_date_inputs_on_params(modified_params, current_user_object = nil)
+
       use_timezone = (current_user_object.try(:timezone)) || Time.now.strftime("%z")
 
       modified_params = modified_params.tap do |params|
@@ -104,5 +72,27 @@ module HotGlue
       end
       modified_params
     end
+
+
+    def hawk_params(hawk_schema, modified_params)
+      @hawk_alarm = ""
+      hawk_schema.each do |hawk_key,hawk_definition|
+        hawk_root = hawk_definition[0]
+        hawk_scope = hawk_definition[1]
+        begin
+          eval("hawk_root.#{hawk_scope}").find(modified_params[hawk_key.to_s])
+        rescue ActiveRecord::RecordNotFound => e
+          @hawk_alarm << "You aren't allowed to set #{hawk_key.to_s} to #{modified_params[hawk_key.to_s]}. "
+          modified_params.tap { |hs| hs.delete(hawk_key.to_s) }
+        end
+      end
+      modified_params
+    end
+
+    private
+
+    def server_timezone
+      Time.now.strftime("%z").to_i/100
+    end
   end
 end

data/config/database.yml

@@ -1,11 +1,11 @@
 development:
-  adapter: sqlite3
-  database: ../spec/dummy/db/development.sqlite3
+  adapter: postgresql
+  database: dummy_dev
   pool: 5
   timeout: 5000
 
 test:
-  adapter: sqlite3
-  database: ../spec/dummy/db/test.sqlite3
+  adapter: postgresql
+  database: dummy_test
   pool: 5
   timeout: 5000

data/lib/generators/hot_glue/install_generator.rb

@@ -87,11 +87,6 @@ module HotGlue
 
       end
 
-      if Rails.version.split(".")[0].to_i >= 7
-        copy_file "confirmable.js", "#{'spec/dummy/' if Rails.env.test?}app/javascript/controllers/confirmable.js"
-      end
-
-
       begin
         if Rails.version.split(".")[0].to_i == 6
           app_js_contents = File.read("app/javascript/packs/application.js")