terrazzo 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da1376c6052a70bacdbb878ee703543e04e0dc044f57cb5b04c35aa08ea536c
-  data.tar.gz: 9fe6747b3ee47446e501a37c82978a1e1d00fc33b517ad8c8a34ec13b9620889
+  metadata.gz: bddc5aafa6fba7a2d87bb86fd4e29d5ddfeb476c2440594603c669782eb8815b
+  data.tar.gz: 06f9d7c58f0241269f060debbc67ef2f94049cfc5f46d3e2165989c67387eabc
 SHA512:
-  metadata.gz: 316fb61ca947bd8a4d581bcd46a6b1c74a4b0b6a2b6c8113e27ceed6df52f124721a2c8b12d09fb7fbe9f09eb69e8a4ead22d79175946d9d1f74a33da23612a9
-  data.tar.gz: d15cdb461bfc96aa705c463f0f174ce8490a836afaf8755225d6268edd90462e94019687f3f717a4559e32de3a4dc6711d3b580546477b8f7e674e164f866710
+  metadata.gz: 57972ea8d44edfc9d96542f0d008ffa4da02a562846a861df6e89609b128d1c652619882736715d57aa5502cf67fe80f6cf2af62e70ba51529b38c6ddd9ec0ad
+  data.tar.gz: 882f78a2c3b7faa03907e73f5638a01414c74b6950c50716d3db8419c7f4eba8067b6ab22b7ff8188c0b7e740dfee441b63332b016eaf2955cdf0942982f3149

data/lib/generators/terrazzo/dashboard/dashboard_generator.rb

@@ -68,7 +68,7 @@ module Terrazzo
           next if col.name.end_with?("_type") && columns.any? { |c| c.name == col.name.sub(/_type$/, "_id") }
           next if association_foreign_key?(col.name, associations)
 
-          types[col.name.to_sym] = column_to_field_type(col)
+          types[col.name.to_sym] = has_enum?(col.name) ? "Field::Select" : column_to_field_type(col)
         end
 
         # Active Storage attachment names (used to filter internal associations)

data/lib/generators/terrazzo/dashboard/templates/dashboard.rb.erb

@@ -4,9 +4,9 @@ class <%= class_name %>Dashboard < Terrazzo::BaseDashboard
   ATTRIBUTE_TYPES = {
 <% attribute_types.each do |attr, type| -%>
 <% if has_enum?(attr.to_s) -%>
-    <%= attr %>: Terrazzo::<%= type %>.with_options(collection: <%= enum_collection(attr.to_s).inspect %>),
+    <%= attr %>: <%= type %>.with_options(collection: <%= enum_collection(attr.to_s).inspect %>),
 <% else -%>
-    <%= attr %>: Terrazzo::<%= type %>,
+    <%= attr %>: <%= type %>,
 <% end -%>
 <% end -%>
   }.freeze
@@ -33,4 +33,11 @@ class <%= class_name %>Dashboard < Terrazzo::BaseDashboard
   #   active: ->(resources) { resources.where(active: true) },
   #   recent: ->(resources) { resources.where("created_at > ?", 30.days.ago) },
   # }.freeze
+
+  # Overwrite this method to customize how <%= file_name.pluralize.humanize.downcase %> are displayed
+  # across all pages of the admin dashboard.
+  #
+  # def display_resource(resource)
+  #   "<%= class_name %> ##{resource.id}"
+  # end
 end

data/lib/generators/terrazzo/eject/eject_generator.rb

@@ -136,10 +136,17 @@ module Terrazzo
             new_content = build_fields_barrel_with_ejection(field_type)
             create_file barrel_path, new_content, force: true
           else
-            # Barrel already has explicit exports; replace the line for this field type
-            # by inserting local exports before the terrazzo re-exports
+            # Barrel already has explicit exports; replace the terrazzo re-export
+            # for this field type with local imports
             unless content.include?("./#{field_type}/")
-              append_to_file barrel_path, "\n#{local_exports}\n"
+              # Remove the existing terrazzo re-export line for this field type
+              terrazzo_export = "export { #{type_label}IndexField, #{type_label}ShowField, #{type_label}FormField } from \"terrazzo/fields\";"
+              if content.include?(terrazzo_export)
+                new_content = content.sub(terrazzo_export, local_exports)
+                create_file barrel_path, new_content, force: true
+              else
+                append_to_file barrel_path, "\n#{local_exports}\n"
+              end
             end
           end
         end

data/lib/generators/terrazzo/routes/routes_generator.rb

@@ -48,6 +48,18 @@ module Terrazzo
           end
         RUBY
 
+        if File.read(Rails.root.join("config/routes.rb")).include?("namespace :#{namespace_name}")
+          say_status :skip, "namespace :#{namespace_name} already exists in config/routes.rb", :yellow
+          say ""
+          say "Add these resource routes to your existing namespace :#{namespace_name} block:", :green
+          say ""
+          lines.each { |line| say line }
+          say ""
+          say "    root to: \"#{first_resource}#index\"", :green if first_resource
+          say ""
+          return
+        end
+
         route route_block.strip
       end
 

data/lib/terrazzo/version.rb

@@ -1,3 +1,3 @@
 module Terrazzo
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrazzo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Terrazzo Contributors