hot-glue 0.4.3 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d47957c2da1cdb01154d9f1c38f0b75a5b49884170ba3c828c2e09deed802434
-  data.tar.gz: 9163970db2cd3ce1b500b685a98f012aff047e2d0405567d5b58593660064af5
+  metadata.gz: ea7829bc862ee2a0a10b70bc624c31f2f20391731932857423483d27f068a173
+  data.tar.gz: 22f9c32718db75de7d4bd84a5486218b2a75823dba7a2b191bb211cdf5b7770f
 SHA512:
-  metadata.gz: 03ffdc5b1334eb92efe53dd4f4a9e8619dbb1b4a654f5f491a52b013770eb144e2d493ca4cfa8c3177d171515e803c18beb8c29a0419dac7fd431e143b373e14
-  data.tar.gz: 127404dffcd900f65297a7fc4aa73b81fab8caf035aa80787649a73d216a09f23b10c45c20ebbf2b4589292ee5564211f6db2234d2e2743b7ae7373f5cd53059
+  metadata.gz: 1d98362fe10be3c546ea9aa253a3141ca936e53adc05028c899667e46601fc8278d818865e503941fcd3d045d300325b083c75cbd507ef70389e904766cc3f46
+  data.tar.gz: 8378310ecb1563d2c7601954d5e0c1bb9494ed49c88ebbe3bc50a15536b19f8dcc5232457e15bdc7ddb27229cf0c87dc4db25fd36861eeeddf0e6ca920c09634

data/.circleci/config.yml

@@ -0,0 +1,71 @@
+# 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
+      - ruby/rspec-test
+
+# 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.
+

data/.gitignore

@@ -18,4 +18,5 @@ spec/dummy/app/views/
 spec/dummy/app/controllers/
 spec/dummy/specs/
 
-spec/strawman/
+spec/dummy/node_modules/
+spec/dummy/log/

data/Gemfile

@@ -1,10 +1,12 @@
+# THESE GEMS ARE NOT PART OF YOUR RAILS APP!!!
+
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
 # not required for your app
-gem 'pg'
+gem 'sqlite3'
 gem 'byebug'
 gem 'rails'
 gem 'devise', require: true
@@ -13,4 +15,5 @@ gem 'devise', require: true
 gem "rails-controller-testing", group: [:test]
 gem "database_cleaner", group: [:test]
 gem "rspec-rails", group: [:test]
+gem "rspec_junit_formatter", group: [:test]
 gem "factory_bot", group: [:test]

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.4.2)
+    hot-glue (0.4.6)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
-      rails (> 5.1, <= 7)
-      sass-rails
+      rails (> 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -91,7 +90,6 @@ GEM
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
     ffaker (2.20.0)
-    ffi (1.15.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     i18n (1.8.10)
@@ -127,7 +125,6 @@ GEM
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    pg (1.2.3)
     racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
@@ -183,16 +180,8 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    sass-rails (6.0.0)
-      sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
+    rspec_junit_formatter (0.5.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -200,8 +189,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    sqlite3 (1.4.2)
     thor (1.1.0)
-    tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     warden (1.2.9)
@@ -221,10 +210,11 @@ DEPENDENCIES
   devise
   factory_bot
   hot-glue!
-  pg
   rails
   rails-controller-testing
   rspec-rails
+  rspec_junit_formatter
+  sqlite3
 
 BUNDLED WITH
    2.1.4

data/{LICENCE → LICENSE}

@@ -1,3 +1,7 @@
+© 2022 Jason Fleetwood-Boldt. All Rights Reserved
+This software is 'fauxpen source,' which means you can think of it like 'free' as in speech but not 'free' as in beer....
+
+It is definitely 'free' as in Britney.
 
 FOR HOBBYISTS/STUDENTS/TEACHERS/INDIVIDUALS/NON-PROFITS:
 
@@ -7,14 +11,14 @@ Any users of this software agree to work to
 1) dismantle systemic racism
 2) seek justice for black, brown, transgender people, women, and
 3) work towards LGBTQIAA+ representation and inclusion
-
-FOR ALL OTHERS:
-
-TO PURCHASE A LICENSE PLEASE VISIT
-https://heliosdev.shop/hot-glue-license
-
 Organizations using this software agree to center the narratives of black, brown, transgender, and non-advantaged people in the world.
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+Just sign the pledge at https://heliosdev.shop/hot-glue-license and your email will be granted lifetime usage access.
+
+TO PURCHASE A COMMERCIAL USAGE LICENSE PLEASE VISIT
+https://heliosdev.shop/hot-glue-license
 
+OR JUST BUY THE TUTORIAL (all purchases come with lifetime license)
+https://jfb.teachable.com/p/hot-glue-in-depth-tutorial

data/README.md

@@ -1,6 +1,5 @@
 
-[![Build Status](https://app.travis-ci.com/jasonfb/hot-glue.svg?branch=main)](https://travis-ci.com/jasonfb/hot-glue)
-
+[![Hot Glue](https://circleci.com/gh/jasonfb/hot-glue.svg?style=shield)](https://circleci.com/gh/jasonfb/hot-glue)
 
 Hot Glue is a Rails scaffold builder for the Turbo era. It is an evolution of the admin-interface style scaffolding systems of the 2010s ([activeadmin](https://github.com/activeadmin/activeadmin), [rails_admin](https://github.com/sferik/rails_admin), and [active_scaffold](https://github.com/activescaffold/active_scaffold)).
 
@@ -79,11 +78,17 @@ _BOOTSTRAP IS NO LONGER NEEDED_, but I recommend it.
 
 IF you are using `--layout=bootstrap` (step 3), you must install Bootstrap here.
 
-Bootstrap with Webpacker is no longer in Rails 7 by default. (For that see ________TBD________)
+Webpacker is no longer in Rails 7. Also, there is a new option for Rails 7 to build Bootstrap using `cssbundling-rails`
+
+
+
+
 
-For Bootstrap with Sprockets (recommended by Rails team), see https://github.com/twbs/bootstrap-rubygem
+For the old method:
 
-If going the the Bootstrap with Sprockets route, note the gem is
+- https://github.com/twbs/bootstrap-rubygem
+
+With the old method, install the gem using:
 ```
 gem 'bootstrap', '~> 5.1.3'
 ```
@@ -243,7 +248,7 @@ https://github.com/FortAwesome/font-awesome-sass
 
 Add to your Gemfile
 
-As of 2021-12-28 Devise for Rails 7 is still not released so you must use main branch, like so:
+As of 2022-01-26 Devise for Rails 7 is still not released so you must use main branch, like so:
 `gem 'devise', branch: 'main', git: 'https://github.com/heartcombo/devise.git'`
 
 If on Rails 6 **or** Rails 7, you must do the steps in **Legacy Step #5** (below).
@@ -252,6 +257,7 @@ If on Rails 6 **or** Rails 7, you must do the steps in **Legacy Step #5** (below
 
 To be clear: You CAN use Devise with Rails 7, but you must still do the Legacy Step #5 described below for your login to work.
 
+You MUST run the installer FIRST or else you will put your app into a non-workable state:
 ```
 rails generate devise:install
 ```
@@ -277,6 +283,18 @@ As described in Legacy Step #5, **you cannot** skip Devise installer Step 4, eve
 Once you copy the files, you must modify the Devise views to disable Turbo as described in Legacy Step #5.
 
 
+Be sure to create primary auth model with:
+
+`rails generate devise User name:string`
+
+Remember, you don't need to tell Devise that your User has an email, an encrypted password, a reset token, and a 'remember me' flag to let the user stay logged in.
+
+Those features come by default with Devise, and you'll find the fields for them in the newly generated migration file. 
+
+In the example above, you are creating all of those fields along with a simple 'name' (string) field for your User table.
+
+
+
 ## LEGACY SETUP FOR RAILS 6
 
 (Note Legacy Step #5 is necessary for BOTH Rails 6 and Rails 7.)
@@ -404,17 +422,27 @@ end
 ```
 
 
-### `--nest=`
+### `--nested=`
+
+This object is nested within another tree of objects, and there is a nested route in your routes.rb file
+
+resources :invoices do
+  resource :lines do
+end
+
+
+`rails generate hot_glue:scaffold Line --nested=invoice`
 
-pass `--nest=` to denote a nested resources
 
+Example #1: Invoice has many  :lines and line belongs_to :invoice
 
-`rails generate hot_glue:scaffold Line --nest=invoice`
 
-In this example, it is presumed that the current user has_many :invoices, and that invoices have many :lines
+For multi-level nesting use slashes to separate your levels of nesting. 
 
+`rails generate hot_glue:scaffold Charge --nested=invoice`
+`rails generate hot_glue:scaffold Charge --nest=invoice/line`
 
-For multi-level nesting use slashes to separate your levels of nesting. Remember, you should match what you have in your routes.rb file.
+Remember, you should match what you have in your routes.rb file.
 
 ```
 resources :invoices do
@@ -424,13 +452,10 @@ resources :invoices do
 end
 
 ```
-In this example, it is presumed that the current user has_many :invoices, and that invoices have many :lines, and that lines have many :charges
 
+For non-Gd controllers, your auth root will be used as the starting point when loading the objects from the URL if this object is nested.
 
-To generate scaffold:
-`rails generate hot_glue:scaffold Charge --nest=invoice/line`
-
-The order of the nest should match the nested resources you have in your own app.  In particular, you auth root will be used as the starting point when loading the objects from the URL:
+(For Gd controllers the root object will be loaded directly from the ActiveRecord object.)
 
 In the example above, @invoice will be loaded from
 
@@ -444,11 +469,14 @@ Then, finally the @charge will be loaded
 
 `@charge = @line.charges.find(params[:id])`
 
-It's called "poor man's access control" because if a user attempts to hack the URL by passing ids for objects they don't own--- which Rails makes relatively easy with its default URL pattern-- they will hit ActiveRecord not found errors (the objects they don't own won't be found in the associated relationship).
+This is "starfish access control" or "poor man's access control."  It works when the current user has several things they can manage, and by extension can manage children of those things.  
+
 
-It works, but it isn't granular. As well, it isn't appropriate for a large app with any level of intricacy to access control (that is, having roles).
+## Optional Nesting
 
-Your customers can delete their own objects by default (may be a good idea or a bad idea for you). If you don't want that, you should strip out the delete actions off the controllers.
+**God controllers only ** have a special build feature where they can be specified to be optionally nested. 
+
+When build as optionally nested, 
 
 
 ### `--auth=`
@@ -576,30 +604,30 @@ IMPORTANT: By default, all fields that begin with an underscore (`_`) are automa
 
 I would recommend this for fields you want globally non-editable by users in your app. For example, a counter cache or other field set only by a backend mechanism.
 
-### `--stimulus_syntax=true` or `--stimulus_syntax=false`
-(for Rails <=6, default is false. For Rails 7, default is true.)
+### `--ujs_syntax=true` (Default is set automatically based on whether you have turbo-rails installed)
 
-Stimulus is only used for the delete button's confirmation dialog.
+If you are pre-Turbo (UJS), your delete buttons will come out like this:
+`data: {'confirm': 'Are you sure you want to delete....?'}`
 
-If you don't have stimulus syntax enabled, your delete buttons have this. This will confirm the delete with a simple alert if you have UJS enabled.
+If you are Turbo (Rails 7 or Rails 6 with proactive Turbo-Rails install), your delete button will be:
+`data: {'turbo-confirm': 'Are you sure you want to delete....?'}`
 
-```
-{confirm: 'Are you sure?'}
-```
+If you specify the flag, you preference will be used. If you leave the flag off, Hot Glue will detect the presence of Turbo-Rails in your app. 
 
-If you do have Stimulus syntax enabled, your delete buttons will look like so:
-```
-    ## TODO: fix this
-```
+**WARNING**: If you created a new Rails app since October 2021 and you have the yanked turbo-rails Gems on your local machine, 
+you will have some bugs with the delete buttons and also not be on the latest version of turbo-rails.
 
+Make sure to uninstall the yanked 7.1.0 and 7.1.1 from your machine with `gem uninstall turbo-rails`
+and also fix any Rails apps created since October 2021 by fixing the Gemfile. Details here:
+https://stackoverflow.com/questions/70671324/new-rails-7-turbo-app-doesnt-show-the-data-turbo-confirm-alert-messages-dont-f
 
 
-### `--magic-buttons` (Version 0.4.0 only)
+### `--magic-buttons` 
 If you pass a list of magic buttons (separated by commas), they will appear in the button area on your list.
 
-It will be assumed there will be cooresponding bang methods on your models.
+It will be assumed there will be corresponding bang methods on your models.
 
-The band methods can respond in one of four ways:
+The bang (`!`) methods can respond in one of four ways:
 
 • With true, in which case a generic success message will be shown in the flash notice (“Approved” or “Rejected” in this case)
 
@@ -661,6 +689,11 @@ Omits pagination. (All list views have pagination by default.)
 
 Omits list action. Only makes sense to use this if you are create a view where you only want the create button you want to navigate to the update screen alternative ways.
 
+
+### `--no-list-labels`
+
+Omits list labels. (note that in the form the labels are rendered again anyway)
+
 ### `--no-create`
 
 Omits create action.
@@ -711,8 +744,13 @@ Obviously, the created controller will always have this base controller as its s
 
 # VERSION HISTORY
 
+#### 2022-01-25 - v0.4.7 - 
+
+#### 2022-01-11 - v0.4.5 - buttons on smarty layouts take up 1 bootstrap column each; fixes confirmation alert for delete buttons
 
-#### 2022-12-30 - v0.4.2
+#### 2022-01-01 - v0.4.3 and 0.4.4 - adding fully email based license; no activation codes required
+
+#### 2022-12-30 - v0.4.2 -- Smart layouts introduced
 
 #### 2021-12-15 - v0.4.1
 
@@ -720,7 +758,6 @@ Obviously, the created controller will always have this base controller as its s
 
 #### 2021-12-12 - v0.3.9 - Magic Buttons
 
-
 #### 2021-12-11 - v0.3.5 - Downnesting
 
 
@@ -786,9 +823,9 @@ SETUP:
 • if you can't get through see https://stackoverflow.com/questions/68050807/gem-install-mimemagic-v-0-3-10-fails-to-install-on-big-sur/68170982#68170982
 
 
-The dummy sandbox is found at `spec/dummy`
+The dummy sandbox is found at `spec/Dummy`
 
-The dummy sandbox lives as mostly checked- into the repository, **except** the folders where the generated code goes (`spec/dummy/app/views/`, `spec/dummy/app/controllers/`, `spec/dummy/specs/` are excluded from Git)
+The dummy sandbox lives as mostly checked- into the repository, **except** the folders where the generated code goes (`spec/Dummy/app/views/`, `spec/Dummy/app/controllers/`, `spec/Dummy/specs/` are excluded from Git)
 
 When you run the **internal specs**, which you can do **at the root of this repo** using the command `rspec`, a set of specs will run to assert the generators are erroring when they are supposed to and producing code when they are supposed to.
 
@@ -797,15 +834,16 @@ The DUMMY testing DOES NOT test the actual functionality of the output code (it
 
 # DATABASE
 
-`cd spec/dummy`
+`cd spec/Dummy`
 `rails db:drop`
 `rails db:create`
 `rails db:migrate`
 `RAILS_ENV=test rails db:migrate`
 
-`cd ../..`
 
-take note that when running the spec at the root of the repo you are initializing the Dummy app, which will use the 
-SQLite database in spec/dummy/database/
+being able to run `rake spec` at the root of this repo is acheived using
+```
+ln -s  spec/dummy/db/schema.rb db/schema.rb
+```
 
 

data/config/database.yml

@@ -1,86 +1,11 @@
-# PostgreSQL. Versions 9.3 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On macOS with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On macOS with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # https://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-
 development:
-  <<: *default
-  database: Dummy_development
-
-  # The specified database role being used to connect to postgres.
-  # To create additional roles in postgres see `$ createuser --help`.
-  # When left blank, postgres will use the default role. This is
-  # the same name as the operating system user running Rails.
-  #username: Dummy
-
-  # The password associated with the postgres role (username).
-  #password:
-
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
+  adapter: sqlite3
+  database: ../spec/dummy/db/development.sqlite3
+  pool: 5
+  timeout: 5000
 
-  # The TCP port the server listens on. Defaults to 5432.
-  # If your server runs on a different port number, change accordingly.
-  #port: 5432
-
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # Defaults to warning.
-  #min_messages: notice
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
-  <<: *default
-  database: Dummy_test
-
-# As with config/credentials.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password or a full connection URL as an environment
-# variable when you boot the app. For example:
-#
-#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
-#
-# If the connection URL is provided in the special DATABASE_URL environment
-# variable, Rails will automatically merge its configuration values on top of
-# the values provided in this file. Alternatively, you can specify a connection
-# URL environment variable explicitly:
-#
-#   production:
-#     url: <%= ENV['MY_APP_DATABASE_URL'] %>
-#
-# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full overview on how database connection configuration can be specified.
-#
-production:
-  <<: *default
-  database: Dummy_production
-  username: Dummy
-  password: <%= ENV['DUMMY_DATABASE_PASSWORD'] %>
+  adapter: sqlite3
+  database: ../spec/dummy/db/test.sqlite3
+  pool: 5
+  timeout: 5000

data/db/schema.rb

@@ -0,0 +1 @@
+db/spec/dummy/db/schema.rb

data/lib/generators/hot_glue/install_generator.rb

@@ -31,7 +31,7 @@ module HotGlue
 
 
       print "Do you have a license key (y/N)? "
-      do_you_have_a_license = STDIN.gets.strip || "Y"
+      do_you_have_a_license = STDIN.gets.strip || "N"
 
       if do_you_have_a_license.downcase == "y"
         print "Please enter the EMAIL you used to purchase a Hot Glue license, \nTeachable tutorial, or Helios Merch Shop product: "
@@ -43,7 +43,9 @@ module HotGlue
         resp = JSON.parse(stream.read)
 
         if resp['status'] == 'success'
-          # we good
+          if resp['redirect']
+            HotGlue::Helpers.open_page(resp['redirect'])
+          end
           puts "\n" + "    * " + resp['response'] + " * \n\n"
         else
           puts "\n" + "    * " + resp['response'] + " * \n\n"
@@ -53,7 +55,6 @@ module HotGlue
           print "https://jfb.teachable.com/p/hot-glue-in-depth-tutorial \n"
           print "https://shop.heliosdev.shop/ \n"
           print "All purchases come with a Hot Glue lifetime license for individuals and hobbyists\n"
-
           return
         end
       else
@@ -67,12 +68,12 @@ module HotGlue
         if choice == "1"
           HotGlue::Helpers.open_page("https://heliosdev.shop/hot-glue-license?utm_campaing=hotglue-installer")
         elsif choice == "2"
-          HotGlue::Helpers.open_page("https://jfb.teachable.com/p/hot-glue-in-depth-tutorial?utm_campaing=hotglue-installer")
+          HotGlue::Helpers.open_page("https://jfb.teachable.com/p/hot-glue-in-depth-tutorial?utm_source=hotglue-installer")
           print "All purchases come with a Hot Glue lifetime license for individuals and hobbyists\n"
 
         else
-          HotGlue::Helpers.open_page("https://shop.heliosdev.shop/?utm_campaing=hotglue-installer")
-          print "Be sure to ALSO check out the HOT GLUE TUTORIAL here: \n"
+          HotGlue::Helpers.open_page("https://shop.heliosdev.shop/?utm_source=hotglue-installer")
+          print "ALSO check out the HOT GLUE TUTORIAL here: \n"
           print "https://jfb.teachable.com/p/hot-glue-in-depth-tutorial \n"
           print "All purchases come with a Hot Glue lifetime license for individuals and hobbyists\n"
         end

data/lib/generators/hot_glue/layout/builder.rb

@@ -3,13 +3,15 @@
 module HotGlue
   module Layout
     class Builder
-      attr_reader :include_setting, :downnest_children, :no_edit, :no_delete, :columns, :smart_layout
+      attr_reader :include_setting, :downnest_children, :buttons_width, :columns, :smart_layout
 
       def initialize(params)
         @include_setting = params[:include_setting]
         @downnest_children = params[:downnest_children]
-        @no_edit = params[:no_edit]
-        @no_delete = params[:no_delete]
+
+        @buttons_width = params[:buttons_width]
+
+        @no_buttons = @buttons_width == 0
         @columns = params[:columns]
         @smart_layout = params[:smart_layout]
       end
@@ -23,7 +25,7 @@ module HotGlue
           portals:  {
 
           },
-          buttons: { size: ''}
+          buttons: { size: @buttons_width}
         }
 
         downnest_children.each do |child|
@@ -32,9 +34,8 @@ module HotGlue
 
         # smart layout: 2 columns per field; 4 column for EACH downnested portals, 2 column for buttons
         how_many_downnest = downnest_children.size
-        button_column_size = (no_edit && no_delete) ? 0 : 2
 
-        bootstrap_columns = (12-button_column_size)
+        bootstrap_columns = (12-@buttons_width )
         bootstrap_columns = bootstrap_columns - (how_many_downnest*4)
         available_columns = (bootstrap_columns / 2).floor # bascially turns the 12-column grid into a 6-column grid
 
@@ -55,7 +56,7 @@ module HotGlue
 
           if columns.size > available_columns
             each_col_can_have = (columns.size.to_f / available_columns.to_f).round
-            # byebug
+
             layout_object[:columns][:container] = (0..available_columns-1).collect { |x|
               columns.slice(0+(x*each_col_can_have),each_col_can_have)
             }
@@ -71,15 +72,16 @@ module HotGlue
           layout_object[:columns][:container] = columns.collect{|col| [col]}
 
         else
+
           (0..available_columns-1).each do |int|
             layout_object[:columns][:container][int] = []
           end
 
           # input control
-          user_layout_columns = options['include'].split(":")
+          user_layout_columns = @include_setting .split(":")
 
           if user_layout_columns.size > available_columns
-            raise "Your include statement #{options['include']}  has #{user_layout_columns.size} columns, but I can only construct up to #{available_columns}"
+            raise "Your include statement #{@include_setting }  has #{user_layout_columns.size} columns, but I can only construct up to #{available_columns}"
           end
           user_layout_columns.each_with_index  do |column,i|
             layout_object[:columns][:container][i] = column.split(",")