trap 2.2 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ddfeac6f412bcc95002dd44fc9f5de6535412117a0da30fcfd02d88e2013de1
-  data.tar.gz: 3dd2db672921d36c84b5db1c0491df45dd4b706c024ab50fef81582562f08427
+  metadata.gz: 49e62e1f47a818266ae94e494c0a1b00873f369cdd9551480151aab1e4efb02e
+  data.tar.gz: f53e3fceef11df36d09396aaf7053c162664e8198fc4993ef126da9715931a68
 SHA512:
-  metadata.gz: 7b53dffe6731661c66022de323fbe23d6a1534811db8e7ccf4a19c7a9d609d3075659156ef57324770b5e56fb55e90aba044f51a83c700bfa17cbe8e5727432b
-  data.tar.gz: 1d0491949ec8f825a57071b2cc191827da4980cc161537817f2141e63ca1802ba745bb801d2856c2725a0389540cdb2b74c30fcbcb4bccc2b841526d5fc91587
+  metadata.gz: 19f6220b141b43d97534f2bc25f56d0a85188d51742e9d55f385fccc894e3219bfbe283daa850ddd31fec26da62c67b99aa4f7aa3023c4351cba25d9416ea09c
+  data.tar.gz: 924996bce0caac8f7a6cea9339da5a08974b462a458b7e40263164d1d6cc44b52c60dfa67ca2f383abe4ce33a94e552ea902ab991e225cd970916d2a81f3a269

data/.rubocop.yml

@@ -2,10 +2,12 @@ Documentation:
   Enabled: false
 Metrics/LineLength:
   Max: 120
+Metrics/BlockLength:
+  Enabled: false
+  Include:
+    - spec/
 Metrics/AbcSize:
   Max: 18
-Style/ClassAndModuleChildren:
-  EnforcedStyle: compact
 Layout/ArgumentAlignment:
   EnforcedStyle: with_fixed_indentation
 AllCops:

data/README.md

@@ -1,6 +1,7 @@
 # Trap
 
-Bootstrap helpers
+Bootstrap helpers. Bootstrap 4.x compatible.
+Use `trap 1.x` for Bootstrap 3.x compatible.
 
 ## Installation
 
@@ -47,7 +48,7 @@ Using `menu_item` instead of
 </li>
 ```
 
-## For Bootstrap 
+## For Bootstrap 3
 
 You should use `trap-1.x` versions to include Bootstrap 3. Contributing to `bootstrap-3` branch.
 

data/lib/trap/helpers/bootstrap_helper.rb

@@ -5,7 +5,7 @@ module BootstrapHelper
     path = name || path if block_given?
     options = args.extract_options!
     options[:class] = [options[:class], 'nav-link'].join(' ')
-    content_tag :li, class: "nav-item #{is_active?(path, options)}" do
+    content_tag :li, class: "nav-item #{active?(path, options)}" do
       if block_given?
         name = path
         path = options
@@ -17,23 +17,35 @@ module BootstrapHelper
   def model_menu_item(model:, route:, icon: nil, number: nil, pluralize: nil)
     title = model.is_a?(Class) ? (pluralize || model.model_name.human.pluralize(:ru)) : model
     if icon
-      menu_item route do
-        concat icon_element icon
-        concat ' '
-        concat title
-        if number && number != 0
-          concat ' '
-          concat(content_tag(:span, number.to_s, class: 'badge danger'))
-        end
-      end
+      build_menu_item_with_icon route: route, icon: icon, number: number, title: title
     else
       menu_item title, route
     end
   end
 
+  def dropdown(text, icon = nil, &block)
+    content_tag :li, class: 'nav-item dropdown' do
+      build_a_tag_for_dropdown text: text, icon: icon, &block
+    end
+  end
+
+  def dropdown_item(text, link)
+    link_to(text, link, class: 'dropdown-item')
+  end
+
+  def dropdown_model_item(model:, route:, pluralize: nil)
+    title = pluralize || model.model_name.human.pluralize(:ru)
+    dropdown_item title, route
+  end
+
+  def dropdown_divider
+    content_tag(:div, class: 'dropdown-divider') do
+    end
+  end
+
   private
 
-  def is_active?(path, options = {})
+  def active?(path, options = {})
     :active if uri_state(path, options).in? %i[active chosen]
   end
 
@@ -45,16 +57,59 @@ module BootstrapHelper
                   else
                     request.path
                   end
-    if !options[:method].nil? || !options['data-method'].nil?
+    active_uri_state options: options, uri: uri, request_uri: request_uri, root_url: root_url, root: root
+  end
+
+  def build_menu_item_with_icon(route:, icon:, title:, number:)
+    menu_item route do
+      concat icon_element icon
+      concat ' '
+      concat title
+      if number && number != 0
+        concat ' '
+        concat(content_tag(:span, number.to_s, class: 'badge danger'))
+      end
+    end
+  end
+
+  def build_a_tag_for_dropdown(text:, icon:, &block)
+    concat(link_to('#', **dropdown_link_attributes(text)) do
+      if icon
+        concat content_tag :span, '', class: "glyphicon glyphicon-#{icon}"
+        concat ' '
+      end
+      concat text
+    end)
+    concat(content_tag(:div, class: 'dropdown-menu', aria: { labelledby: text }) do
+      yield(block)
+    end)
+  end
+
+  def dropdown_link_attributes(text)
+    {
+      class: 'nav-link dropdown-toggle',
+      id: text,
+      role: :button,
+      data: { toggle: :dropdown },
+      aria: { haspopup: true, expanded: false }
+    }
+  end
+
+  def active_uri_state(options:, uri:, request_uri:, root_url:, root:)
+    if uri_state_is_inactive?(options: options)
       :inactive
-    elsif uri == request_uri || (options[:root] && (request_uri == '/') || (request_uri == root_url))
+    elsif uri_state_is_active?(request_uri: request_uri, options: options, root_url: root_url, uri: uri)
       :active
     else
-      if request_uri.start_with?(uri) && !root
-        :chosen
-      else
-        :inactive
-      end
+      request_uri.start_with?(uri) && !root ? :chosen : :inactive
     end
   end
+
+  def uri_state_is_inactive?(options:)
+    !options[:method].nil? || !options['data-method'].nil?
+  end
+
+  def uri_state_is_active?(request_uri:, options:, root_url:, uri:)
+    uri == request_uri || (options[:root] && (request_uri == '/') || (request_uri == root_url))
+  end
 end

data/lib/trap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Trap
-  VERSION = '2.2'
+  VERSION = '3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trap
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: '3.0'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler