rollable 0.1.1 → 0.1.2

data/lib/rollable/base.rb

@@ -30,6 +30,22 @@ module Rollable
 
       private
 
+      # Not used
+      def set_role_checking_helpers
+        rollables = @rollables.reject { |c| c.nil? }
+        rollables.each do |object|
+          @role_names.each do |role|
+            ["_on","_of",""].each do |extra|
+              define_method("is_#{role}#{extra}?") do |thing|
+                self.roles.where("rollable_type = ? AND name = ?", object, role).inject(false) do |v,o| # You can't do an inner join on polymorphic relationships, unfortunately.
+                  v ||= (o.rollable == thing)
+                end
+              end
+            end
+          end
+        end
+      end
+
       def set_role_setter_helpers
         rollables = @rollables
         @role_names.each do |name|
@@ -96,7 +112,7 @@ module Rollable
 
     # TODO: Don't need method_missing no more, use dynamic dispatch instead.
     def method_missing(method, *args)
-      if method =~ /^is_([a-z]+)(?:_(?:on|of))?\?$/ #Common spell to match against regex
+      if !(method =~ /is_a\?/) && method =~ /^is_([a-z]+)(?:_(?:on|of))?\?$/ #Common spell to match against regex
         role = $1
         that_thing = args.first.presence
         object = that_thing.class.to_s if that_thing

data/lib/rollable/version.rb

@@ -1,3 +1,3 @@
 module Rollable
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/rollable_test/spec/models/user_spec.rb

@@ -33,4 +33,11 @@ describe User do
       @user.is_owner_of?(Horse.first).should be_true
     end
   end
+
+  context "Bugs" do
+    it "should still respond to is_a?" do
+      @user = User.create
+      @user.is_a?(User).should be_true
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-06-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2164273120 !ruby/object:Gem::Requirement
+  requirement: &2173010900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2164273120
+  version_requirements: *2173010900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164272620 !ruby/object:Gem::Requirement
+  requirement: &2173010400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2164272620
+  version_requirements: *2173010400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164272160 !ruby/object:Gem::Requirement
+  requirement: &2173009940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164272160
+  version_requirements: *2173009940
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2164271780 !ruby/object:Gem::Requirement
+  requirement: &2173009560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164271780
+  version_requirements: *2173009560
 description: This gem adds agnostic roles for authorization to Rails.
 email:
 - mail@timonv.nl