effective_bootstrap 0.9.34 → 0.9.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58f7d739c4c9d00ead21293bee0bcceefbca0b57e8ac958bec112f5aadeee535
-  data.tar.gz: 9a069cd5fefdce47db3f69095fef7e0f8eed3829036c264bf1ee3c3b36f36f51
+  metadata.gz: b22f36af611b8928951e32da7674994739220cf189d8b1486359e58507a66bff
+  data.tar.gz: 884b64100e7d832a0ba995f6b0e14b1ac12e147e560b0a583cb40ea52dd57f69
 SHA512:
-  metadata.gz: 513dcea0768e7af3828d1742d0929e021b02ce7041ebbd5e24208a7a452f109ad62a8367bed9f851b01b43f5cc82d102bc6d7c680036333ee94eb9fbda743d66
-  data.tar.gz: 82c31a8d062c6070bdc6d146150f169757be27979a4d429218af739f7d45cba797a22e0e5ed11263eb3b920a02c68476e9269cbc80e50950fcba7363bbaac913
+  metadata.gz: 4ffe5bbd7785815688f74a8e0c3304438dff1d12f3213c20220e664f40c0d4f71fc37e06f09de4beb15994cc63ff2dd766c79a666b58353ce52b4919f57f7c2e
+  data.tar.gz: 28330b3adfa44c418270d85ace2339960d2664eb5d44fa56158a0ff23aea940648567a3422b7a6f81d5466a13bcab6a2549580bfc1ad53dd24135b4e9633a963

data/app/helpers/effective_bootstrap_helper.rb

@@ -10,7 +10,7 @@ module EffectiveBootstrapHelper
   def accordion(options = nil, &block)
     (options ||= {})[:class] = "accordion #{options.delete(:class)}".strip
 
-    id = "accordion-#{''.object_id}"
+    id = "accordion-#{effective_bootstrap_unique_id}"
 
     @_accordion_active = id
     content = content_tag(:div, capture(&block), options.merge(id: id))
@@ -62,7 +62,7 @@ module EffectiveBootstrapHelper
   def collapse(label, opts = {}, &block)
     raise 'expected a block' unless block_given?
 
-    id = "collapse-#{String.new.object_id}"
+    id = "collapse-#{effective_bootstrap_unique_id}"
     show = (opts.delete(:show) == true)
 
     link_opts = { 'data-toggle': 'collapse', role: 'button', href: "##{id}", 'aria-controls': "##{id}", 'aria-expanded': show }
@@ -259,7 +259,7 @@ module EffectiveBootstrapHelper
   def nav_dropdown(label, right: false, link_class: [], list_class: [], &block)
     raise 'expected a block' unless block_given?
 
-    id = "dropdown-#{''.object_id}"
+    id = "dropdown-#{effective_bootstrap_unique_id}"
 
     content_tag(:li, class: 'nav-item dropdown') do
       content_tag(:a, class: 'nav-link dropdown-toggle', href: '#', id: id, role: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) do
@@ -274,6 +274,52 @@ module EffectiveBootstrapHelper
     content_tag(:div, '', class: 'dropdown-divider')
   end
 
+  # Breadcrumb
+  #
+  # https://getbootstrap.com/docs/4.0/components/breadcrumb/
+  # Builds a breadcrumb based on the controller namespace, action and @page_title instance variable
+  #
+  def bootstrap_breadcrumb(root_title: nil, root_path: nil, index_title: nil, index_path: nil, page_title: nil)
+    effective_resource = (@_effective_resource || Effective::Resource.new(controller_path))
+    resource = instance_variable_get('@' + effective_resource.name) if effective_resource.name
+
+    root_title ||= 'Home'
+    root_path ||= '/'
+
+    index_title ||= controller.class.name.split('::').last.sub('Controller', '').titleize
+    index_path ||= effective_resource.action_path(:index) || request.path.split('/')[0...-1].join('/')
+
+    page_title ||= (@page_title || resource&.to_s || controller.action_name.titleize)
+
+    # Build items
+    # An array of arrays [[title, url]]
+    items = []
+
+    # Namespaces
+    Array(effective_resource.namespace).each do |namespace|
+      items << [namespace.titleize, '/' + namespace]
+    end
+
+    # Home
+    items << [root_title, '/'] unless items.present?
+
+    # Controller index action
+    items << [index_title, index_path] unless controller.action_name == 'index'
+
+    # Always
+    items << [page_title, nil]
+
+    # Now take items and turn them into breadcrumbs
+    content_tag(:ol, class: 'breadcrumb') do
+      (items[0...-1].map do |title, path|
+        content_tag(:li, link_to(title, path, title: title), class: 'breadcrumb-item')
+      end + items[-1..-1].map do |title, path|
+        content_tag(:li, title, class: 'breadcrumb-item active', 'aria-current': 'page')
+      end).join.html_safe
+    end
+  end
+
+
   # Pagination
   #
   # https://getbootstrap.com/docs/4.0/components/pagination/
@@ -390,7 +436,7 @@ module EffectiveBootstrapHelper
 
     @_tab_mode = :tablist
     @_tab_active = (active || :first)
-    @_tab_unique = ''.object_id if unique
+    @_tab_unique = effective_bootstrap_unique_id if unique
 
     content_tag(:ul, {class: 'nav nav-tabs', role: 'tablist'}.merge(list)) do
       yield # Yield to tab the first time
@@ -430,7 +476,7 @@ module EffectiveBootstrapHelper
 
     @_tab_mode = :tablist_vertical
     @_tab_active = (active || :first)
-    @_tab_unique = ''.object_id if unique
+    @_tab_unique = effective_bootstrap_unique_id if unique
 
     content_tag(:div, class: 'row border') do
       content_tag(:div, class: 'col-3 border-right') do
@@ -458,4 +504,15 @@ module EffectiveBootstrapHelper
     end
   end
 
+  def effective_bootstrap_unique_id
+    # Set the first unique value
+    @_effective_bootstrap_unique_id ||= Time.zone.now.to_i
+
+    # Everytime we access this function make a new one
+    @_effective_bootstrap_unique_id = @_effective_bootstrap_unique_id + 1
+
+    # Return the updated value
+    @_effective_bootstrap_unique_id
+  end
+
 end

data/app/models/effective/form_inputs/article_editor.rb

@@ -6,9 +6,9 @@ module Effective
       def self.defaults
         {
           active_storage: nil,
-          css: '/assets/article_editor/',
+          css: ['/assets/article_editor/arx-frame.min.css'],
           custom: {
-            css: ['/assets/application.css', '/assets/effective_bootstrap_article_editor.css']
+            css: ['/assets/effective_bootstrap_article_editor.css']
           },
           classes: {
             body: 'article-editor-body',
@@ -40,7 +40,7 @@ module Effective
               '12': 'col-sm-12'
             }
           },
-          plugins: ['blockcode', 'cellcolor', 'imageposition', 'imageresize', 'inlineformat', 'removeformat', 'reorder', 'style'],
+          plugins: ['blockcode', 'cellcolor', 'imageposition', 'imageresize', 'inlineformat', 'listitem', 'removeformat', 'reorder', 'style'],
           quote: {
             template: '<blockquote><p></p></blockquote>'
           },
@@ -75,7 +75,15 @@ module Effective
       end
 
       def input_js_options
-        self.class.defaults.merge(active_storage: active_storage)
+        self.class.defaults.merge(active_storage: active_storage, custom: { css: custom_css })
+      end
+
+      def custom_css
+        [
+          (@template.asset_pack_path('application.css') if @template.respond_to?(:asset_pack_path)),
+          (@template.asset_path('application.css') if @template.respond_to?(:asset_path)),
+          ('/assets/effective_bootstrap_article_editor.css')
+        ]
       end
 
       def active_storage

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.34'.freeze
+  VERSION = '0.9.38'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.34
+  version: 0.9.38
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails