simple-navigation 2.7.0 → 2.7.1

data/CHANGELOG

@@ -1,9 +1,13 @@
+*2.7.1
+
+* added SimpleNavigation.request and SimpleNavigation.request_uri as abstraction for getting request_uri (rails2/rails3)
+* use request.fullpath instead of request.request_uri for Rails3. Credits to Ben Langfeld.
+
 *2.7.0
 
 * added new option :highlights_on to item definition in config-file. Specify a regexp which is matched against the current_uri to determine if an item is active or not. Replaces explicit highlighting in controllers.
 * deprecated explicit highlighting in the controllers.
 
-
 *2.6.0
 
 * added rendering option 'skip_if_empty' to Renderer::List to avoid rendering of empty ul-tags
@@ -17,7 +21,7 @@
 
 *2.5.3
 
-* removed depreciated railtie_name from simple_navigation/railtie. Credits to Markus Schirp.
+* removed deprecated railtie_name from simple_navigation/railtie. Credits to Markus Schirp.
 
 *2.5.2
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 2
 :minor: 7
-:patch: 0
+:patch: 1

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

@@ -35,7 +35,7 @@ SimpleNavigation::Configuration.run do |navigation|
     #           :unless - Specifies a proc to call to determine if the item should not
     #                     be rendered (e.g. <tt>:unless => Proc.new { current_user.admin? }</tt>). The
     #                     proc should evaluate to a true or false value and is evaluated in the context of the view.
-    #           :method - Specified the http-method for the generated link - default is :get.
+    #           :method - Specifies the http-method for the generated link - default is :get.
     #           :highlights_on - if autohighlighting is turned off and/or you want to explicitly specify 
     #                            when the item should be highlighted, you can set a regexp which is matched 
     #                            against the current URI.

data/lib/simple_navigation.rb

@@ -149,6 +149,20 @@ module SimpleNavigation
       self.registered_renderers.merge!(renderer_hash)
     end
 
+    # Returns the current request.
+    #
+    def request
+      SimpleNavigation.template.request if SimpleNavigation.template
+    end
+
+    # Returns the current request's URI.
+    #
+    def request_uri
+      return '' unless SimpleNavigation.request
+      return SimpleNavigation.request.fullpath if SimpleNavigation.request.respond_to?(:fullpath)
+      SimpleNavigation.request.request_uri
+    end
+
     private
   
   

data/lib/simple_navigation/item.rb

@@ -66,7 +66,7 @@ module SimpleNavigation
     def selected_by_url?
       if highlights_on
         raise ArgumentError, ':highlights_on must be a regexp' unless highlights_on.instance_of?(Regexp)
-        SimpleNavigation.template.request.request_uri =~ highlights_on
+        SimpleNavigation.request_uri =~ highlights_on
       elsif auto_highlight?
         !!(root_path_match? || (SimpleNavigation.template && SimpleNavigation.template.current_page?(url)))
       else

data/lib/simple_navigation/item_container.rb

@@ -29,7 +29,7 @@ module SimpleNavigation
     # * <tt>:unless</tt> - Specifies a proc to call to determine if the item should not
     #   be rendered (e.g. <tt>:unless => Proc.new { current_user.admin? }</tt>). The
     #   proc should evaluate to a true or false value and is evaluated in the context of the view.
-    # * <tt>:method</tt> - Specified the http-method for the generated link - default is :get.
+    # * <tt>:method</tt> - Specifies the http-method for the generated link - default is :get.
     # * <tt>:highlights_on</tt> - if autohighlighting is turned off and/or you want to explicitly specify 
     #   when the item should be highlighted, you can set a regexp which is matched againstthe current URI.
     #

data/spec/lib/simple_navigation/item_spec.rb

@@ -282,8 +282,7 @@ describe SimpleNavigation::Item do
     context ':highlights_on option is set' do
       before(:each) do
         @item.stub!(:highlights_on => /^\/current/)
-        @template = stub(:template, :request => stub(:request, :request_uri => '/current_url'))
-        SimpleNavigation.stub!(:template => @template)
+        SimpleNavigation.stub!(:request_uri => '/current_url')
       end
       it "should not check for autohighlighting" do
         @item.should_not_receive(:auto_highlight?)

data/spec/lib/simple_navigation_spec.rb

@@ -325,6 +325,44 @@ describe SimpleNavigation do
     end
   end
   
+  describe 'request' do
+    context 'template is set' do
+      before(:each) do
+        @request = stub(:request)
+        SimpleNavigation.stub!(:template => stub(:template, :request => @request))
+      end
+      it {SimpleNavigation.request.should == @request}
+    end
+    context 'template is not set' do
+      it {SimpleNavigation.request.should be_nil}
+    end
+  end
+  
+  describe 'request_uri' do
+    context 'request is set' do
+      context 'fullpath is defined on request' do
+        before(:each) do
+          @request = stub(:request, :fullpath => '/fullpath')
+          SimpleNavigation.stub!(:request => @request)
+        end
+        it {SimpleNavigation.request_uri.should == '/fullpath'}
+      end
+      context 'fullpath is not defined on request' do
+        before(:each) do
+          @request = stub(:request, :request_uri => '/request_uri')
+          SimpleNavigation.stub!(:request => @request)
+        end
+        it {SimpleNavigation.request_uri.should == '/request_uri'}
+      end
+    end
+    context 'request is not set' do
+      before(:each) do
+        SimpleNavigation.stub!(:request => nil)
+      end
+      it {SimpleNavigation.request_uri.should == ''}
+    end
+  end
+  
   describe 'config' do
     it {SimpleNavigation.config.should == SimpleNavigation::Configuration.instance}
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 7
-  - 0
-  version: 2.7.0
+  - 1
+  version: 2.7.1
 platform: ruby
 authors: 
 - Andi Schacke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 +02:00
+date: 2010-08-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency