autolink 1.0.0 → 3.0.0

data/autolink.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name    = 'autolink'
-  gem.version = "1.0.0"
+  gem.version = "3.0.0"
 
   gem.author, gem.email = 'Burke Libbey', "burke@burkelibbey.org"
   gem.homepage = "http://github.com/burke/autolink"

data/lib/autolink/action_controller_extensions.rb

@@ -1,26 +1,25 @@
-module ActionController #:nodoc:
-  class Base
+module ActionDispatch
+  module Routing
+    module UrlFor
 
-    def autolink(obj)
-      polymorphic_url(obj.default_lineage) 
-    end 
+      def autolink(obj)                                    # +
+        polymorphic_url(obj.default_lineage)               # +
+      end                                                  # +
 
-    def url_for(options = {})
-      options ||= {}
-      case options
-      when ActiveRecord::Base                   # +
-        @@__url = @url                          # +
-        autolink(options)                       # +
-      when String
-        options
-      when Hash
-        @url = @@__url unless @url              # +
-        @url.rewrite(rewrite_options(options))
-      else
-        polymorphic_url(options)
+      def url_for(options = nil)
+        case options
+        when ActiveRecord::Base                            # +
+          autolink(options)                                # +
+        when String
+          options
+        when nil, Hash
+          _routes.url_for((options || {}).reverse_merge!(url_options).symbolize_keys)
+        else
+          polymorphic_url(options)
+        end
       end
-    end
 
+    end 
   end 
 end 
     

data/lib/autolink/action_view_extensions.rb

@@ -1,28 +1,24 @@
 module ActionView
   module Helpers
     module UrlHelper
+      
       def url_for(options = {})
         options ||= {}
-        url = case options
+        case options
         when ActiveRecord::Base                      # This method is the same as 2.3.8, 
           polymorphic_path(options.default_lineage)  # Except for the addition of these two lines.
         when String
-          escape = true
           options
         when Hash
-          options = { :only_path => options[:host].nil? }.update(options.symbolize_keys)
-          escape  = options.key?(:escape) ? options.delete(:escape) : true
-          @controller.send(:url_for, options)
+          options = options.symbolize_keys.reverse_merge!(:only_path => options[:host].nil?)
+          super
         when :back
-          escape = false
-          @controller.request.env["HTTP_REFERER"] || 'javascript:history.back()'
+          controller.request.env["HTTP_REFERER"] || 'javascript:history.back()'
         else
-          escape = false
           polymorphic_path(options)
         end
-
-        escape ? escape_once(url).html_safe : url
       end
+
     end 
   end 
 end 

data/lib/autolink/rspec.rb

@@ -1,3 +1,31 @@
+# This is a really bad idea. There's a reason this isn't supported out of the box.
+# ...but I don't want to refactor thousands of specs.
+module Spec
+  module Mocks
+    class Mock
+      def antimock(*methods)
+        methods.each do |method|
+          __mock_proxy.instance_eval <<-CODE
+            def @target.#{method}
+              syms = __mock_proxy.instance_variable_get("@stubs").map(&:sym)
+              @__sub = #{self.class}.new
+              syms.each do |sym|
+                # Define this method to call the same method on @target.
+                that = self
+                (class << @__sub; self; end).send(:define_method, sym) do 
+                  that.send(sym)
+                end 
+              end 
+              @__sub.#{method}
+            end
+          CODE
+        end 
+        self
+      end 
+    end 
+  end 
+end 
+
 module Spec
   module Rails
     module Matchers
@@ -25,24 +53,7 @@ module Spec
     module Mocks
       
       def __post_mock_model(model_class, mock)
-
-        mock.__send__(:__mock_proxy).instance_eval <<-CODE
-          def @target.default_lineage
-            # self == @target
-            syms = __mock_proxy.instance_variable_get("@stubs").map(&:sym)
-            @__sub = #{model_class}.new
-            syms.each do |sym|
-              # Define this method to call the same method on @target.
-              that = self
-              (class << @__sub; self; end).send(:define_method, sym) do 
-                that.send(sym)
-              end 
-            end 
-            @__sub.default_lineage
-          end
-        CODE
-
-        mock
+        mock.antimock(:default_lineage)
       end 
       
       alias __mock_model mock_model

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autolink
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 7
   prerelease: false
   segments: 
-  - 1
+  - 3
   - 0
   - 0
-  version: 1.0.0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Burke Libbey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 -05:00
+date: 2010-10-13 00:00:00 -05:00
 default_executable: 
 dependencies: []