surrounded 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31db490fd3a2fd39b290aa7c5f9368e1ce3fa963
-  data.tar.gz: eef7f29cd0632c9066686d00b873629ef80f7942
+  metadata.gz: 2c6531f19ef8b5dbc0b493ec8e152e9b437a30cb
+  data.tar.gz: e697f17d7fd567a6267dacd4920818f7fc38479d
 SHA512:
-  metadata.gz: 6719cd08a3549f2b23a5193e86e656fb88480d3321193fad86709e09fdfe9ccf07b68659a5c51efe2b59e6c27904227246b23d17ece00882b411262123d9f881
-  data.tar.gz: 71ae69d703a4c4502ddc000f06294c6c87f047253c2c4a86b7acee3a6d3d0106abf4b9e4578bfe8320e109afbdd1f77caf99a16ecb237f1b1b604204f1087da3
+  metadata.gz: 45331f12b9e8bede773e36f022f1df5950de459b6687b5dad81b960d2cf4d85fbd694b79d4cc94691871dfdae699a0bbe19a54537f544c98e21afd29f20f2e60
+  data.tar.gz: 0adab8408e419a3437a75bf08f342a15aaef6b6b9090bd1bb3352a09e44eeeebe4bbf6abe638cd4601dcce85daf10180a088e336e0b94e3f021f7de2090aab9b

data/lib/surrounded/access_control.rb

@@ -2,6 +2,7 @@ module Surrounded
   module AccessControl
     def self.extended(base)
       base.send(:include, AccessMethods)
+      base.const_set(:'AccessError', Class.new(StandardError))
     end
     
     private
@@ -20,7 +21,7 @@ module Surrounded
             
             method_restrictor = "disallow_#{name}?"
             if self.respond_to?(method_restrictor, true) && self.send(method_restrictor)
-              raise ::Surrounded::Context::AccessError.new("access to `#{name}' is not allowed")
+              raise ::Surrounded::Context::AccessError.new("access to #{self.name}##{name} is not allowed")
             end
             
             self.send("__trigger_#{name}")

data/lib/surrounded/context_errors.rb

@@ -3,6 +3,6 @@ module Surrounded
   module Context
     class InvalidRole < ::Triad::KeyNotPresent; end
     module InvalidRoleType; end
-    class AccessError < StandardError; end
+    class AccessError < ::StandardError; end
   end
 end

data/lib/surrounded/version.rb

@@ -1,3 +1,3 @@
 module Surrounded
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/test/context_access_test.rb

@@ -32,9 +32,9 @@ describe Surrounded::Context, 'access control' do
   end
   
   it 'raises errors when trigger method not allowed' do
-    error = assert_raises(Surrounded::Context::AccessError){
+    error = assert_raises(::Surrounded::Context::AccessError){
       context.if_ready
     }
-    assert_match(/access to `if_ready' is not allowed/i, error.message)
+    assert_match(/access to FilteredContext#if_ready is not allowed/i, error.message)
   end
 end

data/test/surrounded_context_test.rb

@@ -132,16 +132,16 @@ end
 
 describe Surrounded::Context, 'assigning roles' do
   include Surrounded
-  let(:user){ CastingUser.new("Jim") }
-  let(:other_user){ User.new("Guille") }
+  let(:user){ User.new("Jim") }
+  let(:other_user){ CastingUser.new("Guille") }
   let(:context){ RoleAssignmentContext.new(user, other_user) }
 
   it 'tries to use casting to add roles' do
-    refute_includes(context.user_ancestors, RoleAssignmentContext::User)
+    refute_includes(context.other_user_ancestors, RoleAssignmentContext::OtherUser)
   end
 
   it 'extends objects with role modules failing casting' do
-    assert_includes(context.other_user_ancestors, RoleAssignmentContext::OtherUser)
+    assert_includes(context.user_ancestors, RoleAssignmentContext::User)
   end
 
   it 'sets role players to respond to role methods' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surrounded
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - '''Jim Gay'''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: triad