lockdown 0.4.2 → 0.4.3

data/History.txt

@@ -1,3 +1,6 @@
+== 0.4.3 2008-05-08
+* Fixed: broken show (and destroy) permission test.  also reduced calls to polymorphic path by generating the url once
+
 == 0.4.2 2008-05-08
 * Fixed: broken link_to functionality. 
 

data/lib/lockdown/controller.rb

@@ -177,10 +177,11 @@ module Lockdown
             end
           end
           
-          # Test to see if using a get method (show)
-          path += "/show" if path.split("/").last.to_i > 0
+          # Test to see if url contains id 
+          parts = path.split("/").collect{|p| p unless p =~ /\A\d+\z/}.compact
+          new_path = parts.join("/")
 
-          return true if path_allowed?(path)
+          return true if path_allowed?(new_path)
 
           return false
         end

data/lib/lockdown/version.rb

@@ -2,7 +2,7 @@ module Lockdown #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/lockdown/view.rb

@@ -39,9 +39,10 @@ module Lockdown
       end
     
       def link_to_secured(name, options = {}, html_options = nil)
-        url = lock_down_url(options, html_options)
-        if authorized? url
-          return link_to_open(name,options,html_options)
+        # Don't want to go through the polymorphic test twice
+        url = real_url(options, html_options)
+        if authorized? test_path(url, html_options)
+          return link_to_open(name, url, html_options)
         end
         return ""
       end
@@ -52,24 +53,30 @@ module Lockdown
       end
     
       def button_to_secured(name, options = {}, html_options = nil)
-        url = lock_down_url(options, html_options)
-        if authorized? url
-          return button_to_open(name,options,html_options)
+        url = real_url(options, html_options)
+        if authorized? test_path(url,html_options)
+          return button_to_open(name,url,html_options)
         end
         return ""
       end
     
       private
 
-      def lock_down_url(options, html_options = {})
-        return options unless options.respond_to?(:new_record?)
-        p = polymorphic_path(options)
-        if html_options.is_a?(Hash) && html_options[:method] == :delete
-          p += "/destroy"
-        elsif p.split("/").last.to_i > 0
-          p += "/show"
+      def real_url(options, html_options = {})
+        unless options.respond_to?(:new_record?)
+          options 
+        else
+          polymorphic_path(options)
+        end
+      end
+      
+      def test_path(url, html_options)
+        if url.split("/").last.to_i > 0
+          url += "/show"
+        elsif html_options.is_a?(Hash) && html_options[:method] == :delete
+          url += "/destroy"
         end
-        return p
+        url 
       end
     end # Rails
   end # View

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Andrew Stone