maybee 0.0.2 → 0.0.3

data/lib/maybee/authorization.rb

@@ -17,12 +17,9 @@ module Maybee
       return false if !@allow_nil && @subject_classes && @subject_classes.none? { |klass| subject.is_a?(klass) }
       return true unless @conditionals
       return true if @conditionals.all? do |clause, cond|
+        next(false) if subject.nil? && !@allow_nil
         if :if_subject == clause || :unless_subject == clause
-          if @allow_nil && subject.nil?
-            next(true)
-          else
-            receiver, argument = subject, object
-          end
+          receiver, argument = subject, object
         else
           receiver, argument = object, subject
         end

data/lib/maybee/authorization_object.rb

@@ -8,9 +8,11 @@ module Maybee
       base.authorizations = {}
       base.class_eval do
         attr_accessor :authorization_subject
-        before_create { authorize?(:create) }
-        before_update { authorize?(:update) }
-        before_destroy { authorize?(:destroy) }
+        if base.include?(ActiveRecord::Callbacks)
+          before_create { authorize?(:create) }
+          before_update { authorize?(:update) }
+          before_destroy { authorize?(:destroy) }
+        end
       end
     end
   

data/lib/maybee/version.rb

@@ -1,3 +1,3 @@
 module Maybee
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maybee
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2151917600 !ruby/object:Gem::Requirement
+  requirement: &2151917460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2151917600
+  version_requirements: *2151917460
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2151916880 !ruby/object:Gem::Requirement
+  requirement: &2151916700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151916880
+  version_requirements: *2151916700
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151916160 !ruby/object:Gem::Requirement
+  requirement: &2151915940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151916160
+  version_requirements: *2151915940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2151915460 !ruby/object:Gem::Requirement
+  requirement: &2151915340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151915460
+  version_requirements: *2151915340
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2151914840 !ruby/object:Gem::Requirement
+  requirement: &2151914680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151914840
+  version_requirements: *2151914680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151914060 !ruby/object:Gem::Requirement
+  requirement: &2151913920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,18 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2151914060
+  version_requirements: *2151913920
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: &2151913340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2151913340
 description: A simple, yet flexible approach to model-based authorization
 email: mtgrosser@gmx.net
 executables: []