hot-glue 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d49dfdd41bc05a338dea0a64271e490d8eba74367c288d9a63083e670d170f8c
-  data.tar.gz: 6d9f6b0a85c4b9e9445351872d0da7619c0321d769e7f92555bf0743aafbc475
+  metadata.gz: ea01452aae7ac4063616c9d520839fcec9b652ed8175aa458688d345b13084d5
+  data.tar.gz: d4a13d7de5bbca528115f0d206e084a6398e39e3fa18c543b56dce657c31e94f
 SHA512:
-  metadata.gz: 7561e146c38b1d58c08f1ef8662224124177749ee23740d4422fc88027f1a2ad903a4c812919a960144ba9e1439834fcad1037648e0baec001a312b4765a90c3
-  data.tar.gz: 77727cf6fb916de0cc487753dbbde345f3c1ab9263040575c41725f26ac13f6c75e0f26c016d5d5ac5a85d15378fa4b3f9fa893b9ad517a435a6fd60b3da3694
+  metadata.gz: 7484282af3627e8e8fdb519b90a56fee40db2a0cab7677c5b3429bd36e64307ce4fb96481c40d04c3aa03960c6113a5ab69e567a1eca9e50ee628fa0450d437d
+  data.tar.gz: 49b764d7f47a86c595c75859af621eb69abd1796b1041e6e8e331203e7228f4510c9595584eab1577c2e7267d1cb6c75d7216d391ad9e2b70a6e6baaa3c7b76a

data/Gemfile

@@ -4,13 +4,13 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec
 
 # not required for your app
-gem 'sqlite3'
+gem 'pg'
 gem 'byebug'
-gem 'rails', '6.1'
+gem 'rails'
 gem 'devise', require: true
 
-
 # for testing
 gem "rails-controller-testing", group: [:test]
 gem "database_cleaner", group: [:test]
-gem "rspec-rails", group: [:test]
+gem "rspec-rails", group: [:test]
+gem "factory_bot", group: [:test]

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.3.9)
+    hot-glue (0.4.1)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
-      rails (> 5.1, <= 7.0.0)
+      rails (> 5.1, <= 7)
       sass-rails
-      turbo-rails (> 0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -89,24 +88,26 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.4.4)
     erubi (1.10.0)
+    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)
       concurrent-ruby (~> 1.0)
-    kaminari (1.2.1)
+    kaminari (1.2.2)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.1)
-      kaminari-activerecord (= 1.2.1)
-      kaminari-core (= 1.2.1)
-    kaminari-actionview (1.2.1)
+      kaminari-actionview (= 1.2.2)
+      kaminari-activerecord (= 1.2.2)
+      kaminari-core (= 1.2.2)
+    kaminari-actionview (1.2.2)
       actionview
-      kaminari-core (= 1.2.1)
-    kaminari-activerecord (1.2.1)
+      kaminari-core (= 1.2.2)
+    kaminari-activerecord (1.2.2)
       activerecord
-      kaminari-core (= 1.2.1)
-    kaminari-core (1.2.1)
+      kaminari-core (= 1.2.2)
+    kaminari-core (1.2.2)
     loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -126,6 +127,7 @@ 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)
@@ -198,11 +200,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
     thor (1.1.0)
     tilt (2.0.10)
-    turbo-rails (7.1.1)
-      rails (>= 6.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     warden (1.2.9)
@@ -220,11 +219,12 @@ DEPENDENCIES
   byebug
   database_cleaner
   devise
+  factory_bot
   hot-glue!
-  rails (= 6.1)
+  pg
+  rails
   rails-controller-testing
   rspec-rails
-  sqlite3
 
 BUNDLED WITH
    2.1.4

data/README.md

@@ -0,0 +1,30 @@
+# HOW THIS GEM IS TESTED
+
+SETUP:
+• Run bundle install
+• 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 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.
+
+The DUMMY testing DOES NOT test the actual functionality of the output code (it just tests the functionality of the generation process).
+
+
+# DATABASE
+
+`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/
+
+

data/config/database.yml

@@ -1,11 +1,86 @@
+# 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:
-  adapter: sqlite3
-  database: ../spec/dummy/db/development.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *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
 
+  # 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:
-  adapter: sqlite3
-  database: ../spec/dummy/db/test.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *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'] %>

data/config/hot_glue.yml

@@ -0,0 +1,3 @@
+---
+:layout: hotglue
+:markup: erb

data/db/schema.rb

@@ -15,12 +15,12 @@ ActiveRecord::Schema.define(version: 2021_03_06_225506) do
   create_table "abcs", force: :cascade do |t|
     t.integer "xxx"
     t.string "yyy"
-    t.integer "def_id"
+    t.integer "dfg_id"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
   end
 
-  create_table "defs", force: :cascade do |t|
+  create_table "dfg", force: :cascade do |t|
     t.integer "user_id"
     t.string "name"
     t.datetime "created_at", precision: 6, null: false
@@ -28,7 +28,7 @@ ActiveRecord::Schema.define(version: 2021_03_06_225506) do
   end
 
   create_table "ghis", force: :cascade do |t|
-    t.integer "def_id"
+    t.integer "dfg_id"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
   end

data/lib/generators/hot_glue/install_generator.rb

@@ -17,7 +17,7 @@ module HotGlue
 
       if @layout == "hotglue" && options['theme'].nil?
         puts "You have selected to install Hot Glue without a theme. You can either use the --layout=bootstrap to install NO HOT GLUE THEME, or to use a Hot Glue theme please choose: like_boostrap, like_menlo_park, like_cupertino, like_mountain_view, dark_knight"
-        exit
+        return
       end
 
       if @layout == 'boostrap'
@@ -40,7 +40,7 @@ module HotGlue
 
         if (license_should_be != license_activation_key)
           puts "Ooops... it seems that Hot Glue license is not valid. Please check 1) the email address you used for this license, 2) The app name you used to purchase this license, and 3) the activation key itself."
-          exit
+          return
         end
       end
 

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

@@ -0,0 +1,115 @@
+
+
+module HotGlue
+  module Layout
+    class Builder
+      attr_reader :include_setting, :downnest_children, :no_edit, :no_delete, :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]
+        @columns = params[:columns]
+        @smart_layout = params[:smart_layout]
+      end
+
+      def construct
+        layout_object = {
+          columns: {
+            size_each: nil,
+            container: [] # array of arrays
+          },
+          portals:  {
+
+          },
+          buttons: { size: ''}
+        }
+
+        downnest_children.each do |child|
+          layout_object[:portals][child] = {size: 4}
+        end
+
+        # 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 = bootstrap_columns - (how_many_downnest*4)
+        available_columns = (bootstrap_columns / 2).floor # bascially turns the 12-column grid into a 6-column grid
+
+        if available_columns < 0
+          raise "Cannot build layout with #{how_many_downnest} downnested portals"
+        end
+
+        @downnest_children_width = []
+        @downnest_children.each_with_index{ |child, i| @downnest_children_width[i] = 4}
+
+        if include_setting.nil?
+
+        end
+
+        if smart_layout
+          # automatic control
+          #
+
+          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)
+            }
+            layout_object[:columns][:container].last.append *columns.slice(0+(available_columns*each_col_can_have),each_col_can_have)
+
+          else
+            layout_object[:columns][:container] = (0..available_columns-1).collect { |x|
+              [ columns[x]]
+            }
+            layout_object[:columns][:container].reject!{|x| x == [nil]}
+          end
+        elsif !include_setting.include?(":")
+          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(":")
+
+          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}"
+          end
+          user_layout_columns.each_with_index  do |column,i|
+            layout_object[:columns][:container][i] = column.split(",")
+          end
+
+          if user_layout_columns.size < layout_object[:columns][:container].size
+            layout_object[:columns][:container].reject!{|x| x == []}
+          end
+        end
+
+        if layout_object[:columns][:container].size < available_columns
+          available = available_columns - layout_object[:columns][:container].size
+          downnest_child_count = 0
+
+          while(available > 0)
+            if (downnest_child_count <= downnest_children.size-1)
+              layout_object[:portals][downnest_children[downnest_child_count]][:size] = layout_object[:portals][downnest_children[downnest_child_count]][:size]  + 2
+            else
+              # leave as-is
+            end
+            downnest_child_count = downnest_child_count + 1
+            available = available - 1
+          end
+          # give some space back to the downnest
+        end
+
+        puts "*** constructed layout columns #{layout_object.inspect}"
+        layout_object
+      end
+
+    end
+  end
+end