simple-navigation 3.3.2 → 3.3.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+*3.3.3
+
+* Bugfix in Adapters::Sinatra#current_url? (compares unencoded URIs). Thanks to Matthew Gast.
+
 *3.3.2
 
 * The patch listed in 3.3.1 somehow did not make it into the gem... sorry. Re-releasing...

data/Rakefile

@@ -38,7 +38,7 @@ begin
     gemspec.description = "With the simple-navigation gem installed you can easily create multilevel navigations for your Rails, Sinatra or Padrino applications. The navigation is defined in a single configuration file. It supports automatic as well as explicit highlighting of the currently active navigation through regular expressions."
     gemspec.add_development_dependency('rspec', '>= 2.0.1')
     gemspec.add_dependency('activesupport', '>= 2.3.2')
-    gemspec.authors = ["Andi Schacke"]
+    gemspec.authors = ["Andi Schacke", "Mark J. Titorenko"]
     gemspec.rdoc_options = ["--inline-source", "--charset=UTF-8"]
     gemspec.files = FileList["[A-Z]*", "{lib,spec,rails,generators}/**/*"] - FileList["**/*.log"]
     gemspec.rubyforge_project = 'andi'

data/VERSION

@@ -1 +1 @@
-3.3.2
+3.3.3

data/lib/simple_navigation/adapters/sinatra.rb

@@ -34,6 +34,7 @@ module SimpleNavigation
         else
           uri = request_uri.split('?').first
         end
+        uri = CGI.unescape(uri)
         if url_string =~ /^\w+:\/\//
           url_string == "#{request.scheme}://#{request.host_with_port}#{uri}"
         else

data/spec/lib/simple_navigation/adapters/sinatra_spec.rb

@@ -35,15 +35,34 @@ describe SimpleNavigation::Adapters::Sinatra do
     before(:each) do
       @request.stub!(:scheme => 'http', :host_with_port => 'my_host:5000')
     end
-    it {@adapter.current_page?('/full?param=true').should be_true}
-    it {@adapter.current_page?('/full?param3=true').should be_false}
-    it {@adapter.current_page?('/full').should be_true}
-    it {@adapter.current_page?('http://my_host:5000/full?param=true').should be_true}
-    it {@adapter.current_page?('http://my_host:5000/full?param3=true').should be_false}
-    it {@adapter.current_page?('http://my_host:5000/full').should be_true}
-    it {@adapter.current_page?('https://my_host:5000/full').should be_false}
-    it {@adapter.current_page?('http://my_host:6000/full').should be_false}
-    it {@adapter.current_page?('http://my_other_host:5000/full').should be_false}
+
+    describe 'when URL is not encoded' do
+      it {@adapter.current_page?('/full?param=true').should be_true}
+      it {@adapter.current_page?('/full?param3=true').should be_false}
+      it {@adapter.current_page?('/full').should be_true}
+      it {@adapter.current_page?('http://my_host:5000/full?param=true').should be_true}
+      it {@adapter.current_page?('http://my_host:5000/full?param3=true').should be_false}
+      it {@adapter.current_page?('http://my_host:5000/full').should be_true}
+      it {@adapter.current_page?('https://my_host:5000/full').should be_false}
+      it {@adapter.current_page?('http://my_host:6000/full').should be_false}
+      it {@adapter.current_page?('http://my_other_host:5000/full').should be_false}
+    end
+
+    describe 'when URL is encoded' do
+      before(:each) do
+        @request.stub!(:fullpath => '/full%20with%20spaces?param=true', :path => '/full%20with%20spaces')
+      end
+
+      it {@adapter.current_page?('/full%20with%20spaces?param=true').should be_true}
+      it {@adapter.current_page?('/full%20with%20spaces?param3=true').should be_false}
+      it {@adapter.current_page?('/full%20with%20spaces').should be_true}
+      it {@adapter.current_page?('http://my_host:5000/full%20with%20spaces?param=true').should be_true}
+      it {@adapter.current_page?('http://my_host:5000/full%20with%20spaces?param3=true').should be_false}
+      it {@adapter.current_page?('http://my_host:5000/full%20with%20spaces').should be_true}
+      it {@adapter.current_page?('https://my_host:5000/full%20with%20spaces').should be_false}
+      it {@adapter.current_page?('http://my_host:6000/full%20with%20spaces').should be_false}
+      it {@adapter.current_page?('http://my_other_host:5000/full%20with%20spaces').should be_false}
+    end
   end
 
   describe 'link_to' do

metadata

@@ -2,15 +2,16 @@
 name: simple-navigation
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors: 
 - Andi Schacke
+- Mark J. Titorenko
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 Z
+date: 2011-06-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec