five-two-nw-olivander 0.2.0.49 → 0.2.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d230d3b035fa0ef2848260e9a18935d703332e40ae67e1f3ac82720859ed681
-  data.tar.gz: 25d75dde2112dee7691f9e01f02da3383b7f86fb1a5bebf21516fffbef504443
+  metadata.gz: e178485d7c7d6e52a13df286378873fadb049edcbc84a88de71763db0f29dc02
+  data.tar.gz: 8e60799ed84eb44f378741a5df3d95d48159837ce752fda30a5b5deac7604cc7
 SHA512:
-  metadata.gz: 64885a09cd9644a5eb035605186ec6ccfd711906772a81ff62b3ecf8523c78cf7ed2fd6a6eeb4e349e19779591f09b7f02516dd6ab06f8a4a0520aca8af0a212
-  data.tar.gz: 95a26ab22fb487d7fae8646898457fc77fbd77d02dd0a5fa8439931a892b1da3e05c80ac23307c9d2db6a0f3561f0c727abcf4975f93315679b913761b201a89
+  metadata.gz: 1597949c45595dca40b42e52a6434f7c4317b7d8cead7694b0167552140d591207700341562951ad0c526099ba1d6a466cfb111205c4adcc595289a48b83ffa3
+  data.tar.gz: c256983a41fc1c851e311fd6675ddd4c89db14f4ea36b4591ef1670f6f91c838d001f8372cd7e694380771ac0dd206f3b757c88f229e5ce44d2a4b0a726232db

data/app/assets/javascripts/controllers/datatable_index_charts_controller.js

@@ -20,8 +20,11 @@ export default class extends Controller {
   transformData(chart) {
     var self = this
     if (chart.as == 'LineChart') {
-      // we don't know what to do
-      return chart.data
+      var transformed = chart.data.map(([name, obj]) => ({
+        name,
+        data: Object.entries(obj || {})
+      }));
+      return transformed
     } else {
       return chart.data
     }

data/app/components/olivander/components/menu_item_component.rb

@@ -4,7 +4,6 @@ class Olivander::Components::MenuItemComponent < ViewComponent::Base
   attr_reader :menu_item
 
   def initialize(menu_item)
-    super
     @menu_item = menu_item
   end
 end

data/app/components/olivander/components/resource_form_component.html.haml

@@ -3,7 +3,7 @@
     %h3= resource_field_group_label(@resource.class, rfg.key) unless rfg.key == :default
     - rfg.sections.each do |section|
       .row
-        - section.fields.each do |field|
+        - section.form_fields.each do |field|
           - label = field_label_for(@resource.class, field.sym)
           %div{ class: section.column_class }
             - if association?(field)

data/app/components/olivander/components/resource_form_component.rb

@@ -7,7 +7,6 @@ class Olivander::Components::ResourceFormComponent < ViewComponent::Base
   def initialize(resource, form_builder)
     @resource = resource
     @f = form_builder
-    super
   end
 
   def collection_for(field)

data/app/components/olivander/components/resource_show_component.html.haml

@@ -7,7 +7,7 @@
           %td{ style: 'width: 8.33%; height: 0px' }
     %tbody
       - rfg.sections.each do |section|
-        - section.fields.each_slice(section.columns) do |slice|
+        - section.show_fields.each_slice(section.columns) do |slice|
           - colspan = (12 - slice.size) / section.columns
           %tr
             - slice.each do |f|

data/app/components/olivander/components/resource_show_component.rb

@@ -7,6 +7,5 @@ class Olivander::Components::ResourceShowComponent < ViewComponent::Base
   def initialize(resource, actions)
     @resource = resource
     @actions = actions
-    super
   end
 end

data/app/components/olivander/components/tabs_component.rb

@@ -14,7 +14,7 @@ module Olivander
         options = args.extract_options!
         @id = options[:id] || "tabs-#{SecureRandom.hex(4)}"
         @card = options.key?(:card) ? !!options[:card] : true
-        @card_class = options.key?(:card_class) ? !!options[:card_class] : 'card-primary'
+        @card_class = options.key?(:card_class) ? options[:card_class] : 'card-primary'
         @tab_strip_id = "tab-strip-#{SecureRandom.hex(4)}"
         @tab_content_id = "tab-strip-#{SecureRandom.hex(4)}"
       end

data/app/controllers/concerns/olivander/resources/auto_form_attributes.rb

@@ -5,7 +5,7 @@ module Olivander
 
       included do
         def auto_form_attributes
-          attributes.keys - ['updated_at', 'created_at', 'deleted_at']
+          attributes.keys - %w[updated_at created_at deleted_at]
         end
 
         def self.method_missing(m, *args, **kwargs, &block)
@@ -16,6 +16,57 @@ module Olivander
             super
           end
         end
+
+        def self.tracked_attrs
+          @tracked_attrs ||= { readers: [], writers: [], accessors: [] }
+        end
+
+        # when subclassing, make sure the subclass gets a copy of parent's tracked attrs
+        def self.inherited(subclass)
+          super if defined?(super)
+
+          # copy parent's lists into subclass so they are independent arrays
+          tracked_attrs.each do |key, arr|
+            subclass.tracked_attrs[key].concat(arr.dup)
+          end
+        end
+
+        # override attr_* to capture names, then delegate to the original behavior
+        def self.attr_reader(*names)
+          tracked_attrs[:readers].concat(names.map(&:to_sym))
+          super
+        end
+
+        def self.attr_writer(*names)
+          tracked_attrs[:writers].concat(names.map(&:to_sym))
+          super
+        end
+
+        def self.attr_accessor(*names)
+          tracked_attrs[:accessors].concat(names.map(&:to_sym))
+          super
+        end
+
+        # accessors for the tracked data (unique and preserved order)
+        def self.tracked_attrs
+          @tracked_attrs ||= { readers: [], writers: [], accessors: [] }
+        end
+
+        def self.readers
+          tracked_attrs[:readers].uniq
+        end
+
+        def self.writers
+          tracked_attrs[:writers].uniq
+        end
+
+        def self.accessors
+          tracked_attrs[:accessors].uniq
+        end
+
+        def self.all_tracked_attributes
+          (readers + writers + accessors).uniq
+        end
       end
     end
 
@@ -29,54 +80,60 @@ module Olivander
         cattr_accessor :resource_field_group_collection
 
         def self.resource_field_groups
-          auto_resource_fields if self.resource_field_group_collection.nil?
-          self.resource_field_group_collection
+          auto_resource_fields if resource_field_group_collection.nil?
+          resource_field_group_collection
         end
 
-        def self.auto_resource_fields(columns: 2, only: [], except: [], editable: true)
+        def self.auto_resource_fields(columns: 2, only: [], except: [], editable: true, on_show: true, on_form: true)
           return unless ActiveRecord::Base.connection.table_exists?(table_name)
 
           if current_resource_field_group.nil?
-            resource_field_group do
-              auto_resource_fields(columns: columns, only: only, except: except, editable: editable)
+            resource_field_group(editable: editable, on_show: on_show, on_form: on_form) do
+              auto_resource_fields(columns: columns, only: only, except: except, editable: editable, on_show: on_show,
+                                   on_form: on_form)
             end
           elsif current_resource_field_group.forced_section.nil?
             resource_field_section(columns) do
-              auto_resource_fields(columns: columns, only: only, except: except, editable: editable)
+              auto_resource_fields(columns: columns, only: only, except: except, editable: editable, on_show: on_show,
+                                   on_form: on_form)
             end
           else
             if only.size.zero?
               only = [
-                self.columns.collect{ |x| x.name.to_sym },
-                reflections.map{ |r| r[1].name },
+                self.columns.collect { |x| x.name.to_sym },
+                reflections.map { |r| r[1].name }
               ]
-              only << attachment_definitions.select{ |x| x[0] } if respond_to?(:attachment_definitions)
+              only << attachment_definitions.select { |x| x[0] } if respond_to?(:attachment_definitions)
               only = only.flatten - SKIPPED_ATTRIBUTES
             end
-            only = only - except
+            only -= except
             only.each do |inc|
+              all_tracked_attributes.each do |sym|
+                next unless inc == sym
+
+                resource_field sym, :string, editable: false, on_show: true, on_form: false
+              end
+
               self.columns.each do |att|
                 sym = att.name.to_sym
                 type = att.type
                 next unless inc == sym
 
-                resource_field sym, type, editable: editable
+                resource_field sym, type, editable: editable, on_show: on_show, on_form: on_form
               end
 
-              reflections.map{ |x| x[1] }
-                         .filter{ |x| x.foreign_key == inc || x.name == inc }
+              reflections.map { |x| x[1] }
+                         .filter { |x| x.foreign_key == inc || x.name == inc }
                          .each do |r|
-                begin
-                  type = r.association_class.name.demodulize.underscore.to_sym
-                  resource_field(r.name, type, editable: editable && !uneditable_association?(r, type))
-                rescue NotImplementedError
-                  resource_field(r.name, :association, editable: editable && !uneditable_association?(r, type))
-                end
+                type = r.association_class.name.demodulize.underscore.to_sym
+                resource_field(r.name, type, editable: editable && !uneditable_association?(r, type))
+              rescue NotImplementedError
+                resource_field(r.name, :association, editable: editable && !uneditable_association?(r, type))
               end
 
               next unless respond_to?(:attachment_definitions)
 
-              attachment_definitions.filter{ |x| x == inc }.each do |ad|
+              attachment_definitions.filter { |x| x == inc }.each do |ad|
                 resource_field ad[0], :file, editable: editable
               end
             end
@@ -90,42 +147,46 @@ module Olivander
           %i[has_one_through_association].include?(type)
         end
 
-        def self.resource_field_group(key = :default, editable: true, &block)
+        def self.resource_field_group(key = :default, editable: true, on_show: true, on_form: true)
           self.resource_field_group_collection ||= []
-          self.current_resource_field_group = resource_field_group_collection.select{ |x| x.key == key}.first
+          self.current_resource_field_group = resource_field_group_collection.select { |x| x.key == key }.first
           unless current_resource_field_group.present?
-            self.current_resource_field_group = ResourceFieldGroup.new(key, editable)
-            self.resource_field_group_collection << self.current_resource_field_group
+            self.current_resource_field_group = ResourceFieldGroup.new(key, editable, on_show, on_form)
+            self.resource_field_group_collection << current_resource_field_group
           end
           yield
           self.current_resource_field_group = nil
         end
 
-        def self.resource_field_section(columns = nil, &block)
-          self.current_resource_field_group.forced_section = self.current_resource_field_group.next_section(columns)
+        def self.resource_field_section(columns = nil)
+          current_resource_field_group.forced_section = current_resource_field_group.next_section(columns)
           yield
-          self.current_resource_field_group.forced_section = nil
+          current_resource_field_group.forced_section = nil
         end
 
-        def self.resource_field(sym, type = :string, editable: nil)
-          self.current_resource_field_group.add_field(sym, type, editable)
+        def self.resource_field(sym, type = :string, editable: nil, on_show: true, on_form: true)
+          current_resource_field_group.add_field(sym, type, editable, on_show, on_form)
         end
       end
 
       class ResourceFieldGroup
-        attr_accessor :fields, :key, :editable, :forced_section, :sections
+        attr_accessor :fields, :key, :editable, :forced_section, :sections, :on_show, :on_form
 
-        def initialize(key, editable)
+        def initialize(key, editable, on_show, on_form)
           self.key = key
           self.editable = editable
+          self.on_show = on_show
+          self.on_form = on_form
           self.fields = []
           self.sections = []
         end
 
-        def add_field(sym, type, editable)
+        def add_field(sym, type, editable, on_show, on_form)
           e = editable.nil? ? self.editable : editable
+          s = on_show
+          f = on_form
           section = forced_section || next_section
-          field = ResourceField.new(sym, type, e, self)
+          field = ResourceField.new(sym, type, e, s, f, self)
           section.fields << field
           fields << field
         end
@@ -137,7 +198,7 @@ module Olivander
         end
 
         def max_section_columns
-          sections.collect{ |x| x.columns }.max
+          sections.collect { |x| x.columns }.max
         end
       end
 
@@ -150,16 +211,26 @@ module Olivander
         end
 
         def column_class
-          "col-md-#{12/columns}"
+          "col-md-#{12 / columns}"
+        end
+
+        def show_fields
+          fields.select { |f| f.on_show }
+        end
+
+        def form_fields
+          fields.select { |f| f.on_form }
         end
       end
 
       class ResourceField
-        attr_accessor :sym, :type, :editable
+        attr_accessor :sym, :type, :editable, :on_show, :on_form
 
-        def initialize(sym, type, editable, group)
+        def initialize(sym, type, editable, on_show, on_form, _group)
           self.sym = sym
           self.type = type
+          self.on_show = on_show
+          self.on_form = on_form
           self.editable = editable
         end
       end

data/app/controllers/concerns/olivander/resources/route_builder.rb

@@ -63,10 +63,11 @@ module Olivander
     end
 
     class RoutedResource
-      attr_accessor :model, :namespaces, :actions
+      attr_accessor :model, :nested_models, :namespaces, :actions
 
       def initialize(model, namespaces, crud_actions)
         self.model = model
+        self.nested_models = []
         self.namespaces = namespaces
         self.actions = []
         %i[index new create edit show update destroy].each do |ca|
@@ -134,10 +135,15 @@ module Olivander
 
       class_methods do
         def resource(model, only: DEFAULT_CRUD_ACTIONS, except: [], namespaces: [])
+          parent_resource = self.current_resource
           self.current_resource = RoutedResource.new(model, namespaces, DEFAULT_CRUD_ACTIONS & (only - except))
+          if parent_resource
+            parent_resource.nested_models << self.current_resource
+          else
+            resources[model] = current_resource
+          end
           yield if block_given?
-          resources[model] = current_resource
-          self.current_resource = nil
+          self.current_resource = parent_resource
         end
 
         def action(sym, **kwargs)
@@ -171,44 +177,52 @@ module Olivander
               build_resource_route(mapper, r, r.namespaces.last(r.namespaces.size - 1))
             end
           else
-            mapper.resources r.model, only: [] do
-              mapper.collection do
-                r.collection_actions.each do |ba|
-                  next if ba.no_route
-                  next if ba.action == :new
-
-                  if ba.confirm
-                    mapper.get ba.action, action: "confirm_#{ba.action}"
-                    set_controller_and_helper(ba)
-                    mapper.post ba.action
-                  else
-                    mapper.send(ba.verb, ba.action)
-                    set_controller_and_helper(ba)
-                  end
+            map_it(mapper, r)
+          end
+        end
+        
+        def map_it(mapper, r)
+          mapper.resources r.model, only: [] do
+            mapper.collection do
+              r.collection_actions.each do |ba|
+                next if ba.no_route
+                next if ba.action == :new
+  
+                if ba.confirm
+                  mapper.get ba.action, action: "confirm_#{ba.action}"
+                  set_controller_and_helper(ba)
+                  mapper.post ba.action
+                else
+                  mapper.send(ba.verb, ba.action)
+                  set_controller_and_helper(ba)
                 end
               end
-
-              if r.collection_actions.select { |x| x.action == :new }.size.positive?
-                mapper.new do
-                  mapper.get :new
-                end
+            end
+  
+            if r.collection_actions.select { |x| x.action == :new }.size.positive?
+              mapper.new do
+                mapper.get :new
               end
-
-              mapper.member do
-                r.member_actions.each do |ma|
-                  next if ma.no_route
-
-                  if ma.confirm
-                    mapper.get ma.action, action: "confirm_#{ma.action}"
-                    set_controller_and_helper(ma)
-                    mapper.post ma.action
-                  else
-                    mapper.send(ma.verb, ma.action)
-                    set_controller_and_helper(ma)
-                  end
+            end
+  
+            mapper.member do
+              r.member_actions.each do |ma|
+                next if ma.no_route
+  
+                if ma.confirm
+                  mapper.get ma.action, action: "confirm_#{ma.action}"
+                  set_controller_and_helper(ma)
+                  mapper.post ma.action
+                else
+                  mapper.send(ma.verb, ma.action)
+                  set_controller_and_helper(ma)
                 end
               end
             end
+
+            r.nested_models.each do |nm|
+              map_it(mapper, nm)
+            end
           end
         end
       end

data/app/views/application/index.html.haml

@@ -23,7 +23,10 @@
                   %button.btn.btn-tool{ type: :button, 'data-card-widget': :maximize }
                     %i.fas.fa-expand
               .card-body{ style: 'height: 220px' }
-                = send(chart[:as].underscore, @datatable.to_json[:charts][k][:data], id: chart[:name], height: '90%', adapter: 'google')
+                - if chart[:as] == 'LineChart'
+                  = send(chart[:as].underscore, @datatable.to_json[:charts][k][:data].map{ |x| {name: x[0], data: x[1]}}, id: chart[:name], height: '90%')
+                - else
+                  = send(chart[:as].underscore, @datatable.to_json[:charts][k][:data], id: chart[:name], height: '90%', adapter: 'google')
 
   = content_for :datatable_charts
 

data/lib/generators/olivander/active_record/model/templates/model.rb.tt

@@ -0,0 +1,32 @@
+<% module_namespacing do -%>
+# frozen_string_literal: true
+
+# Model class for <%= plural_table_name %> table
+class <%= class_name %> < <%= parent_class_name.classify %>
+  include HagridChassis::MultiTenant
+  include HagridChassis::Audited
+
+<% attributes.select(&:reference?).each do |attribute| -%>
+  belongs_to :<%= attribute.name %><%= ", polymorphic: true" if attribute.polymorphic? %>
+<% end -%>
+<% attributes.select(&:rich_text?).each do |attribute| -%>
+  has_rich_text :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachment?).each do |attribute| -%>
+  has_one_attached :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachments?).each do |attribute| -%>
+  has_many_attached :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:token?).each do |attribute| -%>
+  has_secure_token<% if attribute.name != "token" %> :<%= attribute.name %><% end %>
+<% end -%>
+<% if attributes.any?(&:password_digest?) -%>
+  has_secure_password
+<% end -%>
+
+  effective_resource do
+<% attributes.each do |attribute| -%><%= "    #{attribute.name} :#{attribute.type}\n" unless attribute.type == :references %><% end -%>
+  end
+end
+<% end -%>

data/lib/generators/olivander/active_record/model/templates/module.rb.tt

@@ -0,0 +1,7 @@
+<% module_namespacing do -%>
+module <%= class_path.map(&:camelize).join("::") %>
+  def self.table_name_prefix
+    '<%= namespaced? ? namespaced_class_path.join("_") : class_path.join("_") %>_'
+  end
+end
+<% end -%>

data/lib/generators/olivander/active_record_generator.rb

@@ -0,0 +1,21 @@
+require "rails/generators/active_record/model/model_generator"
+
+module Olivander
+  class ActiveRecordGenerator < ActiveRecord::Generators::ModelGenerator
+    desc  "This will generate ActiveRecord files using Olivander templates"
+    argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
+
+    # redefine the source path so we can isolate our templates
+    # note that ActiveRecords's generator defines a path like:
+    # ../../migration/templates/create_table_migration.rb
+    # so we have to put two dummy path positions to counter-act
+    # the ../.. and of course append .tt for thor to treat the file
+    # as a template
+    source_root File.expand_path('active_record/model/templates', __dir__)
+
+    def create_migration_file
+      self.attributes = shell.base.attributes
+      super
+    end
+  end
+end

data/lib/generators/olivander/controller/templates/controller.rb.tt

@@ -0,0 +1,8 @@
+<% module_namespacing do -%>
+# frozen_string_literal: true
+
+# Controller class for <%= plural_table_name %> table
+class <%= class_name %>Controller < ApplicationController
+  include Olivander::Resources::CrudController
+end
+<% end -%>

data/lib/generators/olivander/controller_generator.rb

@@ -0,0 +1,7 @@
+require 'rails/generators/rails/controller/controller_generator'
+
+module Olivander
+  class ControllerGenerator < Rails::Generators::ControllerGenerator
+    source_root File.expand_path('controller/templates', __dir__)
+  end
+end

data/lib/generators/olivander/datatable_generator.rb

@@ -0,0 +1,13 @@
+module Olivander
+  class DatatableGenerator < Rails::Generators::NamedBase
+    include Rails::Generators::ResourceHelpers
+
+    argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
+
+    source_root File.expand_path('templates/datatable', __dir__)
+
+    def create_datatable
+      template "datatable.rb", File.join("app/datatables", controller_file_path, "../#{file_name}_datatable.rb")
+    end
+  end
+end

data/lib/generators/olivander/infrastructure_generator.rb

@@ -0,0 +1,76 @@
+module Olivander
+  class InfrastructureGenerator < Rails::Generators::Base
+    source_root File.expand_path('templates/infrastructure', __dir__)
+
+    # boolean option — use --no-application-controller to disable
+    class_option :application_controller,
+                 type: :boolean,
+                 default: true,
+                 desc: "Modify ApplicationController to include infrastructure hooks"
+
+    def create_infrastructure
+      create_builders
+      setup_asset_pipeline
+      modify_application_controller
+      create_hello_olivander
+      route 'root "hello_olivander#index"'
+    end
+  
+    private
+    
+    def create_builders
+      template "route_builder.rb", File.join("app/services", "route_builder.rb")
+      template "context_builder.rb", File.join("app/services", "context_builder.rb")
+      template "menu_builder.rb", File.join("app/services", "menu_builder.rb")
+    end
+    
+    def setup_asset_pipeline
+      template "manifest.js", File.join("app/assets/config", "manifest.js")
+      pin_all = 'pin_all_from "#{Olivander.root}/../app/assets/javascripts/controllers", under: "controllers"'
+      inject_into_file 'config/importmap.rb', pin_all, verbose: true, force: false
+    end
+
+    def create_hello_olivander
+      template "hello_olivander_controller.rb", File.join("app/controllers", "hello_olivander_controller.rb")
+    end
+  
+    # Insert a safe snippet into ApplicationController
+    def modify_application_controller
+      unless options[:application_controller]
+        say_status :skip, "ApplicationController modification skipped", :yellow
+        return
+      end
+  
+      target = File.join("app", "controllers", "application_controller.rb")
+      snippet = <<~RUBY
+  
+        # --- Olivander infrastructure additions (generated) ---
+        # If you want to remove this, delete the lines between the markers.
+        before_action :build_context
+    
+        def build_context
+          # can?(:build, :context)
+          ContextBuilder.build_context
+        end
+
+        def authorize!(*args)
+          # implement authorization logic
+        end
+        # ------------------------------------------------------
+      RUBY
+  
+      if File.exist?(target)
+        inject_into_class target, "ApplicationController", snippet.indent(2)
+        say_status :insert, "added infrastructure hooks to #{target}", :green
+      else
+        # create a minimal ApplicationController if none exists
+        create_file target, <<~RUBY
+          class ApplicationController < ActionController::Base
+            #{snippet.indent(2)}
+          end
+        RUBY
+        say_status :create, "#{target} (new)", :green
+      end
+    end
+  end  
+end

data/lib/generators/olivander/migration/templates/create_table_migration.rb.tt

@@ -0,0 +1,27 @@
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+  def change
+    create_table :<%= table_name %><%= primary_key_type %> do |t|
+<% attributes.each do |attribute| -%>
+<% foreign_key_type ||= nil -%>
+<% if attribute.password_digest? -%>
+      t.string :password_digest<%= attribute.inject_options %>
+<% elsif attribute.token? -%>
+      t.string :<%= attribute.name %><%= attribute.inject_options %>
+<% elsif attribute.reference? -%>
+      t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
+<% elsif !attribute.virtual? -%>
+      t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
+<% end -%>
+<% end -%>
+<% if options[:timestamps] %>
+      t.audits
+<% end -%>
+    end
+<% attributes.select(&:token?).each do |attribute| -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>, unique: true
+<% end -%>
+<% attributes_with_index.each do |attribute| -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+<% end -%>
+  end
+end

data/lib/generators/olivander/model_generator.rb

@@ -0,0 +1,7 @@
+require "rails/generators/active_record/model/model_generator"
+require "olivander/generators/olivander/active_record_generator"
+
+module Olivander
+  class ModelGenerator < ::Olivander::ActiveRecordGenerator
+  end
+end

data/lib/generators/olivander/scaffold_generator.rb

@@ -0,0 +1,117 @@
+module Olivander
+  class ScaffoldGenerator < Rails::Generators::NamedBase
+    include Rails::Generators::ResourceHelpers
+
+    argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
+    class_option :menu,
+                 type: :boolean,
+                 default: true,
+                 desc: "Modify MenuBuilder to include menu item"
+
+    source_root File.expand_path('templates/scaffold', __dir__)
+
+    hook_for :orm, as: :model, required: true do |instance, controller|
+      instance.invoke controller, [ instance.name ], instance.options.merge({ test_framework: false })
+    end
+
+    hook_for :datatable, type: :boolean, default: true
+
+    hook_for :resource_controller do |instance, controller|
+      instance.invoke controller, [ instance.name.pluralize ], instance.options.merge({ helper: false, test_framework: false, assets: false })
+    end
+
+    def create_views
+      # template "views/_form.html.haml", File.join("app/views", controller_file_path, '_form.html.haml')
+      # template "views/_model.html.haml", File.join("app/views", controller_file_path, "_#{file_name}.html.haml")
+    end
+
+    # Make an entry in \Rails routing file <tt>config/routes.rb</tt>
+    #
+    #   route "root 'welcome#index'"
+    #   route "root 'admin#index'", namespace: :admin
+    def handle_route
+      return if options[:actions].present?
+
+      use_route_builder = File.exist?(Rails.root.join("app/services/route_builder.rb"))
+      if use_route_builder
+        route_for_route_builder
+      else
+        route "resources :#{file_name.pluralize}", namespace: regular_class_path
+      end
+    end
+
+    def handle_menu
+      say_status :menu, "Handling menu option", :yellow
+      return unless options[:menu]
+    
+      target = 'app/services/menu_builder.rb'
+      unless File.exist?(target)
+        say_status :error, "#{target} not found, skipping menu injection", :red
+        return
+      end
+    
+      # The exact line we want to insert (note trailing comma)
+      new_line = <<~RUBY.indent(6)
+            builder.build_menu_item(key: "#{file_name.pluralize}", url: builder.#{file_name.pluralize}_path),
+      RUBY
+    
+      file_contents = File.read(target)
+      # avoid inserting duplicates
+      if file_contents.include?(new_line.strip)
+        say_status :skip, "menu item already present in #{target}", :yellow
+        return
+      end
+    
+      # Insert before the closing bracket of the array (a line that only contains optional whitespace and `]`)
+      inject_into_file target,
+                       new_line,
+                       before: /^\s*\]\s*$/m,
+                       verbose: true,
+                       force: false
+    
+      say_status :done, "Inserted menu item into #{target}", :green
+    end
+
+    private
+
+    def route_for_route_builder
+      route 'RouteBuilder.build_routes(self)'
+      namespace = regular_class_path
+      namespace = Array(namespace)
+      routing_code = "resource :#{file_name.pluralize}, namespaces:[#{namespace.map{ |n| ":#{n}" }.join(', ')}]"
+      namespace_pattern = namespace.each_with_index.reverse_each.reduce(nil) do |pattern, (name, i)|
+        cummulative_margin = "\\#{i + 1}[ ]{2}"
+        blank_or_indented_line = "^[ ]*\n|^#{cummulative_margin}.*\n"
+        "(?:(?:#{blank_or_indented_line})*?^(#{cummulative_margin})namespace :#{name} do\n#{pattern})?"
+      end.then do |pattern|
+        /^([ ]*).+include Olivander::Resources::RouteBuilder*\n#{pattern}/
+      end
+      # routing_code = namespace.reverse.reduce(routing_code) do |code, name|
+      #   "namespace :#{name} do\n#{rebase_indentation(code, 2)}end"
+      # end
+
+      log :route, routing_code
+
+      target_file_name = "app/services/route_builder.rb"
+      in_root do
+        if namespace_match = match_file(target_file_name, namespace_pattern)
+          base_indent, *, existing_block_indent = namespace_match.captures.compact.map(&:length)
+          existing_line_pattern = /^[ ]{,#{existing_block_indent}}\S.+\n?/
+          routing_code = rebase_indentation(routing_code, base_indent + 1).gsub(existing_line_pattern, "")
+          namespace_pattern = /#{Regexp.escape namespace_match.to_s}/
+        end
+
+        inject_into_file target_file_name, routing_code, after: namespace_pattern, verbose: true, force: false
+
+        if behavior == :revoke && namespace.any? && namespace_match
+          empty_block_pattern = /(#{namespace_pattern})((?:\s*end\n){1,#{namespace.size}})/
+          gsub_file target_file_name, empty_block_pattern, verbose: false, force: true do |matched|
+            beginning, ending = empty_block_pattern.match(matched).captures
+            ending.sub!(/\A\s*end\n/, "") while !ending.empty? && beginning.sub!(/^[ ]*namespace .+ do\n\s*\z/, "")
+            beginning + ending
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/olivander/templates/datatable/datatable.rb.tt

@@ -0,0 +1,29 @@
+<% module_namespacing do -%>
+# frozen_string_literal: true
+
+# Datatable class for <%= plural_table_name %> table
+class <%= class_name %>Datatable < ::Olivander::Datatable
+  auto_datatable <%= class_name %>
+                # only: %w[],
+                # hide: %w[],
+                # show: %w[],
+                # scopes: %i[],
+                # collection: <%= class_name %>.all
+
+  # filters do
+  #   scope :all, default: true
+  # end
+
+  # datatable do
+  #   order :id, :desc
+<% attributes.each do |attribute| -%>
+  #   col :<%= attribute.name %>
+<% end -%>
+  #   actions_col
+  # end
+
+  # collection do
+  #   <%= class_name %>.all
+  # end
+end
+<% end -%>

data/lib/generators/olivander/templates/infrastructure/context_builder.rb.tt

@@ -0,0 +1,16 @@
+class ContextBuilder
+  include Rails.application.routes.url_helpers
+
+  def self.build_context
+    builder = ContextBuilder.new
+    Olivander::CurrentContext.build do |_ctx, app_ctx, _user, _ability|
+      app_ctx.name = 'Set Your System Name'
+      app_ctx.logo.url = '/images/logo.png'
+      app_ctx.logo.alt = 'Set Your Logo Alt Text'
+      app_ctx.company.name = 'Set Your Company Name'
+      app_ctx.menu_items = MenuBuilder.build_menu_items
+      app_ctx.route_builder = RouteBuilder
+      app_ctx.sign_out_path = builder.root_path
+    end.application_context
+  end
+end

data/lib/generators/olivander/templates/infrastructure/hello_olivander_controller.rb.tt

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# a default landing page for Olivander
+class HelloOlivanderController < ApplicationController
+  layout 'olivander/adminlte/main'
+
+  def index
+    @page_title = 'Welcome to Olivander'
+    render({html: "This is only the beginning...".html_safe, layout: true})
+  end
+end

data/lib/generators/olivander/templates/infrastructure/manifest.js

@@ -0,0 +1,5 @@
+//= link_tree ../images
+//= link_directory ../stylesheets .css
+//= link_tree ../../javascript .js
+//= link_tree ../../../vendor/javascript .js
+//= link olivander_manifest.js

data/lib/generators/olivander/templates/infrastructure/menu_builder.rb.tt

@@ -0,0 +1,32 @@
+class MenuBuilder
+  include Rails.application.routes.url_helpers
+
+  def self.build_menu_items
+    builder = MenuBuilder.new
+    [
+      builder.build_menu_item(key: 'root', url: builder.root_path),
+    ]
+  end
+
+  def condition_proc(verb, noun)
+    proc { Olivander::CurrentContext.ability.can? verb, noun }
+  end
+
+  def build_menu_item(key: nil, controller: nil, action: nil, url: nil, is_module: false, condition: nil, items: nil)
+    url ||= url_for(controller:, action:, only_path: true)
+    key ||= url.gsub('.', '_').gsub(' ', '_')
+
+    condition = proc { true } if !condition && is_module
+
+    unless items
+      submenu_key = "#{key.gsub('.', '_')}_submenu"
+      items = proc { send(submenu_key) } if respond_to?(submenu_key)
+    end
+
+    key = key.gsub('help.', '') if !I18n.exists?("menus.#{key}") && key.starts_with?('help.')
+    mi = Olivander::Menus::MenuItem.new(key, url, nil, is_module:)
+    mi.with_condition { condition.is_a?(Proc) ? condition.call : condition } if condition.present?
+    mi.with_submenu_items { items.call } if items.present?
+    mi
+  end
+end

data/lib/generators/olivander/templates/infrastructure/route_builder.rb.tt

@@ -0,0 +1,8 @@
+<% module_namespacing do -%>
+# frozen_string_literal: true
+
+# RouteBuilder for Olivander
+class RouteBuilder
+  include Olivander::Resources::RouteBuilder
+end
+<% end %>

data/lib/olivander/version.rb

@@ -2,5 +2,5 @@
 
 # needed for gem
 module Olivander
-  VERSION = '0.2.0.49'
+  VERSION = '0.2.0.51'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.49
+  version: 0.2.0.51
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-16 00:00:00.000000000 Z
+date: 2025-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -310,6 +310,22 @@ files:
 - config/locales/simple_form.en.yml
 - config/routes.rb
 - lib/five-two-nw-olivander.rb
+- lib/generators/olivander/active_record/model/templates/model.rb.tt
+- lib/generators/olivander/active_record/model/templates/module.rb.tt
+- lib/generators/olivander/active_record_generator.rb
+- lib/generators/olivander/controller/templates/controller.rb.tt
+- lib/generators/olivander/controller_generator.rb
+- lib/generators/olivander/datatable_generator.rb
+- lib/generators/olivander/infrastructure_generator.rb
+- lib/generators/olivander/migration/templates/create_table_migration.rb.tt
+- lib/generators/olivander/model_generator.rb
+- lib/generators/olivander/scaffold_generator.rb
+- lib/generators/olivander/templates/datatable/datatable.rb.tt
+- lib/generators/olivander/templates/infrastructure/context_builder.rb.tt
+- lib/generators/olivander/templates/infrastructure/hello_olivander_controller.rb.tt
+- lib/generators/olivander/templates/infrastructure/manifest.js
+- lib/generators/olivander/templates/infrastructure/menu_builder.rb.tt
+- lib/generators/olivander/templates/infrastructure/route_builder.rb.tt
 - lib/o18n.rb
 - lib/olivander.rb
 - lib/olivander/application_context.rb