casey_jones 0.0.107 → 0.0.108

data/lib/acts_as_linkable/acts_as_linkable.rb

@@ -6,7 +6,7 @@ module ActsAsLinkable
   end
 
   module ActionViewExtensions
-    def link(obj)
+    def link(obj, options={}, html_options={})
       raise "I can't link to nil." unless obj
       if (obj.class == Array) || (obj.class == ActiveRecord::Relation)
         obj.map{|v| link(v)}.to_sentence
@@ -17,13 +17,12 @@ module ActsAsLinkable
           obj_name = (p[:object_name] ||= obj.class.name.underscore).to_s.to_sym
           (render :partial => p[:partial], :locals => {obj_name => obj}).strip
         else
-          opts = {}
-          link_attr = obj.link_attr
-          link_attr.each do |key, val|
-            link_attr[key] = obj.send(val) if val.class == Symbol
+          name = obj.link_attr[:name]
+          link_attr.except(:name).each do |key, val|
+            html_options[key] ||= obj.send(val) if val.class==Symbol
           end
-          opts[:title] = link_attr[:title] if link_attr.has_key?(:title)
-          link_to link_attr[:name], obj, opts
+          url = self.send("#{obj.class.name.tableize}_path", obj, options.except(:remote))
+          link_to name, obj, html_options, :remote => options[:remote]||true
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: casey_jones
 version: !ruby/object:Gem::Version 
-  hash: 201
+  hash: 199
   prerelease: false
   segments: 
   - 0
   - 0
-  - 107
-  version: 0.0.107
+  - 108
+  version: 0.0.108
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-24 00:00:00 -07:00
+date: 2010-07-25 00:00:00 -07:00
 default_executable: 
 dependencies: []