simple-navigation 4.0.5 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 517a3078bcdee06d396acd50e301c2d595316ebb
-  data.tar.gz: b4da0b90ffa1a1996a6ce0ad5af542ae586f3936
+  metadata.gz: 80fdb7f2e02862d983ad05c0fdfc0abba3e702e8
+  data.tar.gz: 8b61d65bd217b32bea405141a7e5f5e212d79159
 SHA512:
-  metadata.gz: a976b0a7c53937f03c25cad0fb84cc004a09e1d5f0f71a23e298cf5c03ed3ffb74600132c46d8eb78de5c1b4266f81f16f83e0b517278aa330cd2db7f64028fd
-  data.tar.gz: 7a2e60a09ae9126e6a97349e3fe6118744b316acf5d797bb7432ebed49f02b3d326048e788db962988d7dafb8f162d548388c41f25f56e2203d3d2f0f943e38d
+  metadata.gz: 8171a0a34b62e9ca31f1c1d7fb6ab9ca838be0d566243cd0d11c106797d8279f2e53aeb634eeae79b01e9007da24b47bb706a776580ec010859bc9b74751d0e5
+  data.tar.gz: 9cff271a844731db1151e6031dac06351d8592b3038327e92e0f7b245045f523974c741f9dd33332baeeb492cea9d474fd29f54fe6318517596d02222d5115fc

data/.gitignore

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

data/.travis.yml

@@ -1,11 +1,18 @@
 before_install:
   - gem install bundler
 
-rvm:
-  - 2.2.6
-  - 2.3.3
-
-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,5 +1,13 @@
 # Changelog
 
+## 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).

data/README.md

@@ -9,7 +9,7 @@ Simple Navigation is a ruby library for creating navigations (with multiple leve
 
 ## 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
 
@@ -60,4 +60,4 @@ In this situation `/Users/username/.rubies/ruby-2.2.3/bin/rake` is the command y
 
 ## License
 
-Copyright (c) 2017 codeplant GmbH, released under the MIT license
+Copyright (c) 2019 codeplant GmbH, released under the MIT license

data/Rakefile

@@ -15,6 +15,7 @@ namespace :spec do
     rails-3-2-stable
     rails-4-1-stable
     rails-4-2-stable
+    rails-5-2-stable
   ]
 
   mappers.each do |gemfile|

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,10 @@
+source 'https://rubygems.org'
+
+gem 'rake', '< 11.0'
+
+# not yet
+#gem 'railties', '~> 6.0.0'
+gem 'railties', '6.0.0.rc2'
+gem 'rspec-rails', '~> 3.8.2'
+
+gemspec path: '../'

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)

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.5'
+  VERSION = '4.1.0'
 end

data/simple-navigation.gemspec

@@ -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/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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-navigation
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.1.0
 platform: ruby
 authors:
 - Andi Schacke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2019-08-17 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
@@ -257,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: simple-navigation is a ruby library for creating navigations (with multiple