simple-navigation 4.0.2 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 74cc5517ce88a27754c28387348f7e6123b47635
-  data.tar.gz: cdc2d6be45b5db54783bc6c0648a83e08269a51e
+SHA256:
+  metadata.gz: 9df430bc691baeee7336fcfbbf5b6702b89440da2d61a2d7cf9e654e04241f09
+  data.tar.gz: '059b49e4ac9536964aff8678c86dea636bdc29f3ceeeb51d661e4b0b3df02733'
 SHA512:
-  metadata.gz: bb71f7c8d13ca7b614018a7b3adb20c36d80e17c321808440dbc36cd828ee142b55014bf9edaab58deecdfc1f80705b7104bb51099165ed66ecc26a63e7f30c6
-  data.tar.gz: 10105e6488f0563814605edb78f4a6db4f16beef9074d898684df514b46c26bb210ebc529ea2b8b837ab7c7fe99bd94b6960d4e09e292f7ba861bdbd6dc94bdb
+  metadata.gz: 6a5b51b3afcc9f5324335d7064bcc12cd417d151384b219ad1b2db10d3d161a9517cbcd9a9c766555c93e7b343d3ca233ab50663459670fc6b4804216fc57534
+  data.tar.gz: 98417524e1562117207ca2f9c5eddc77328e8d0d5ef3da1ef42f52c420634c7e011931622d5f642d869d265f4b4ffda9c3477a31ea03b2cf3d200f7c2d7d1ca4

data/.gitignore

@@ -7,3 +7,4 @@ Gemfile.lock
 capybara-*
 gemfiles/*.lock
 log
+spec/fake_app/tmp

data/.travis.yml

@@ -1,12 +1,18 @@
 before_install:
   - gem install bundler
 
-rvm:
-  - 2.0.0
-  - 2.1.5
-  - 2.2.1
-
-gemfile:
-  - gemfiles/rails-4-2-stable.gemfile
-  - gemfiles/rails-4-1-stable.gemfile
-  - gemfiles/rails-3-2-stable.gemfile
+matrix:
+  include:
+  - rvm: 2.5.3
+    gemfile: gemfiles/rails-6-0-stable.gemfile
+  - rvm: 2.6.0
+    gemfile: gemfiles/rails-6-0-stable.gemfile
+  - rvm: 2.5.1
+    gemfile: gemfiles/rails-5-2-stable.gemfile
+  - rvm: 2.4.5
+    gemfile: gemfiles/rails-4-2-stable.gemfile
+  - rvm: 2.3.3
+    gemfile: gemfiles/rails-4-1-stable.gemfile
+  - rvm: 2.3.3
+    gemfile: gemfiles/rails-3-2-stable.gemfile
+  

data/CHANGELOG.md

@@ -1,10 +1,35 @@
 # Changelog
 
+## 4.2.0
+
+* improvements to generator template. Credits to mgrunberg.
+* be able to run 'rake spec:rails-6-0-stable'. Credits to mgrunberg.
+
+## 4.1.0
+
+* Delay rails6 initialization using on_load (getting rid of deprecation warnings in rails 6). Credits to Markus Benning.
+* Fix link to wiki in README. Thanks to Greg Molnar.
+* Fix uninitialized variable `@dom_attributes` warning. Credits to Johan Tell.
+* Fixed tests for rails 5x. Credits to Eugene Gavrilov.
+
+
+## 4.0.5
+
+* Fix #188 Blank url and highligh_on_subpath = true causes error. Credits to Tristan Harmer (gondalez) and Ilia Pozhilov (ilyapoz).
+
+## 4.0.4
+
+* Fix #184 uninitialized constant Rails::Railtie (NameError). Credits to n-rodriguez.
+
+## 4.0.3
+
+* Fix #180 Check URL before invoking current_page?
+
 ## 4.0.2
 
-* fixing current_page? when url is nil 
+* fixing current_page? when url is nil
 
-## 4.0.1 
+## 4.0.1
 
 * fixed padrino adapter
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 codeplant GmbH
+Copyright (c) 2017 codeplant GmbH
 
 MIT License
 

data/README.md

@@ -5,11 +5,11 @@
 [![Code Climate](https://codeclimate.com/github/codeplant/simple-navigation.png)](https://codeclimate.com/github/codeplant/simple-navigation)
 [![Coverage Status](https://coveralls.io/repos/codeplant/simple-navigation/badge.png)](https://coveralls.io/r/codeplant/simple-navigation)
 
-Simple Navigation is a ruby library for creating navigations (with multiple levels) for your Rails 2, Rails 3, Rails 4, Sinatra or Padrino applications. It runs with all ruby versions (including ruby 2.x).
+Simple Navigation is a ruby library for creating navigations (with multiple levels) for your Rails, Sinatra or Padrino applications. It runs with all ruby versions (including ruby 2.x).
 
 ## Documentation
 
-For the complete documentation, take a look at the [project's wiki](http://wiki.github.com/codeplant/simple-navigation).
+For the complete documentation, take a look at the [project's wiki](https://github.com/codeplant/simple-navigation/wiki).
 
 ## RDoc
 
@@ -29,12 +29,35 @@ Don't hesitate to come talk on the [project's group](http://groups.google.com/gr
 
 ## Contributing
 
-1. Fork it (https://github.com/codeplant/simple-navigation/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 new Pull Request
+Fork, fix, then send a Pull Request.
+
+To run the test suite locally against all supported frameworks:
+
+    % bundle install
+    % rake spec:all
+
+To target the test suite against one framework:
+
+    % rake spec:rails-4-2-stable
+
+You can find a list of supported spec tasks by running rake -T. You may also find it useful to run a specific test for a specific framework. To do so, you'll have to first make sure you have bundled everything for that configuration, then you can run the specific test:
+
+% BUNDLE_GEMFILE='gemfiles/rails-4-2-stable.gemfile' bundle install -j 4
+% BUNDLE_GEMFILE='gemfiles/rails-4-2-stable.gemfile' bundle exec rspec ./spec/requests/users_spec.rb
+
+### Rake and Bundler
+
+If you use a shell plugin (like oh-my-zsh:bundler) that auto-prefixes commands with `bundle exec` using the `rake` command will fail.
+
+Get the original command with `type -a rake`:
+
+    % type -a rake
+    rake is an alias for bundled_rake
+    rake is /Users/username/.rubies/ruby-2.2.3/bin/rake
+    rake is /usr/bin/rake
+
+In this situation `/Users/username/.rubies/ruby-2.2.3/bin/rake` is the command you should use.
 
 ## License
 
-Copyright (c) 2014 codeplant GmbH, released under the MIT license
+Copyright (c) 2021 codeplant GmbH, released under the MIT license

data/Rakefile

@@ -1,10 +1,35 @@
-require 'bundler/gem_tasks'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core'
 require 'rspec/core/rake_task'
+
 require 'rdoc/task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: 'spec'
+
+namespace :spec do
+  mappers = %w[
+    rails-3-2-stable
+    rails-4-1-stable
+    rails-4-2-stable
+    rails-5-2-stable
+    rails-6-0-stable
+  ]
+
+  mappers.each do |gemfile|
+    desc "Run Tests against #{gemfile}"
+    task gemfile do
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle -j 4 --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+    end
+  end
+
+  desc 'Run Tests against all ORMs'
+  task all: mappers
+end
 
 RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/gemfiles/rails-3-2-stable.gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rake', '< 11.0'
 gem 'railties', '~> 3.2.0'
 gem 'rspec-rails', '~> 3.2.1'
 

data/gemfiles/rails-4-1-stable.gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rake', '< 11.0'
 gem 'railties', '~> 4.1.0'
 gem 'rspec-rails', '~> 3.2.1'
 

data/gemfiles/rails-4-2-stable.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'launchy'
+gem 'rake', '< 11.0'
 gem 'railties', '~> 4.2.0'
 gem 'rspec-rails', '~> 3.2.1'
 

data/gemfiles/rails-5-2-stable.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rake', '< 11.0'
+gem 'railties', '~> 5.2.0'
+gem 'rspec-rails', '~> 3.8.2'
+
+gemspec path: '../'

data/gemfiles/rails-6-0-stable.gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'rake', '< 11.0'
+
+# not yet
+gem 'railties', '~> 6.0.0'
+gem 'rspec-rails', '~> 3.8.2'
+
+gemspec path: '../'

data/generators/navigation_config/templates/config/navigation.rb

@@ -24,7 +24,7 @@ SimpleNavigation::Configuration.run do |navigation|
   # If you need to add custom html around item names, you can define a proc that
   # will be called with the name you pass in to the navigation.
   # The example below shows how to wrap items spans.
-  #navigation.name_generator = Proc.new {|name, item| "<span>#{name}</span>"}
+  #navigation.name_generator = Proc.new {|name, item| tag.span(name) }
 
   # Specify if the auto highlight feature is turned on (globally, for the whole navigation). Defaults to true
   #navigation.auto_highlight = true
@@ -45,6 +45,7 @@ SimpleNavigation::Configuration.run do |navigation|
     # url - the address that the generated item links to. You can also use url_helpers (named routes, restful routes helper, url_for etc.)
     # options - can be used to specify attributes that will be included in the rendered navigation item (e.g. id, class etc.)
     #           some special options that can be set:
+    #           :html - Specifies html attributes that will be included in the rendered navigation item
     #           :if - Specifies a proc to call to determine if the item should
     #                 be rendered (e.g. <tt>if: -> { current_user.admin? }</tt>). The
     #                 proc should evaluate to a true or false value and is evaluated in the context of the view.
@@ -67,7 +68,7 @@ SimpleNavigation::Configuration.run do |navigation|
     # You can also specify a condition-proc that needs to be fullfilled to display an item.
     # Conditions are part of the options. They are evaluated in the context of the views,
     # thus you can use all the methods and vars you have available in the views.
-    primary.item :key_3, 'Admin', url, class: 'special', if: -> { current_user.admin? }
+    primary.item :key_3, 'Admin', url, html: { class: 'special' }, if: -> { current_user.admin? }
     primary.item :key_4, 'Account', url, unless: -> { logged_in? }
 
     # you can also specify html attributes to attach to this particular level

data/lib/simple_navigation.rb

@@ -12,7 +12,7 @@ require 'simple_navigation/items_provider'
 require 'simple_navigation/renderer'
 require 'simple_navigation/adapters'
 require 'simple_navigation/config_file_finder'
-require 'simple_navigation/railtie' if defined?(::Rails)
+require 'simple_navigation/railtie' if defined?(::Rails::Railtie)
 
 require 'forwardable'
 

data/lib/simple_navigation/adapters/rails.rb

@@ -5,6 +5,21 @@ module SimpleNavigation
 
       def self.register
         SimpleNavigation.set_env(::Rails.root, ::Rails.env)
+
+        # Autoloading in initializers is deprecated on rails 6.0
+        # This delays the hook initialization using the on_load
+        # hooks, but does not change behaviour for existing
+        # rails versions.
+        if ::Rails::VERSION::MAJOR >= 6
+          ActiveSupport.on_load(:action_controller_base) do
+            SimpleNavigation::Adapters::Rails.register_controller_helpers
+          end
+        else
+          register_controller_helpers
+        end
+      end
+
+      def self.register_controller_helpers
         ActionController::Base.send(:include, SimpleNavigation::Helpers)
         SimpleNavigation::Helpers.instance_methods.each do |m|
           ActionController::Base.send(:helper_method, m.to_sym)
@@ -38,7 +53,7 @@ module SimpleNavigation
       end
 
       def current_page?(url)
-        url && template && template.current_page?(url)
+        template && template.current_page?(url)
       end
 
       def link_to(name, url, options = {})

data/lib/simple_navigation/item.rb

@@ -153,8 +153,10 @@ module SimpleNavigation
 
     def selected_by_autohighlight?
       return false unless auto_highlight?
+      return false unless self.url
+
       root_path_match? ||
-      SimpleNavigation.current_page?(url_for_autohighlight) ||
+      (url_for_autohighlight && SimpleNavigation.current_page?(url_for_autohighlight)) ||
       autohighlight_by_subpath?
     end
 

data/lib/simple_navigation/item_container.rb

@@ -16,6 +16,7 @@ module SimpleNavigation
       @items ||= []
       @renderer = SimpleNavigation.config.renderer
       @auto_highlight = true
+      @dom_attributes = {}
     end
 
     def dom_attributes
@@ -24,7 +25,8 @@ module SimpleNavigation
         id: dom_id,
         class: dom_class
       }.reject { |_, v| v.nil? }
-      (@dom_attributes || {}).merge(dom_id_and_class)
+
+      @dom_attributes.merge(dom_id_and_class)
     end
 
     # Creates a new navigation item.

data/lib/simple_navigation/version.rb

@@ -1,3 +1,3 @@
 module SimpleNavigation
-  VERSION = '4.0.2'
+  VERSION = '4.2.0'
 end

data/simple-navigation.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
                           "as explicit highlighting of the currently active "        \
                           "navigation through regular expressions."
   spec.summary          = "simple-navigation is a ruby library for creating navigations "\
-                          "(with multiple levels) for your Rails2, Rails3, Rails4, Sinatra or "  \
+                          "(with multiple levels) for your Rails, Sinatra or "  \
                           "Padrino application."
   spec.homepage         = 'http://github.com/codeplant/simple-navigation'
   spec.license          = 'MIT'
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '>= 2.3.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'coveralls', '~> 0.7'
   spec.add_development_dependency 'guard-rspec', '~> 4.2'

data/spec/fake_app/config/navigation.rb

@@ -1,6 +1,6 @@
 SimpleNavigation::Configuration.run do |navigation|
   navigation.items do |nav|
-    nav.item :item_1, 'Item 1', '/item_1'
-    nav.item :item_2, 'Item 2', '/item_2'
+    nav.item :item_1, 'Item 1', '/item_1', html: {class: 'item_1'}, link_html: {id: 'link_1'}
+    nav.item :item_2, 'Item 2', '/item_2', html: {class: 'item_2'}, link_html: {id: 'link_2'}
   end
 end

data/spec/initializers/have_css_matcher.rb

@@ -1,6 +1,7 @@
 RSpec::Matchers.define :have_css do |expected, times|
   match do |actual|
-    selector = HTML::Selector.new(expected).select(actual)
+    selector = Nokogiri::HTML(actual).css(expected)
+
     if times
       expect(selector.size).to eq times
     else

data/spec/integration/rendering_navigation_spec.rb

@@ -8,5 +8,7 @@ RSpec.feature 'Rendering navigation' do
 
     expect(page).to have_content('Item 1')
     expect(page).to have_content('Item 2')
+    expect(page).to have_selector('li.item_1 a#link_1')
+    expect(page).to have_selector('li.item_2 a#link_2')
   end
 end

data/spec/simple_navigation/item_spec.rb

@@ -246,6 +246,14 @@ module SimpleNavigation
               double(:config, auto_highlight: true, highlight_on_subpath: true, ignore_query_params_on_auto_highlight: true, ignore_anchors_on_auto_highlight: true)
             end
 
+            context "but item has no url" do
+              let(:url) { nil }
+
+              it 'returns false' do
+                expect(item.selected?).to be false
+              end
+            end
+
             context "and the current url is a sub path of the item's url" do
               before do
                 allow(adapter).to \

data/spec/simple_navigation/renderer/breadcrumbs_spec.rb

@@ -5,8 +5,7 @@ module SimpleNavigation
 
       let(:item) { nil }
       let(:options) {{ level: :all }}
-      let(:output) { HTML::Document.new(raw_output).root }
-      let(:raw_output) { renderer.render(navigation) }
+      let(:output) { renderer.render(navigation) }
       let(:renderer) { Breadcrumbs.new(options) }
 
       before { select_an_item(navigation[item]) if item }
@@ -75,7 +74,7 @@ module SimpleNavigation
             let(:item) { nil }
 
             it "doesn't render the prefix before the breadcrumbs" do
-              expect(raw_output).not_to match(/^<div.+>You are here: /)
+              expect(output).not_to match(/^<div.+>You are here: /)
             end
           end
 
@@ -83,7 +82,7 @@ module SimpleNavigation
             let(:item) { :invoices }
 
             it 'renders the prefix before the breadcrumbs' do
-              expect(raw_output).to match(/^<div.+>You are here: /)
+              expect(output).to match(/^<div.+>You are here: /)
             end
           end
         end

data/spec/simple_navigation/renderer/links_spec.rb

@@ -5,9 +5,8 @@ module SimpleNavigation
         let!(:navigation) { setup_navigation('nav_id', 'nav_class') }
 
         let(:item) { nil }
-        let(:options) {{ level: :all }}
-        let(:output) { HTML::Document.new(raw_output).root }
-        let(:raw_output) { renderer.render(navigation) }
+        let(:options) { { level: :all } }
+        let(:output) { renderer.render(navigation) }
         let(:renderer) { Links.new(options) }
 
         before { select_an_item(navigation[item]) if item }
@@ -29,7 +28,7 @@ module SimpleNavigation
         end
 
         it "renders the 'a' tags with the corresponding item's :html_options" do
-          expect(output).to have_css('a[style=float:right]')
+          expect(output).to have_css('a[style="float:right"]')
         end
 
         context 'when an item has a specified id' do
@@ -62,7 +61,7 @@ module SimpleNavigation
           let(:options) {{ level: :all, join_with: ' | ' }}
 
           it 'separates the items with the specified separator' do
-            expect(raw_output.scan(' | ').size).to eq 3
+            expect(output.scan(' | ').size).to eq 3
           end
         end
 

data/spec/simple_navigation/renderer/list_spec.rb

@@ -4,9 +4,8 @@ module SimpleNavigation
       let!(:navigation) { setup_navigation('nav_id', 'nav_class') }
 
       let(:item) { nil }
-      let(:options) {{ level: :all }}
-      let(:output) { HTML::Document.new(raw_output).root }
-      let(:raw_output) { renderer.render(navigation) }
+      let(:options) { { level: :all } }
+      let(:output) { renderer.render(navigation) }
       let(:renderer) { List.new(options) }
 
       before { select_an_item(navigation[item]) if item }

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: simple-navigation
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.2.0
 platform: ruby
 authors:
 - Andi Schacke
 - Mark J. Titorenko
 - Simon Courtois
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,16 +30,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +175,8 @@ files:
 - gemfiles/rails-3-2-stable.gemfile
 - gemfiles/rails-4-1-stable.gemfile
 - gemfiles/rails-4-2-stable.gemfile
+- gemfiles/rails-5-2-stable.gemfile
+- gemfiles/rails-6-0-stable.gemfile
 - generators/navigation_config/USAGE
 - generators/navigation_config/navigation_config_generator.rb
 - generators/navigation_config/templates/config/navigation.rb
@@ -239,7 +241,7 @@ homepage: http://github.com/codeplant/simple-navigation
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--inline-source"
 - "--charset=UTF-8"
@@ -256,12 +258,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: simple-navigation is a ruby library for creating navigations (with multiple
-  levels) for your Rails2, Rails3, Rails4, Sinatra or Padrino application.
+  levels) for your Rails, Sinatra or Padrino application.
 test_files:
 - spec/fake_app/config/navigation.rb
 - spec/fake_app/rails_app.rb