lib/permissive/permission_definition.rb in permissive-0.2.2.alpha vs lib/permissive/permission_definition.rb in permissive-0.2.4.alpha

@@ -15,10 +15,11 @@
         end
         permission_definition
       end
 
       def interpolate_scope(model, scope)
+        return :global if scope.to_s == 'global'
         attempted_scope = scope.to_s.singularize.classify
         model_module = model.name.to_s.split('::')
         model_module.pop
         model_module = model_module.join('::')
         if (model_module.blank? ? Object : Object.const_get(model_module)).const_defined?(attempted_scope)
@@ -27,10 +28,11 @@
           scope.to_s.classify
         end
       end
 
       def normalize_scope(model, scope)
+        return :global if scope.to_s == 'global'
         scope = case scope
         when Class
           scope.name.tableize
         when String, Symbol
           interpolate_scope(model, scope).to_s.tableize
@@ -49,10 +51,63 @@
         name = name.to_s.downcase.to_sym
         roles[@role].push(name) unless roles[@role].include?(name)
       end
     end
 
+    def define_methods
+      permission_setter = @options[:on] == :global ? 'permissions' : "#{@options[:on].to_s.singularize}_permissions"
+      if model.instance_methods.include?("#{permission_setter}=")
+        if !model.instance_methods.include?("#{permission_setter}_with_permissive=")
+          model.class_eval <<-eoc
+            def #{permission_setter}_with_permissive=(values)
+              values ||= []
+              if values.all? {|value| value.is_a?(String) || value.is_a?(Symbol)}
+                can!(values, :reset => true, :on => #{@options[:on].inspect})
+              else
+                self.#{permission_setter}_without_permissive = values
+              end
+            end
+            # alias_method_chain "#{permission_setter}=", :permissive
+          eoc
+        end
+        model.alias_method_chain "#{permission_setter}=", :permissive
+      else
+        model.class_eval <<-eoc
+          def #{permission_setter}=(values)
+            values ||= []
+            if values.all? {|value| value.is_a?(String) || value.is_a?(Symbol)}
+              can!(values, :reset => true, :on => #{@options[:on].inspect})
+            end
+          end
+        eoc
+      end
+
+      if model.instance_methods.include?('role=') && !model.respond_to?(:permissive_role_defined?)
+        puts "role= defined but role_defined? is false"
+        model.class_eval do
+          def role_with_permissive=(role_name)
+            self.permissions = self.class.permissions[:global].roles[role_name.to_s.downcase.to_sym]
+            self.role_without_permissive = role_name.to_s.downcase
+          end
+        end
+        model.alias_method_chain :role=, :permissive
+      else
+        model.class_eval do
+          def role=(role_name)
+            self.permissions = self.class.permissions[:global].roles[role_name.to_s.downcase.to_sym]
+          end
+
+          class << self
+            def permissive_role_defined?
+              true
+            end
+            protected :permissive_role_defined?
+          end
+        end
+      end
+    end
+
     def initialize(model, options = {})
       options.assert_valid_keys(:on)
       @options = options
       @model = model.name
     end
@@ -60,11 +115,12 @@
     def model
       @model.constantize
     end
 
     def on(class_name, &block)
-      Permissive::PermissionDefinition.define(model, @options.merge(:on => class_name), &block)
+      permission_definition = Permissive::PermissionDefinition.define(model, @options.merge(:on => class_name), &block)
+      permission_definition.define_methods
     end
 
     def permission(name, value)
       unless value.is_a?(Numeric)
         raise Permissive::PermissionError.new("Permissions must be integers or longs. Strings, symbols, and floats are not currently supported.")
@@ -80,15 +136,15 @@
     def role(*names, &block)
       names.each do |name|
         @role = name.to_s.to_sym
         roles[@role] ||= []
         instance_eval(&block) if block_given?
-      end
-      unless model.instance_methods.include?('role=')
-        model.class_eval do
-          def role=(role_name)
-            self.permissions = self.class.permissions[:global].roles[role_name.to_s.downcase.to_sym]
-          end
+        if model.instance_methods.include?('role') && !model.instance_methods.include?("is_#{name}?")
+          model.class_eval <<-eoc
+            def is_#{name}?
+              role == #{name.to_s.downcase.inspect}
+            end
+          eoc
         end
       end
     end
 
     def roles
\ No newline at end of file