trap 2.0 → 4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1d9c932c31ecce9f96dbb36a22ccc91d4462164b
-  data.tar.gz: 1882e7b6bfb7fb0daff4bfbf1f213b7156d48345
+SHA256:
+  metadata.gz: cf16945c4f212f6aef573445c4070d9e9c916250fcd25144fb1457e5608ce6e8
+  data.tar.gz: 9a7b52dcce3532f7bb0f4c7bb82a93e677ee67f93227071e01a127f3cbefe33a
 SHA512:
-  metadata.gz: dffe666a921e2970f67a63892124eedba40089fe71e474f484acc91f1697e061f0e47c7e60129d4ed1139039dae095f111e10a058080585e3a1db47172650530
-  data.tar.gz: f01b4e13fc51c051c6be787ef56e5d958f4e3223b5925a8422e9be56bbcf13aef7fca6faf33cae09fef2821ccd23a40c18ed220f7562d504d472fd2f96cf4ad5
+  metadata.gz: 88e6015b3fb23d6ea8cac7e240c48409139dd573ba8e4950428f1cc4a0898ffc8eed51524b31288773798b609eee697960c4dd999d50ec818a4ea097cfdcc768
+  data.tar.gz: 58d341852ea440da9f7af1b6d64cd32b3065f1ba0ed90b5883b50867a9b549e676a98793c42de01d226ca5c2ddbdb10286baecb83c640804916cc88e796b3efb

data/.github/workflows/ruby.yml

@@ -0,0 +1,19 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-versions: 2.6.5, 2.7.0, 2.5.7, 2.4.9
+    - name: Build and test with Rake
+      run: |
+        gem install bundler -v '1.17.2'
+        bundle install --jobs 4 --retry 3
+        bundle exec rspec
+        rubocop

data/.rubocop.yml

@@ -0,0 +1,14 @@
+Documentation:
+  Enabled: false
+Metrics/LineLength:
+  Max: 120
+Metrics/BlockLength:
+  Enabled: false
+  Include:
+    - spec/
+Metrics/AbcSize:
+  Max: 18
+Layout/ArgumentAlignment:
+  EnforcedStyle: with_fixed_indentation
+AllCops:
+  TargetRubyVersion: 2.7

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in trap.gemspec

data/README.md

@@ -1,6 +1,8 @@
-# Trap
+# Trap [![Build Status](https://github.com/kalashnikovisme/trap/workflows/Ruby/badge.svg)](https://github.com/kalashnikovisme/trap/actions)
 
-Bootstrap helpers
+Bootstrap helpers. Bootstrap 4.x compatible.
+
+Use `trap 1.x` for Bootstrap 3.x compatible.
 
 ## Installation
 
@@ -28,7 +30,9 @@ module ApplicationHelper
 end
 ```
 
-List of methods you can use with Trap:
+## List of methods you can use with Trap
+
+### Menu items
 
 * menu_item
 Bootstrap navbar item
@@ -47,7 +51,25 @@ Using `menu_item` instead of
 </li>
 ```
 
-## For Bootstrap 
+* model_menu_item
+Bootstrap navbar item based on ActiveRecord
+
+```erb
+<%= model_menu_item model:, route:, icon:, number:, pluralize: %>
+```
+
+### Dropdown
+
+You can create dropdowns with something like this:
+
+```ruby
+= dropdown t("admin.navbar.links.#{item.keys.first}") do
+  = dropdown_item text, link
+  = dropdown_divider
+  = dropdown_model_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
+```
+
+## For Bootstrap 3
 
 You should use `trap-1.x` versions to include Bootstrap 3. Contributing to `bootstrap-3` branch.
 

data/Rakefile

@@ -1,2 +1,3 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
+require 'bundler/gem_tasks'

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "trap"
+require 'bundler/setup'
+require 'trap'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "trap"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/lib/trap/helpers/bootstrap_helper.rb

@@ -1,18 +1,52 @@
+# frozen_string_literal: true
+
 module BootstrapHelper
   def menu_item(name = nil, path = '#', *args, &block)
     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
-      name, path = path, options if block_given?
+    content_tag :li, class: "nav-item #{active?(path, options)}" do
+      if block_given?
+        name = path
+        path = options
+      end
       link_to name, path, options, &block
     end
   end
 
+  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
+      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 = {})
-    :active if uri_state(path, options).in? [:active, :chosen]
+  def active?(path, options = {})
+    :active if uri_state(path, options).in? %i[active chosen]
   end
 
   def uri_state(uri, options = {})
@@ -23,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: { 'bs-toggle': :dropdown },
+      aria: { 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) and not(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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Trap
-  VERSION = '2.0'
+  VERSION = '4.0'
 end

data/lib/trap.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 require 'trap/version'
 require 'trap/helpers/bootstrap_helper'
 
-ActionView::Base.send :include, BootstrapHelper
+ActionView::Base.include BootstrapHelper

data/trap.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'trap/version'
 
@@ -9,16 +10,17 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Pavel Kalashnikov']
   spec.email         = ['kalashnikovisme@gmail.com']
 
-  spec.summary       = %q{Bootstrap helpers}
-  spec.description   = %q{Bootstrap helpers}
+  spec.summary       = 'Bootstrap helpers'
+  spec.description   = 'Bootstrap helpers'
   spec.homepage      = 'https://github.com/kalashnikovisme/trap'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib', 'app']
+  spec.require_paths = %w[lib app]
 
-  spec.add_development_dependency 'bundler', '>= 1.8'
   spec.add_development_dependency 'rake', '>= 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: trap
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '4.0'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: Bootstrap helpers
 email:
 - kalashnikovisme@gmail.com
@@ -45,7 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -78,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Bootstrap helpers