Merge pull request #19 from dwbutler/master

Support for dynamic querying

lib/role_model/class_methods.rb

@@ -34,7 +34,27 @@ module RoleModel
     #
     # declare valid roles
     def roles(*roles)
+      opts = roles.last.is_a?(Hash) ? roles.pop : {}
       self.valid_roles = roles.flatten.map(&:to_sym)
+      unless (opts[:dynamic] == false)
+        self.define_dynamic_queries(self.valid_roles)
+      end
+    end
+    
+    # Defines dynamic queries for :role
+    #   #is_<:role>?
+    #   #<:role>?
+    #
+    # Defines new methods which call #is?(:role)
+    def define_dynamic_queries(roles)
+      dynamic_module = Module.new do
+        roles.each do |role|
+          ["#{role}?".to_sym, "is_#{role}?".to_sym].each do |method|
+            define_method(method) { is? role }
+          end
+        end
+      end
+      include dynamic_module
     end
   end
 end

spec/role_model_spec.rb

@@ -296,6 +296,78 @@ describe RoleModel do
       end
     end
   end
+  
+  describe "dynamically query for an individual role" do
+    subject { model_class.new }
+    
+    it "should return true when the given role was assigned" do
+      subject.roles = :foo
+      subject.is_foo?.should be_true
+      subject.foo?.should be_true
+    end
+
+    it "should return false when the given role was not assigned" do
+      subject.roles = :bar
+      subject.is_foo?.should be_false
+      subject.foo?.should be_false
+    end
+
+    it "should return false when no role was assigned" do
+      subject.is_foo?.should be_false
+      subject.bar?.should be_false
+    end
+
+    it "should throw NoMethodError when asked for an undefined role" do
+      lambda { subject.baz? }.should raise_error(NoMethodError)
+      lambda { subject.is_baz? }.should raise_error(NoMethodError)
+    end
+    
+    it "should not define dynamic finders when opting out" do
+      non_dynamic_klass = Class.new do
+        attr_accessor :roles_mask
+        attr_accessor :custom_roles_mask
+        include RoleModel
+        roles :foo, :bar, :third, :dynamic => false
+      end
+      
+      model = non_dynamic_klass.new
+      lambda { model.is_foo? }.should raise_error(NoMethodError)
+      lambda { model.bar? }.should raise_error(NoMethodError)
+    end
+    
+    it "should be able to override the default dynamic query methods and call super" do
+      klass = Class.new do
+        def bar?
+          return false
+        end
+        
+        attr_accessor :roles_mask
+        attr_accessor :custom_roles_mask
+        include RoleModel
+        roles :foo, :bar, :baz
+        
+        def is_baz?
+          return false
+        end
+        
+        def foo?
+          ret = super
+          !ret
+        end
+      end
+      
+      model = klass.new
+      model.roles = [:foo, :bar, :baz]
+      
+      model.foo?.should be_false
+      
+      model.bar?.should be_false
+      model.is_bar?.should be_true
+      
+      model.is_baz?.should be_false
+      model.baz?.should be_true
+    end
+  end
 
   context "query for multiple roles" do
     [:has_any_role?, :is_any_of?, :has_role?].each do |check_role_assignment_method|