surrounded 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2236ff5ee05ddc4b3c857e3700ca2205fa966e62
-  data.tar.gz: 7e47950aaac3dd0dc4b74f18409ef5590226b5ef
+  metadata.gz: 3364c250a02c0589ae2cbaf9645235cfd83f7406
+  data.tar.gz: 28bcbe612f92d77a9df5d4a5294ebc22420013a2
 SHA512:
-  metadata.gz: 1b6e97b48a2c4cda950b2507bff57bcb36bad18171774474405d01030f546e43b2df6adb4e8809477517953ee330df5ffde71c8d0e19af1f469103db5eece897
-  data.tar.gz: 606cb9ba7d77942a770956eb73581bd4f0fe08caf31bd8305ad404dcea7dd2dbe558521fc908160ba91c2b70bf36c644fc4aef65d940efb6353cf502be24ae3b
+  metadata.gz: bf99487271fdcc488dbf5b8dc36d8f7fdd66354bb218bf753682de69cc281d63c9808e3c5f3b7a23c7e71a31f61fa8df0643d9ca4b049c47d35e5734c3f63e79
+  data.tar.gz: 5ce4fcdc96205adf8e24d31de75e88ce5e42877266c4714a8066084f61d3e598140bf2830f8f7193c63e318d61c9fb627278e3f5e43b7785d954544e895128dd

data/Changelog.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.9.11]
+
+- Rely on the standard library Forwardable to setup how the RoleMap forwards messages to the container.
+- Update RoleMap role_player? method to rescue from StandardError, a non-implementation-specific exception.
+- Move to using triad 0.3.0 which relies on concurrent-ruby 0.9+ and moves off of thread_safe 0.3.5
+
 ## [0.9.10]
 
 - Do something with name collisions when a role player has an existing method of another role in the context.

data/lib/surrounded/access_control.rb

@@ -5,9 +5,7 @@ module Surrounded
   module AccessControl
     def self.extended(base)
       base.send(:include, AccessMethods)
-      unless defined?(base::AccessError)
-        base.const_set(:AccessError, Class.new(::Surrounded::Context::AccessError))
-      end
+      Surrounded::Exceptions.define(base, exceptions: :AccessError)
     end
     
     private

data/lib/surrounded/context.rb

@@ -1,4 +1,5 @@
 require 'set'
+require 'surrounded/exceptions'
 require 'surrounded/context/role_map'
 require 'surrounded/context/role_builders'
 require 'surrounded/context/initializing'
@@ -31,21 +32,10 @@ module Surrounded
         extend TriggerControls
 
       }
-      define_exceptions(base)
     end
 
     private
 
-    def self.define_exceptions(klass)
-      self.constants.select{|const|
-        self.const_get(const) < ::StandardError
-      }.map{|exception|
-        unless klass.const_defined?(exception)
-          klass.const_set(exception, Class.new(self.const_get(exception)))
-        end
-      }
-    end
-
     # Set the default type of implementation for role methods for all contexts.
     def self.default_role_type
       @default_role_type ||= :module

data/lib/surrounded/context/initializing.rb

@@ -29,7 +29,7 @@ module Surrounded
 
       def default_initializer(params, setup_args, &block)
         private_attr_reader(*setup_args)
-        @initializer_block = block || nil
+        @initializer_block = block
         mod = Module.new
         line = __LINE__; mod.class_eval %{
           def initialize(#{params})

data/lib/surrounded/context/name_collision_detector.rb

@@ -7,9 +7,7 @@ module Surrounded
 
       def self.extended(base)
         base.send :include, NameCollisionHandler
-        unless defined?(base::NameCollisionError)
-          base.const_set(:NameCollinionError, Class.new(::Surrounded::Context::NameCollisionError))
-        end
+        Surrounded::Exceptions.define(base, exceptions: :NameCollisionError)
       end
   
       def on_name_collision(method_name)
@@ -61,7 +59,7 @@ module Surrounded
           elsif self.class.respond_to?(handler, true)
             self.class.method(handler)
           else
-            method(:nothing)
+            raise ArgumentError, %{your name collision handler was set to `#{handler}' but there is no instance nor class method of that name}
           end
         end
       end

data/lib/surrounded/context/role_builders.rb

@@ -12,6 +12,10 @@ module Surrounded
 
     module RoleBuilders
 
+      def self.extended(base)
+        Surrounded::Exceptions.define(base, exceptions: :InvalidRoleType)
+      end
+
       # Define behaviors for your role players
       def role(name, type=default_role_type, &block)
         if type == :module

data/lib/surrounded/context/role_map.rb

@@ -1,28 +1,26 @@
 require 'triad'
-require 'surrounded/context_errors'
+require 'forwardable'
 module Surrounded
   module Context
-    class InvalidRole < ::Triad::ItemNotPresent; end
-
     class RoleMap
+      extend Forwardable
 
       class << self
         def from_base(klass=::Triad)
-          role_mapper = Class.new(::Surrounded::Context::RoleMap)
-          num = __LINE__; role_mapper.class_eval %{
-            def container
-              @container ||= #{klass}.new
-            end
-          }, __FILE__, num
-          %w{ update each values keys }.each do |meth|
-            num = __LINE__; role_mapper.class_eval %{
-              def #{meth}(*args, &block)
-                container.send(:#{meth}, *args, &block)
-              end
-            }, __FILE__, num
-          end
+          role_mapper = Class.new(self)
+          Surrounded::Exceptions.define(role_mapper, exceptions: :ItemNotPresent, namespace: klass)
+          role_mapper.container_class=(klass)
+          role_mapper.def_delegators :container, :update, :each, :values, :keys
           role_mapper
         end
+
+        def container_class=(klass)
+          @container_class = klass
+        end
+      end
+
+      def container
+        @container ||= self.class.instance_variable_get(:@container_class).new
       end
 
       def role?(role)
@@ -31,7 +29,7 @@ module Surrounded
 
       def role_player?(object)
         !values(object).empty?
-      rescue ::Triad::ItemNotPresent
+      rescue ::StandardError
         false
       end
 

data/lib/surrounded/exceptions.rb

@@ -0,0 +1,11 @@
+module Surrounded
+  module Exceptions
+    def self.define(klass, exceptions:, namespace: Surrounded::Context)
+      Array(exceptions).each{ |exception|
+        unless klass.const_defined?(exception)
+          klass.const_set(exception, Class.new(namespace.const_get(exception)))
+        end
+      }
+    end
+  end
+end

data/lib/surrounded/version.rb

@@ -1,5 +1,5 @@
 module Surrounded
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
   
   def self.version
     VERSION

data/surrounded.gemspec

@@ -5,7 +5,7 @@ require 'surrounded/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "surrounded"
-  spec.version       = Surrounded::VERSION
+  spec.version       = Surrounded.version
   spec.authors       = ["'Jim Gay'"]
   spec.email         = ["jim@saturnflyer.com"]
   spec.description   = %q{Gives an object implicit access to other objects in it's environment.}
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "triad",  "~> 0.2.2"
+  spec.add_dependency "triad",  "~> 0.3.0"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake"

data/test/name_collisions_test.rb

@@ -126,6 +126,21 @@ describe 'handling name collisions' do
     }
   end
 
+  it 'can ignore collisions' do
+    set_handler :nothing
+    assert_output(nil, nil) {
+      new_context_with_collision
+    }
+  end
+
+  it 'raises an error with an unknown handler' do
+    set_handler :barf
+    err = assert_raises(ArgumentError) {
+      new_context_with_collision
+    }
+    expect(err.message).must_match(/your name collision handler was set to \`barf' but there is no instance nor class method of that name/)
+  end
+
   let(:create_context_with_multiple_collisions){
     ContextWithMultipleCollisions.new(first: First.new, second: Second.new, third: Third.new)
   }
@@ -143,7 +158,7 @@ ERR
 
   it 'can use a class method' do
     class ContextOverridesName
-      def class_method_handler(message)
+      def self.class_method_handler(message)
         puts message
       end
     end

data/test/surrounded_context_test.rb

@@ -97,6 +97,21 @@ describe Surrounded::Context, '#role?' do
   end
 end
 
+describe Surrounded::Context, '#role_player?' do
+  let(:player){ User.new("Jim") }
+  let(:other_player){ User.new("Amy") }
+  let(:non_player){ User.new("Guille") }
+  let(:context){ TestContext.new(player, other_player) }
+
+  it 'is true if the given object is a role player' do
+    expect(context.role_player?(player)).must_equal true
+  end
+
+  it 'is false if the given oject is not a role player' do
+    expect(context.role_player?(non_player)).must_equal false
+  end
+end
+
 class RoleAssignmentContext
   extend Surrounded::Context
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surrounded
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - "'Jim Gay'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: triad
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,8 +81,8 @@ files:
 - lib/surrounded/context/role_builders.rb
 - lib/surrounded/context/role_map.rb
 - lib/surrounded/context/trigger_controls.rb
-- lib/surrounded/context_errors.rb
 - lib/surrounded/east_oriented.rb
+- lib/surrounded/exceptions.rb
 - lib/surrounded/shortcuts.rb
 - lib/surrounded/version.rb
 - surrounded.gemspec
@@ -149,3 +149,4 @@ test_files:
 - test/surrounded_context_test.rb
 - test/surrounded_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/lib/surrounded/context_errors.rb

@@ -1,5 +0,0 @@
-require 'triad'
-module Surrounded
-  module Context
-  end
-end