roleful 0.0.2 → 0.0.3

data/lib/core_ext/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def extract_options!
+    last.is_a?(Hash) ? pop : { }
+  end
+end

data/lib/core_ext/object.rb

@@ -0,0 +1,21 @@
+# http://eigenclass.org/hiki/bounded+space+instance_exec
+class Object
+  module InstanceExecHelper; end
+  include InstanceExecHelper
+  def instance_exec(*args, &block)
+    begin
+      old_critical, Thread.critical = Thread.critical, true
+      n = 0
+      n += 1 while respond_to?(mname="__instance_exec#{n}")
+      InstanceExecHelper.module_eval{ define_method(mname, &block) }
+    ensure
+      Thread.critical = old_critical
+    end
+    begin
+      ret = send(mname, *args)
+    ensure
+      InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
+    end
+    ret
+  end
+end

data/lib/roleful.rb

@@ -1,11 +1,19 @@
 $LOAD_PATH << File.dirname(__FILE__) + '/roleful'
+$LOAD_PATH << File.dirname(__FILE__) + '/core_ext'
 
-require 'rubygems'
-require 'nakajima'
-require 'set'
+# Core extensions
+require 'object'  unless respond_to?(:instance_exec)
+require 'array'   unless [].respond_to?(:extract_options!)
+
+# Project files
 require 'role'
 require 'inclusion'
 
+# Other libraries
+require 'rubygems'
+require 'metaid'
+require 'set'
+
 module Roleful
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/roleful/inclusion.rb

@@ -10,10 +10,12 @@ module Roleful
   end
   
   module InstanceMethods
+    # Gives an object temporary roles for the duration of the block.
     def with_role(*tmp_roles)
-      old = meta_def(:role) {tmp_roles }
+      old_role = method(:role)
+      meta_def(:role) { tmp_roles }
       result = yield
-      meta_eval { remove_method(:role) }
+      meta_eval { define_method(:role, old_role) }
       result
     end
     
@@ -44,9 +46,10 @@ module Roleful
       roles.each { |name| define_role(name.to_sym, options, &block) }
     end
     
-    # Adapted from ActiveSupport, modified a bit to ease binding contexts
+    # Delegates method calls to the object's #role_proxy, accounting for
+    # cases when there are multiple roles for the given object.
     def delegate_permission(*methods)
-      options = methods.pop    
+      options = methods.pop
       raise ArgumentError, "Delegation needs a target." unless options.is_a?(Hash) && to = options[:to]
 
       methods.each do |method|

data/lib/roleful/role.rb

@@ -9,22 +9,20 @@ module Roleful
       define_predicates
     end
 
-    def can(permission, &block)
-      permission_name = "can_#{permission}?"
+    def can(sym, &block)
+      handlers[sym] = block || proc { true }
       
-      handlers[permission] = block || proc { true }
-      meta_def(permission_name) { |target, *args| handle(target, permission, *args) }
-      
-      meta_delegate(permission_name)
-      add_permission(permission)
-    end
-    
-    def can?(target, permission, *args)
-      superuser? ?
-        @klass::PERMISSIONS.include?(permission) : 
-        handle(target, permission, *args)
+      metaclass.class_eval(<<-END, __FILE__, __LINE__)
+        def can_#{sym}?(target, *args)
+          handle(target, #{sym.inspect}, *args)
+        end
+      END
+
+      register_permission(sym)
     end
     
+    # Used when the permission in question is granted for the
+    # role in question. TODO: Is this really necessary?
     def method_missing(sym, *args)
       method_id = sym.to_s
       match_permission_or_predicate?(method_id) ? superuser? : super
@@ -32,6 +30,12 @@ module Roleful
     
     private
     
+    def can?(target, permission, *args)
+      superuser? ?
+        @klass::PERMISSIONS.include?(permission) : 
+        handle(target, permission, *args)
+    end
+    
     def handle(target, permission, *args)
       return false if handlers[permission].nil?
       target.instance_exec(*args, &handlers[permission])
@@ -41,10 +45,12 @@ module Roleful
       options[:superuser] || false # returns false, not nil
     end
     
+    # TODO memoize the generated regex
     def permission?(method)
       method.match(/can_(#{@klass::PERMISSIONS.to_a.join('|')})+\?/)
     end
     
+    # TODO memoize the generated regex
     def predicate?(method)
       method.match(/(#{@klass::ROLES.keys.join('|')})\?/)
     end
@@ -55,17 +61,18 @@ module Roleful
     
     def define_predicates
       meta_def("#{name}?") { true }
-      meta_delegate("#{name}?")
-      meta_delegate("can?")
+      delegate_predicate("#{name}?")
+      delegate_predicate("can?")
     end
     
-    def add_permission(permission)
+    def register_permission(permission)
       permission = permission.to_sym
       @permissions.add(permission)
       @klass::PERMISSIONS.merge(@permissions)
+      delegate_predicate("can_#{permission}?")
     end
     
-    def meta_delegate(name)
+    def delegate_predicate(name)
       @klass.delegate_permission name, :to => :role_proxy
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roleful
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: nakajima-nakajima
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: 
 email: patnakajima@gmail.com
 executables: []
@@ -41,6 +31,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/core_ext
+- lib/core_ext/array.rb
+- lib/core_ext/object.rb
 - lib/roleful
 - lib/roleful/inclusion.rb
 - lib/roleful/role.rb
@@ -67,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Generic roles for you and your objects