five-two-nw-olivander 0.1.2.2 → 0.1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44fe284f2bfe724fd9afc389fe29459b92d7358bd2db4bbcc834c575b4defb89
-  data.tar.gz: 19de553ddc1641dea2af0b12e41a9c9c4459470972205227d106d6cc61f5660e
+  metadata.gz: 597764e454652e4a42b1d81c7d63db17f9495a662886fd9184c7fc3790d16c75
+  data.tar.gz: faa979538cb5fa01390a65e0378054b3f916b3f3630ac45e586ff64fb43e9ffa
 SHA512:
-  metadata.gz: 29b8d4a75d6680a5283562bcd52e746a74c21cff1b9f0ed6982d6132c05cafc28659343a5f9ed6d18de437c36bb08a9966ba21cf6cd873c98028137785b59358
-  data.tar.gz: b698a84298b468c808c630332a19e90f8061b4f8ef232324a8c890e15fa5c0cd5c6d2adbc0408085dcfce1e2334a69d98a811f4ab8f4d405eda5eea55392ceb6
+  metadata.gz: b1d0847e4694082bcbf22f3717f4ea551f1144697b51e809539118402f347e46158767a8fdca8eab49b1262dde97e09ad964f8722b0d3701cfbfe3789478da34
+  data.tar.gz: 92df52efda623339deb45a35ad86c5a52e0205ba5eb49e71aa70d5683eb2df079825531407f58634c0970c0a6802b8c62081e6c910fdedd494dec4a88fbd90a6

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

@@ -0,0 +1,13 @@
+module Olivander
+  module Resources
+    module AutoFormAttributes
+      extend ActiveSupport::Concern
+
+      included do
+        def auto_form_attributes
+          attributes.keys - ['updated_at', 'created_at', 'deleted_at']
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,129 @@
+module Olivander
+  module Resources
+    class ResourceAction
+      attr_accessor :sym, :action, :verb, :confirm, :turbo_frame, :collection, :controller, :crud_action, :show_in_form, :show_in_datatable, :no_route
+
+      def initialize(sym, action: nil, controller: nil, verb: :get, confirm: false, turbo_frame: nil, collection: false, crud_action: false,
+                     show_in_form: true, show_in_datatable: true, no_route: false)
+        self.sym = sym
+        self.action = action || sym
+        self.controller = controller
+        self.verb = verb
+        self.confirm = confirm
+        self.turbo_frame = turbo_frame
+        self.collection = collection
+        self.crud_action = crud_action
+        self.show_in_form = show_in_form
+        self.show_in_datatable = show_in_datatable
+        self.no_route = no_route
+      end
+    end
+
+    class RoutedResource
+      attr_accessor :model, :actions
+
+      def initialize(model, crud_actions)
+        self.model = model
+        self.actions = []
+        crud_actions.each do |ca|
+          actions << ResourceAction.new(ca, controller: model, crud_action: true)
+        end
+      end
+
+      def crud_actions
+        actions.select{ |x| x.crud_action }
+      end
+
+      def additional_actions
+        actions.select{ |x| !x.crud_action }
+      end
+
+      def member_actions
+        additional_actions.select{ |x| !x.collection }
+      end
+
+      def collection_actions
+        additional_actions.select{ |x| x.collection }
+      end
+
+      def datatable_bulk_actions
+        collection_actions.select{ |x| x.show_in_datatable }
+      end
+
+      def unpersisted_crud_actions
+        allowed = %i[index new]
+        crud_actions.select{ |x| allowed.include?(x.sym) }
+      end
+
+      def persisted_crud_actions
+        allowed = %i[show edit destroy]
+        crud_actions.select{ |x| allowed.include?(x.sym) }
+      end
+    end
+
+    module RouteBuilder
+      extend ActiveSupport::Concern
+
+      DEFAULT_CRUD_ACTIONS = %i[index new create show edit update destroy]
+
+      included do
+        class_attribute :resources, default: {}
+        class_attribute :current_resource
+      end
+
+      class_methods do
+        def resource(model, only: DEFAULT_CRUD_ACTIONS, except: [], &block)
+          self.current_resource = RoutedResource.new(model, DEFAULT_CRUD_ACTIONS & (only - except))
+          yield if block_given?
+          resources[model] = current_resource
+          self.current_resource = nil
+        end
+
+        def action(sym, verb: :get, confirm: false, turbo_frame: nil, collection: false, show_in_datatable: true, show_in_form: true, no_route: false, controller: nil, action: nil)
+          raise 'Must be invoked in a resource block' unless current_resource.present?
+
+          controller ||= current_resource.model
+          current_resource.actions << ResourceAction.new(
+            sym, action: action, controller: controller, verb: verb, confirm: confirm, turbo_frame: turbo_frame, collection: collection,
+            show_in_datatable: show_in_datatable, show_in_form: show_in_form, no_route: no_route
+          )
+        end
+
+        def build_routes(mapper)
+          build_resource_routes(mapper)
+        end
+
+        def build_resource_routes(mapper)
+          resources.keys.each do |k|
+            r = resources[k]
+            mapper.resources r.model, only: r.crud_actions.map{ |ca| ca.action } do
+              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}"
+                    mapper.post ma.action
+                  else
+                    mapper.send(ma.verb, ma.action)
+                  end
+                end
+              end
+
+              mapper.collection do
+                r.collection_actions.each do |ba|
+                  next if ba.no_route
+                  if ba.confirm
+                    mapper.get ba.action, action: "confirm_#{ba.action}"
+                    mapper.post ba.action
+                  else
+                    mapper.send(ma.verb, ba.action)
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/helpers/olivander/application_helper.rb

@@ -16,5 +16,22 @@ module Olivander
     def user_image_path(user)
       "avatar#{SecureRandom.random_number(4)}.png"
     end
+
+    def authorized_resource_actions(resource, for_action: :show)
+      plural_name = resource.is_a?(Class) ? resource.table_name : resource.class.table_name
+      routed_resource = @context.route_builder.resources[plural_name.to_sym]
+      actions = resource.is_a?(Class) ?
+        (routed_resource.unpersisted_crud_actions | routed_resource.collection_actions) : 
+        (resource.persisted? ? (routed_resource.persisted_crud_actions | routed_resource.member_actions): [])
+      actions.reject{ |a| a.sym == for_action }
+    end
+
+    def resource_form_actions(resource, for_action: :show)
+      [].tap do |output|
+        authorized_resource_actions(resource, for_action: for_action).select{ |x| x.show_in_form }.each do |a|
+          output << link_to(a.sym, {controller: a.controller, action: a.action}, method: a.verb, class: 'btn btn-primary', data: { turbo: true })
+        end
+      end.join('&nbsp;').html_safe
+    end
   end
 end

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

@@ -0,0 +1,17 @@
+- read_only = action_name != 'edit'
+= simple_form_for(@resource) do |f|
+  .card
+    .card-header
+      .card-tools
+        = resource_form_actions(@resource, for_action: action_name.to_sym)
+    .card-body
+      =f.error_notification
+      =f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present?
+      - @resource.auto_form_attributes.each do |a|
+        .row
+          .col-12
+            = f.input a, disabled: read_only
+    .card-footer.text-right
+      = link_to 'Cancel', @_effective_resource.action_path(:index), class: 'btn btn-secondary'
+      - unless read_only
+        = f.button :submit, class: 'btn btn-primary'

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

@@ -3,9 +3,5 @@
 
 - if @resource
   .row
-    .col-8
-      %h1= @page_title
-    .col-4.text-right
-      = render_resource_buttons(@resource, edit: false)
-
-  = render_resource_form(@resource)
+    .col-12
+      = render_resource_form(@resource)

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

@@ -4,7 +4,9 @@
   .col-12
     .card
       .card-header
-        %h1= @page_title
+        %h3.card-title= @page_title
+        .card-tools
+          = resource_form_actions(resource.klass, for_action: :index)
       .card-body
         - if @datatable
           = render_datatable(@datatable)
@@ -19,6 +21,5 @@
           %p effective_resources index view is not sure what to render.
           %p Define an @datatable, @#{resource.try(:plural_name) || 'a plural'}, or @#{resource.try(:name) || 'a singular'}.
           %p or include Effective::CrudController in your controller
-      .card-footer
-        = render_resource_buttons(resource.klass, (action ||= :index) => false)
+      -# .card-footer
 

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

@@ -2,10 +2,4 @@
 - @resource = instance_variable_get('@' + resource.name) if resource.name
 
 - if @resource
-  .row
-    .col-8
-      %h1= @page_title
-    .col-4.text-right
-      = render_resource_buttons(@resource)
-
   = render_resource_form(@resource)

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

@@ -3,12 +3,6 @@
 
 - if @resource
   .row
-    .col-8
-      %h1= @page_title
-    .col-4.text-right
-      = render_resource_buttons(@resource, show: false)
+    .col-12
+      = render_resource_form(@resource)
 
-  = render_resource_partial(@resource)
-
-.form-actions
-  = link_to 'Continue', (resource.action_path(:index) || root_path), class: 'btn btn-primary'

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -0,0 +1,3 @@
+= dropdown(variation: :dropleft, btn_class: btn_class) do
+  - authorized_resource_actions(resource, for_action: action_name).select{ |x| x.show_in_datatable }.each do |a|
+    = dropdown_link_to a.sym, { controller: a.controller, action: a.action, id: resource.id }

data/app/views/layouts/olivander/adminlte/_head.html.haml

@@ -8,4 +8,4 @@
   = javascript_include_tag "https://www.gstatic.com/charts/loader.js"
   = stylesheet_link_tag "adminlte", "data-turbo-track": "reload"
   = javascript_include_tag "adminlte", "data-turbo-track": "reload"
-  -# = javascript_importmap_tags
+  = javascript_importmap_tags

data/app/views/layouts/olivander/adminlte/_sidebar.html.haml

@@ -24,3 +24,38 @@
       %ul.nav.nav-pills.nav-sidebar.nav-compact.flex-column{"data-accordion" => "false", "data-widget" => "treeview", :role => "menu"}
         - @context.menu_items.each do |menu_item|
           = render Olivander::Components::MenuItemComponent.new(menu_item)
+
+
+:javascript
+  $(document).ready(function(){
+    function getUrl() {
+      const reg = /\/new|\/[0-9]+[\/edit]*/,
+            url = "" + window.location;
+      return url.replace(reg, '');
+    }
+    const url = getUrl();
+
+    $('ul.nav-sidebar a').filter(function() {
+      return this.href == url;
+    }).addClass('active');
+
+    $('ul.nav-sidebar a').filter(function() {
+      return this.href == url;
+    }).parent().addClass('active');
+
+    $('ul.nav-treeview a').filter(function() {
+      return this.href == url;
+    }).parentsUntil(".sidebar-menu > .nav-treeview").addClass('menu-open');
+
+    $('ul.nav-treeview a').filter(function() {
+      return this.href == url;
+    }).addClass('active');
+
+    $('li.has-treeview a').filter(function() {
+      return this.href == url;
+    }).addClass('active');
+
+    $('ul.nav-treeview a').filter(function() {
+      return this.href == url;
+    }).parentsUntil(".sidebar-menu > .nav-treeview").children(0).addClass('active');
+  });

data/lib/olivander/application_context.rb

@@ -1,6 +1,6 @@
 module Olivander
   class ApplicationContext
-    attr_accessor :name, :logo, :company, :menu_items
+    attr_accessor :name, :logo, :company, :menu_items, :route_builder
 
     def self.default
       ctx = ApplicationContext.new

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.2"
+  VERSION = "0.1.2.3"
 end

data/lib/templates/erb/scaffold/_form.html.haml

@@ -0,0 +1,8 @@
+= simple_form_for(@resource) do |f|
+  =f.error_notification}
+  =f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present?}
+  .form-inputs
+    - attributes.each do |attribute|
+      = f.send(attribute.reference? ? :association : :input, attribute.name)
+  .form-actions
+    = f.button :submit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.2
+  version: 0.1.2.3
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-03 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -171,21 +171,21 @@ files:
 - app/assets/stylesheets/olivander/application.css
 - app/components/olivander/components/menu_item_component.html.haml
 - app/components/olivander/components/menu_item_component.rb
+- app/controllers/concerns/olivander/resources/auto_form_attributes.rb
+- app/controllers/concerns/olivander/resources/route_builder.rb
 - app/controllers/olivander/application_controller.rb
-- app/controllers/olivander/resources/crud_chain.rb
-- app/controllers/olivander/resources/crud_controller.rb
-- app/controllers/olivander/resources/default_crud_chain.rb
-- app/controllers/olivander/test_controller.rb
 - app/datatables/olivander/datatable.rb
 - app/datatables/test_datatable.rb
 - app/helpers/olivander/application_helper.rb
 - app/jobs/olivander/application_job.rb
 - app/mailers/olivander/application_mailer.rb
 - app/models/olivander/application_record.rb
+- app/views/application/_form.html.haml
 - app/views/application/edit.html.haml
 - app/views/application/index.html.haml
 - app/views/application/new.html.haml
 - app/views/application/show.html.haml
+- app/views/effective/resource/_actions_dropleft.html.haml
 - app/views/layouts/olivander/adminlte/_content.html.haml
 - app/views/layouts/olivander/adminlte/_content_kanban.html.haml
 - app/views/layouts/olivander/adminlte/_control_sidebar.html.haml
@@ -210,7 +210,7 @@ files:
 - lib/olivander/menus/menu_item.rb
 - lib/olivander/version.rb
 - lib/tasks/olivander_tasks.rake
-- lib/templates/erb/scaffold/_form.html.erb
+- lib/templates/erb/scaffold/_form.html.haml
 homepage: https://rubygems.org/gems/olivander
 licenses:
 - MIT

data/app/controllers/olivander/resources/crud_chain.rb

@@ -1,119 +0,0 @@
-module Olivander
-  module Resources
-    class CrudChain
-      attr_accessor :controller
-
-      def initialize(controller)
-        @controller = controller
-      end
-
-      def links
-        @links ||= {
-          authorize_action: nil,
-          before_load: nil, load_resource: nil, after_load: nil,
-          authorize_resource: nil,
-          before_assign: nil, assign: nil, after_assign: nil,
-          update_if: nil,
-          before_update: nil, update: nil, after_update: nil,
-          update_success: nil, update_failure: nil,
-          render_success: nil, render_failure: nil
-        }
-      end
-
-      def on(chain_link, &block)
-        raise "Invalid Link: #{chain_link}" unless links.keys.include?(chain_link)
-
-        links[chain_link] = block
-        self
-      end
-
-      def skip_load
-        clear_keys(%i[before_load load_resource after_load])
-        self
-      end
-
-      def skip_assign
-        clear_keys(%i[before_assign assign after_assign])
-        self
-      end
-
-      def skip_update
-        update_if { false }
-        self
-      end
-
-      def skip_render
-        clear_keys(%i[render_success render_failure])
-        self
-      end
-
-      def execute
-        execute_link_keys(%i[authorize_action before_load load_resource after_load authorize_resource before_assign assign after_assign])
-        success = perform_update
-        # we may not do any update - in which case we assume success
-        success = true if success.nil?
-        execute_link_key(success ? :render_success : :render_failure)
-        success
-      end
-
-      # def self.test
-      #   CrudChain.new('string')
-      #            .before_load { puts "we did a before load from within this action: #{self}" }
-      #            .before_update { puts "we are doing a before_update on a controller named: #{self.class.name}" }
-      #            .execute
-      # end
-
-      def clear_keys(keys)
-        keys.each { |k| clear_key(k) }
-      end
-
-      def clear_keys_except(keys)
-        (links.keys - keys).each { |k| clear_key(k) }
-      end
-
-      def clear_key(key)
-        links[key] = nil
-      end
-
-      private
-
-      def perform_update
-        perform_update = execute_link_key(:update_if)
-        perform_update = true if perform_update.nil?
-        return false unless perform_update
-
-        execute_link_key(:before_update) 
-        success = execute_link_key(:update)
-        execute_link_key(:after_update)
-        execute_link_key(success ? :update_success : :update_failure)
-        success
-      end
-
-      def execute_link_keys(keys)
-        keys.each do |k|
-          execute_link_key(k)
-        end
-      end
-
-      def execute_link_key(key)
-        block = links[key]
-        return if block.nil?
-
-        @controller.instance_exec(&block)
-      end
-
-      def respond_to_missing?(method_name, _include_private = false)
-        links.keys.include?(method_name.to_sym)
-      end
-
-      # syntax sugar to allow direct assignment of a chain link
-      def method_missing(m, *args, &block)
-        if respond_to_missing?(m)
-          send(:on, m, &block)
-        else
-          super
-        end
-      end
-    end
-  end
-end

data/app/controllers/olivander/resources/crud_controller.rb

@@ -1,55 +0,0 @@
-module Olivander
-  module Resources
-    module CrudController
-      def index
-        execute_crud_chain(crud_action: :index)
-      end
-
-      def new
-        execute_crud_chain(crud_action: :new)
-      end
-
-      def create
-        execute_crud_chain(crud_action: :create)
-      end
-
-      def show
-        execute_crud_chain(crud_action: :show)
-      end
-
-      def edit
-        execute_crud_chain(crud_action: :edit)
-      end
-
-      def update
-        execute_crud_chain(crud_action: :update)
-      end
-
-      def destroy
-        execute_crud_chain(crud_action: :destroy)
-      end
-
-      def execute_crud_chain(crud_action: action_name, only: [], skip: [], &block)
-        chain = default_crud_chain(crud_action)
-        chain.clear_keys_except(only) if only.size.positive?
-        chain.clear_keys(skip) if skip.size.positive?
-        yield(chain) if block_given?
-        chain.execute
-      end
-
-      def default_crud_chain(crud_action = '')
-        chain = Olivander::Resources::CrudChain.new(self)
-        chain.links.keys.each do |k|
-          method_name = "crud_chain_#{crud_action}_#{k}"
-          method_name = "crud_chain_#{k}" unless respond_to?(method_name)
-          next unless respond_to?(method_name)
-
-          chain.on(k) do
-            send(method_name)
-          end
-        end
-        chain
-      end
-    end
-  end
-end

data/app/controllers/olivander/resources/default_crud_chain.rb

@@ -1,48 +0,0 @@
-module Olivander
-  module Resources
-    module DefaultCrudChain
-      def crud_chain_index_authorize_action
-        puts 'default crud chain: index_authorize_action'
-      end
-
-      def crud_chain_index_load_resource
-        puts 'default crud chain: index_load_resource'
-      end
-
-      def crud_chain_load_resource
-        puts 'default crud chain: load_resource'
-      end
-
-      def crud_chain_authorize_resource
-        raise 'Unauthorized' unless true
-        puts 'default crud chain: authorize_resource'
-      end
-
-      def crud_chain_assign
-        puts 'default crud chain: assign'
-      end
-
-      def crud_chain_update_if
-        puts 'default crud chain: update_if'
-        return true if %w[create update destroy].include?(action_name)
-        return false if %w[index new show edit].include?(action_name)
-        return false if request.method == 'GET'
-
-        true
-      end
-
-      def crud_chain_update
-        puts 'default crud chain: update'
-        true
-      end
-
-      def crud_chain_render_success
-        puts 'default crud chain: render_success'
-      end
-
-      def crud_chain_render_failure
-        puts 'default crud chain: render_failure'
-      end
-    end
-  end
-end

data/app/controllers/olivander/test_controller.rb

@@ -1,35 +0,0 @@
-module Olivander
-  class TestController < ApplicationController
-    include Olivander::Resources::CrudController
-    include Olivander::Resources::DefaultCrudChain
-
-    def index
-      execute_crud_chain(crud_action: :index) do |c|
-        c.authorize_resource { puts 'block: authorize_resource'; true }
-         .update { puts 'block: update'; true }
-         .before_assign { puts 'block: before assign' }
-         .after_assign { puts 'block: after assign' }
-      end
-    end
-
-    # def crud_chain_update
-    #   puts 'controller: update'
-    # end
-
-    # def crud_chain_index_update
-    #   puts 'controller: index_update'
-    # end
-
-    # def crud_chain_before_load
-    #   puts 'controller: before_load'
-    # end
-
-    # def crud_chain_after_update
-    #   puts 'controller: after_update'
-    # end
-
-    # def crud_chain_index_after_update
-    #   puts 'controller: index_after_update'
-    # end
-  end
-end

data/lib/templates/erb/scaffold/_form.html.erb

@@ -1,15 +0,0 @@
-<%# frozen_string_literal: true %>
-<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
-  <%%= f.error_notification %>
-  <%%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
-
-  <div class="form-inputs">
-  <%- attributes.each do |attribute| -%>
-    <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
-  <%- end -%>
-  </div>
-
-  <div class="form-actions">
-    <%%= f.button :submit %>
-  </div>
-<%% end %>