attempt to fix #66; url is converted to a string on Item construction…

… with adapter-specific url_for call

lib/simple_navigation.rb

@@ -31,7 +31,7 @@ module SimpleNavigation
   class << self
     extend Forwardable
 
-    def_delegators :adapter, :request, :request_uri, :request_path, :context_for_eval, :current_page?
+    def_delegators :adapter, :request, :request_uri, :request_path, :context_for_eval, :current_page?, :url_for
     def_delegators :adapter_class, :register
 
     # Sets the root path and current environment as specified. Also sets the default config_file_path.

lib/simple_navigation/adapters/base.rb

@@ -24,6 +24,10 @@ def context_for_eval; end
       # Used to determine if an item should be autohighlighted.
       def current_page?(url); end
 
+      # Returns a URL as a string representation for the specified object.
+      # Used to translate objects to URL strings for autohighlight matching.
+      def url_for(object); end
+
       # Returns a link with the specified name, url and options.
       # Used for rendering.
       def link_to(name, url, options={}); end
@@ -34,4 +38,4 @@ def content_tag(type, content, options={}); end
 
     end
   end
-end
+end

lib/simple_navigation/adapters/padrino.rb

@@ -6,6 +6,10 @@ def self.register
         SimpleNavigation.set_env(PADRINO_ROOT, PADRINO_ENV)
         ::Padrino::Application.send(:helpers, SimpleNavigation::Helpers)
       end
+
+      def url_for(object)
+        context.url_for object
+      end
 
       def link_to(name, url, options={})
         context.link_to name, url, options
@@ -17,4 +21,4 @@ def content_tag(type, content, options={})
 
     end
   end
-end
+end

lib/simple_navigation/adapters/rails.rb

@@ -38,6 +38,10 @@ def current_page?(url)
         template.current_page?(url) if template
       end
 
+      def url_for(object)
+        template.url_for(object) if template
+      end
+
       def link_to(name, url, options={})
         template.link_to(html_safe(name), url, options) if template
       end

lib/simple_navigation/adapters/sinatra.rb

@@ -42,6 +42,10 @@ def current_page?(url)
         end
       end
 
+      def url_for(object)
+        object.to_s
+      end
+
       def link_to(name, url, options={})
         "<a href='#{url}' #{to_attributes(options)}>#{name}</a>"
       end

lib/simple_navigation/core/item.rb

@@ -15,7 +15,14 @@ def initialize(container, key, name, url, options, items=nil, &sub_nav_block)
       @key = key
       @method = options.delete(:method)
       @name = name
-      @url = url.instance_of?(Proc) ? url.call : url
+      @url = case url
+             when Proc
+               url.call
+             when String
+               url
+             else
+               SimpleNavigation.url_for(url)
+             end
       @highlights_on = options.delete(:highlights_on)
       @html_options = options
       if sub_nav_block || items

spec/lib/simple_navigation/adapters/padrino_spec.rb

@@ -12,6 +12,13 @@ def create_adapter
     @adapter = create_adapter
   end
 
+  describe 'url_for' do
+    it "should delegate to context" do
+      @context.should_receive(:url_for).with(:object)
+      @adapter.url_for(:object)
+    end
+  end
+
   describe 'link_to' do
     it "should delegate to context" do
       @context.should_receive(:link_to).with('name', 'url', :my_option => true)

spec/lib/simple_navigation/adapters/rails_spec.rb

@@ -194,6 +194,24 @@ def create_adapter
     end
   end
 
+  describe 'url_for' do
+    context 'template is set' do
+      before(:each) do
+        @adapter.stub!(:template => @template)
+      end
+      it "should delegate the call to the template" do
+        @template.should_receive(:url_for).with(:object)
+        @adapter.url_for(:object)
+      end
+    end
+    context 'template is not set' do
+      before(:each) do
+        @adapter.stub!(:template => nil)
+      end
+      it {@adapter.url_for(:object).should be_nil}
+    end
+  end
+
   describe 'link_to' do
     context 'template is set' do
       before(:each) do

spec/lib/simple_navigation/adapters/sinatra_spec.rb

@@ -65,6 +65,12 @@ def create_adapter
     end
   end
 
+  describe 'url_for' do
+    it "should return a string" do
+      @adapter.url_for(:object).should == 'object'
+    end
+  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>"
@@ -77,4 +83,4 @@ def create_adapter
     end
   end
 
-end
+end

spec/lib/simple_navigation/core/item_spec.rb

@@ -5,7 +5,10 @@
   before(:each) do
     @item_container = stub(:item_container, :level => 1).as_null_object
     @item = SimpleNavigation::Item.new(@item_container, :my_key, 'name', 'url', {})
-    @adapter = stub(:adapter)
+    @adapter = mock(:adapter)
+    @adapter.stub!(:url_for) { |o| o.as_url }
+    @object = mock(:object)
+    @object.stub!(:as_url) { 'my_url' }
     SimpleNavigation.stub!(:adapter => @adapter)
   end
 
@@ -114,6 +117,12 @@
         end
         it {@item.url.should == 'my_url'}
       end
+      context 'url is an object' do
+        before(:each) do
+          @item = SimpleNavigation::Item.new(@item_container, :my_key, 'name', @object, {})
+        end
+        it {@item.url.should == 'my_url'}
+      end
     end
 
   end