three 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db0908414cedec93c7f8f5cae166fad7b1b1ef9b
-  data.tar.gz: 7cd6687d38c7ccc4d9ffef7daaf1d719f7b26aed
+  metadata.gz: c4018a469715b0050959db01c36db56f214d9ccd
+  data.tar.gz: bd36ca9b6b88aad4869562354fae9d518e88c194
 SHA512:
-  metadata.gz: aa8cbc2fc7e2289a322eadefa7dca02afe0e2cf8d16edeef25087693d0f7e6ea0a793b6ea1d4085d6ac24c08b21010525a357dcacdc532d1cdca3067f50888bf
-  data.tar.gz: 3a55795d388bf63dedb2403708a07dcc60ca1d0b4b16f1b4846fb80425b51ae0e59bee59d4797614571b29d8bf5f34d6e101cdc7a3db560361a4a65e1dcee1d1
+  metadata.gz: e4deed1807609d3bac89dfc02501d5995cc116d66699d763a79e4c1a6674cd397ec9351c42f34c1629981a9b70e34194d21395d9a960443d2db7ff8e2ab3d7f2
+  data.tar.gz: 4a35b37082a40d2e5209f03875287acd110297cdc4da31dcf256bc138676de5148e0895ca84960b70e129b59c07415df07da59cf961b2e350e6a9cedcdc2f1a6

data/README.markdown

@@ -151,3 +151,20 @@ The "prevented" method works just like "allowed," except that it will remove the
 
 The "prevented" method is the only only feature added with six. 
 
+### Errors
+
+By default, errors in a rule or calling a rule is turned off.  This means that you don't have to declare "allowed" or "prevented" on your rules, and you can have clean examples like the one above.
+
+However, sometimes you may not want to run your production code through blanket rescue statements.  So, you can disable this using:
+
+```ruby
+
+module RulesMissingMethods
+end
+
+evaluator = Three.evaluator_for RulesMissingMethods
+evaluator.rescue_errors = false
+
+evaluator.allowed? nil, :watch_out # POW an error was raised
+
+```

data/lib/three/evaluator.rb

@@ -2,7 +2,10 @@ module Three
 
   class Evaluator
 
+    attr_accessor :rescue_errors
+
     def initialize(rules)
+      @rescue_errors = true
       @rules = a_single_array_was_provided?(rules) ? rules[0] : rules
     end
 
@@ -55,10 +58,14 @@ module Three
     end
 
     def execute_rule rule, method, subject, target
-      begin
+      if rescue_errors
+        begin
+          rule.send(method, subject, target)
+        rescue
+          []
+        end
+      else
         rule.send(method, subject, target)
-      rescue
-        []
       end
     end
 

data/lib/three/version.rb

@@ -1,3 +1,3 @@
 module Three
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/three/evaluator_spec.rb

@@ -0,0 +1,89 @@
+require_relative '../spec_helper'
+
+describe Three::Evaluator do
+
+  describe "rescuing failures" do
+
+    describe "allowed" do
+
+      it "should return false if the rule returns an error" do
+
+        good_rule, missing_rule, failing_rule = Object.new, Object.new, Object.new
+        good_rule.stubs(:allowed).returns [:something]
+        missing_rule.stubs(:allowed).returns [:something_else]
+        failing_rule.stubs(:allowed).raises 'error'
+
+        Three.evaluator_for(good_rule).allowed?(nil, :something).must_equal true
+        Three.evaluator_for(missing_rule).allowed?(nil, :something).must_equal false
+        Three.evaluator_for(failing_rule).allowed?(nil, :something).must_equal false
+          
+      end
+
+      describe "the error checking is disabled" do
+
+        it "should throw if the rule returns an error" do
+
+          failing_rule = Object.new
+          failing_rule.stubs(:allowed).raises 'error'
+          failing_rule.stubs(:prevented).returns []
+
+          begin
+            evaluator = Three.evaluator_for(failing_rule)
+            evaluator.rescue_errors = false
+            evaluator.allowed? nil, :something
+          rescue
+            error_hit = true
+          end
+
+          error_hit.must_equal true
+            
+        end
+
+      end
+
+    end
+
+    describe "prevented" do
+
+      it "should return not block the permission if it returns an error" do
+
+        good_rule, bad_rule = Object.new, Object.new
+
+        good_rule.stubs(:allowed).returns [:apple]
+        good_rule.stubs(:prevented).returns [:apple]
+
+        bad_rule.stubs(:allowed).returns [:apple]
+        bad_rule.stubs(:prevented).raises 'k'
+
+        Three.evaluator_for(good_rule).allowed?(nil, :apple).must_equal false
+        Three.evaluator_for(bad_rule).allowed?(nil, :apple).must_equal true
+          
+      end
+
+      describe "the error checking is disabled" do
+
+        it "should throw if the prevented rule returns an error" do
+
+          failing_rule = Object.new
+          failing_rule.stubs(:allowed).returns [:sigh]
+          failing_rule.stubs(:prevented).raises 'k'
+
+          begin
+            evaluator = Three.evaluator_for(failing_rule)
+            evaluator.rescue_errors = false
+            evaluator.allowed? nil, :sigh
+          rescue
+            error_hit = true
+          end
+
+          error_hit.must_equal true
+            
+        end
+
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: three
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Darren Cauthon
@@ -48,7 +48,6 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - ORIGINAL_LICENSE
 - README.markdown
@@ -57,6 +56,7 @@ files:
 - lib/three/evaluator.rb
 - lib/three/version.rb
 - spec/spec_helper.rb
+- spec/three/evaluator_spec.rb
 - spec/three_spec.rb
 - three.gemspec
 homepage: https://github.com/darrencauthon/three
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: three

data/Gemfile.lock

@@ -1,20 +0,0 @@
-PATH
-  remote: .
-  specs:
-    three (1.0.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    metaclass (0.0.4)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    rake (10.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  mocha
-  rake
-  three!