simple-navigation 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9df430bc691baeee7336fcfbbf5b6702b89440da2d61a2d7cf9e654e04241f09
-  data.tar.gz: '059b49e4ac9536964aff8678c86dea636bdc29f3ceeeb51d661e4b0b3df02733'
+  metadata.gz: 32593dd3a7c2dd75f81fe21b56e89ec3fff2570b73461eac762b7911fc096297
+  data.tar.gz: afed0ee3fdf40f71edb92446191699482c52e8cea2bcaf5cf4a9430f55b4e0a2
 SHA512:
-  metadata.gz: 6a5b51b3afcc9f5324335d7064bcc12cd417d151384b219ad1b2db10d3d161a9517cbcd9a9c766555c93e7b343d3ca233ab50663459670fc6b4804216fc57534
-  data.tar.gz: 98417524e1562117207ca2f9c5eddc77328e8d0d5ef3da1ef42f52c420634c7e011931622d5f642d869d265f4b4ffda9c3477a31ea03b2cf3d200f7c2d7d1ca4
+  metadata.gz: b70cf93db548b4521e4ee41d8df47c782f7ea1b849935e157dc5d1f686eb32b285daa42bad75a643c208b739097083ce94d90554c7826288cc38724198cba6a0
+  data.tar.gz: 5a376e9eeca42af65b8e23b37b30b3947c3b1d2554e55a3e2527705a80a077fd655d4fddff29b9f744b461f4affdd17ee2640a27fda924e3872882106bcbab8c

data/.travis.yml

@@ -3,6 +3,12 @@ before_install:
 
 matrix:
   include:
+  - rvm: 2.5.8
+    gemfile: gemfiles/rails-6-1-stable.gemfile
+  - rvm: 2.6.7
+    gemfile: gemfiles/rails-6-1-stable.gemfile
+  - rvm: 2.7.3
+    gemfile: gemfiles/rails-6-1-stable.gemfile
   - rvm: 2.5.3
     gemfile: gemfiles/rails-6-0-stable.gemfile
   - rvm: 2.6.0
@@ -15,4 +21,3 @@ matrix:
     gemfile: gemfiles/rails-4-1-stable.gemfile
   - rvm: 2.3.3
     gemfile: gemfiles/rails-3-2-stable.gemfile
-  

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.3.0
+
+* removed warnings from rspec. Thanks mgrunberg.
+* add compatibility with rails 6.1. Credits to mgrunberg.
+* run specs against 6.1. Credits to mgrunberg.
+
 ## 4.2.0
 
 * improvements to generator template. Credits to mgrunberg.

data/Rakefile

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

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

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

data/lib/simple_navigation/version.rb

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

data/spec/simple_navigation/adapters/rails_spec.rb

@@ -186,7 +186,7 @@ module SimpleNavigation
             before { adapter.instance_variable_set(:@template, nil) }
 
             it 'raises an exception' do
-              expect{ adapter.context_for_eval }.to raise_error
+              expect{ adapter.context_for_eval }.to raise_error(RuntimeError, 'no context set for evaluation the config file')
             end
           end
         end

data/spec/simple_navigation/adapters/sinatra_spec.rb

@@ -9,7 +9,7 @@ describe SimpleNavigation::Adapters::Sinatra do
     context "when adapter's context is not set" do
       it 'raises an exception' do
         allow(adapter).to receive_messages(context: nil)
-        expect{ adapter.context_for_eval }.to raise_error
+        expect{ adapter.context_for_eval }.to raise_error(RuntimeError, 'no context set for evaluation the config file')
       end
     end
 

data/spec/simple_navigation/config_file_finder_spec.rb

@@ -23,7 +23,7 @@ module SimpleNavigation
 
         context 'and no navigation.rb file is found in the paths' do
           it 'raises an exception' do
-            expect{ finder.find(context) }.to raise_error
+            expect { finder.find(context) }.to raise_error(RuntimeError, /Config file 'navigation.rb' not found in path\(s\)/)
           end
         end
       end
@@ -41,7 +41,7 @@ module SimpleNavigation
 
         context 'and no other_navigation.rb file is found in the paths' do
           it 'raise an exception' do
-            expect{ finder.find(context) }.to raise_error
+            expect{ finder.find(context) }.to raise_error(RuntimeError, /Config file 'other_navigation.rb' not found in path\(s\)/)
           end
         end
       end

data/spec/simple_navigation/configuration_spec.rb

@@ -89,7 +89,7 @@ module SimpleNavigation
           let(:provider) { double(:provider) }
 
           it 'raises an exception' do
-            expect{ config.items(provider) {} }.to raise_error
+            expect{ config.items(provider) {} }.to raise_error(RuntimeError, 'please specify either items_provider or block, but not both')
           end
         end
 
@@ -139,7 +139,7 @@ module SimpleNavigation
 
         context 'when items_provider is not specified' do
           it "raises an exception" do
-            expect{ config.items }.to raise_error
+            expect{ config.items }.to raise_error(RuntimeError, 'please specify either items_provider or block, but not both')
           end
         end
       end

data/spec/simple_navigation/helpers_spec.rb

@@ -382,7 +382,7 @@ module SimpleNavigation
           it 'raises an exception' do
             expect{
               controller.render_navigation(level: :invalid)
-            }.to raise_error
+            }.to raise_error(ArgumentError, 'Invalid navigation level: invalid')
           end
         end
       end
@@ -408,7 +408,7 @@ module SimpleNavigation
         before { allow(SimpleNavigation).to receive_messages(primary_navigation: nil) }
 
         it 'raises an exception' do
-          expect{controller.render_navigation}.to raise_error
+          expect{controller.render_navigation}.to raise_error(RuntimeError, 'no primary navigation defined, either use a navigation config file or pass items directly to render_navigation')
         end
       end
 

data/spec/simple_navigation/item_container_spec.rb

@@ -435,7 +435,7 @@ module SimpleNavigation
             it 'raises an error' do
               expect{
                 item_container.item('key', 'name', 'url', { if: 'text' })
-              }.to raise_error
+              }.to raise_error(ArgumentError, ':if or :unless must be procs or lambdas')
             end
           end
         end

data/spec/simple_navigation/item_spec.rb

@@ -346,7 +346,7 @@ module SimpleNavigation
           let(:options) {{ highlights_on: :hello }}
 
           it 'raises an exception' do
-            expect{ item.selected? }.to raise_error
+            expect{ item.selected? }.to raise_error(ArgumentError, ':highlights_on must be a Regexp, Proc or :subpath')
           end
         end
       end

data/spec/simple_navigation/items_provider_spec.rb

@@ -36,7 +36,7 @@ module SimpleNavigation
         let(:provider) { double(:provider) }
 
         it 'raises an exception' do
-          expect{ items_provider.items }.to raise_error
+          expect{ items_provider.items }.to raise_error(RuntimeError, /items_provider either must be a symbol .*, an object .* or an enumerable/)
         end
       end
     end

data/spec/simple_navigation/renderer/base_spec.rb

@@ -32,7 +32,7 @@ module SimpleNavigation
 
       describe '#render' do
         it "raise an exception to indicate it's a subclass responsibility" do
-          expect{ base.render(:container) }.to raise_error
+          expect{ base.render(:container) }.to raise_error(NotImplementedError, 'subclass responsibility')
         end
       end
 

data/spec/simple_navigation_spec.rb

@@ -104,7 +104,7 @@ describe SimpleNavigation do
 
     context "when the config file for the context doesn't exists" do
       it 'raises an exception' do
-        expect{ subject.load_config }.to raise_error
+        expect{ subject.load_config }.to raise_error(RuntimeError, /Config file 'navigation.rb' not found in path\(s\)/)
       end
     end
   end
@@ -152,7 +152,7 @@ describe SimpleNavigation do
       it 'raises an exception' do
         expect{
           subject.active_item_container_for('something else')
-        }.to raise_error
+        }.to raise_error(ArgumentError, 'Invalid navigation level: something else')
       end
     end
   end

data/spec/spec_helper.rb

@@ -24,7 +24,10 @@ end
 
 def setup_adapter_for(framework, context = double(:context))
   if framework == :rails
-    allow(context).to receive_messages(view_context: ActionView::Base.new)
+    # Rails 6.0 and 6.1 provide ActionView::Base.empty method that creates ActionView with an empty LookupContext.
+    # The method is not available on older versions
+    view_context = ActionView::Base.respond_to?(:empty) ? ActionView::Base.empty : ActionView::Base.new
+    allow(context).to receive_messages(view_context: view_context)
   end
 
   allow(SimpleNavigation).to receive_messages(framework: framework)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-navigation
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Andi Schacke
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,6 +177,7 @@ files:
 - gemfiles/rails-4-2-stable.gemfile
 - gemfiles/rails-5-2-stable.gemfile
 - gemfiles/rails-6-0-stable.gemfile
+- gemfiles/rails-6-1-stable.gemfile
 - generators/navigation_config/USAGE
 - generators/navigation_config/navigation_config_generator.rb
 - generators/navigation_config/templates/config/navigation.rb