lockdown 2.0.6 → 2.0.7

data/lib/lockdown.rb

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

data/lib/lockdown/configuration.rb

@@ -170,7 +170,7 @@ module Lockdown
       # @return [Regex] 
       def access_rights_for_user(user)
         return unless user
-        return Lockdown::Resource.regex if administrator?(user)
+        return Lockdown::Resource.all_access if administrator?(user)
 
         user_groups = user.send(Lockdown.user_groups_hbtm_reference)
 

data/lib/lockdown/resource.rb

@@ -3,7 +3,7 @@
 module Lockdown
   class Resource
     class << self
-      attr_accessor :resources, :resources_regex
+      attr_reader :resources
 
       # When a new resource is created, this method is called to register the root
       def register_regex(resource)
@@ -11,9 +11,14 @@ module Lockdown
         @resources << resource unless @resources.include?(resource)
       end
 
-      # @return [Regexp] created from resources' base regex
-      def regex
-        @resources_regex ||= Lockdown.regex(@resources.join("|"))
+      # @return [String] all registered regular expressions joined by a pipe
+      def all_access
+        @resources.join(Lockdown::DELIMITER)
+      end
+
+      # Reset resources to empty array
+      def reset_resources
+        @resources = []
       end
     end # class block
 

data/lockdown.gemspec

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

data/test/lockdown/test_resource.rb

@@ -43,5 +43,13 @@ class TestLockdownResource < MiniTest::Unit::TestCase
     assert_equal resource.regex_pattern, "\/users(\/.*)?"
   end
 
+  def test_all_access
+    Lockdown::Resource.reset_resources 
+    Lockdown::Resource.new(:users)
+    Lockdown::Resource.new(:posts)
+
+    assert_equal Lockdown::Resource.all_access, "(\/users(\/.*)?)#{Lockdown::DELIMITER}(\/posts(\/.*)?)"
+  end
+
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 6
-  version: 2.0.6
+  - 7
+  version: 2.0.7
 platform: ruby
 authors: 
 - Andrew Stone
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-20 00:00:00 -05:00
+date: 2011-03-05 00:00:00 -05:00
 default_executable: 
 dependencies: []