trap 2.1 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d395d95cddb26cae5c79a136ae4ce809c51f0dda
-  data.tar.gz: 6d82661e8090caa4794f66ed6763fe71a9f356ad
+SHA256:
+  metadata.gz: 1ddfeac6f412bcc95002dd44fc9f5de6535412117a0da30fcfd02d88e2013de1
+  data.tar.gz: 3dd2db672921d36c84b5db1c0491df45dd4b706c024ab50fef81582562f08427
 SHA512:
-  metadata.gz: e269e6d919e53aa6c9b15d625844610d63c1ce0c31df09f8f61b5eebda646f89236309e2a6147c684cffc22bbd59b61684bed5abf8cc3ff7aca74567091a8235
-  data.tar.gz: 45fcbb7f40d2f8757bbfc6dd33893903e86f652fa64da583b9fdc02948fd83f4520e9f458878f06f5fe7710cb4e069f2680b4ef3f880299fba5bd23fcdfc8b2b
+  metadata.gz: 7b53dffe6731661c66022de323fbe23d6a1534811db8e7ccf4a19c7a9d609d3075659156ef57324770b5e56fb55e90aba044f51a83c700bfa17cbe8e5727432b
+  data.tar.gz: 1d0491949ec8f825a57071b2cc191827da4980cc161537817f2141e63ca1802ba745bb801d2856c2725a0389540cdb2b74c30fcbcb4bccc2b841526d5fc91587

data/.rubocop.yml

@@ -0,0 +1,12 @@
+Documentation:
+  Enabled: false
+Metrics/LineLength:
+  Max: 120
+Metrics/AbcSize:
+  Max: 18
+Style/ClassAndModuleChildren:
+  EnforcedStyle: compact
+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,7 +1,6 @@
 # Trap
 
-Bootstrap helpers. Bootstrap 4.x compatible.
-Use `trap 1.x` for Bootstrap 3.x compatible.
+Bootstrap helpers
 
 ## Installation
 
@@ -48,7 +47,7 @@ Using `menu_item` instead of
 </li>
 ```
 
-## For Bootstrap 3
+## For Bootstrap 
 
 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.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/lib/trap/helpers/bootstrap_helper.rb

@@ -1,16 +1,21 @@
+# 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?
+      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)
-    title = model.is_a?(Class) ? model.model_name.human.pluralize(:ru) : model
+  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
@@ -29,7 +34,7 @@ module BootstrapHelper
   private
 
   def is_active?(path, options = {})
-    :active if uri_state(path, options).in? [:active, :chosen]
+    :active if uri_state(path, options).in? %i[active chosen]
   end
 
   def uri_state(uri, options = {})
@@ -40,12 +45,12 @@ module BootstrapHelper
                   else
                     request.path
                   end
-    if !options[:method].nil? || !options["data-method"].nil?
+    if !options[:method].nil? || !options['data-method'].nil?
       :inactive
     elsif uri == request_uri || (options[:root] && (request_uri == '/') || (request_uri == root_url))
       :active
     else
-      if request_uri.start_with?(uri) and not(root)
+      if request_uri.start_with?(uri) && !root
         :chosen
       else
         :inactive

data/lib/trap/version.rb

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

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,15 +10,15 @@ 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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trap
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: '2.2'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -78,8 +79,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
 signing_key: 
 specification_version: 4
 summary: Bootstrap helpers