five-two-nw-olivander 0.1.2.29 → 0.1.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c61a734e5a96ba24272b92909d114e801ff0296c5069ee1da4203b66458e295c
-  data.tar.gz: acc01f788c4120e50a39dd257c92bcbc1ba63d5a9348339f0b6905eb6395270e
+  metadata.gz: c44e3b7096fe950aaac7828a92343e5f05cabac07d3776d35369fd434fd83a97
+  data.tar.gz: 6a46d72cfc1f35b37fdc61ee0027f278785af0fcb79e5ee38f1f67cf72da4756
 SHA512:
-  metadata.gz: 4e568cb13335373644accbe7546189f47ceae111d72b9dd77de4cc1d79cdae2f48c1cf619dee2823e763f0ce403a36f4e05b94bd617bee6d09cf4a89d44b16de
-  data.tar.gz: 6e1ecbeed3877a5bc9a2da54f0f2bbe71410f78d3b5ca341b37f79fe7f0891376f20019619d5d3db0fe90a9542b1445e7963bfc96bda4ef84a6b1c8f86cb5517
+  metadata.gz: fa838b60681399f4000cf08e2c0fcc8d23cbacd9ea8c72087a309fc78bcb1223f3062ce5be88c849591d477aaef2c49a18c35b0e5bc166ef972aa4d6902e04d8
+  data.tar.gz: ad347d7be7b1a862b125152ea10484e5b9c5cd36287064d3c8bc49fe60043349aaff32eca85f77ceee1c8d5e1eb7c769fb12af5e54457908b87bb0ddbd95f65d

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

@@ -0,0 +1,49 @@
+require 'olivander/resources/model_registry'
+
+module Olivander
+  module Resources
+    module ModelRegistrar
+      extend ActiveSupport::Concern
+
+      included do
+        def this_is_included_method
+          puts 'hi'
+        end
+      end
+
+      class_methods do
+        def register_model(model = self, context: :default, using: self, &block)
+          Rails.logger.debug "###################"
+          Rails.logger.debug "registering model #{model.name} in context #{context} using #{using&.name} at #{self.name}"
+          using.register_model(model, context: context, &block) && return unless using == self
+
+          ::Olivander::Resources::ModelRegistry.global_registry.register(model, &block)
+          Rails.logger.debug "###################\n"
+        end
+      end
+    end
+
+    class TestRegistrant
+    end
+
+    class TestRegistrar
+      include ModelRegistrar
+    end
+
+    class TestRegistrar2
+      include ModelRegistrar
+
+      # register_model do
+      #   puts 'hello'
+      #   field_layout :show do :all end
+      # end
+      # register_model Olivander::Resources::TestRegistrant, context: :foo do
+      #   puts 'this is the other thing'
+      #   field_layout do [[1, :id]] end
+      # end
+      # register_model context: :bar, using: TestRegistrar do
+      #   puts 'and lastly...'
+      # end
+    end
+  end
+end

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

@@ -0,0 +1,201 @@
+module Olivander
+  module Resources
+    module ModelRegistry
+      mattr_accessor :global_registry
+
+      module Registry
+        extend ActiveSupport::Concern
+
+        class_methods do
+          attr_accessor :_registry_hash
+          attr_accessor :_registering
+
+          def register(model, &block)
+            self._registry_hash ||= {}
+            self._registering = ensure_registry_for(model)
+            instance_exec(&block)
+            _registering.make_datatable_classes
+            self._registering = nil
+            # Rails.logger.debug _registry_hash
+          end
+
+          def entry_for(model)
+            _registry_hash[model]
+          end
+
+          def ensure_registry_for(model)
+            _registry_hash[model] ||= RegisteredModel.new(model)
+          end
+
+          def field_layout(layouts = [:show, :form])
+            layouts = [*layouts] # ensure it's an array
+            field_layout = block_given? ? yield : :all
+            layouts.each do |layout|
+              Rails.logger.debug "setting layout for #{_registering}[#{layout}]"
+              _registering.add_layout(layout, field_layout)
+            end
+          end
+
+          def add_datatable(view = nil, &block)
+            _registering.add_datatable(view, DatatableDef.new(_registering, &block))
+          end
+
+          def render_fields(field_list, with_format: :string)
+            _registering.render_fields(field_list, with_format)
+          end
+        end
+      end
+
+      class DatatableDef
+        attr_accessor :model, :blocks, :datatable_class, :block
+
+        def initialize(model, &block)
+          Rails.logger.info "making new datatable"
+          Rails.logger.info block.source
+          self.model = model
+          self.blocks = {}
+
+          # instance_exec(&block) if block_given?
+          self.block = block
+        end
+
+        def datatable(sym)
+          blocks[:datatable] = Proc.new{ datatable do model.send(sym) end }
+        end
+
+        def collection(sym)
+          blocks[:collection] = Proc.new{ collection do model.send(sym) end }
+        end
+
+        def filters(sym)
+          blocks[:filters] = Proc.new{ model.send(sym) }
+        end
+
+        def charts(sym)
+          blocks[:charts] = Proc.new{ model.send(sym) }
+        end
+
+        def make_class(key)
+          # return datatable_class unless datatable_class.nil?
+          # ensure_blocks
+
+          name_key = key == :index ? '' : key
+          name = [model.name.demodulize, name_key, 'Datatable'].join
+          blocks = self.blocks
+          block = self.block
+          klass = Class.new(Olivander::Datatable) do
+            puts 'stuff'
+            # blocks.values.each do |block|
+            #   puts 'this is a block'
+              # puts block.source
+              # instance_eval(block.source)
+              # binding.pry
+            #   instance_exec(&block)
+            # end
+            # collection do
+            #   Erp::Rate.all
+            # end
+            instance_exec(&block)
+          end
+          module_name = model.name.deconstantize
+          constantized_module = module_name.constantize
+          constantized_module.send(:remove_const, name) if constantized_module.const_defined?(name)
+          self.datatable_class = constantized_module.const_set(name, klass)
+        end
+
+        def ensure_blocks
+          blocks[:collection] ||= Proc.new{
+            model.all
+          }
+        end
+      end
+
+      class RegisteredModel
+        attr_accessor :fields, :layouts, :datatables, :name, :model
+
+        def initialize(model)
+          self.model = model
+          set_fields
+          self.layouts = {}
+          self.datatables = {}
+          self.name = model.name
+        end
+
+        def to_s
+          name
+        end
+
+        def inspect
+          name
+        end
+
+        def add_layout(key, layout)
+          layout = [[2, fields]] if layout == :all
+          layouts[key] = layout
+        end
+
+        def layout(key)
+          layouts[key] || add_layout(key, :all)
+        end
+
+        def add_datatable(key, datatable_def)
+          Rails.logger.info "adding datatable #{key}"
+          datatables[key || :index] = datatable_def
+          # binding.pry
+        end
+
+        def datatable(key)
+          datatables[key] || add_datatable(key, DatatableDef.new(self))
+        end
+
+        def make_datatable_classes
+          datatables.each do |key, dt_def|
+            dt_def.make_class(key)
+          end
+        end
+
+        def render_fields(field_list, with_format)
+          field_list.each do |field|
+            fields[field].render_as = with_format
+          end
+        end
+
+        private
+
+        def set_fields
+          self.fields = {}
+
+          if model.respond_to?(:columns)
+            model.columns.map{ |x| RegisteredField.new(x) }.each do |field|
+              fields[field.key] = field
+            end
+          end
+        end
+      end
+
+      class RegisteredField
+        attr_accessor :key, :ar_def, :dt_def, :render_as
+
+        def to_s
+          key
+        end
+
+        def inspect
+          key
+        end
+
+        def initialize(ar_def)
+          self.key = ar_def.name.to_sym
+          self.ar_def = ar_def
+          self.render_as = ar_def.type
+          self.dt_def = {}
+        end
+      end
+
+      class DefaultModelRegistry
+        include Registry
+        ::Olivander::Resources::ModelRegistry.global_registry = Olivander::Resources::ModelRegistry::DefaultModelRegistry
+      end
+    end
+  end
+end

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

@@ -109,7 +109,9 @@ module Olivander
         end
 
         def build_routes(mapper)
+          Rails.logger.info "building routes..."
           build_resource_routes(mapper)
+          Rails.logger.info "...routes built"
         end
 
         def set_controller_and_helper(a)
@@ -121,6 +123,7 @@ module Olivander
 
         def build_resource_routes(mapper)
           resources.keys.each do |k|
+            before_routes = Rails.application.routes.named_routes.helper_names
             r = resources[k]
             mapper.resources r.model, only: [] do
               mapper.collection do
@@ -157,6 +160,10 @@ module Olivander
                 end
               end
             end
+            after_routes = Rails.application.routes.named_routes.helper_names
+            net_routes = after_routes - before_routes
+            # Rails.logger.info "added these route helpers:\n#{net_routes}"
+            # binding.pry if k == :projects
           end
         end
       end

data/app/datatables/olivander/datatable.rb

@@ -41,6 +41,17 @@ module Olivander
         column_attributes.each do |key|
           label = field_label_for(klazz, key)
           sym = key.gsub('_id', '')
+
+          # modifiers = STRIP OFF ANY PUNCTUATION MARKS
+          # modifiers.each do |modifier|
+          #   case !:
+          #     visible = false
+          #   case $:
+          #     type = currency
+          #   end
+          # end
+
+
           visible = show.include?(key) || !(default_hidden.include?(key) || hide.include?(key))
           if link_path.present? && sym == :id
             link_col sym, link_path, 'id', visible: visible

data/app/helpers/olivander/application_helper.rb

@@ -91,7 +91,7 @@ module Olivander
     end
 
     def sidebar_context_name
-      [@context.name, sidebar_context_suffix&.upcase].reject(&:blank?).join(' ')
+      [@context.name, sidebar_context_suffix&.upcase].reject{ |x| x.blank? or x == 'PRODUCTION' }.join(' ')
     end
 
     def sidebar_context_suffix

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.29'.freeze
+  VERSION = '0.1.2.30'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.29
+  version: 0.1.2.30
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -193,6 +193,8 @@ files:
 - app/components/olivander/components/small_box_component.html.haml
 - app/components/olivander/components/small_box_component.rb
 - app/controllers/concerns/olivander/resources/auto_form_attributes.rb
+- app/controllers/concerns/olivander/resources/model_registrar.rb
+- app/controllers/concerns/olivander/resources/model_registry.rb
 - app/controllers/concerns/olivander/resources/route_builder.rb
 - app/controllers/olivander/application_controller.rb
 - app/datatables/olivander/datatable.rb