simple-navigation 3.3.1 → 3.3.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+*3.3.2
+
+* The patch listed in 3.3.1 somehow did not make it into the gem... sorry. Re-releasing...
+
 *3.3.1
 
 * bugfix in sinatra adapter. Use Rack::Request#scheme instead of Rack::Request#protocol. Credits to Matthew Gast.

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rspec/core/rake_task'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run specs.'
 task :default => :spec
@@ -20,7 +20,7 @@ namespace :spec do
 end
 
 desc 'Generate documentation for the simple_navigation plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'SimpleNavigation'
   rdoc.options << '--line-numbers' << '--inline-source'
@@ -44,9 +44,6 @@ begin
     gemspec.rubyforge_project = 'andi'
   end
   Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
 rescue LoadError => e
   puts "Jeweler not available (#{e}). Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end

data/VERSION

@@ -1 +1 @@
-3.3.1
+3.3.2

data/lib/simple_navigation/adapters/sinatra.rb

@@ -3,12 +3,12 @@ require 'cgi'
 module SimpleNavigation
   module Adapters
     class Sinatra < Base
-      
+
       def self.register
         SimpleNavigation.set_env(sinatra_root, sinatra_environment)
         ::Sinatra::Application.send(:helpers, SimpleNavigation::Helpers)
       end
-      
+
       def initialize(context)
         @context = context
         @request = context.request
@@ -18,15 +18,15 @@ module SimpleNavigation
         raise 'no context set for evaluation the config file' unless context
         context
       end
-      
+
       def request_uri
         request.fullpath
       end
-      
+
       def request_path
         request.path
       end
-      
+
       def current_page?(url)
         url_string = CGI.unescape(url)
         if url_string.index("?")
@@ -35,34 +35,34 @@ module SimpleNavigation
           uri = request_uri.split('?').first
         end
         if url_string =~ /^\w+:\/\//
-          url_string == "#{request.protocol}#{request.host_with_port}#{uri}"
+          url_string == "#{request.scheme}://#{request.host_with_port}#{uri}"
         else
           url_string == uri
-        end        
+        end
       end
-      
+
       def link_to(name, url, options={})
         "<a href='#{url}' #{to_attributes(options)}>#{name}</a>"
       end
-      
+
       def content_tag(type, content, options={})
         "<#{type} #{to_attributes(options)}>#{content}</#{type}>"
       end
-      
+
       protected
-      
+
       def self.sinatra_root
         ::Sinatra::Application.root
       end
-      
+
       def self.sinatra_environment
         ::Sinatra::Application.environment
       end
-      
+
       def to_attributes(options)
         options.map {|k, v| "#{k}='#{v}'"}.join(' ')
       end
-      
+
     end
   end
 end

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

@@ -22,18 +22,18 @@ describe SimpleNavigation::Adapters::Sinatra do
       @adapter.context_for_eval.should == @context
     end
   end
-  
+
   describe 'request_uri' do
     it {@adapter.request_uri.should == '/full?param=true'}
   end
-  
+
   describe 'request_path' do
     it {@adapter.request_path.should == '/full'}
   end
-  
+
   describe 'current_page?' do
     before(:each) do
-      @request.stub!(:protocol => 'http://', :host_with_port => 'my_host:5000')
+      @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}
@@ -41,20 +41,21 @@ describe SimpleNavigation::Adapters::Sinatra do
     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 'link_to' do
     it "should return a link" do
       @adapter.link_to('link', 'url', :class => 'clazz', :id => 'id').should == "<a href='url' class='clazz' id='id'>link</a>"
     end
   end
-  
+
   describe 'content_tag' do
     it "should return a tag" do
       @adapter.content_tag(:div, 'content', :class => 'clazz', :id => 'id').should == "<div class='clazz' id='id'>content</div>"
     end
   end
-  
+
 end

metadata

@@ -2,7 +2,7 @@
 name: simple-navigation
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors: 
 - Andi Schacke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-19 00:00:00 Z
+date: 2011-06-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec