lockdown 2.0.4 → 2.0.5

data/lib/lockdown/configuration.rb

@@ -49,6 +49,9 @@ module Lockdown
       # Which environments Lockdown should not sync with db
       # Default ['test']
       attr_accessor :skip_db_sync_in
+      # Slice size for permission regexes
+      # Default 10
+      attr_accessor :permission_slice_size
       # Set defaults.
       def reset
         @configured                   = false
@@ -70,6 +73,7 @@ module Lockdown
         @user_model                   = "User"
 
         @skip_db_sync_in              = ['test']
+        @permission_slice_size        = 10
       end
 
       # @return [String] concatentation of public_access + "|" + protected_access
@@ -182,17 +186,21 @@ module Lockdown
           end
         end
 
-        if permission_names.empty?
-          authenticated_access
-        else
-          authenticated_access + "|" + access_rights_for_permissions(*permission_names)
+        slice_permission_regexes(authenticated_access, access_rights_for_permissions(*permission_names))
+      end
+
+      def slice_permission_regexes(authenticated_access, permissions)
+        result = [authenticated_access]
+        permissions.each_slice(permission_slice_size) do |permission_slice|
+          result << permission_slice.join('|')
         end
+        result
       end
 
       # @param [Array(String)] names permission names
       # @return [String] combination of regex_patterns from permissions
       def access_rights_for_permissions(*names)
-        names.collect{|name| "(#{permission(name).regex_pattern})"}.join('|')
+        names.collect{|name| "(#{permission(name).regex_pattern})"}
       end
 
       def skip_sync?

data/lib/lockdown/delivery.rb

@@ -10,18 +10,14 @@ module Lockdown
         rescue NameError
         end
 
-        access_rights ||= Lockdown::Configuration.public_access
-
-        access_rights_regex = Lockdown.regex(access_rights)
-
         path += "/" unless path =~ /\/$/
         path = "/" + path unless path =~ /^\//
 
-        if (access_rights_regex =~ path) == 0
-          return true 
-        end
+        access_rights ||= [Lockdown::Configuration.public_access]
 
-        return false
+        return access_rights.any? do |access_rights_group|
+          (Lockdown.regex(access_rights_group) =~ path) == 0
+        end
       end
     end # class block
   end # Delivery

data/lib/lockdown.rb

@@ -24,7 +24,7 @@ module Lockdown
 
     # @return the version string for the library.
     def version
-      '2.0.4'
+      '2.0.5'
     end
 
     def rails_mixin

data/lockdown.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lockdown}
-  s.version = "2.0.4"
+  s.version = "2.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
-  s.date = %q{2010-10-10}
+  s.date = %q{2010-10-24}
   s.description = %q{Restrict access to your controller actions. }
   s.email = %q{andy@stonean.com}
   s.extra_rdoc_files = [

data/test/lockdown/test_configuration.rb

@@ -184,10 +184,21 @@ class TestLockdownConfiguration < MiniTest::Unit::TestCase
     Authorization.permission('faq')
     Authorization.permission('about')
 
-    assert_equal "((/home(/.*)?))|((/faq(/.*)?))|((/about(/.*)?))", 
+    assert_equal ["((/home(/.*)?))","((/faq(/.*)?))","((/about(/.*)?))"],
       @config.access_rights_for_permissions('home', 'faq', 'about')
   end
 
+  def test_permission_regex_slicing
+    @config.permission_slice_size = 2
+
+    Authorization.permission('home')
+    Authorization.permission('faq')
+    Authorization.permission('about')
+
+    assert_equal ["x","((/home(/.*)?))|((/faq(/.*)?))","((/about(/.*)?))"],
+      @config.slice_permission_regexes('x', @config.access_rights_for_permissions('home', 'faq', 'about'))
+  end
+
   def test_skip_sync?
     assert_equal true, @config.skip_sync?
   end

data/test/lockdown/test_delivery.rb

@@ -185,8 +185,8 @@ class TestLockdown < MiniTest::Unit::TestCase
 
     assert_equal false, Lockdown::Delivery.allowed?('/users/')
 
-    assert_equal false, Lockdown::Delivery.allowed?('/users/', Lockdown::Configuration.authenticated_access)
-    assert_equal false, Lockdown::Delivery.allowed?('/users', Lockdown::Configuration.authenticated_access)
+    assert_equal false, Lockdown::Delivery.allowed?('/users/', [Lockdown::Configuration.authenticated_access])
+    assert_equal false, Lockdown::Delivery.allowed?('/users', [Lockdown::Configuration.authenticated_access])
   end
 
   def test_it_handles_namespaced_routes_correctly
@@ -203,8 +203,8 @@ class TestLockdown < MiniTest::Unit::TestCase
 
     assert_equal false, Lockdown::Delivery.allowed?('/nested/users')
 
-    assert_equal true, Lockdown::Delivery.allowed?('/users', Lockdown::Configuration.authenticated_access)
-    assert_equal true, Lockdown::Delivery.allowed?('/nested/users', Lockdown::Configuration.authenticated_access)
+    assert_equal true, Lockdown::Delivery.allowed?('/users', [Lockdown::Configuration.authenticated_access])
+    assert_equal true, Lockdown::Delivery.allowed?('/nested/users', [Lockdown::Configuration.authenticated_access])
   end
 
   def test_it_matches_exact_paths_only
@@ -218,7 +218,7 @@ class TestLockdown < MiniTest::Unit::TestCase
 
     assert_equal false, Lockdown::Delivery.allowed?('/users_that_should_be_protected')
 
-    assert_equal true, Lockdown::Delivery.allowed?('/users', Lockdown::Configuration.authenticated_access)
-    assert_equal true, Lockdown::Delivery.allowed?('/users_that_should_be_protected', Lockdown::Configuration.authenticated_access)
+    assert_equal true, Lockdown::Delivery.allowed?('/users', [Lockdown::Configuration.authenticated_access])
+    assert_equal true, Lockdown::Delivery.allowed?('/users_that_should_be_protected', [Lockdown::Configuration.authenticated_access])
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - Andrew Stone
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 -04:00
+date: 2010-10-24 00:00:00 -04:00
 default_executable: 
 dependencies: []