lockdown 0.4.3 → 0.4.4

data/History.txt

@@ -1,3 +1,6 @@
+== 0.4.4 2008-05-08
+* Modified: refactored the link_to_secured and authorized? code to be more efficient
+
 == 0.4.3 2008-05-08
 * Fixed: broken show (and destroy) permission test.  also reduced calls to polymorphic path by generating the url once
 

data/lib/lockdown/controller.rb

@@ -104,9 +104,11 @@ module Lockdown
           return true if current_user_is_admin?
 
           # See if path is known
-          return true if path_allowed?(path)
-
-          return false
+          if path_allowed?(path)
+            true 
+          else
+            false
+          end
         end
       
         # Can log Error => e if desired, I don't desire to now.
@@ -157,33 +159,33 @@ module Lockdown
           request.request_uri
         end
 
-        def authorized?(options)
+        def authorized?(url)
           return true if current_user_is_admin?
 
-          url_parts = URI::split url_for(options)
+          url_parts = URI::split(url)
         
           path = url_parts[5]
 
           # See if path is known
           return true if path_allowed?(path)
 
-          if options.is_a?(String)
-            # Test for a named routed
-            begin
-              hsh = ActionController::Routing::Routes.recognize_path(options)
-              return true if path_allowed?(path_from_hash(hsh)) unless hsh.nil?
-            rescue Exception => e
-              # continue on
-            end
-          end
-          
           # 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?(new_path)
 
-          return false
+          # Test for a named routed
+          begin
+            hsh = ActionController::Routing::Routes.recognize_path(url)
+            unless hsh.nil?
+              return true if path_allowed?(path_from_hash(hsh)) 
+            end
+          rescue Exception => e
+            # continue on
+          end
+
+          false
         end
       
         def access_denied(e)

data/lib/lockdown/version.rb

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

data/lib/lockdown/view.rb

@@ -23,7 +23,7 @@ module Lockdown
       end
 
       def link_to_or_show(name, url = '', options = {})
-        lnk = link_to(name, options, html_options)
+        lnk = link_to(name, url , options)
         lnk.length == 0  ? name : lnk
       end
     end # Merb
@@ -39,8 +39,8 @@ module Lockdown
       end
     
       def link_to_secured(name, options = {}, html_options = nil)
-        # Don't want to go through the polymorphic test twice
-        url = real_url(options, html_options)
+        # Don't want to go through the url_for twice
+        url = url_for(options)
         if authorized? test_path(url, html_options)
           return link_to_open(name, url, html_options)
         end
@@ -53,25 +53,17 @@ module Lockdown
       end
     
       def button_to_secured(name, options = {}, html_options = nil)
-        url = real_url(options, html_options)
-        if authorized? test_path(url,html_options)
-          return button_to_open(name,url,html_options)
+        url = url_for(options)
+        if authorized? test_path(url, html_options)
+          return button_to_open(name, url, html_options)
         end
         return ""
       end
     
       private
 
-      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
+        if url.split("/").last =~ /\A\d+\z/
           url += "/show"
         elsif html_options.is_a?(Hash) && html_options[:method] == :delete
           url += "/destroy"

metadata

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