bullet_train-super_scaffolding 1.0.27 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9aa5ac0c67b58b810e04c0d3d168029f9f9ef7da7faa3a8e7caa983e9902827
-  data.tar.gz: fc327f125d39b8fa070aa8fa2f0a44e970f76b40582862d5fa9a65f001bc933c
+  metadata.gz: ade9510dad6e37f1400c6d5a934f76aadd00dcf0f8d31ee4bf94a22b335db337
+  data.tar.gz: 8c6cbfd05ae88e622ba92cdbe0b7692c5d543c272fd17ed244ec039c77b0155c
 SHA512:
-  metadata.gz: bdc55ee986f3a46ca5e5ca7b9246cb6de751a08f643a036f75eb2b05ca03da3b077e52c3befe5e75d68b54bdba29598414c10e45be4307e5bfdc72da5e4d94fa
-  data.tar.gz: b73895f7df4bacab8e606077847bfb3b64287e8e79ddfe72a2dd6d244dbe61f6370dcf06d5cdc07d43685b753e1fe7c0f088b9cadad3108289b20edad2f58eef
+  metadata.gz: 175dfb1b7ba5d85c3d6f50910b96b9759f6b850f747a848a87d66afc865b6fd58f917fc9ea78d43d601f80a9366ff6517bb67850c2c26ddea48cf0d3f9d53822
+  data.tar.gz: b52ffae0b1fd6cb1bc67c053f53b89bacd9ef6165a59d034fd6b67603c3cfd7eba0a8a8896bd47a5e7923da9d1ec708626622a69e8c074addd961f4e4cf635d6

data/lib/bullet_train/super_scaffolding/version.rb

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

data/lib/scaffolding/block_manipulator.rb

@@ -137,4 +137,8 @@ class Scaffolding::BlockManipulator
     end
     current_line
   end
+
+  def block_indentation_size(line_number)
+    lines[line_number].scan(/^\s+/).first.size
+  end
 end

data/lib/scaffolding/routes_file_manipulator.rb

@@ -1,5 +1,5 @@
 class Scaffolding::RoutesFileManipulator
-  attr_accessor :child, :parent, :lines, :transformer_options
+  attr_accessor :child, :parent, :lines, :transformer_options, :block_manipulator
 
   def initialize(filename, child, parent, transformer_options = {})
     self.child = child
@@ -7,6 +7,7 @@ class Scaffolding::RoutesFileManipulator
     @filename = filename
     self.lines = File.readlines(@filename)
     self.transformer_options = transformer_options
+    self.block_manipulator = Scaffolding::BlockManipulator.new(@filename)
   end
 
   def child_parts
@@ -141,7 +142,12 @@ class Scaffolding::RoutesFileManipulator
     current_namespace = nil
     while namespaces.any?
       current_namespace = namespaces.shift
-      namespace_lines = find_namespaces(created_namespaces + [current_namespace], within)
+      namespace_lines = if within.nil?
+        find_namespaces(created_namespaces + [current_namespace], within)
+      else
+        scope_namespace_to_parent(current_namespace, within)
+      end
+
       unless namespace_lines[current_namespace]
         lines_to_add = ["namespace :#{current_namespace} do", "end"]
         if created_namespaces.any?
@@ -156,6 +162,35 @@ class Scaffolding::RoutesFileManipulator
     namespace_lines ? namespace_lines[current_namespace] : nil
   end
 
+  # Since it's possible for multiple namespaces to exist on different levels,
+  # We scope the namespace we're trying to scaffold to its proper parent before processing it.
+  #
+  # i.e:
+  # Parent: Insight => Child: Personality::CharacterTrait
+  # Parent: Team    => Child: Personality::Disposition
+  # In this case, the :personality namespace under :insights should be
+  # ignored when Super Scaffolding Personality::Dispositon.
+  #
+  # resources do :insights do
+  #   namespace :personality do
+  #     resources :character_traits
+  #   end
+  # end
+  #
+  # namespace :personality do
+  #   resources :dispositions
+  # end
+  #
+  # In this case, Personality::CharacterTrait is under Team just like Personality::Disposition,
+  # but Personality::CharacterTrait's DIRECT parent is Insight so we shouldn't scaffold its routes there.
+  def scope_namespace_to_parent(namespace, within)
+    namespace_block_start = namespace_blocks_directly_under_parent(within).map do |namespace_block|
+      namespace_line_number = namespace_block.begin
+      namespace_line_number if lines[namespace_line_number].match?(/ +namespace :#{namespace}/)
+    end.compact
+    namespace_block_start.present? ? {namespace => namespace_block_start} : {}
+  end
+
   def find(needle, within = nil)
     lines_within(within).each_with_index do |line, line_number|
       return (within + (within ? 1 : 0) + line_number) if line.match?(needle)
@@ -220,6 +255,8 @@ class Scaffolding::RoutesFileManipulator
     result
   end
 
+  # Finds namespace blocks no matter how many levels deep they are nested in resource blocks, etc.
+  # However, will not find namespace blocks inside namespace blocks.
   def top_level_namespace_block_lines(within)
     local_namespace_blocks = []
     lines_within(within).each do |line|
@@ -253,6 +290,24 @@ class Scaffolding::RoutesFileManipulator
     local_namespace_blocks
   end
 
+  # Whereas top_level_namespace_block_lines grabs all namespace blocks that
+  # appear first no matter how many resource blocks they're nested in,
+  # this method grabs namespace blocks that are only indented one level deep.
+  def namespace_blocks_directly_under_parent(within)
+    blocks = []
+    if lines[within].match?(/do$/)
+      parent_indentation_size = block_manipulator.block_indentation_size(within)
+      within_block_end = find_block_end(within)
+      within.upto(within_block_end) do |line_number|
+        if lines[line_number].match?(/^#{" " * (parent_indentation_size + 2)}namespace/)
+          namespace_block_lines = line_number..find_block_end(line_number)
+          blocks << namespace_block_lines
+        end
+      end
+    end
+    blocks
+  end
+
   def find_or_create_resource_block(parts, options = {})
     find_or_create_resource(parts, options)
     find_or_convert_resource_block(parts.last, options)
@@ -300,7 +355,6 @@ class Scaffolding::RoutesFileManipulator
     child_namespaces, child_resource, parent_namespaces, parent_resource = divergent_parts
 
     within = find_or_create_namespaces(base_namespaces)
-    within = find_or_create_namespaces(common_namespaces, within) if common_namespaces.any?
 
     # e.g. Project and Projects::Deliverable
     if parent_namespaces.empty? && child_namespaces.one? && parent_resource == child_namespaces.first
@@ -326,33 +380,31 @@ class Scaffolding::RoutesFileManipulator
       #   resources :deliverables, except: collection_actions
       # end
 
+      # We want to see if there are any namespaces one level above the parent itself,
+      # because namespaces with the same name as the resource can exist on the same level.
+      parent_block_start = find_block_parent(parent_within)
+      namespace_line_within = find_or_create_namespaces(child_namespaces, parent_block_start)
+      find_or_create_resource([child_resource], options: "except: collection_actions", within: namespace_line_within)
       unless find_namespaces(child_namespaces, within)[child_namespaces.last]
-        insert_after(["", "namespace :#{child_namespaces.last} do", "end"], find_block_end(scope_within))
-        unless find_namespaces(child_namespaces, within)[child_namespaces.last]
-          raise "tried to insert `namespace :#{child_namespaces.last}` but it seems we failed"
-        end
+        raise "tried to insert `namespace :#{child_namespaces.last}` but it seems we failed"
       end
 
-      find_or_create_resource(child_namespaces + [child_resource], options: "except: collection_actions", within: within)
-
     # e.g. Projects::Deliverable and Objective Under It, Abstract::Concept and Concrete::Thing
     elsif parent_namespaces.any?
 
       # namespace :projects do
       #   resources :deliverables
       # end
-      #
+      top_parent_namespace = find_namespaces(parent_namespaces, within)[parent_namespaces.first]
+      find_or_create_resource(child_namespaces + [child_resource], within: top_parent_namespace)
+
       # resources :projects_deliverables, path: 'projects/deliverables' do
       #   resources :objectives
       # end
-
-      find_resource(parent_namespaces + [parent_resource], within: within)
-      top_parent_namespace = find_namespaces(parent_namespaces, within)[parent_namespaces.first]
       block_parent_within = find_block_parent(top_parent_namespace)
       parent_namespaces_and_resource = (parent_namespaces + [parent_resource]).join("_")
       parent_within = find_or_create_resource_block([parent_namespaces_and_resource], options: "path: '#{parent_namespaces_and_resource.tr("_", "/")}'", within: block_parent_within)
       find_or_create_resource(child_namespaces + [child_resource], within: parent_within)
-
     else
 
       begin

data/lib/scaffolding/script.rb

@@ -37,6 +37,12 @@ def check_required_options_for_attributes(scaffolding_type, attributes, child, p
     name = parts.shift
     type = parts.join(":")
 
+    unless Scaffolding.valid_attribute_type?(type)
+      raise "You have entered an invalid attribute type: #{type}. General data types are used when creating new models, but Bullet Train " +
+            "uses field partials when Super Scaffolding, i.e. - `name:text_field` as opposed to `name:string`. " +
+            "Please refer to the Field Partial documentation to view which attribute types are available."
+    end
+
     # extract any options they passed in with the field.
     type, attribute_options = type.scan(/^(.*){(.*)}/).first || type
 

data/lib/scaffolding/transformer.rb

@@ -655,8 +655,14 @@ class Scaffolding::Transformer
         "email"
       when "color_picker"
         "code"
-      else
+      when "text_field"
+        "text"
+      when "text_area"
+        "text"
+      when "file_field"
         "text"
+      else
+        raise "Invalid attribute type: #{type}."
       end
 
       cell_attributes = if boolean_buttons
@@ -1030,10 +1036,14 @@ class Scaffolding::Transformer
           scaffold_add_line_to_file("./app/views/account/scaffolding/completely_concrete/tangible_things/_tangible_thing.json.jbuilder", ":#{name},", RUBY_NEW_FIELDS_HOOK, prepend: true, suppress_could_not_find: true)
           scaffold_add_line_to_file("./app/serializers/api/v1/scaffolding/completely_concrete/tangible_thing_serializer.rb", ":#{name},", RUBY_NEW_FIELDS_HOOK, prepend: true)
 
-          assertion = if type == "date_field"
+          assertion = case type
+          when "date_field"
             "assert_equal Date.parse(tangible_thing_data['#{name}']), tangible_thing.#{name}"
-          elsif type == "date_and_time_field"
+          when "date_and_time_field"
             "assert_equal DateTime.parse(tangible_thing_data['#{name}']), tangible_thing.#{name}"
+          when "file_field"
+            # TODO: If we want to use Cloudinary to handle our files, we should make sure we're getting a URL.
+            "assert_equal tangible_thing_data['#{name}']['record']['id'], tangible_thing.#{name}.record.id"
           else
             "assert_equal tangible_thing_data['#{name}'], tangible_thing.#{name}"
           end
@@ -1276,10 +1286,20 @@ class Scaffolding::Transformer
       else
         transform_string("association :absolutely_abstract_creative_concept, factory: :scaffolding_absolutely_abstract_creative_concept")
       end
+
       scaffold_replace_line_in_file("./test/factories/scaffolding/completely_concrete/tangible_things.rb", content, "absolutely_abstract_creative_concept { nil }")
 
       add_has_many_association
 
+      # Adds file attachment to factory
+      attributes.each do |attribute|
+        attribute_name, partial_type = attribute.split(":")
+        if partial_type == "file_field"
+          content = "#{attribute_name} { Rack::Test::UploadedFile.new(\"test/support/foo.txt\") }"
+          scaffold_replace_line_in_file("./test/factories/scaffolding/completely_concrete/tangible_things.rb", content, "#{attribute_name} { nil }")
+        end
+      end
+
       if class_names_transformer.belongs_to_needs_class_definition?
         scaffold_replace_line_in_file("./app/models/scaffolding/completely_concrete/tangible_thing.rb", transform_string("belongs_to :absolutely_abstract_creative_concept, class_name: \"Scaffolding::AbsolutelyAbstract::CreativeConcept\"\n"), transform_string("belongs_to :absolutely_abstract_creative_concept\n"))
       end
@@ -1430,6 +1450,6 @@ class Scaffolding::Transformer
 
     add_additional_step :yellow, transform_string("If you would like the table view you've just generated to reactively update when a Tangible Thing is updated on the server, please edit `app/models/scaffolding/absolutely_abstract/creative_concept.rb`, locate the `has_many :completely_concrete_tangible_things`, and add `enable_updates: true` to it.")
 
-    restart_server
+    restart_server unless ENV["CI"].present?
   end
 end

data/lib/scaffolding.rb

@@ -1,2 +1,21 @@
 module Scaffolding
+  def self.valid_attribute_type?(type)
+    [
+      "boolean",
+      "button",
+      "cloudinary_image",
+      "color_picker",
+      "date_and_time_field",
+      "date_field",
+      "email_field",
+      "file_field",
+      "options",
+      "password_field",
+      "phone_field",
+      "super_select",
+      "text_area",
+      "text_field",
+      "trix_editor"
+    ].include?(type.gsub(/{.*}/, "")) # Pop off curly brackets such as `super_select{class_name=Membership}`
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.30
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-22 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard