bullet_train-super_scaffolding 1.0.24 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c51b54399bb608b01931f86efd965719fe7bd4231107a903c72d06411fb9f6b3
-  data.tar.gz: 977733e8384c06ce13676a41f273783f9b8d1e90ad3ded2b82c6d7c533bf4225
+  metadata.gz: b9aa5ac0c67b58b810e04c0d3d168029f9f9ef7da7faa3a8e7caa983e9902827
+  data.tar.gz: fc327f125d39b8fa070aa8fa2f0a44e970f76b40582862d5fa9a65f001bc933c
 SHA512:
-  metadata.gz: '063490810ef08ba8cbd454ffde388101538973e76c1fabbe80f1bc2362b73009485114a684ac373a9e0e0bc75eda107623959cd74f2742adace07fdea165168f'
-  data.tar.gz: 70713bf20a0addeb635a89b0dd7c45f80c39faf9c8d80f9d20046f39cb0781529ac74ac7258e83e0d67c5a8712c722733de8ac3e0fd3a30b280a8ba237380115
+  metadata.gz: bdc55ee986f3a46ca5e5ca7b9246cb6de751a08f643a036f75eb2b05ca03da3b077e52c3befe5e75d68b54bdba29598414c10e45be4307e5bfdc72da5e4d94fa
+  data.tar.gz: b73895f7df4bacab8e606077847bfb3b64287e8e79ddfe72a2dd6d244dbe61f6370dcf06d5cdc07d43685b753e1fe7c0f088b9cadad3108289b20edad2f58eef

data/app/models/scaffolding/completely_concrete/tangible_thing.rb

@@ -1,6 +1,8 @@
 class Scaffolding::CompletelyConcrete::TangibleThing < ApplicationRecord
   # 🚅 add concerns above.
 
+  # 🚅 add attribute accessors above.
+
   belongs_to :absolutely_abstract_creative_concept, class_name: "Scaffolding::AbsolutelyAbstract::CreativeConcept"
   # 🚅 add belongs_to associations above.
 

data/app/models/scaffolding/completely_concrete/tangible_things/assignment.rb

@@ -1,6 +1,8 @@
 class Scaffolding::CompletelyConcrete::TangibleThings::Assignment < ApplicationRecord
   # 🚅 add concerns above.
 
+  # 🚅 add attribute accessors above.
+
   belongs_to :tangible_thing, class_name: "Scaffolding::CompletelyConcrete::TangibleThing"
   belongs_to :membership, class_name: "Membership"
   # 🚅 add belongs_to associations above.

data/app/views/account/scaffolding/completely_concrete/tangible_things/_index.html.erb

@@ -4,7 +4,10 @@
 <% hide_actions ||= false %>
 <% hide_back ||= false %>
 
-<%= render 'account/shared/box' do |p| %>
+<% tangible_things = tangible_things.order(:id) unless has_order?(tangible_things) %>
+<% pagy, tangible_things = pagy(tangible_things, page_param: :tangible_things_page) %>
+
+<%= render 'account/shared/box', pagy: pagy do |p| %>
   <% p.content_for :title, t(".contexts.#{context.class.name.underscore}.header") %>
   <% p.content_for :description do %>
     <%= t(".contexts.#{context.class.name.underscore}.description#{"_empty" unless tangible_things.any?}") %>
@@ -69,4 +72,4 @@
       <% end %>
     <% end %>
   <% end %>
-<% end %>
+<% end %>

data/app/views/account/scaffolding/completely_concrete/tangible_things/show.html.erb

@@ -15,6 +15,7 @@
           <%= render 'shared/attributes/boolean', attribute: :boolean_button_value %>
           <%= render 'shared/attributes/option', attribute: :button_value %>
           <%= render 'shared/attributes/options', attribute: :multiple_button_values %>
+          <%= render 'shared/attributes/code', attribute: :color_picker_value %>
           <%= render 'shared/attributes/text', attribute: :cloudinary_image_value %>
           <%= render 'shared/attributes/date', attribute: :date_field_value %>
           <%= render 'shared/attributes/date_and_time', attribute: :date_and_time_field_value %>

data/lib/bullet_train/super_scaffolding/scaffolders/oauth_provider_scaffolder.rb

@@ -61,7 +61,7 @@ module BulletTrain
             puts "When you find one you like, hover your mouse over it and then come back here and"
             puts "and enter the name of the icon you want to use."
             response = STDIN.gets.chomp
-            `open http://light.pinsupreme.com/icon_fonts_themefy.html`
+            TerminalCommands.open_file_or_link("http://light.pinsupreme.com/icon_fonts_themefy.html")
             puts ""
             puts "Did you find an icon you wanted to use? Enter the name here or hit enter to just"
             puts "use the dollar symbol:"

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.0.24"
+    VERSION = "1.0.27"
   end
 end

data/lib/bullet_train/terminal_commands.rb

@@ -0,0 +1,30 @@
+module TerminalCommands
+  def self.open_file_or_link(file_or_link, options = {})
+    command = if macosx?
+      "open"
+    elsif linux?
+      "xdg-open"
+    end
+    `#{command} #{file_or_link}`
+  end
+
+  def self.os
+    Gem::Platform.local.os
+  end
+
+  def self.macosx?
+    os == macosx
+  end
+
+  def self.linux?
+    os == linux
+  end
+
+  def self.macosx
+    "darwin"
+  end
+
+  def self.linux
+    "linux"
+  end
+end

data/lib/scaffolding/script.rb

@@ -8,6 +8,8 @@ require "scaffolding/class_names_transformer"
 require "scaffolding/oauth_providers"
 require "scaffolding/routes_file_manipulator"
 
+require_relative "../bullet_train/terminal_commands"
+
 # filter out options.
 argv = []
 @options = {}

data/lib/scaffolding/transformer.rb

@@ -23,6 +23,7 @@ class Scaffolding::Transformer
   ENDPOINTS_HOOK = "# 🚅 super scaffolding will mount new endpoints above this line."
   ERB_NEW_FIELDS_HOOK = "<%#{RUBY_NEW_FIELDS_HOOK} %>"
   CONCERNS_HOOK = "# 🚅 add concerns above."
+  ATTR_ACCESSORS_HOOK = "# 🚅 add attribute accessors above."
   BELONGS_TO_HOOK = "# 🚅 add belongs_to associations above."
   HAS_MANY_HOOK = "# 🚅 add has_many associations above."
   OAUTH_PROVIDERS_HOOK = "# 🚅 add oauth providers above."
@@ -414,6 +415,8 @@ class Scaffolding::Transformer
     before_scaffolding_hooks = <<~RUBY
       #{CONCERNS_HOOK}
 
+      #{ATTR_ACCESSORS_HOOK}
+
     RUBY
 
     after_scaffolding_hooks = <<-RUBY
@@ -565,7 +568,7 @@ class Scaffolding::Transformer
   def add_attributes_to_various_views(attributes, scaffolding_options = {})
     sql_type_to_field_type_mapping = {
       # 'binary' => '',
-      "boolean" => "buttons",
+      "boolean" => "options",
       "date" => "date_field",
       "datetime" => "date_and_time_field",
       "decimal" => "text_field",
@@ -631,15 +634,13 @@ class Scaffolding::Transformer
       attribute_partial ||= attribute_options[:attribute] || case type
       when "trix_editor", "ckeditor"
         "html"
-      when "buttons", "super_select", "options"
-        if boolean_buttons
-          "boolean"
-        elsif is_ids
+      when "buttons", "super_select", "options", "boolean"
+        if is_ids
           "has_many"
         elsif is_id
           "belongs_to"
         else
-          "option"
+          "option#{"s" if is_multiple}"
         end
       when "cloudinary_image"
         attribute_options[:height] = 200
@@ -747,7 +748,7 @@ class Scaffolding::Transformer
       # FORM FIELD
       #
 
-      unless cli_options["skip-form"]
+      unless cli_options["skip-form"] || attribute_options[:readonly]
 
         # add `has_rich_text` for trix editor fields.
         if type == "trix_editor"
@@ -768,8 +769,14 @@ class Scaffolding::Transformer
           # add_additional_step :yellow, transform_string("We've added a reference to a `placeholder` to the form for the select or super_select field, but unfortunately earlier versions of the scaffolded locales Yaml don't include a reference to `fields: *fields` under `form`. Please add it, otherwise your form won't be able to locate the appropriate placeholder label.")
         end
 
+        # TODO: This feels incorrect.
+        # Should we adjust the partials to only use `{multiple: true}` or `html_options: {multiple_true}`?
         if is_multiple
-          field_options[:multiple] = "true"
+          if type == "super_select"
+            field_options[:multiple] = "true"
+          else
+            field_attributes[:multiple] = "true"
+          end
         end
 
         valid_values = if is_id
@@ -912,6 +919,18 @@ class Scaffolding::Transformer
 
             <% end %>
 
+            <% if type == "color_picker" %>
+            options:
+              - '#9C73D2'
+              - '#48CDFE'
+              - '#53F3ED'
+              - '#47E37F'
+              - '#F2593D'
+              - '#F68421'
+              - '#F9DE00'
+              - '#929292'
+            <% end %>
+
           <% if is_association %>
           <%= attribute_name %>: *<%= attribute_name %>
           <% end %>
@@ -930,16 +949,19 @@ class Scaffolding::Transformer
       # STRONG PARAMETERS
       #
 
-      unless cli_options["skip-form"]
+      unless cli_options["skip-form"] || attribute_options[:readonly]
 
         # add attributes to strong params.
         [
           "./app/controllers/account/scaffolding/completely_concrete/tangible_things_controller.rb"
         ].each do |file|
-          if is_ids
+          if is_ids || is_multiple
             scaffold_add_line_to_file(file, "#{name}: [],", RUBY_NEW_ARRAYS_HOOK, prepend: true)
           else
             scaffold_add_line_to_file(file, ":#{name},", RUBY_NEW_FIELDS_HOOK, prepend: true)
+            if type == "file_field"
+              scaffold_add_line_to_file(file, ":#{name}_removal,", RUBY_NEW_FIELDS_HOOK, prepend: true)
+            end
           end
         end
 
@@ -1021,8 +1043,10 @@ class Scaffolding::Transformer
         # scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller_test.rb", "assert_equal tangible_thing_attributes['#{name.gsub('_', '-')}'], tangible_thing.#{name}", RUBY_NEW_FIELDS_HOOK, prepend: true)
 
         if attribute_assignment
-          scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint_test.rb", "#{name}: #{attribute_assignment},", RUBY_ADDITIONAL_NEW_FIELDS_HOOK, prepend: true)
-          scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint_test.rb", "assert_equal @tangible_thing.#{name}, #{attribute_assignment}", RUBY_EVEN_MORE_NEW_FIELDS_HOOK, prepend: true)
+          unless attribute_options[:readonly]
+            scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint_test.rb", "#{name}: #{attribute_assignment},", RUBY_ADDITIONAL_NEW_FIELDS_HOOK, prepend: true)
+            scaffold_add_line_to_file("./test/controllers/api/v1/scaffolding/completely_concrete/tangible_things_endpoint_test.rb", "assert_equal @tangible_thing.#{name}, #{attribute_assignment}", RUBY_EVEN_MORE_NEW_FIELDS_HOOK, prepend: true)
+          end
         end
       end
 
@@ -1134,9 +1158,38 @@ class Scaffolding::Transformer
 
         case type
         when "file_field"
+          remove_file_methods =
+            <<~RUBY
+              def #{name}_removal?
+                #{name}_removal.present?
+              end
+
+              def remove_#{name}
+                #{name}.purge
+              end
+            RUBY
+
+          # Generating a model with an `attachment` data type (i.e. - `rails g ModelName file:attachment`)
+          # adds `has_one_attached` to our model, just not directly above the HAS_ONE_HOOK.
+          # We move the string here so it's right above the HAS_ONE_HOOK.
+          model_file_path = transform_string("./app/models/scaffolding/completely_concrete/tangible_thing.rb")
+          model_contents = File.readlines(model_file_path)
+          model_without_attached_hook = model_contents.reject.each { |line| line.include?("has_one_attached :#{name}") }
+          File.open(model_file_path, "w") do |f|
+            model_without_attached_hook.each { |line| f.write(line) }
+          end
+
           scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "has_one_attached :#{name}", HAS_ONE_HOOK, prepend: true)
+
+          scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "attr_accessor :#{name}_removal", ATTR_ACCESSORS_HOOK, prepend: true)
+          scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", remove_file_methods, METHODS_HOOK, prepend: true)
+          scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "after_validation :remove_#{name}, if: :#{name}_removal?", CALLBACKS_HOOK, prepend: true)
         when "trix_editor"
           scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "has_rich_text :#{name}", HAS_ONE_HOOK, prepend: true)
+        when "buttons"
+          if boolean_buttons
+            scaffold_add_line_to_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", "validates :#{name}, inclusion: [true, false]", VALIDATIONS_HOOK, prepend: true)
+          end
         end
 
       end
@@ -1346,9 +1399,9 @@ class Scaffolding::Transformer
             puts "OK, great! Let's do this! By default these menu items appear with a puzzle piece, but after you hit enter I'll open two different pages where you can view other icon options. When you find one you like, hover your mouse over it and then come back here and and enter the name of the icon you want to use. (Or hit enter to skip this step.)"
             $stdin.gets.chomp
             if `which open`.present?
-              `open https://themify.me/themify-icons`
+              TerminalCommands.open_file_or_link("https://themify.me/themify-icons")
               if font_awesome?
-                `open https://fontawesome.com/icons?d=gallery&s=light`
+                TerminalCommands.open_file_or_link("https://fontawesome.com/icons?d=gallery&s=light")
               end
             else
               puts "Sorry! We can't open these URLs automatically on your platform, but you can visit them manually:"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.27
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-15 00:00:00.000000000 Z
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bt-link"
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -157,6 +158,7 @@ files:
 - lib/bullet_train/super_scaffolding/scaffolders/join_model_scaffolder.rb
 - lib/bullet_train/super_scaffolding/scaffolders/oauth_provider_scaffolder.rb
 - lib/bullet_train/super_scaffolding/version.rb
+- lib/bullet_train/terminal_commands.rb
 - lib/scaffolding.rb
 - lib/scaffolding/block_manipulator.rb
 - lib/scaffolding/class_names_transformer.rb
@@ -186,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Bullet Train Super Scaffolding