link2 0.1.6 → 0.1.7

data/README.textile

@@ -19,7 +19,7 @@ This is *not* a re-implementation of these helpers; rather it wraps these but pa
 * *DRY* - based on specified arguments: Use what's know to make smart assumptions for more readable and maintainable view code.
 * *I18n deluxe* - Lookup scoped translations based on action, model, etc., for more flexible translations - with lean defaults. Enhanced with some nifty interpolation features as well. Code first, translate later.
 * *DOM Selectors* - Why defining DOM classes for RESTful links all the time when same patterns occur? Optionally DONE.
-* *Stable* - Full test-coverage for stability. Unit + Rails integration tests, check: @54 tests: all passed@
+* *Stable* - Full test-coverage for stability. Unit + Rails integration tests, check: @59 tests: all passed@
 * *Maintainable* - Well-documented code.
 
 h2. Installation
@@ -116,18 +116,11 @@ h2. Usage
   ...
 </pre>
 
-...and for the record (not yet implemented, but soon):
+Same works for @button@, and you also can optionally use the branded aliases: @link2@ and @button2@.
 
-<pre>
-  link :edit, [@post, @comment]
-    # => ::Link2::NotImplementedYetError, "case link(:action, [...]) not yet supported. Need to refactor some stuff."
-</pre>
-
-Same works for @button_to@, and you also can optionally use the branded aliases: @link2@ and @button2@.
+h2. URL + HTML Options
 
-h2. Options hashes: URL + HTML Options
-
-Link2 link helpers accept options in the same way as the core helpers @link_to@/@button_to@: first @options@ (a.k.a. @url_options@) and then @html_options@. See the "Rails core UrlHelpers documentation":http://railsapi.com/doc/rails-v2.3.5/classes/ActionView/Helpers/UrlHelper.html#M002452 for details on this. Link2 helpers just pass any non-Link2-related options to the Rails core helpers. In other words no need to learn a new API; just pass the needed options like in the past.
+Link2 link helpers accept options in the same way as the core helpers @link_to@ and @button_to@: first @options@ (a.k.a. @url_options@) and then @html_options@. See the "Rails core UrlHelpers documentation":http://railsapi.com/doc/rails-v2.3.5/classes/ActionView/Helpers/UrlHelper.html#M002452 for details on this. Link2 helpers just pass any non-Link2-related options to the Rails core helpers. In other words no need to learn a new API; just pass the needed options like in the past.
 
 h2. Expected arguments (...but the examples should be enough)
 
@@ -248,13 +241,49 @@ This behavior is enabled by default but can be disabled just in case; preferably
   end
 </pre>
 
-h2. TODO
+h2. The other fellows...
 
-See "TODO":http://github.com/grimen/link2/blob/master/TODO
+*@link_to_function@*
+
+To get the Link2 features for @link_to_function@ - which is *deprecated in Rails 3* because of it's obtrusive nature (note: obtrusive should be avoided) - you can get such behaviour with Link2 (if you must) by specifying @:onclick@ HTML attribute like so:
+
+<pre>
+  link :hello, :onclick => "alert('Hello world!')"
+</pre>
+
+*@link_to_remote@*
+
+No Link2-wrapper for this one. Also, it's *deprecated in Rails 3* as well for same reasons as above. In Rails 3 it should be possible to call it like so:
+
+<pre>
+  link :hello, say_hello_path(@world), :remote => true
+</pre>
 
-h2. A note on design decisions
+...but as Link2 is *not tested with Rails 3* yet; use the old-school @link_to@ for now.
 
-I didn't extend the behavior for the helper @link_to_if@, @link_to_unless@ because I simply think they should not be used in Rails apps; my strong opinion is that they introduce unnecessary complexity in code and make it less readable. I also skipped @link_to_if_current@ because it's not very thorough implementation - even an extra URI slash make it confused, which is funny. Hate it, or LOVE IT.
+*@link_to_if@ + @link_to_unless@*
+
+I didn't extend the behavior for the helpers @link_to_if@ and @link_to_unless@ because I simply think they should not be used in Rails apps; my strong opinion is that they introduce unnecessary complexity in code and make it less readable. I also skipped @link_to_if_current@ because it's not very thorough implementation - even an extra URI slash make it confused, which is funny. Hate it, or LOVE IT.
+
+h2. Inspiration
+
+I really like the "declarative_authorization":http://github.com/stffn/declarative_authorization view helper DSL for checking permissions on models, and brought the pattern to the link helpers - they are like *ying & yang*:
+
+<pre>
+  link(:edit, @account) if permitted_to?(:edit, @account)
+</pre>
+
+...but I usually mix it with an alias:
+
+<pre>
+  link(:edit, @account) if can?(:edit, @account)
+</pre>
+
+Nice, huh? =)
+
+h2. TODO
+
+See "TODO":http://github.com/grimen/link2/blob/master/TODO
 
 h2. License
 

data/Rakefile

@@ -13,11 +13,11 @@ require File.join(File.dirname(__FILE__), 'lib', 'link2', 'version')
 #   rake build
 #   sudo rake install
 #
-# == Git tag & push to origin/master
+# == Git tag & push to origin/master and push gem to Rubygems.org:
 #
 #   rake release
 #
-# == Release to Gemcutter.org:
+# == Release to Rubygems.org:
 #
 #   rake gemcutter:release
 #

data/TODO

@@ -1,26 +1,27 @@
 TODO
 
-1) [ISSUE:] Implement the problematic one: link(:action, [@parent, @resource])
+* [FEATURE:] Fix action mapping procs to handle named scopes. Should work, but do not for some reason. =/
 
-* Fix action mapping procs to handle named scopes. Should work, but do not for some reason. =/
+* [FEATURE:] Fix action mapping procs to receive session, params, etc in a options hash. My mocking/stubbing don't want to work. ='(
 
-* Fix action mapping procs to receive session, params, etc in a options hash. My mocking/stubbing don't want to work. ='(
+* [TEST:] Integration tests for namespaced controllers/models
 
-* Add support: #link_to_function + #button_to_function: I18n, more?
+* [DESIGN:] Link2::Brain#link_to_args MUST be refactored when the DSL is 100% settled. Not far from it, but feedback first.
 
-    js_link(:hello, "alert('Clicked :hello.');")  =>  link_to_function(I18n.t(:hello, ...), "alert('Clicked :hello.');")
+* [DESIGN:] Merge #label_and_url_for_resource and #url_for_args
 
-* Add support: #link_to_remote + #button_to_remote: I18n, more? Could probably be cleaned up quite a lot.
+* [TEST:] ORM-tests: DataMapper, MongoMapper
 
-    ajax_link(...)
+* [COMPAT:] Check Rails 3 compatibility.
 
-* ORM-tests: DataMapper, MongoMapper
+* [ENHANCEMENT:] Check with Rails routes (RouteSet) if current action is a :member or :collection:
 
-* Check Rails 3 compatibility.
+    link(:show)   =>  link(:show, @post)
+    link(:index)  =>  link(:index, Post)
 
-* Link2::Brain#link_to_args MUST be refactored when the DSL is 100% settled. Not far from it, but feedback first.
+NOT SURE:
 
-* Integration tests for namespaced controllers/models
+* Make Link2 parse label and title-attribute for the link based on configuration: Link2.label_method = :to_s, Link2.attr_methods = {:title => :description}
 
 * This works:
     link_to x, :terms   =>  link_to x, terms_path
@@ -30,15 +31,8 @@ TODO
 
   The middle part (auto-detect route for :fraggle before resource :fraggle) maybe too abstract DSL, not sure.
 
+* Add support for: #link_to_remote + #button_to_remote in Rails 2.x, with:
 
-NOT SURE:
-
-* Check with Rails routes (RouteSet) if current action is a :member or :collection, and look for resource vs. collection:
+    link(..., :remote => true)
 
-    link(:show)   =>  link(@post)     =>  link(:show, @post)      =>  link("Show", @posts)
-    link(:index)  =>  link(@posts)    =>  link(:index, @posts)    =>  link("Index", @posts)
-
-  Current implementation is a bit dumber but should work okay: resource_or_collection = @post || @posts, where
-  @post is tried first. Maybe should be developers responsibility like now...
-
-* Make Link2 parse label and title-attribute for the link based on configuration: Link2.label_method = :to_s, Link2.attr_methods = {:title => :description}
+  ...or not: Maybe only support in Rails 3.

data/lib/link2/brain.rb

@@ -3,7 +3,8 @@
 module Link2
   module Brain
 
-    AutoDetectionFailed = Class.new(::NotImplementedError)
+    AutoDetectionFailed = Class.new(::ArgumentError)
+    NilArgument = Class.new(::ArgumentError)
 
     URL_PATH_REGEX = /\//
     CLASS_INSTANCE_STRING = /\#\<.*\:0x.*\>/
@@ -29,6 +30,8 @@ module Link2
         html_options = args.pop if args.last.is_a?(Hash)
         url_options = args.pop if args.last.is_a?(Hash)
 
+        raise NilArgument, "Passed argument is nil: #{args.inspect}." if args.any? { |arg| arg.nil? }
+
         case args.size
         when 0
           raise ArgumentError, "No arguments specified. A least specify action or url."
@@ -46,8 +49,8 @@ module Link2
             # link :new  => link_to I18n.t(:new, ...), new_{auto_detected_resource}_path
             # link :back  => link_to I18n.t(:back, ...), (session[:return_to] || :back)
             action = args.shift
-            resource = nil # TODO: auto-detect resource.
-            label = self.localized_label(action, resource, url_options)
+            label = self.localized_label(action, resource = nil, url_options)
+            resource = false if html_options && html_options.key?(:onclick) # false => do not auto-detect
             url = self.url_for_args(action, resource, url_options)
           elsif args.first.is_a?(Object)
             # link @user  => link_to I18n.t(:show, ...), user_path(@user)
@@ -66,36 +69,26 @@ module Link2
               # link "Start", :home  => link_to I18n.t(:start, ...), root_path
               # link "Cancel", :back  => link_to I18n.t(:cancel, ...), :back
               label, action = args.slice!(0..1)
-              resource = nil
-              url = self.url_for_args(action, resource, url_options)
+              url = self.url_for_args(action, resource = nil, url_options)
             elsif ::Link2::Support.resource_identifier_class?(args.second)
               # link "New", :new  => link_to "New", new_{auto_detected_resource}_path
               # link "<<", :back  => link_to "<<", (session[:return_to] || :back)
               label, action = args.slice!(0..1)
-              resource = nil # TODO: auto-detect resource.
-              url = self.url_for_args(action, resource, url_options)
+              url = self.url_for_args(action, resource = nil, url_options)
             else
               raise ArgumentError, "Invalid 2nd argument: #{args.inspect}"
             end
           elsif args.first.is_a?(Symbol)
-            # TODO: Implement support for aray of nested resources.
-            if args.second.is_a?(Array)
-              raise ::Link2::NotImplementedYetError, "case link(:action, [...]) not yet supported. Need to refactor some stuff."
-            end
-
             if args.second.is_a?(String)
               # link :new, new_post_path  => link_to I18n.t(:new, ...), new_post_path
               # link :back, root_path  => link_to I18n.t(:back, ...), (session[:return_to] || :back)
               action, url = args.slice!(0..1)
-              resource = nil
-              label = self.localized_label(action, resource, url_options)
+              label = self.localized_label(action, resource = nil, url_options)
             elsif args.second.is_a?(Symbol) && ::Link2.url_for_mapping(args.second)
               # link :start, :home  => link_to I18n.t(:start, ...), root_path
               # link :cancel, :back  => link_to I18n.t(:cancel, ...), :back
               key, action = args.slice!(0..1)
-              resource = nil
-              resource = self.auto_detect_resource || self.auto_detect_resource
-              label = self.localized_label(key, resource, url_options)
+              label = self.localized_label(key, resource = nil, url_options)
               url = self.url_for_args(action, resource, url_options)
             elsif ::Link2::Support.resource_identifier_class?(args.second)
               # link :new, Post  => link_to I18n.t(:new, ...), new_post_path
@@ -104,6 +97,11 @@ module Link2
               action, resource = args.slice!(0..1)
               label = self.localized_label(action, resource, url_options)
               url = self.url_for_args(action, resource, url_options)
+            elsif args.second.is_a?(Array)
+              # link :kick, [:admin, @user]  => link_to I18n.t(:show, ...), admin_user_path(@user)
+              action, resource = args.slice!(0..1)
+              url_options_with_action = url_options.present? ? url_options.merge(:action => action) : {:action => action}
+              label, url = self.label_and_url_for_resource(resource, url_options_with_action)
             else
               raise ArgumentError, "Invalid 2nd argument: #{args.inspect}"
             end
@@ -113,16 +111,16 @@ module Link2
         when 3
           if args.first.is_a?(String)
             if args.second.is_a?(Symbol)
-              # TODO: Implement support for aray of nested resources.
-              if args.third.is_a?(Array)
-                raise ::Link2::NotImplementedYetError, 'case link("Label", :action, [...]) not yet supported. Need to refactor some stuff.'
-              end
-
               if ::Link2::Support.resource_identifier_class?(args.third)
                 # link "New", :new, Post  => link_to "New", new_post_path
                 # link "Edit", :edit, @post  => link_to "Edit", edit_post_path(@post)
                 label, action, resource = args.slice!(0..2)
                 url = self.url_for_args(action, resource, url_options)
+              elsif args.third.is_a?(Array)
+                # link "Kick", :kick, [:admin, @user]  => link_to I18n.t(:show, ...), admin_user_path(@user)
+                label, action, resource = args.slice!(0..2)
+                url_options_with_action = url_options.present? ? url_options.merge(:action => action) : {:action => action}
+                url = self.label_and_url_for_resource(resource, url_options_with_action).last
               else
                 raise ArgumentError, "Invalid 3rd argument: #{args.inspect}"
               end
@@ -164,13 +162,18 @@ module Link2
       #
       # See documentation on +polymorphic_url+ for available core options.
       #
-      def label_and_url_for_resource(resource, options = {})
-        options ||= {}
+      def label_and_url_for_resource(*args)
+        options = args.extract_options!.dup
+        resource = args.first
+
         url_for_options = options.slice(*POLYMORPHIC_OPTION_KEYS).reverse_merge(:routing_type => :path)
         i18n_options = options.except(url_for_options.keys)
+
         last_resource = ::Link2::Support.extract_resource(resource)
+        action = options.delete(:action)
+        url_for_options[:action] = [:show, :index].include?(action) ? nil : action
 
-        label = self.localized_label(:show, last_resource, i18n_options)
+        label = self.localized_label(action || :show, last_resource, i18n_options)
         url = polymorphic_url(resource, url_for_options)
 
         [label, url]
@@ -200,7 +203,9 @@ module Link2
         options = args.extract_options!.dup
         action, resource = args
 
-        if resource.is_a?(String) # url
+        if resource == false # javascript onclick; disable resource auto-detection
+          ::Link2::DEFAULT_LINK
+        elsif resource.is_a?(String) # url
           resource
         elsif resource.nil? && url = ::Link2.url_for_mapping(action, resource) # mapping
           url

data/lib/link2/helpers.rb

@@ -5,10 +5,6 @@ module Link2
 
     include ::Link2::Brain
 
-    def self.included(base)
-      include JavascriptLinkHelpers
-    end
-
     # Enhanced +link_to+ helper.
     #
     # TODO: Documentation for this helper. For now the README should be sufficient.
@@ -31,27 +27,5 @@ module Link2
     end
     alias :button2 :button
 
-    # Rails 3-deprecations - unless +prototype_legacy_helper+-plugin.
-
-    module JavascriptLinkHelpers
-      def js_link(*args)
-        raise ::Link2::NotImplementedYetError
-      end
-
-      def js_button(*args)
-        raise ::Link2::NotImplementedYetError
-      end
-
-      def ajax_link(*args)
-        raise ::Link2::NotImplementedYetError
-      end
-      alias :remote_link :ajax_link
-
-      def ajax_button(*args)
-        raise ::Link2::NotImplementedYetError
-      end
-      alias :remote_button :ajax_button
-    end
-
   end
 end

data/lib/link2/support.rb

@@ -71,7 +71,7 @@ module Link2
       #     # => true
       #
       def resource_identifier_class?(object)
-        (object.is_a?(NilClass) || object.is_a?(Symbol) || self.record_class?(object))
+        (object.is_a?(Symbol) || self.record_class?(object))
       end
 
       # Check if passed object is an array for record instances, i.e. "collection".

data/lib/link2/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Link2
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

data/test/helpers_test.rb

@@ -35,6 +35,16 @@ class HelpersTest < ActionView::TestCase
     assert_equal link_to('Hello', '#'), link('Hello')
   end
 
+  test "link(label_or_action, :onclick => '...') should render link_to_function(label, 'javascript: ...')" do
+    if self.respond_to?(:link_to_function) # Note: Deprecated in Rails 3
+      assert_equal link_to_function('Hello', 'alert("hello")'), link('Hello', :onclick => 'alert("hello"); return false;')
+      assert_equal link_to_function('Hello', 'alert("hello")'), link(:hello, :onclick => 'alert("hello"); return false;')
+    end
+
+    assert_equal link_to('Hello', '#', :onclick => 'alert("hello"); return false;'), link('Hello', :onclick => 'alert("hello"); return false;')
+    assert_equal link_to('Hello', '#', :onclick => 'alert("hello"); return false;'), link(:hello, :onclick => 'alert("hello"); return false;')
+  end
+
   test "auto-detecting resource: link(:action) should render link_to(t(:action, ...), @resource)" do
     self.expects(:current_controller_name).with(nil).returns('fraggles').at_least_once
 
@@ -90,7 +100,7 @@ class HelpersTest < ActionView::TestCase
     # assert_equal link_to("Show", "?"), link(::Fraggle) # test this stupid case?
   end
 
-  test "link([@parent, @resource]) should render link_to(t(:show, ...), polymorphic_path([@parent, @resource]))" do
+  test "link([@parent_resource, @resource]) should render link_to(t(:show, ...), polymorphic_path([@parent_resource, @resource]))" do
     assert_equal link_to("Show", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}"),              link([@mookey, @mookeys_cool_aid])
     assert_equal link_to("Show", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}", ONE_HASH),    link([@mookey, @mookeys_cool_aid], ONE_HASH)
     assert_equal link_to("Show", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}", *TWO_HASHES), link([@mookey, @mookeys_cool_aid], *TWO_HASHES)
@@ -159,11 +169,37 @@ class HelpersTest < ActionView::TestCase
     assert_equal link_to("Edit", "/fraggles/#{@mookey.id}/edit", *TWO_HASHES),  link(:edit, @mookey, *TWO_HASHES)
   end
 
-  test "link(:action, [@parent, @resource]) should render link_to(t(:action, ...), polymorphic_path([@parent, @resource]), :action => :action)" do
-    # assert_equal link_to("Edit", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/edit"), link(:edit, [@mookey, @mookeys_cool_aid])
-    assert_raise(::Link2::NotImplementedYetError) { link(:edit, [@mookey, @mookeys_cool_aid]) }
-    assert_raise(::Link2::NotImplementedYetError) { link(:edit, [@mookey, @mookeys_cool_aid], ONE_HASH) }
-    assert_raise(::Link2::NotImplementedYetError) { link(:edit, [@mookey, @mookeys_cool_aid], *TWO_HASHES) }
+  test "should accept polymorphic resource array for valid actions" do
+    [:edit, :show, :kick, :index].each do |action|
+      assert_nothing_raised { link(action, [@mookey, @mookeys_cool_aid]) }
+      assert_nothing_raised { link(action, [@mookey, @mookeys_cool_aid], ONE_HASH) }
+      assert_nothing_raised { link(action, [@mookey, @mookeys_cool_aid], *TWO_HASHES) }
+    end
+  end
+
+  test "should raise the traditional error if generated route don't exists" do
+    assert_raise(NoMethodError) { link(:hug, [@mookey, @mookeys_cool_aid]) }
+    assert_raise(NoMethodError) { link(:hug, [@mookey, @mookeys_cool_aid], ONE_HASH) }
+    assert_raise(NoMethodError) { link(:hug, [@mookey, @mookeys_cool_aid], *TWO_HASHES) }
+  end
+
+  test "link(:action, [@a, @b]) should render link_to(t(:action, ...), polymorphic_path([@a, @b]), :action => :action)" do
+    assert_equal link_to("Edit", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/edit"),               link(:edit, [@mookey, @mookeys_cool_aid])
+    assert_equal link_to("Edit", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/edit", ONE_HASH),     link(:edit, [@mookey, @mookeys_cool_aid], ONE_HASH)
+    assert_equal link_to("Edit", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/edit", *TWO_HASHES),  link(:edit, [@mookey, @mookeys_cool_aid], *TWO_HASHES)
+
+    assert_equal link_to("Show", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}"),                    link(:show, [@mookey, @mookeys_cool_aid])
+    assert_equal link_to("Show", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}", ONE_HASH),          link(:show, [@mookey, @mookeys_cool_aid], ONE_HASH)
+    assert_equal link_to("Show", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}", *TWO_HASHES),       link(:show, [@mookey, @mookeys_cool_aid], *TWO_HASHES)
+
+    assert_equal link_to("Kick", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/kick"),               link(:kick, [@mookey, @mookeys_cool_aid])
+    assert_equal link_to("Kick", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/kick", ONE_HASH),     link(:kick, [@mookey, @mookeys_cool_aid], ONE_HASH)
+    assert_equal link_to("Kick", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/kick", *TWO_HASHES),  link(:kick, [@mookey, @mookeys_cool_aid], *TWO_HASHES)
+
+    # QUESTION: Hum...should be a case?
+    # assert_equal link_to("Index", "/fraggles/#{@mookey.id}/cool_aids"),               link(:index, [@mookey, @mookeys_cool_aid])
+    # assert_equal link_to("Index", "/fraggles/#{@mookey.id}/cool_aids", ONE_HASH),     link(:index, [@mookey, @mookeys_cool_aid], ONE_HASH)
+    # assert_equal link_to("Index", "/fraggles/#{@mookey.id}/cool_aids", *TWO_HASHES),  link(:index, [@mookey, @mookeys_cool_aid], *TWO_HASHES)
   end
 
   test "auto-detecting resource: link(label, :action) should render link_to(label, @resource, :action => :action)" do
@@ -214,14 +250,56 @@ class HelpersTest < ActionView::TestCase
     assert_equal link_to("Editish", "/fraggles/#{@mookey.id}/edit", *TWO_HASHES), link("Editish", :edit, @mookey, *TWO_HASHES)
   end
 
-  test "js_link should not be implemented (yet)" do
-    assert_raise(::Link2::NotImplementedYetError) { js_link(:alert, 'alert("New");', {}, {}) }
-    assert_raise(::Link2::NotImplementedYetError) { js_button(:alert, 'alert("New");', {}, {}) }
+  test "three arguments: should accept polymorphic resource array for valid actions" do
+    [:edit, :show, :kick, :index].each do |action|
+      assert_nothing_raised { link("", action, [@mookey, @mookeys_cool_aid]) }
+      assert_nothing_raised { link("", action, [@mookey, @mookeys_cool_aid], ONE_HASH) }
+      assert_nothing_raised { link("", action, [@mookey, @mookeys_cool_aid], *TWO_HASHES) }
+    end
   end
 
-  test "ajax_link should not be implemented (yet)" do
-    assert_raise(::Link2::NotImplementedYetError) { ajax_link(:home, {}, {}) }
-    assert_raise(::Link2::NotImplementedYetError) { ajax_button(:home, {}, {}) }
+  test "three arguments: should raise the traditional error if generated route don't exists" do
+    assert_raise(NoMethodError) { link("", :hug, [@mookey, @mookeys_cool_aid]) }
+    assert_raise(NoMethodError) { link("", :hug, [@mookey, @mookeys_cool_aid], ONE_HASH) }
+    assert_raise(NoMethodError) { link("", :hug, [@mookey, @mookeys_cool_aid], *TWO_HASHES) }
+  end
+
+  test "three arguments: link(:action, [@a, @b]) should render link_to(t(:action, ...), polymorphic_path([@a, @b]), :action => :action)" do
+    assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/edit"),               link("", :edit, [@mookey, @mookeys_cool_aid])
+    assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/edit", ONE_HASH),     link("", :edit, [@mookey, @mookeys_cool_aid], ONE_HASH)
+    assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/edit", *TWO_HASHES),  link("", :edit, [@mookey, @mookeys_cool_aid], *TWO_HASHES)
+
+    assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}"),                    link("", :show, [@mookey, @mookeys_cool_aid])
+    assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}", ONE_HASH),          link("", :show, [@mookey, @mookeys_cool_aid], ONE_HASH)
+    assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}", *TWO_HASHES),       link("", :show, [@mookey, @mookeys_cool_aid], *TWO_HASHES)
+
+    assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/kick"),               link("", :kick, [@mookey, @mookeys_cool_aid])
+    assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/kick", ONE_HASH),     link("", :kick, [@mookey, @mookeys_cool_aid], ONE_HASH)
+    assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/kick", *TWO_HASHES),  link("", :kick, [@mookey, @mookeys_cool_aid], *TWO_HASHES)
+
+    # QUESTION: Hum...should be a case?
+    # assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids"),               link("", :index, [@mookey, @mookeys_cool_aid])
+    # assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids", ONE_HASH),     link("", :index, [@mookey, @mookeys_cool_aid], ONE_HASH)
+    # assert_equal link_to("", "/fraggles/#{@mookey.id}/cool_aids", *TWO_HASHES),  link("", :index, [@mookey, @mookeys_cool_aid], *TWO_HASHES)
+  end
+
+  # Nil
+
+  test "should throw error on any nil argument (excluding options)" do
+    self.stubs(:current_controller_name).returns('fraggles')
+    @fraggle = @mookey
+
+    assert_raise(::Link2::Brain::NilArgument) { link(nil) }
+
+    assert_raise(::Link2::Brain::NilArgument) { link(Object.new, nil) }
+    assert_raise(::Link2::Brain::NilArgument) { link(nil, Object.new) }
+
+    assert_raise(::Link2::Brain::NilArgument) { link(nil, nil, nil) }
+    assert_raise(::Link2::Brain::NilArgument) { link(Object.new, nil, nil) }
+    assert_raise(::Link2::Brain::NilArgument) { link(nil, Object.new, nil) }
+    assert_raise(::Link2::Brain::NilArgument) { link(nil, nil, Object.new) }
+    assert_raise(::Link2::Brain::NilArgument) { link(Object.new, Object.new, nil) }
+    assert_raise(::Link2::Brain::NilArgument) { link(Object.new, nil, Object.new) }
   end
 
   # DOM selectors

data/test/support_test.rb

@@ -19,10 +19,11 @@ class SupportTest < ActiveSupport::TestCase
   end
 
   test "#resource_identifier_class?: should only be true for valid classes" do
-    assert ::Link2::Support.resource_identifier_class?(nil)
     assert ::Link2::Support.resource_identifier_class?(:hello)
     assert ::Link2::Support.resource_identifier_class?(::Fraggle)
+    assert ::Link2::Support.resource_identifier_class?(::Fraggle.new)
 
+    assert_not ::Link2::Support.resource_identifier_class?(nil)
     assert_not ::Link2::Support.resource_identifier_class?(::Unicorn)
   end
 

data/test/test_helper.rb

@@ -44,7 +44,9 @@ end
 
 # Routes.
 ActionController::Routing::Routes.draw do |map|
-  map.resources :fraggles, :has_many => :cool_aids
+  map.resources :fraggles, :member => {:kick => :post} do |fraggles|
+    fraggles.resources :cool_aids, :member => {:kick => :post}
+  end
   map.resource :cool_aid
 
   map.root :controller => 'fraggles'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: link2
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -9,79 +14,107 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 +01:00
+date: 2010-03-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: actionpack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 3
         version: 1.2.3
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webrat
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: leftright
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-    version: 
+  type: :development
+  version_requirements: *id007
 description: "Generation next link_to-helper for Rails: Spiced with intelligence, and semantic beauty."
 email: grimen@gmail.com
 executables: []
@@ -119,18 +152,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "Generation next link_to-helper for Rails: Spiced with intelligence, and semantic beauty."