lockdown 1.6.4 → 1.6.5

data/lib/lockdown/frameworks/rails/controller.rb

@@ -77,6 +77,11 @@ module Lockdown
 
             path = url_parts[5]
 
+            subdir = Lockdown::System.fetch(:subdirectory)
+            if subdir && subdir == path[1,subdir.length]
+              path = path[(subdir.length+1)..-1]
+            end
+
             return true if path_allowed?(path)
 
             begin
@@ -120,7 +125,8 @@ module Lockdown
           end
 
           def path_from_hash(hash)
-            hash[:controller].to_s + "/" + hash[:action].to_s
+            subdir = Lockdown::System.fetch(:subdirectory)
+            (subdir ? subdir + "/" : "") + hash[:controller].to_s + "/" + hash[:action].to_s
           end
 
           def remote_url?(domain = nil)

data/lib/lockdown.rb

@@ -16,7 +16,7 @@ module Lockdown
   extend Lockdown::References
   extend Lockdown::Helper
 
-  VERSION = '1.6.4'
+  VERSION = '1.6.5'
 
   class << self
     attr_accessor :logger

data/lockdown.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lockdown}
-  s.version = "1.6.4"
+  s.version = "1.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
-  s.date = %q{2010-02-08}
+  s.date = %q{2010-03-01}
   s.description = %q{Restrict access to your controller actions.  Supports basic model level restrictions as well}
   s.email = %q{andy@stonean.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -05:00
+date: 2010-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency