rails-menu-manager 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4e581b735d3ae2594071364e8a3d4bc9e61ff41b
-  data.tar.gz: d032d81ae6a24718579a8534f6b841e562f610a3
+SHA256:
+  metadata.gz: 1c40996b44142d644d0acde8336e987c0c642bbfcda7033269f18d7db368cb39
+  data.tar.gz: 96db0e2948e9a287df8b40c64b468c2d78de94a78d3f7b7a26e54730f491dcd1
 SHA512:
-  metadata.gz: 34fb992a4bb146cc75543e4f34c71fb22925e508a5cc4aeadbcb21d13f6b6be54b67a0548efcebd689eb8d4d52e7a413ee6679c910f9279f67a844ef549777e2
-  data.tar.gz: 48f8d6f2e67b154833a93f1962c3463eb386cc56bca4c2284c73658fe9e0176778fc398b1c60ae0e69485d8904283ad9c4635446c40029428394c73e3ea0cd3b
+  metadata.gz: 9bf5c7b24567ee069e0874dbf66f37a674c93da3bd09022a7e1c6cacb370f692120f8dd565c775596b2208c9d680dce607abb977db8a806c6ba3d523e8791dd2
+  data.tar.gz: b7c85acb10c0e7a9d58fbc6ffa86563e48cdf66e87f7ddf690b75550e028b818df69b748fb19312726f717ea6515b5528a2c830ce48e0093a4d6c9240c792845

data/.gitignore

@@ -1,9 +1,3 @@
-/.bundle/
-/.yardoc
+/.bundle
 /Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
+/pkg

data/.gitlab-ci.yml

@@ -0,0 +1,130 @@
+stages:
+  - build
+  - test
+  - codequality
+  - security
+
+build:
+  stage: build
+  image: ruby:2.6
+  script:
+    - gem install bundler --no-document
+    - bundle update
+  artifacts:
+    paths:
+      - Gemfile.lock
+
+.rspec: &rspec
+  stage: test
+  before_script:
+    - ruby -v
+    - echo "${RSPEC_RAILS_VERSION}"
+    - gem install bundler -v "~>${BUNDLER_VERSION:-2.0}" --no-document
+    - export BUNDLE_GEMFILE="spec/Gemfile"
+    - bundle install --jobs=$(nproc) --path="../cache/bundle"
+    - bundle list
+  script:
+    - bundle exec rake spec
+  cache:
+    key: "$CI_JOB_NAME"
+    paths:
+      - cache/
+
+rspec-ruby2.4-rails4.2:
+  <<: *rspec
+  image: ruby:2.4
+  variables:
+    BUNDLER_VERSION: '1.7'
+    RSPEC_RAILS_VERSION: '4.2'
+
+rspec-ruby2.5-rails4.2:
+  <<: *rspec
+  image: ruby:2.5
+  variables:
+    BUNDLER_VERSION: '1.7'
+    RSPEC_RAILS_VERSION: '4.2'
+
+rspec-ruby2.4-rails5.0:
+  <<: *rspec
+  image: ruby:2.4
+  variables:
+    RSPEC_RAILS_VERSION: '5.0'
+
+rspec-ruby2.5-rails5.0:
+  <<: *rspec
+  image: ruby:2.5
+  variables:
+    RSPEC_RAILS_VERSION: '5.0'
+
+rspec-ruby2.6-rails5.0:
+  <<: *rspec
+  image: ruby:2.6
+  variables:
+    RSPEC_RAILS_VERSION: '5.0'
+
+rspec-ruby2.4-rails5.1:
+  <<: *rspec
+  image: ruby:2.4
+  variables:
+    RSPEC_RAILS_VERSION: '5.1'
+
+rspec-ruby2.5-rails5.1:
+  <<: *rspec
+  image: ruby:2.5
+  variables:
+    RSPEC_RAILS_VERSION: '5.1'
+
+rspec-ruby2.6-rails5.1:
+  <<: *rspec
+  image: ruby:2.6
+  variables:
+    RSPEC_RAILS_VERSION: '5.1'
+
+rspec-ruby2.4-rails5.2:
+  <<: *rspec
+  image: ruby:2.4
+  variables:
+    RSPEC_RAILS_VERSION: '5.2'
+
+rspec-ruby2.5-rails5.2:
+  <<: *rspec
+  image: ruby:2.5
+  variables:
+    RSPEC_RAILS_VERSION: '5.2'
+
+rspec-ruby2.6-rails5.2:
+  <<: *rspec
+  image: ruby:2.6
+  variables:
+    RSPEC_RAILS_VERSION: '5.2'
+
+rspec-ruby2.5-rails6.0:
+  <<: *rspec
+  image: ruby:2.5
+  variables:
+    RSPEC_RAILS_VERSION: '6.0'
+
+rspec-ruby2.6-rails6.0:
+  <<: *rspec
+  image: ruby:2.6
+  variables:
+    RSPEC_RAILS_VERSION: '6.0'
+
+rspec-ruby2.5-rails6.1:
+  <<: *rspec
+  image: ruby:2.5
+  variables:
+    RSPEC_RAILS_VERSION: '6.1'
+
+rspec-ruby2.6-rails6.1:
+  <<: *rspec
+  image: ruby:2.6
+  variables:
+    RSPEC_RAILS_VERSION: '6.1'
+
+rubocop:
+  stage: codequality
+  image: ruby:2.6
+  script:
+    - gem install rubocop rubocop-performance --no-document
+    - rubocop

data/.rubocop.yml

@@ -0,0 +1,16 @@
+require:
+  - rubocop-performance
+
+AllCops:
+  TargetRubyVersion: 2.4
+
+Layout/HashAlignment:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+Metrics/LineLength:
+  Max: 120
+
+Naming/FileName:
+  Exclude:
+    - 'lib/rails-menu-manager.rb'

data/CHANGELOG.md

@@ -1,7 +1,54 @@
-# Change Log
+# Changelog
 
-## 0.2.0 (2015-04-20) (initial release)
-### Changes
-- Renamed namespace from Rails::Menu::Manager to RailsMenuManager
+All notable changes to this project will be documented in this file.
 
-## 0.1.0 (2015-04-20) (initial release)
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.5.0] - 2020-12-12
+
+### Added
+
+- support for Rails 6.1
+
+## [0.4.1] - 2019-11-06
+
+### Changed
+
+- set supported ruby versions to >= 2.4.0
+
+### Fixed
+
+- support for Rails 6.0.X
+
+## [0.4.0] - 2019-08-22
+
+### Added
+
+- support for Rails 6.0
+
+### Removed
+
+- support for Rails 4.0 and 4.1
+
+## [0.3.1] - 2016-09-26
+
+### Fixed
+
+- prevent menu items from being highlighted which have the same last path element as other menu items
+
+## [0.3.0] - 2016-07-07
+
+### Changed
+
+- rails 5.0 support
+
+## [0.2.0] - 2015-04-20
+
+### Changed
+
+- renamed namespace from Rails::Menu::Manager to RailsMenuManager
+
+## [0.1.0] - 2015-04-20

data/Gemfile

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

data/README.md

@@ -1,8 +1,3 @@
-[![Gem Version](https://img.shields.io/gem/v/rails-menu-manager.svg)](https://rubygems.org/gems/rails-menu-manager)
-[![Dependencies](https://img.shields.io/gemnasium/ydkn/rails-menu-manager.svg)](https://gemnasium.com/ydkn/rails-menu-manager)
-[![Travis CI](https://img.shields.io/travis/ydkn/rails-menu-manager.svg)](https://travis-ci.org/ydkn/rails-menu-manager)
-[![Code Climate](https://img.shields.io/codeclimate/github/ydkn/rails-menu-manager.svg)](https://codeclimate.com/github/ydkn/rails-menu-manager)
-
 # Rails Menu Manager
 
 Simple menu manager for Rails.
@@ -47,11 +42,3 @@ link_to 'users', users_path, class: in_menu?(:main, :users) ? 'active' : nil
 
 link_to 'users', users_path, class: in_menu?(:sidebar, :users) ? 'active' : nil
 ```
-
-## Contributing
-
-1. Fork it ( https://github.com/ydkn/rails-menu-manager/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'

data/lib/rails-menu-manager.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'rails_menu_manager/version'
 require 'rails_menu_manager/railtie'

data/lib/rails_menu_manager/action_controller.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 require 'rails_menu_manager/menu_item'
 
 module RailsMenuManager
+  # Menu methods for ActionController
   module ActionController
     extend ActiveSupport::Concern
 
@@ -14,11 +17,7 @@ module RailsMenuManager
     # @param [Array] Menu path to check
     # @return [Boolean] Boolean indicating if at least one menu item is in path
     def in_menu?(*args)
-      _menu_items.each do |menu|
-        return true if menu.in?(*args)
-      end
-
-      false
+      rails_menu_manger_items.any? { |m| m.in?(*args) }
     end
 
     # Adds a menu
@@ -26,23 +25,24 @@ module RailsMenuManager
     #
     # @param [Array/Hash] Menu path and options.
     def menu(*args)
-      _add_menu_setting(*args)
+      rails_menu_manger_add_menu_setting(*args)
     end
 
     private
 
-    def _menu_items
-      @_menu_items ||= []
+    def rails_menu_manger_items
+      @rails_menu_manger_items ||= []
     end
 
-    def _add_menu_setting(*args)
+    def rails_menu_manger_add_menu_setting(*args)
       opts = args.extract_options!
 
-      path = args.map { |p| p.to_sym }
+      path = args.map(&:to_sym)
 
-      _menu_items << MenuItem.new(path, opts)
+      rails_menu_manger_items << MenuItem.new(path, opts)
     end
 
+    # Class methods for ActionController
     module ClassMethods
       def menu(*args)
         opts = args.extract_options!
@@ -55,7 +55,7 @@ module RailsMenuManager
         }
 
         before_action before_action_opts do
-          _add_menu_setting(*args, opts)
+          rails_menu_manger_add_menu_setting(*args, opts)
         end
       end
     end

data/lib/rails_menu_manager/menu_item.rb

@@ -1,17 +1,27 @@
+# frozen_string_literal: true
+
 module RailsMenuManager
+  # Representation of a single menu item
   class MenuItem
+    PATH_SEPARATOR = 0x1F.chr
+
     attr_reader :path, :options
 
     def initialize(path, options = {})
-      @path     = path
-      @path_str = path.join('#')
-      @options  = options
+      @path    = path
+      @options = options
     end
 
     def in?(*args)
       return false if path.nil?
 
-      !!(@path_str =~ /\A#{args.join('#')}/i)
+      (path_as_string(path) =~ /\A#{path_as_string(args)}/i)
+    end
+
+    private
+
+    def path_as_string(path)
+      path.join(PATH_SEPARATOR) + PATH_SEPARATOR
     end
   end
 end

data/lib/rails_menu_manager/railtie.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 require 'rails/railtie'
 require 'rails_menu_manager/action_controller'
 
 module RailsMenuManager
+  # Railtie which will register and set up the menu manager
   class Railtie < Rails::Railtie
     initializer 'rails-menu-manager' do
-      ::ActionController::Base.send(:include, RailsMenuManager::ActionController)
+      ::ActionController::Base.include(RailsMenuManager::ActionController)
     end
   end
 end

data/lib/rails_menu_manager/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsMenuManager
-  VERSION = '0.2.0'
+  VERSION = '0.5.0'
 end

data/rails-menu-manager.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 'rails_menu_manager/version'
 
@@ -8,20 +9,23 @@ Gem::Specification.new do |spec|
   spec.version       = RailsMenuManager::VERSION
   spec.authors       = ['Florian Schwab']
   spec.email         = ['me@ydkn.de']
-
-  spec.summary       = %q{Simple menu manager for Rails.}
-  spec.description   = %q{Simple menu manager for Rails.}
-  spec.homepage      = 'https://github.com/ydkn/rails-menu-manager'
+  spec.summary       = 'Simple menu manager for Rails.'
+  spec.description   = 'Simple menu manager for Rails.'
+  spec.homepage      = 'https://gitlab.com/ydkn/rails-menu-manager'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'railties', '>= 4.0', '< 5.0'
+  spec.required_ruby_version = '>= 2.4.0'
+
+  spec.add_dependency 'railties', '>= 4.2', '< 6.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.9'
-  spec.add_development_dependency 'rake',    '~> 10.0'
-  spec.add_development_dependency 'rspec',   '~> 3.2'
-  spec.add_development_dependency 'yard',    '~> 0.8'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-performance'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-menu-manager
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Florian Schwab
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2020-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,76 +16,90 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 description: Simple menu manager for Rails.
 email:
 - me@ydkn.de
@@ -94,26 +108,25 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails40
-- gemfiles/rails41
-- gemfiles/rails42
 - lib/rails-menu-manager.rb
 - lib/rails_menu_manager/action_controller.rb
 - lib/rails_menu_manager/menu_item.rb
 - lib/rails_menu_manager/railtie.rb
 - lib/rails_menu_manager/version.rb
 - rails-menu-manager.gemspec
-homepage: https://github.com/ydkn/rails-menu-manager
-licenses: []
+homepage: https://gitlab.com/ydkn/rails-menu-manager
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,17 +134,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Simple menu manager for Rails.
 test_files: []
-has_rdoc: 

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.1.5
-  - 2.2.2
-
-gemfile:
-  - gemfiles/rails40
-  - gemfiles/rails41
-  - gemfiles/rails42
-
-script: bundle exec rake spec
-
-before_install:
-  - gem install bundler -v '~> 1.9'

data/gemfiles/rails40

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rails-menu-manager.gemspec
-gemspec path: '..'
-
-
-gem 'railties', '~> 4.0'

data/gemfiles/rails41

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rails-menu-manager.gemspec
-gemspec path: '..'
-
-
-gem 'railties', '~> 4.1'

data/gemfiles/rails42

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rails-menu-manager.gemspec
-gemspec path: '..'
-
-
-gem 'railties', '~> 4.2'