link2 0.1.5 → 0.1.6

data/README.textile

@@ -16,9 +16,10 @@ This is *not* a re-implementation of these helpers; rather it wraps these but pa
 *Goals/Features:*
 
 * *Rapid & flexible* - prototyping-friendly link helpers - with no trade-offs, really.
-* *DRY* - based on specified arguments: Use what's know to make smart assumptions => DRYer - and more maintainable view code.
+* *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.
-* *Stable* - Full test-coverage for stability. Unit + Rails integration tests, check: @44 tests: all passed@
+* *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@
 * *Maintainable* - Well-documented code.
 
 h2. Installation
@@ -52,12 +53,12 @@ h2. Usage
   link "No operation"
     # => link_to 'No operation', '#'
 
-  link "Hilarious", 'http://bash.org'
-    # => link_to 'No operation', 'http://bash.org'
-
   link 'http://bash.org'
       # => link_to 'http://bash.org', 'http://bash.org'
 
+  link "Hilarious", 'http://bash.org'
+    # => link_to 'Hilarious', 'http://bash.org'
+
   link :home, '/intro'
     # => link_to I18n.t(:home, ...), '/intro'
 
@@ -67,12 +68,24 @@ h2. Usage
   link :back
     # => link_to I18n.t(:home, ...), :back
 
+  link :index
+     # => link_to I18n.t(:index, ...), posts_path                     # Note: auto-detected
+
+  link :trash
+    # => link_to I18n.t(:trash, ...), trash_post_path(@post)          # Note: auto-detected
+
+  link :new
+     # => link_to I18n.t(:new, ...), new_post_path(:id => @post.id)   # Note: auto-detected, id for current resource - if found - passed, makes the implementation more generic
+
   link @post
     # => link_to I18n.t(:show, ...), post_path(@post)
 
   link [@post, @comment]
     # => link_to I18n.t(:show, ...), post_comment_path(@post, @comment)
 
+  link :go_back, :back
+    # => link_to I18n.t(:go_back, ...), :back
+
   link :new, :post
     # => link_to I18n.t(:new, ...), new_post_path
 
@@ -80,7 +93,7 @@ h2. Usage
     # => link_to I18n.t(:new, ...), new_post_path
 
   link :new, @post
-    # => link_to I18n.t(:new, ...), new_post_path(:id => @post.id)  # ...if you think about it; useful for cloning.
+    # => link_to I18n.t(:new, ...), new_post_path(:id => @post.id)    # ...if you think about it; useful for cloning.
 
   link :edit, @post
     # => link_to I18n.t(:edit, ...), edit_post_path(@post)
@@ -91,6 +104,9 @@ h2. Usage
   link :kick, @post
     # => link_to I18n.t(:kick, ...), kick_post_path(@post)
 
+  link "All items", :index
+    # => link_to "All items", posts_path                              # Note: auto-detected, see above
+
   link "New one!", :new, Post
     # => link_to "New one!", new_post_path
 
@@ -105,14 +121,11 @@ h2. Usage
 <pre>
   link :edit, [@post, @comment]
     # => ::Link2::NotImplementedYetError, "case link(:action, [...]) not yet supported. Need to refactor some stuff."
-
-  link :new
-    # => ::Link2::NotImplementedYetError, "Auto-detection of resource is not supported yet."
 </pre>
 
 Same works for @button_to@, and you also can optionally use the branded aliases: @link2@ and @button2@.
 
-h2. Options hashes: URL Options + 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.
 

data/TODO

@@ -1,16 +1,6 @@
 TODO
 
-1) Auto-detect current resource instance for member views (non-collection)
-
-    link(:edit)   =>  link(:edit, @post)
-
-  Detect using "self.controller_name.singularize", or use "resource" if InheritedResources is used.
-
-2) [ISSUE:] Implement the problematic one: link(:action, [@parent, @resource])
-
-* Collections detection:
-
-    link(:index)  =>  link(@posts)   =>  link(:index, @posts)   =>  link("Index", @posts)
+1) [ISSUE:] Implement the problematic one: link(:action, [@parent, @resource])
 
 * Fix action mapping procs to handle named scopes. Should work, but do not for some reason. =/
 
@@ -28,9 +18,27 @@ TODO
 
 * Check Rails 3 compatibility.
 
+* Link2::Brain#link_to_args MUST be refactored when the DSL is 100% settled. Not far from it, but feedback first.
 
 * Integration tests for namespaced controllers/models
 
+* This works:
+    link_to x, :terms   =>  link_to x, terms_path
+
+  So maybe this should work the same?:
+    link :terms, :terms  <=>  link :terms   =>  link :terms, terms_path
+
+  The middle part (auto-detect route for :fraggle before resource :fraggle) maybe too abstract DSL, not sure.
+
+
 NOT SURE:
 
+* Check with Rails routes (RouteSet) if current action is a :member or :collection, and look for resource vs. collection:
+
+    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}

data/lib/link2.rb

@@ -100,6 +100,8 @@ module Link2
        else
          expression
        end
+     rescue
+       nil
      end
 
    end

data/lib/link2/brain.rb

@@ -3,6 +3,8 @@
 module Link2
   module Brain
 
+    AutoDetectionFailed = Class.new(::NotImplementedError)
+
     URL_PATH_REGEX = /\//
     CLASS_INSTANCE_STRING = /\#\<.*\:0x.*\>/
 
@@ -29,7 +31,7 @@ module Link2
 
         case args.size
         when 0
-          raise "No arguments specified. A least specify action or url."
+          raise ArgumentError, "No arguments specified. A least specify action or url."
         when 1
           if args.first.is_a?(String)
             if args.first =~ URL_PATH_REGEX
@@ -53,13 +55,19 @@ module Link2
             resource = args.shift
             label, url = self.label_and_url_for_resource(resource, url_options)
           else
-            raise "Invalid 1st argument: #{args.inspect}"
+            raise ArgumentError, "Invalid 1st argument: #{args.inspect}"
           end
         when 2
           if args.first.is_a?(String)
             if args.second.is_a?(String)
               # link "Hello", hello_path  => link_to "Hello", hello_path
               label, url = args.slice!(0..1)
+            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
+              label, action = args.slice!(0..1)
+              resource = nil
+              url = self.url_for_args(action, resource, 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)
@@ -67,7 +75,7 @@ module Link2
               resource = nil # TODO: auto-detect resource.
               url = self.url_for_args(action, resource, url_options)
             else
-              raise "Invalid 2nd argument: #{args.inspect}"
+              raise ArgumentError, "Invalid 2nd argument: #{args.inspect}"
             end
           elsif args.first.is_a?(Symbol)
             # TODO: Implement support for aray of nested resources.
@@ -79,7 +87,16 @@ module Link2
               # 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)
-              label = self.localized_label(action, nil, url_options)
+              resource = nil
+              label = self.localized_label(action, resource, 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)
+              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
               # link :edit, @post  => link_to I18n.t(:edit, ...), edit_post_path(@post)
@@ -88,10 +105,10 @@ module Link2
               label = self.localized_label(action, resource, url_options)
               url = self.url_for_args(action, resource, url_options)
             else
-              raise "Invalid 2nd argument: #{args.inspect}"
+              raise ArgumentError, "Invalid 2nd argument: #{args.inspect}"
             end
           else
-            raise "Invalid 1st argument: #{args.inspect}"
+            raise ArgumentError, "Invalid 1st argument: #{args.inspect}"
           end
         when 3
           if args.first.is_a?(String)
@@ -107,16 +124,16 @@ module Link2
                 label, action, resource = args.slice!(0..2)
                 url = self.url_for_args(action, resource, url_options)
               else
-                raise "Invalid 3rd argument: #{args.inspect}"
+                raise ArgumentError, "Invalid 3rd argument: #{args.inspect}"
               end
             else
-              raise "Invalid 2nd argument: #{args.inspect}"
+              raise ArgumentError, "Invalid 2nd argument: #{args.inspect}"
             end
           else
-            raise "Invalid 1st argument: #{args.inspect}"
+            raise ArgumentError, "Invalid 1st argument: #{args.inspect}"
           end
         else # when else
-          raise "Invalid number of arguments: #{args.inspect}."
+          raise ArgumentError, "Invalid number of arguments: #{args.inspect}."
         end
 
         if ::Link2.dom_selectors == true
@@ -127,8 +144,6 @@ module Link2
         args << html_options if html_options
 
         [label, url, *args]
-      rescue => e
-        raise ::ArgumentError, e
       end
 
       # Extracts a label and a url for a (polymorphic) resource.
@@ -185,17 +200,17 @@ module Link2
         options = args.extract_options!.dup
         action, resource = args
 
-        if resource.nil?
-          url = ::Link2.url_for_mapping(action, resource) rescue nil
-          if url
-            url
-          else
-            raise ::Link2::NotImplementedYetError,
-              "Resource needs to be specified for non-mapped actions; auto-detection of resource(s) not implemented yet."
-          end
-        elsif resource.is_a?(String)
+        if resource.is_a?(String) # url
           resource
+        elsif resource.nil? && url = ::Link2.url_for_mapping(action, resource) # mapping
+          url
         else
+          resource ||= self.auto_detect_resource || self.auto_detect_collection
+          if resource.nil?
+            raise ::Link2::Brain::AutoDetectionFailed,
+              "Auto-detection of resource or collection failed for args: #{[action, resource].inspect}."
+          end
+
           options[:controller] ||= "/%s" % self.controller_name_for_resource(resource)
           options[:action] = action
           options[:id] = resource.id if !resource.is_a?(Class) && ::Link2::Support.record_class?(resource)
@@ -231,12 +246,21 @@ module Link2
       #   controller_name_for_resource(@post)
       #     # => "posts"
       #
-      def controller_name_for_resource(resource = nil)
-        resource_class = ::Link2::Support.find_resource_class(resource)
-        if ::Link2::Support.record_class?(resource_class)
-          resource_class.to_s.tableize # rescue nil
+      #   controller_name_for_resource([@post_1, @post_2])
+      #     # => "posts"
+      #
+      def controller_name_for_resource(resource_or_collection = nil)
+        if resource_or_collection
+          if ::Link2::Support.record_collection?(resource_or_collection)
+            resource_or_collection.first.class.name.tableize
+          else
+            resource_class = ::Link2::Support.find_resource_class(resource_or_collection)
+            resource_class.name.tableize if ::Link2::Support.record_class?(resource_class)
+          end
         end || self.controller.controller_name
       end
+      # When no resource is passed +current_controller_name+ makes more sense.
+      alias :current_controller_name :controller_name_for_resource
 
       # Parse human resource name for a specified resource.
       #
@@ -269,6 +293,30 @@ module Link2
         custom_name
       end
 
+      # Auto-detect current view resource instance based on expected ivar-name.
+      #
+      def auto_detect_resource
+        if self.respond_to?(:resource) # InheritedResources pattern
+          self.resource
+        else
+          self.instance_variable_get(:"@#{self.current_controller_name.singularize}") # @post
+        end
+      rescue
+        nil
+      end
+
+      # Auto-detect current view resource collection instance based on expected ivar-name.
+      #
+      def auto_detect_collection
+        if self.respond_to?(:collection) # InheritedResources pattern
+          self.collection
+        else
+          self.instance_variable_get(:"@#{self.current_controller_name.pluralize}") # @posts
+        end
+      rescue
+        nil
+      end
+
       # Attach Link2 semantic DOM selector attributes (attributes "id" and "class") based on
       # action and resource - if any can be parsed.
       #

data/lib/link2/support.rb

@@ -28,6 +28,22 @@ module Link2
         raise "No such class: #{resource_class_name}"
       end
 
+      # Extract resource based on resource or collecton of resources.
+      #
+      # == Usage/Examples:
+      #
+      #   extract_resource?(nil)
+      #     # => nil
+      #
+      #   extract_resource?([])
+      #     # => nil
+      #
+      #   extract_resource?(@post)
+      #     # => @post
+      #
+      #   extract_resource?([@post_1, @post_2])
+      #     # => @post_2
+      #
       def extract_resource(resource)
         resource.compact! if resource.is_a?(Array)
         [resource].flatten.last
@@ -36,8 +52,55 @@ module Link2
       # Check if the specified object is a valid resource identifier class. Used
       # for detecting current resource based on controller, action, etc.
       #
+      #   resource_identifier_class?(:string)
+      #     # => false
+      #
+      #   resource_identifier_class?(:post)
+      #     # => true
+      #
+      #   resource_identifier_class?(String)
+      #     # => false
+      #
+      #   resource_identifier_class?(Post)
+      #     # => true
+      #
+      #   resource_identifier_class?("")
+      #     # => false
+      #
+      #   resource_identifier_class?(@post)
+      #     # => true
+      #
       def resource_identifier_class?(object)
-        object.is_a?(NilClass) || object.is_a?(Symbol) || self.record_class?(object)
+        (object.is_a?(NilClass) || object.is_a?(Symbol) || self.record_class?(object))
+      end
+
+      # Check if passed object is an array for record instances, i.e. "collection".
+      # THis assumes all objects in the array is of same kind; makes little sense with mixing
+      # different records kinds in a collection, and in such case any auto-detection is hard.
+      #
+      # == Usage/Examples:
+      #
+      #   record_collection?([])
+      #     # => false
+      #
+      #   record_collection?(@post)
+      #     # => false
+      #
+      #   record_collection?([@post])
+      #     # => true
+      #
+      #   record_collection?([@post, @article])
+      #     # => false
+      #
+      #   record_collection?([@post, @post])
+      #     # => true
+      #
+      def record_collection?(collection_maybe)
+        if collection_maybe.present? && collection_maybe.is_a?(Array)
+          collection_maybe.compact.all? { |object| record_object?(object) }
+        else
+          false
+        end
       end
 
       # Check if a specified objec is a record class type.

data/lib/link2/version.rb

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

data/test/brain_test.rb

@@ -9,6 +9,7 @@ class BrainTest < ActionView::TestCase
     ::I18n.locale = :en
 
     @mookey = ::Fraggle.create(:name => 'Mookey')
+    @wembley = ::Fraggle.create(:name => 'Wembley')
     @tweaked_mookey = ::Fraggle.create(:name => 'Mookey 2.0')
     @tweaked_mookey.class_eval do
       def to_s
@@ -49,8 +50,25 @@ class BrainTest < ActionView::TestCase
   end
 
   test "#controller_name_for_resource: should return current controller if no resource is specified or is nil" do
-    # Current: TestController
-    assert_equal 'test', controller_name_for_resource(nil)
+    self.expects(:controller_name_for_resource).with(nil).returns('fraggles').at_least_once
+    assert_equal 'fraggles', controller_name_for_resource(nil)
+  end
+
+  test "#current_controller_name: should return current controller" do
+    self.expects(:current_controller_name).returns('fraggles').at_least_once
+    assert_equal 'fraggles', current_controller_name
+  end
+
+  test "#auto_detect_resource: " do
+    self.expects(:current_controller_name).returns('fraggles').at_least_once
+    @fraggle = @mookey
+    assert_equal @fraggle, auto_detect_resource
+  end
+
+  test "#auto_detect_collection: should " do
+    self.expects(:current_controller_name).returns('fraggles').at_least_once
+    @fraggles = [@mookey, @wembley]
+    assert_equal @fraggles, auto_detect_collection
   end
 
   test "#human_name_for_resource: should return reosurce name based on resource using #to_s or #human_name" do

data/test/helpers_test.rb

@@ -14,6 +14,7 @@ class HelpersTest < ActionView::TestCase
     ::Link2.i18n_scopes = [] # Keep it simple - no scoped lookups by default.
 
     @mookey = ::Fraggle.create(:name => 'Mookey')
+    @wembley = ::Fraggle.create(:name => 'Wembley')
     @mookeys_cool_aid = ::CoolAid.create(:name => 'Super-tasty')
   end
 
@@ -30,22 +31,49 @@ class HelpersTest < ActionView::TestCase
     assert_equal link_to('/posts?by=date', '/posts?by=date'),         link('/posts?by=date')
   end
 
-  test "link(label) should render link_to(str_label, '#')" do
+  test "link(label) should render link_to(label, '#')" do
     assert_equal link_to('Hello', '#'), link('Hello')
   end
 
-  test "link(:action, url) should render link_to(t(:action, ...), url)" do
-    assert_equal link_to('Home', '/custom-home'), link(:home, '/custom-home')
+  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
+
+    assert_raise(::Link2::Brain::AutoDetectionFailed) do
+      link(:show)
+    end
+
+    @fraggle = @mookey
+
+    assert_nothing_raised(::Link2::Brain::AutoDetectionFailed) do
+      link(:show)
+    end
+
+    assert_equal link_to("Show", "/fraggles/#{@fraggle.id}"),               link(:show)
+    assert_equal link_to("Show", "/fraggles/#{@fraggle.id}", ONE_HASH),     link(:show, ONE_HASH)
+    assert_equal link_to("Show", "/fraggles/#{@fraggle.id}", *TWO_HASHES),  link(:show, *TWO_HASHES)
   end
 
-  test "link(:action) should render link_to(t(:action, ...), url_for(:action => :action, ...)), auto-detecting resource" do
-    # assert_equal link_to("New Fraggle"), link(:new)
-    assert_raise(::Link2::NotImplementedYetError) { link(:new) }
+  test "auto-detecting collection: link(:action) should render link_to(t(:action, ...), @collection)" do
+    self.expects(:current_controller_name).with(nil).returns('fraggles').at_least_once
+
+    assert_raise(::Link2::Brain::AutoDetectionFailed) do
+      link(:index)
+    end
+
+    @fraggles = [@mookey, @wembley]
+
+    assert_nothing_raised(::Link2::Brain::AutoDetectionFailed) do
+      link(:index)
+    end
+
+    assert_equal link_to("Index", "/fraggles"),               link(:index)
+    assert_equal link_to("Index", "/fraggles", ONE_HASH),     link(:index, ONE_HASH)
+    assert_equal link_to("Index", "/fraggles", *TWO_HASHES),  link(:index, *TWO_HASHES)
   end
 
-  test "link(:mapping) should render link_to(t(:mapping, ...), url_for_mapping(:mapping, ...)), auto-detecting resource" do
-    assert_equal link_to("Home", '/'), link(:home)
-    assert_equal link_to("Home", '/', ONE_HASH), link(:home, ONE_HASH)
+  test "link(:mapping) should render link_to(t(:mapping, ...), url_for_mapping(:mapping, ...)), lookup mapping" do
+    assert_equal link_to("Home", '/'),              link(:home)
+    assert_equal link_to("Home", '/', ONE_HASH),    link(:home, ONE_HASH)
     assert_equal link_to("Home", '/', *TWO_HASHES), link(:home, *TWO_HASHES)
 
     swap ::Link2, :action_mappings => {:secret => '/secret'} do
@@ -70,6 +98,22 @@ class HelpersTest < ActionView::TestCase
 
   # link(x, y, {}, {})
 
+  test "link(:action, url) should render link_to(t(:action, ...), url)" do
+    assert_equal link_to('Home', '/custom-home'), link(:home, '/custom-home')
+  end
+
+  test "link(..., :mapping) should render link_to(..., url_for_mapping(:mapping, ...))" do
+    assert_nothing_raised(Exception) { link("Home", :home) }
+    assert_equal link_to("Home", root_path), link("Home", :home)
+    assert_nothing_raised(Exception) { link(:home, :home) }
+    assert_equal link_to("Home", root_path), link(:home, :home)
+
+    assert_nothing_raised(Exception) { link("Back", :back) }
+    assert_equal link_to("Back", :back), link("Back", :back)
+    assert_nothing_raised(Exception) { link(:back, :back) }
+    assert_equal link_to("Back", :back), link(:back, :back)
+  end
+
   test "link(label, url) should render link_to(label, url)" do
     assert_equal link_to('New', '/posts/new'),              link('New', '/posts/new')
     assert_equal link_to('New', '/posts/new', ONE_HASH),    link('New', '/posts/new', ONE_HASH)
@@ -82,9 +126,9 @@ class HelpersTest < ActionView::TestCase
 
   test "link(:action) should render link_to(label, url_for(:action => :action, ...)), auto-detecting resource" do
     # assert_equal link_to("New Fraggle!!"), link("New Fraggle!!", :new)
-    assert_raise(::Link2::NotImplementedYetError) { link("New Fraggle!!", :new) }
-    assert_raise(::Link2::NotImplementedYetError) { link("New Fraggle!!", :new, ONE_HASH) }
-    assert_raise(::Link2::NotImplementedYetError) { link("New Fraggle!!", :new, *TWO_HASHES) }
+    assert_raise(::Link2::Brain::AutoDetectionFailed) { link("New Fraggle!!", :new) }
+    assert_raise(::Link2::Brain::AutoDetectionFailed) { link("New Fraggle!!", :new, ONE_HASH) }
+    assert_raise(::Link2::Brain::AutoDetectionFailed) { link("New Fraggle!!", :new, *TWO_HASHES) }
   end
 
   test "link(label, action) should render link_to(label, url_for_mapping(:mapping, ...)), auto-detecting resource" do
@@ -122,6 +166,42 @@ class HelpersTest < ActionView::TestCase
     assert_raise(::Link2::NotImplementedYetError) { link(:edit, [@mookey, @mookeys_cool_aid], *TWO_HASHES) }
   end
 
+  test "auto-detecting resource: link(label, :action) should render link_to(label, @resource, :action => :action)" do
+    self.expects(:current_controller_name).with(nil).returns('fraggles').at_least_once
+
+    assert_raise(::Link2::Brain::AutoDetectionFailed) do
+      link("Show it", :show)
+    end
+
+    @fraggle = @mookey
+
+    assert_nothing_raised(::Link2::Brain::AutoDetectionFailed) do
+      link("Show it", :show)
+    end
+
+    assert_equal link_to("Show it", "/fraggles/#{@fraggle.id}"),               link("Show it", :show)
+    assert_equal link_to("Show it", "/fraggles/#{@fraggle.id}", ONE_HASH),     link("Show it", :show, ONE_HASH)
+    assert_equal link_to("Show it", "/fraggles/#{@fraggle.id}", *TWO_HASHES),  link("Show it", :show, *TWO_HASHES)
+  end
+
+  test "auto-detecting collection: link(label, :action) should render link_to(label, @collection, :action => :action)" do
+    self.expects(:current_controller_name).with(nil).returns('fraggles').at_least_once
+
+    assert_raise(::Link2::Brain::AutoDetectionFailed) do
+      link("All", :index)
+    end
+
+    @fraggles = [@mookey, @wembley]
+
+    assert_nothing_raised(::Link2::Brain::AutoDetectionFailed) do
+      link("All", :index)
+    end
+
+    assert_equal link_to("All", "/fraggles"),               link("All", :index)
+    assert_equal link_to("All", "/fraggles", ONE_HASH),     link("All", :index, ONE_HASH)
+    assert_equal link_to("All", "/fraggles", *TWO_HASHES),  link("All", :index, *TWO_HASHES)
+  end
+
   # link(x, y,  z, {}, {})
 
   test "link(label, action, resource)" do

data/test/support_test.rb

@@ -26,10 +26,26 @@ class SupportTest < ActiveSupport::TestCase
     assert_not ::Link2::Support.resource_identifier_class?(::Unicorn)
   end
 
+  test "#record_collection?: should be true only i passed value is array of record objects of same kind" do
+    assert_not ::Link2::Support.record_collection?([])
+    assert_not ::Link2::Support.record_collection?(::Fraggle.new)
+    assert_not ::Link2::Support.record_collection?([::Unicorn.new])
+    assert_not ::Link2::Support.record_collection?([::Unicorn.new, ::Fraggle.new])
+
+    assert ::Link2::Support.record_collection?([::Fraggle.new])
+    assert ::Link2::Support.record_collection?([::Fraggle.new, ::Fraggle.new])
+  end
+
   test "#record_class?: should only be true for record classes" do
     assert ::Link2::Support.record_class?(::Fraggle)
 
     assert_not ::Link2::Support.record_class?(::Unicorn)
   end
 
+  test "#record_object?: should only be true for record objects" do
+    assert ::Link2::Support.record_class?(::Fraggle.new)
+
+    assert_not ::Link2::Support.record_class?(::Unicorn.new)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: link2
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +01:00
+date: 2010-03-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency