lotus_admin 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da3c2c63c60b091d7fe7fccaf1b1ef3282d152aaa191b141c0192b7bb8045d8
-  data.tar.gz: a4c88154204fbf234e7ee29ae03866db5fed7b3a3ade921624fbe6a234a7214e
+  metadata.gz: 3f1b026cfd1e070c4d1a0fff64c4d0214818a713c9cfbfaed3a0a476d870321e
+  data.tar.gz: cbe3427768813ca6c7c7df6a97bbf6b2a599a2904e1a1c91f3c3c89781a9a56b
 SHA512:
-  metadata.gz: 0d73ca1d470aab9dda188eeaa1352cd00e7cf079cd4d52bdc35e78543575c5ee78071210fb7af4e8f106788679e945226e7238cebb002ea98ae02bcd74dcbbea
-  data.tar.gz: febc6e4b7f3438873edc38507589a32539edf33bcbeee2268b2b2f192517bb38fad084cfe8ae8bb9d778e12d8aeca4855cf6db88b599de5513251dfd42cb3013
+  metadata.gz: 644eeb24a1917d4ce1cc6ee9385151b6e059f409a0618fc751b88f5476ffd2aa7bf669c050c6abd17f946b30a53cf017d76a16b3cbb4deac3f51e404abac4522
+  data.tar.gz: fbb8c7db19e309b90fed1d44ebc8697cba74420a043560f7a4a2450adbb8c6108e0cea5f06aaa8e888a8836a5bc04f83383050afd7a894fc42e303ad7dbddc3b

data/app/assets/stylesheets/lotus_admin/components/_all.scss

@@ -1,4 +1,5 @@
 @import "lotus_admin/components/alerts";
+@import "lotus_admin/components/badges";
 @import "lotus_admin/components/datepicker";
 @import "lotus_admin/components/devise";
 @import "lotus_admin/components/filters";

data/app/assets/stylesheets/lotus_admin/components/_badges.scss

@@ -0,0 +1,23 @@
+.badge {
+  background-color: $app-gray;
+
+  &.badge-primary {
+    background-color: $brand-primary;
+  }
+
+  &.badge-success {
+    background-color: $brand-success;
+  }
+
+  &.badge-info {
+    background-color: $brand-info;
+  }
+
+  &.badge-warning {
+    background-color: $brand-warning;
+  }
+
+  &.badge-error {
+    background-color: $brand-danger;
+  }
+}

data/app/controllers/concerns/lotus_admin/decorations.rb

@@ -0,0 +1,29 @@
+module LotusAdmin
+  module Decorations
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def decorates_with(decorator_class_or_name)
+        self._decorator_class_name = decorator_class_or_name.to_s
+      end
+    end
+
+    included do
+      class_attribute :_decorator_class_name, instance_accessor: false
+
+      let(:collection) do
+        if self.class._decorator_class_name.present?
+          self.class._decorator_class_name.constantize.decorate_collection(end_of_association_chain)
+        else
+          end_of_association_chain
+        end
+      end
+
+      let(:decorated_resource) do
+        if self.class._decorator_class_name.present?
+          self.class._decorator_class_name.constantize.decorate(resource)
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/lotus_admin/filterable_controller.rb

@@ -18,7 +18,6 @@ module LotusAdmin
 
       let(:filters_enabled?) { self.class.filters_enabled }
       let(:ransack_object) { instance_exec(&self.class._beginning_of_scope_chain).ransack(params[:q]) }
-      let(:collection) { paginate(ransack_object.result) }
     end
 
     class_methods do
@@ -36,5 +35,11 @@ module LotusAdmin
         self._beginning_of_scope_chain = block
       end
     end
+
+    private
+
+    def end_of_association_chain
+      paginate(ransack_object.result)
+    end
   end
 end

data/app/controllers/lotus_admin/authenticated_controller.rb

@@ -3,6 +3,7 @@ class LotusAdmin::AuthenticatedController < LotusAdmin::ApplicationController
   include LotusAdmin::FilterableController
   include LotusAdmin::ResourcefulController
   include LotusAdmin::FileStreamer
+  include LotusAdmin::Decorations
 
   before_action :authenticate_administrator!
   around_action :use_user_time_zone, if: :administrator_signed_in?

data/app/decorators/lotus_admin/application_decorator.rb

@@ -0,0 +1,11 @@
+class LotusAdmin::ApplicationDecorator < Draper::Decorator
+  def self.collection_decorator_class
+    LotusAdmin::PaginatingDecorator
+  end
+
+  private
+
+  def badge(content, type:)
+    h.content_tag(:span, content, class: "badge #{ type }")
+  end
+end

data/app/decorators/lotus_admin/paginating_decorator.rb

@@ -0,0 +1,3 @@
+class LotusAdmin::PaginatingDecorator < Draper::CollectionDecorator
+  delegate :current_page, :total_pages, :limit_value, :entry_name, :total_count, :offset_value, :last_page?
+end

data/lib/lotus_admin/version.rb

@@ -1,3 +1,3 @@
 module LotusAdmin
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

data/lib/lotus_admin.rb

@@ -17,6 +17,7 @@ require 'jquery-rails'
 require 'page_title_helper'
 require 'kaminari'
 require 'ransack'
+require 'draper'
 
 require 'lotus_admin/configuration'
 require 'lotus_admin/form_builder'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus_admin
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Matt Millsaps-Brewer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -226,6 +226,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: draper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -343,11 +357,13 @@ files:
 - app/assets/stylesheets/lotus_admin/application.css.scss
 - app/assets/stylesheets/lotus_admin/components/_alerts.scss
 - app/assets/stylesheets/lotus_admin/components/_all.scss
+- app/assets/stylesheets/lotus_admin/components/_badges.scss
 - app/assets/stylesheets/lotus_admin/components/_datepicker.scss
 - app/assets/stylesheets/lotus_admin/components/_devise.scss
 - app/assets/stylesheets/lotus_admin/components/_filters.scss
 - app/assets/stylesheets/lotus_admin/components/_forms.scss
 - app/assets/stylesheets/lotus_admin/components/_tables.scss
+- app/controllers/concerns/lotus_admin/decorations.rb
 - app/controllers/concerns/lotus_admin/devise_controllers.rb
 - app/controllers/concerns/lotus_admin/exposure.rb
 - app/controllers/concerns/lotus_admin/file_streamer.rb
@@ -363,6 +379,8 @@ files:
 - app/controllers/lotus_admin/resource_controller.rb
 - app/controllers/lotus_admin/sessions_controller.rb
 - app/controllers/lotus_admin/users_controller.rb
+- app/decorators/lotus_admin/application_decorator.rb
+- app/decorators/lotus_admin/paginating_decorator.rb
 - app/helpers/lotus_admin/application_helper.rb
 - app/helpers/lotus_admin/filter_helpers.rb
 - app/helpers/lotus_admin/form_helpers.rb