challah 0.4.1 → 0.5.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Challah 0.5.0
+
+* Modified user permission key lookup to use caching of permission keys.
+* Added timestamps to roles migration.
+
 ## Challah 0.4.1
 
 * Added User#protect_attributes to allow for the addition of app-specific protected attributes in User

data/db/migrate/20120127150434_create_roles.rb

@@ -5,6 +5,7 @@ class CreateRoles < ActiveRecord::Migration
       t.text :description
       t.string :default_path, :default => '/'
       t.boolean :locked, :default => false
+      t.timestamps
     end
   end
 

data/lib/challah/authable/user.rb

@@ -15,7 +15,7 @@ module Challah
         
         before_save :before_save_password
         
-        belongs_to :role
+        belongs_to :role, :touch => true
         has_many :permission_users, :dependent => :destroy
         has_many :permissions, :through => :permission_users, :order => 'permissions.name'
         
@@ -131,8 +131,28 @@ module Challah
       def permission_keys
         return @permission_keys if @permission_keys
         
-        role_keys = self.role(true) ? self.role.permission_keys.clone : []
-        user_keys = new_record? ? [] : self.user_permission_keys.clone
+        role_keys = if role(true)
+          role_key = "#{role.cache_key}/permissions"
+          
+          keys = Rails.cache.fetch(role_key) do
+            role.permission_keys.clone
+          end
+          
+          Rails.cache.write(role_key, keys)          
+          keys
+        else
+          []
+        end
+        
+        user_key = "#{self.cache_key}/permissions"
+        
+        user_keys = Rails.cache.fetch(user_key) do
+          user_permission_keys.clone
+        end
+        
+        user_keys = [] unless user_keys
+          
+        Rails.cache.write(user_key, keys) unless new_record?
 
         @permission_keys = (role_keys + user_keys).uniq            
       end
@@ -145,6 +165,8 @@ module Challah
 
       # Set the permission keys that this role can access
       def permission_keys=(value)
+        Rails.cache.delete("#{self.cache_key}/permissions")
+        
         @permission_keys = value
         @permission_keys
       end
@@ -181,7 +203,7 @@ module Challah
       
       # Returns the permission keys used by this specific user, does not include any role-based permissions. 
       def user_permission_keys
-        self.permissions(true).collect(&:key)
+        new_record? ? [] : self.permissions(true).collect(&:key)
       end
       
       # Is this user valid and ready for a user session?

data/lib/challah/version.rb

@@ -1,3 +1,3 @@
 module Challah
-  VERSION = "0.4.1" unless defined?(::Challah::VERSION)
+  VERSION = "0.5.0" unless defined?(::Challah::VERSION)
 end

data/test/user_test.rb

@@ -181,7 +181,7 @@ class UserTest < ActiveSupport::TestCase
       assert_raises NoMethodError do
         user.does_not_exist
       end
-    end
+    end    
     
     should "authenticate through various means by default" do
       user = Factory(:user)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: challah
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000Z
+date: 2012-02-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70149861857320 !ruby/object:Gem::Requirement
+  requirement: &70359908531280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149861857320
+  version_requirements: *70359908531280
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70149861950500 !ruby/object:Gem::Requirement
+  requirement: &70359908624460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70149861950500
+  version_requirements: *70359908624460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70149861950000 !ruby/object:Gem::Requirement
+  requirement: &70359908623960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70149861950000
+  version_requirements: *70359908623960
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70149861949540 !ruby/object:Gem::Requirement
+  requirement: &70359908623500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149861949540
+  version_requirements: *70359908623500
 description: A simple ruby gem for authentication, users, roles and permissions.
 email:
 - john@johntornow.com