permissable 0.3.0 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/lib/permissable/member.rb

@@ -41,6 +41,12 @@ module Permissable
         # response array to return
         result_response = []
         
+        # Load all permissions fresh so we can kill dupes.
+        saved_permissions = Permission.all
+        # Store new permissions in an array so we can squeeze into one transaction.
+        permissions_to_add    = []
+        permissions_to_update = []
+        
         [resources].flatten.each do |resource|
           
           # Kind of unecessary but since some methods allow you to specify a Classname directly, this just
@@ -51,21 +57,37 @@ module Permissable
           identifier = member_identifier(resource)
           
           [methods].flatten.each do |method|
-            # Permission already exists, continue.
-            next if can?(method, resource, false)
+            
+            resource_type = (resource.respond_to?(:base_class) ? resource.base_class.to_s : resource.class.base_class.to_s)
             
             # Create a new permission for each member (once if its self, multiple times if its associated)
-            [identifier[:member_id]].flatten.each do |member_id|
-              perm = Permission.where(:member_id => member_id, :member_type => identifier[:member_type]).for_resource(resource).first || Permission.new(:member_id => member_id, :member_type => identifier[:member_type])
+            [identifier[:member_id]].flatten.each do |member_id|              
+              perm = saved_permissions.detect{ |p| p.member_id == member_id && p.member_type == identifier[:member_type] && p.resource_id == resource.id && p.resource_type == resource_type }  || Permission.new(:member_id => member_id, :member_type => identifier[:member_type])
               perm.permission_type = method.to_s.downcase
               perm.resource        = resource if perm.new_record?
-              perm.save
-              result_response << perm
+              (perm.new_record?) ? (permissions_to_add << perm) : (permissions_to_update << perm)
             end
           end
         end
         
-        (result_response.size == 1) ? result_response.first : result_response
+        
+        unless permissions_to_add.empty?
+          attrs = permissions_to_add.first.attributes.keys.collect{ |k| k.to_s }
+          sql_insert = "INSERT INTO `permissions` (`#{attrs.join("`,`")}`) VALUES"
+          sql_values = []
+          permissions_to_add.each do |perm|
+            vals = []
+            attrs.each{ |a| vals << ((a == "created_at" || a == "updated_at") ? DateTime.now.utc.strftime("%Y-%m-%d %H:%M:%S") : ((a == "id") ? "NULL" : perm.send(a.to_sym))) }
+            sql_values << "('#{vals.join("','")}')"
+          end        
+          Permission.connection.execute("#{sql_insert} #{sql_values.join(',')}")
+        end
+        
+        unless permissions_to_update.empty?
+          permissions_to_update.each do |perm|
+            Permission.update_all(['permission_type = ?', perm.permission_type ], ['id = ?', perm.id])
+          end
+        end
         
       end
       
@@ -100,7 +122,23 @@ module Permissable
       end
       
       def lookup_permissions!
-        @permissions_cache = PermissionsCache.new(Permission.where(:resource_type => self.class.permissable_resources.collect{ |r| r.to_s.classify }).all)
+
+        resource_types = self.class.permissable_resources.collect{ |r| r.to_s.classify }
+        member_ids   = []
+        member_types = []
+        
+        resource_types.each do |type|
+          identifier = member_identifier(type)
+          member_ids   << identifier[:member_id]
+          member_types << identifier[:member_type]
+        end
+        
+        member_ids   = member_ids.uniq; member_types = member_types.uniq;
+        member_ids   = member_ids.first unless member_ids.size > 1
+        member_types = member_types.first unless member_types.size > 1
+        
+        @permissions_cache ||= PermissionsCache.new(Permission.where(:member_id => member_ids, :member_type => member_types, :resource_type => resource_types).all)
+        
       end
       
       private 

data/permissable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{permissable}
-  s.version = "0.3.0"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brent Kirby"]
-  s.date = %q{2010-09-13}
+  s.date = %q{2010-09-16}
   s.description = %q{Permissable lets you set a number of 'permissions' to your database models. By assigning 'members' to 'resources' (models) you can specify various permission states.}
   s.email = %q{brent@kurbmedia.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: permissable
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Brent Kirby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -04:00
+date: 2010-09-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency