surrounded 0.9.11 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3364c250a02c0589ae2cbaf9645235cfd83f7406
-  data.tar.gz: 28bcbe612f92d77a9df5d4a5294ebc22420013a2
+  metadata.gz: 32e91c5123e8db80ef2b15289144c2cec4f5a774
+  data.tar.gz: 8ffdd46f4497eee0fc0c96f29de1efb0631879d6
 SHA512:
-  metadata.gz: bf99487271fdcc488dbf5b8dc36d8f7fdd66354bb218bf753682de69cc281d63c9808e3c5f3b7a23c7e71a31f61fa8df0643d9ca4b049c47d35e5734c3f63e79
-  data.tar.gz: 5ce4fcdc96205adf8e24d31de75e88ce5e42877266c4714a8066084f61d3e598140bf2830f8f7193c63e318d61c9fb627278e3f5e43b7785d954544e895128dd
+  metadata.gz: a2c8b8e5b137b7b8b74c2642cdc490bbcab860dcd85ca0a08e9b67490ce0f1ff4c5b405821bb3daa1e3a643514e75023265cc902b0617a3cff1bee90a61a2480
+  data.tar.gz: a25fd8d9c292be440405e732ce59f5087a0100a628a0f424ad95a918f72e924377c8485eeeec4a70fa1d01dd900ad5828530ee693ab252d1b56ebfa569aa16ad

data/.travis.yml

@@ -3,14 +3,17 @@ before_install:
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.1
-  - 2.2.5
-  - 2.1.10
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
   - ruby-head
   - jruby-head
-env:
-- COVERALLS=true
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+addons:
+  code_climate:
+    repo_token: 7488b157e7b7f48eac865a9f830fe90a39e6ac10b17f854e17b9529e1854762c
+after_success:
+  - bundle exec codeclimate-test-reporter

data/Changelog.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.0.0]
+
+- Drop deprecations around Context initialize method. It now requires keyword arguments. Non-keyword argumennts may be used with initialize_without_keywords
+- Remove code supporting exception cause it InvalidRoleType prior to ruby 2.1
+
 ## [0.9.11]
 
 - Rely on the standard library Forwardable to setup how the RoleMap forwards messages to the container.
@@ -11,4 +16,4 @@ All notable changes to this project will be documented in this file.
 ## [0.9.10]
 
 - Do something with name collisions when a role player has an existing method of another role in the context.
-- Move InvalidRoleType exception under the host context class namespace. This allows you to rescue from your own namespace.
+- Move InvalidRoleType exception under the host context class namespace. This allows you to rescue from your own namespace.

data/Gemfile

@@ -2,15 +2,9 @@ source 'https://rubygems.org'
 
 group :test do
   gem 'minitest'
-  # gem 'mutant', git: 'https://github.com/kbrock/mutant.git', ref: 'minitest'
   gem "simplecov"
-  gem 'coveralls', :require => false
+  gem 'codeclimate-test-reporter', '~> 1.0.8'
   gem 'casting'
-  gem 'rubinius-coverage', :platform => :rbx
-end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
 end
 
 gemspec

data/README.md

@@ -3,8 +3,6 @@
 
 [![Build Status](https://travis-ci.org/saturnflyer/surrounded.png?branch=master)](https://travis-ci.org/saturnflyer/surrounded)
 [![Code Climate](https://codeclimate.com/github/saturnflyer/surrounded.png)](https://codeclimate.com/github/saturnflyer/surrounded)
-[![Coverage Status](https://coveralls.io/repos/saturnflyer/surrounded/badge.png)](https://coveralls.io/r/saturnflyer/surrounded)
-[![Gem Version](https://badge.fury.io/rb/surrounded.png)](http://badge.fury.io/rb/surrounded)
 
 Surrounded is designed to help you better manage your business logic by keeping cohesive behaviors together. Bring objects together to implement your use cases and gain behavior only when necessary.
 
@@ -43,7 +41,7 @@ Here, you've specified the order when initializing so you can use it like this:
 ```ruby
 user1 = User.find(1)
 user2 = User.find(2)
-context = Employment.new(user1, user2)
+context = Employment.new(employee: user1, boss: user2)
 ```
 
 That ensures that `user1` will become (and have all the features of) the `employee` and `user2` will become (and have all the features of) the `boss`.
@@ -53,20 +51,20 @@ There are 2 things left to do:
 1. define behaviors for each role and
 2. define how you can trigger their actions
 
-Currently initializing contexts does not require the use of keyword arguments, _but it will in the future_.
+Initializing contexts does not require the use of keyword arguments, but you may opt out.
 
-You should consider using explicit names when initialize now by using `keyword_initialize`:
+You should consider using explicit names when initialize now by using `initialize_without_keywords`:
 
 ```ruby
 class Employment
   extend Surrounded::Context
 
-  keyword_initialize :employee, :boss
+  initialize_withou_keywords :employee, :boss
 end
 
 user1 = User.find(1)
 user2 = User.find(2)
-context = Employment.new(employee: user1, boss: user2)
+context = Employment.new(user1, user2)
 ```
 
 This will allow you to prepare your accessing code to use keywords.
@@ -135,7 +133,7 @@ end
 You'll need to define way to trigger these behaviors to occur so that you can use them.
 
 ```ruby
-context = Employment.new(user1, user2)
+context = Employment.new(employee: user1, boss: user2)
 
 context.plan_weekend_work
 ```
@@ -249,7 +247,7 @@ By adding `Surrounded::Context` you can shortcut all this work.
 ```ruby
 class Employment
   extend Surrounded::Context
-  
+
   initialize(:employee, :boss)
 
   module Employee
@@ -269,7 +267,7 @@ Well, it just so happens that you can. This code will work just fine:
 ```ruby
 class Employment
   extend Surrounded::Context
-  
+
   initialize(:employee, :boss)
 
   class Employee < SimpleDelegator
@@ -285,7 +283,7 @@ But the syntax can be even simpler than that if you want.
 ```ruby
 class Employment
   extend Surrounded::Context
-  
+
   initialize(:employee, :boss)
 
   role :employee do
@@ -299,7 +297,7 @@ By default, this code will create a module for you named `Employee`. If you want
 ```ruby
 class Employment
   extend Surrounded::Context
-  
+
   initialize(:employee, :boss)
 
   wrap :employee do
@@ -313,7 +311,7 @@ But if you're making changes and you decide to move from a module to a wrapper o
 ```ruby
 class Employment
   extend Surrounded::Context
-  
+
   initialize(:employee, :boss)
 
   role :employee, :wrapper do
@@ -346,7 +344,7 @@ end
 
 Now the `User` instances will be able to implicitly access objects in their environment.
 
-Via `method_missing` those `User` instances can access a `context` object it stores in an internal collection. 
+Via `method_missing` those `User` instances can access a `context` object it stores in an internal collection.
 
 Inside of the `Employment` context we saw above, the `employee` and `boss` objects are instances of `User` for this example.
 
@@ -442,7 +440,7 @@ context.triggers #=> [:plan_weekend_work]
 
 You might find that useful for dynamically defining user interfaces.
 
-Sometimes I'd rather not use this DSL, however. I want to just write regular methods. 
+Sometimes I'd rather not use this DSL, however. I want to just write regular methods.
 
 We can do that too. You'll need to opt in to this by specifying `trigger :your_method_name` for the methods you want to use.
 
@@ -454,7 +452,7 @@ class Employment
     employee.quit
   end
   trigger :plan_weekend_work
-  
+
   # or in Ruby 2.x
   trigger def plan_weekend_work
     employee.quit
@@ -487,12 +485,12 @@ By running `protect_triggers` you'll be able to define when triggers may or may
 class Employment
   extend Surrounded::Context
   protect_triggers
-  
+
   def plan_weekend_work
     employee.quit
   end
   trigger :plan_weekend_work
-  
+
   disallow :plan_weekend_work do
     employee.bank_balance > 1000000
   end
@@ -627,14 +625,14 @@ class Organization
   extend Surrounded::Context
 
   initialize_without_keywords :leader, :members
-  
+
   role :members do
     # special behavior for the collection
   end
-  
+
   role :member do
     # special behavior to be applied to each member in the collection
-  end  
+  end
 end
 ```
 
@@ -643,7 +641,7 @@ end
 If you create a context object and need to use the same type of object with new role players, you may use the `rebind` method. It will clear any instance_variables from your context object and map the given objects to their names:
 
 ```ruby
-context = Employment.new(current_user, the_boss)
+context = Employment.new(employee: current_user, boss: the_boss)
 context.rebind(employee: another_user, boss: someone_else) # same context, new players
 ```
 
@@ -671,7 +669,7 @@ class ExpensiveCalculation
     end
   end
 end
-ExpensiveCalculation.new(some_object, some_collection).send_to_background(:do_expensive_calculation)
+ExpensiveCalculation.new(leader: some_object, members: some_collection).send_to_background(:do_expensive_calculation)
 ```
 
 The above example is merely pseudo-code to show how `initializer_arguments` can be used. Customize it according to your own needs.
@@ -686,14 +684,14 @@ Surrounded::Context.default_role_type = :module # also :wrap, :wrapper, or :inte
 
 class ActiviatingAccount
   extend Surrounded::Context
-  
+
   # set the default role type only for this class
   self.default_role_type = :module # also :wrap, :wrapper, or :interface
 
   # shortcut initialization code
   initialize(:activator, :account)
   # or handle it yourself
-  def initialize(activator, account)
+  def initialize(activator:, account:)
     # this must be done to handle the mapping of roles to objects
     # pass an array of arrays with role name symbol and the object for that role
     map_roles([[:activator, activator],[:account, account]])
@@ -707,18 +705,21 @@ class ActiviatingAccount
   # these also must be done if you create your own initialize method.
   # this is a shortcut for using attr_reader and private
   private_attr_reader :activator, :account
-  
+
   # If you need to mix default initialzation and extra work use a block
   initialize :activator, :account do
     map_roles(:third_party => get_some_other_object)
+    # explicitly set a single role
+    map_role(:something_new, 'SomeRoleConstant', object_to_play_the_role)
   end
+
   # but remember to set the extra accessors:
-  private_attr_reader :third_party
+  private_attr_reader :third_party, :something_new
 
-  # initialize with keyword arguments
-  keyword_initialize(:activator, :account)
-  # this makes the following instance method signature with required keyword arguments
-  def initialize(activator:, account:)
+  # initialize without keyword arguments
+  initialize_without_keywords(:activator, :account)
+  # this makes the following instance method signature with positional arguments
+  def initialize(activator, account)
     # ...
   end
 
@@ -756,7 +757,7 @@ class ActiviatingAccount
   #   end
   # end
 
-  # if you use a regular method and want to use context-specific behavior, 
+  # if you use a regular method and want to use context-specific behavior,
   # you must handle storing the context yourself:
   def regular_method
     apply_behaviors # handles the adding of all the roles and behaviors
@@ -771,30 +772,30 @@ class ActiviatingAccount
   trigger :some_trigger_method do
     activator.some_behavior # behavior always available
   end
-  
+
   trigger def some_other_trigger
     activator.some_behavior # behavior always available
   end
-  
+
   def regular_non_trigger
     activator.some_behavior # behavior always available with the following line
   end
   trigger :regular_non_trigger # turns the method into a trigger
-  
+
   # create restrictions on what triggers may be used
   protect_triggers # <-- this is required if you want to protect your triggers this way.
   disallow :some_trigger_method do
     # whatever conditional code for the instance of the context
   end
   # you could also use `guard` instead of `disallow`
-  
+
   # or define your own method without the `disallow` keyword
   def disallow_some_trigger_method?
     # whatever conditional code for the instance of the context
   end
   # Prefer using `disallow` because it will wrap role players in their roles for you;
   # the `disallow_some_trigger_method?` defined above, does not.
-  
+
   # Create shortcuts for triggers as class methods
   # so you can do ActiviatingAccount.some_trigger_method(activator, account)
   # This will make all triggers shortcuts.
@@ -804,11 +805,11 @@ class ActiviatingAccount
     instance = self.new(activator, account)
     instance.some_trigger_method
   end
-  
+
   # Set triggers to always return the context object
   # so you can enforce East-oriented style or Tell, Don't Ask
   east_oriented_triggers
-  
+
   # Forward context instance methods as triggers to role players
   forward_trigger :role_name, :method_name
   forward_trigger :role_name, :method_name, :alternative_trigger_name_for_method_name
@@ -816,9 +817,9 @@ class ActiviatingAccount
   forwarding [:list, :of, :methods, :to, :forward] => :role_name
 end
 
-# with keyword_initialize (will be changed to initialize)
+# with initialize (also keyword_initialize)
 context = ActiviatingAccount.new(activator: some_object, account: some_account)
-# with initialize (this will be moved to initialize_without_keywords)
+# with initialize_without_keywords
 context = ActiviatingAccount.new(some_object, some_account)
 context.triggers # => lists a Set of triggers
 # when using protect_triggers
@@ -1072,7 +1073,7 @@ And then execute:
 Or install it yourself as:
 
     $ gem install surrounded
-    
+
 ## Installation for Rails
 
 See [surrounded-rails](https://github.com/saturnflyer/surrounded-rails)

data/lib/surrounded/context.rb

@@ -53,7 +53,7 @@ module Surrounded
     def default_role_type=(type)
       @default_role_type = type
     end
-    
+
     # Provide the ability to create access control methods for your triggers.
     def protect_triggers;  self.extend(::Surrounded::AccessControl); end
 
@@ -68,7 +68,7 @@ module Surrounded
     def role_const_defined?(name)
       const_defined?(name, false)
     end
-    
+
     # Set a named constant and make it private
     def private_const_set(name, const)
       unless role_const_defined?(name)
@@ -119,11 +119,13 @@ module Surrounded
         self.class.triggers
       end
 
-      def rebind(options_hash)
+      def rebind(**options_hash)
         clear_instance_variables
-        initialize(**options_hash)
-      rescue ArgumentError
-        initialize(*options_hash.values)
+        begin
+          initialize(options_hash)
+        rescue ArgumentError
+          initialize(*options_hash.values)
+        end
         self
       end
 
@@ -193,7 +195,7 @@ module Surrounded
         return obj if !wrapper_name
         klass.method(wrapper_name).call(obj)
       end
-      
+
       def remove_behavior(role, behavior, object)
         if behavior && role_const_defined?(behavior)
           remover_name = (module_removal_methods + unwrap_methods).find do |meth|
@@ -306,4 +308,4 @@ module Surrounded
       end
     end
   end
-end
+end

data/lib/surrounded/context/initializing.rb

@@ -7,16 +7,12 @@ module Surrounded
         parameters = setup_args.join(',')
         default_initializer(parameters, setup_args, &block)
       end
-      def initialize(*setup_args, &block)
-        warn "Deprecated: The behavior of 'initialize' will require keywords in the future
-            Consider using keyword arguments or switching to 'initialize_without_keywords'\n\n"
-        initialize_without_keywords(*setup_args, &block)
-      end
 
-      def keyword_initialize(*setup_args, &block)
+      def initialize(*setup_args, &block)
         parameters = setup_args.map{|a| "#{a}:"}.join(',')
         default_initializer(parameters, setup_args, &block)
       end
+      alias keyword_initialize initialize
       alias initialize_with_keywords keyword_initialize
 
       def initializer_block

data/lib/surrounded/context/role_builders.rb

@@ -1,14 +1,6 @@
 module Surrounded
   module Context
-    class InvalidRoleType < ::StandardError
-      unless method_defined?(:cause)
-        def initialize(msg=nil)
-          super
-          @cause = $!
-        end
-        attr_reader :cause
-      end
-    end
+    class InvalidRoleType < ::StandardError; end
 
     module RoleBuilders
 
@@ -67,7 +59,7 @@ module Surrounded
         # Admin
         private_const_set(RoleName(name), Negotiator.for_role(behavior))
       end
-      
+
       private
       def RoleName(text, suffix=nil)
         RoleName.new(text, suffix)
@@ -75,4 +67,4 @@ module Surrounded
 
     end
   end
-end
+end

data/lib/surrounded/version.rb

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

data/test/collection_role_players_test.rb

@@ -39,7 +39,7 @@ describe Surrounded::Context, 'auto-assigning roles for collections' do
   let(:other_two){ User.new('Jason') }
   let(:others){ [other_one, other_two] }
 
-  let(:context){ CollectionContext.new(members, others) }
+  let(:context){ CollectionContext.new(members: members, others: others) }
 
   it 'assigns the collection role to collections' do
     assert_equal members.size, context.get_members_count

data/test/context_access_test.rb

@@ -37,7 +37,7 @@ end
 describe Surrounded::Context, 'access control' do
   let(:user){ User.new("Jim") }
   let(:other_user){ User.new("Guille") }
-  let(:context){ FilteredContext.new(user, other_user) }
+  let(:context){ FilteredContext.new(user: user, other_user: other_user) }
   
   it 'includes triggers when allowed' do
     context.stub(:disallow_if_ready?, false) do

data/test/context_forwarding_test.rb

@@ -38,7 +38,7 @@ end
 describe Surrounded::Context, 'forwarding triggers' do
   let(:user){ User.new("Jim") }
   let(:other_user){ User.new("Guille") }
-  let(:context){ Sending.new(user, other_user) }
+  let(:context){ Sending.new(one: user, two: other_user) }
   
   it 'forwards multiple configured instance methods as triggers' do
     assert_equal 'hello', context.hello

data/test/context_reuse_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 describe Surrounded::Context, 'reusing context object' do
   let(:user){ User.new("Jim") }
   let(:other_user){ User.new("Guille") }
-  let(:context){ TestContext.new(user, other_user) }
+  let(:context){ TestContext.new(user: user, other_user: other_user) }
 
   it 'allows rebinding new players' do
     expect(context.access_other_object).must_equal 'Guille'

data/test/context_shortcuts_test.rb

@@ -21,6 +21,6 @@ describe Surrounded::Context, 'shortcuts' do
   let(:user){ User.new("Jim") }
   let(:other){ User.new("Guille") }
   it 'creates shortcut class methods for triggers' do
-    assert_equal 'it works, shorty!', ShortcutContext.shorty(user, other)
+    assert_equal 'it works, shorty!', ShortcutContext.shorty(user: user, other: other)
   end
 end

data/test/east_oriented_triggers_test.rb

@@ -14,7 +14,7 @@ end
 describe Surrounded::Context, '.east_oriented_triggers' do
   let(:user){ User.new("Jim") }
   let(:other_user){ User.new("Guille") }
-  let(:context){ EastTestContext.new(user, other_user) }
+  let(:context){ EastTestContext.new(user: user, other_user: other_user) }
 
   it 'returns the context object from trigger methods' do
     assert_equal context, context.ask?
@@ -24,8 +24,8 @@ end
 describe Surrounded::Context, '.east_oriented_triggers with protect_triggers' do
   let(:user){ User.new("Jim") }
   let(:other_user){ User.new("Guille") }
-  let(:context){ 
-    ctxt = EastTestContext.new(user, other_user)
+  let(:context){
+    ctxt = EastTestContext.new(user: user, other_user: other_user)
     ctxt.singleton_class.send(:protect_triggers)
     ctxt
   }
@@ -33,4 +33,4 @@ describe Surrounded::Context, '.east_oriented_triggers with protect_triggers' do
   it 'returns the context object from trigger methods' do
     assert_equal context, context.ask?
   end
-end
+end

data/test/example_delegate_class_test.rb

@@ -21,7 +21,7 @@ end
 
 describe DelegateClassContext do
   let(:context){
-    DelegateClassContext.new(User.new('jim'), Object.new)
+    DelegateClassContext.new(user: User.new('jim'), task: Object.new)
   }
   it 'wraps objects using DelegateClass' do
     assert_equal 'hello from the admin DelegateClass wrapper!', context.do_something

data/test/example_proxy_test.rb

@@ -66,7 +66,7 @@ describe ProxyContext do
     OpenStruct.new(name: 'GTD')
   }
   let(:context){
-    ProxyContext.new(user, task)
+    ProxyContext.new(admin: user, task: task)
   }
   it 'proxys methods between objects and its interface' do
     assert_equal 'hello from Jim, the admin interface!', context.do_something
@@ -105,7 +105,7 @@ describe ProxyContext do
   end
 
   it 'allows Surrounded objects to interact with others' do
-    assert context.rebind(user: User.new('Surrounded'), task: task).talking
+    assert context.rebind(admin: User.new('Surrounded'), task: task).talking
   end
 
   it 'works with frozen and primitive objects' do

data/test/example_threaded_test.rb

@@ -54,7 +54,7 @@ describe ThreadedContext do
   let(:members){ [amy, guille, jason, dave] }
 
   it 'works in multi-threaded environments' do
-    meeting = ThreadedContext.new(jim, members)
+    meeting = ThreadedContext.new(leader: jim, members: members)
 
     result = meeting.meet
 

data/test/example_wrapper_test.rb

@@ -20,7 +20,7 @@ end
 
 describe WrapperContext do
   let(:context){
-    WrapperContext.new(Object.new, Object.new)
+    WrapperContext.new(admin: Object.new, task: Object.new)
   }
   it 'wraps objects and allows them to respond to new methods' do
     assert_equal 'hello from the admin wrapper!', context.do_something

data/test/initialization_test.rb

@@ -1,58 +1,66 @@
 require 'test_helper'
 
-class InitContext
+class KeywordContext
   extend Surrounded::Context
 
-  initialize(:user, :other_user) do
+  keyword_initialize(:user, :other_user) do
     @defined_by_initializer_block = 'yup'
   end
 end
 
 describe Surrounded::Context, '.initialize' do
-  it 'defines an initialize method accepting the same arguments' do
-    assert_equal 2, InitContext.instance_method(:initialize).arity
-  end
 
   it 'applies a provided block to the instance' do
-    context = InitContext.new(User.new('Jim'), User.new('Amy'))
+    context = KeywordContext.new(user: User.new('Jim'), other_user: User.new('Amy'))
     assert_equal 'yup', context.instance_variable_get(:@defined_by_initializer_block)
   end
 
   it 'keeps track of the original initialize arguments' do
     jim = User.new('Jim')
     amy = User.new('Amy')
-    context = InitContext.new(jim, amy)
+    context = KeywordContext.new(user: jim, other_user: amy)
     tracked = context.send(:initializer_arguments)
     assert_equal jim, tracked[:user]
     assert_equal amy, tracked[:other_user]
   end
+
+  it 'raises errors with missing keywords' do
+    err = assert_raises(ArgumentError){
+      KeywordContext.new(other_user: User.new('Amy'))
+    }
+    assert_match(/missing keyword: user/, err.message)
+  end
 end
 
-begin
-  class Keyworder
-    extend Surrounded::Context
+class NonKeyworder
+  extend Surrounded::Context
+
+  initialize_without_keywords :this, :that do
+    self.instance_variable_set(:@defined_by_initializer_block, 'yes')
+  end
+
+  trigger :access_other_object do
+    that.name
+  end
+end
 
-    keyword_initialize :this, :that do
-      self.instance_variable_set(:@defined_by_initializer_block, 'yes')
-    end
+describe Surrounded::Context, 'non-keyword initializers' do
+  it 'defines an initialize method accepting the same arguments' do
+    assert_equal 2, NonKeyworder.instance_method(:initialize).arity
   end
 
-  describe Surrounded::Context, 'keyword initializers' do
-    it 'works with keyword arguments' do
-      assert Keyworder.new(this: User.new('Jim'), that: User.new('Guille'))
-    end
+  it 'works without keyword arguments' do
+    assert NonKeyworder.new(User.new('Jim'), User.new('Guille'))
+  end
 
-    it 'raises errors with missing keywords' do
-      err = assert_raises(ArgumentError){
-        Keyworder.new(this: User.new('Amy'))
-      }
-      assert_match(/missing keyword: that/, err.message)
-    end
+  it 'evaluates a given block' do
+    assert_equal 'yes', NonKeyworder.new(User.new('Jim'), User.new('Guille')).instance_variable_get(:@defined_by_initializer_block)
+  end
 
-    it 'evaluates a given block' do
-      assert_equal 'yes', Keyworder.new(this: User.new('Jim'), that: User.new('Guille')).instance_variable_get(:@defined_by_initializer_block)
-    end
+  it 'allows rebinding with a hash' do
+    context = NonKeyworder.new(User.new('Jim'), User.new('Guille'))
+    expect(context.access_other_object).must_equal 'Guille'
+    context.rebind(this: User.new('Amy'), that: User.new('Elizabeth'))
+    expect(context.access_other_object).must_equal 'Elizabeth'
   end
-rescue SyntaxError
-  STDOUT.puts "No support for keywords"
-end
+end

data/test/override_methods_test.rb

@@ -49,7 +49,7 @@ describe Surrounded::Context, 'custom role application' do
   let(:user){ User.new('Jim') }
   let(:other){ User.new('Amy') }
 
-  let(:context){ PrependedRoles.new(user, other) }
+  let(:context){ PrependedRoles.new(user: user, other: other) }
 
   it 'allows you to override existing methods on a role player' do
     assert_equal "Not what you thought, Jim", context.get_name

data/test/role_context_method_test.rb

@@ -69,7 +69,7 @@ describe Surrounded::Context, '.role' do
  
   describe 'interfaces' do
     let(:context){
-      InterfaceContext.new(Hello.new, Hello.new)
+      InterfaceContext.new(admin: Hello.new, other: Hello.new)
     }
     it 'sets interface objects to use interface methods before singleton methods' do
       assert_equal 'hello from admin', context.admin_hello
@@ -121,7 +121,7 @@ describe Surrounded::Context, '.role' do
           the_test.assert_kind_of SimpleDelegator, admin
         end
       end
-      context = CustomDefaultWrap.new(Object.new, self)
+      context = CustomDefaultWrap.new(admin: Object.new, the_test: self)
       context.check_admin_type
     end
  
@@ -142,7 +142,7 @@ describe Surrounded::Context, '.role' do
           end
         end
  
-        context = CustomGlobalDefault.new(Object.new, self)
+        context = CustomGlobalDefault.new(admin: Object.new, the_test: self)
         context.check_admin_type
       ensure
         Surrounded::Context.default_role_type = old_default

data/test/surrounded_context_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 describe Surrounded::Context, '#triggers' do
   let(:user){ User.new("Jim") }
   let(:other_user){ User.new("Guille") }
-  let(:context){ TestContext.new(user, other_user) }
+  let(:context){ TestContext.new(user: user, other_user: other_user) }
 
   it 'lists the externally accessible trigger methods' do
     assert context.triggers.include?(:access_other_object)
@@ -31,7 +31,7 @@ end
 describe Surrounded::Context, '.trigger' do
   let(:user){ User.new("Jim") }
   let(:other_user){ User.new("Guille") }
-  let(:context){ TestContext.new(user, other_user) }
+  let(:context){ TestContext.new(user: user, other_user: other_user) }
 
   it 'defines a public method on the context' do
     assert context.respond_to?(:access_other_object)
@@ -78,7 +78,7 @@ describe Surrounded::Context, '#role?' do
     end
     external_object
   }
-  let(:context){ TestContext.new(user, other_user) }
+  let(:context){ TestContext.new(user: user, other_user: other_user) }
 
   it 'returns the object assigned to the named role' do
     assert_equal user, user.get_role(:user, context)
@@ -101,7 +101,7 @@ 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) }
+  let(:context){ TestContext.new(user: player, other_user: other_player) }
 
   it 'is true if the given object is a role player' do
     expect(context.role_player?(player)).must_equal true
@@ -181,7 +181,7 @@ describe Surrounded::Context, 'assigning roles' do
 
   let(:user){ User.new("Jim") }
   let(:other_user){ CastingUser.new("Guille") }
-  let(:context){ RoleAssignmentContext.new(user, other_user) }
+  let(:context){ RoleAssignmentContext.new(user: user, other_user: other_user) }
 
   it 'tries to use casting to add roles' do
     refute_includes(context.other_user_ancestors, RoleAssignmentContext::OtherUser)
@@ -199,7 +199,7 @@ describe Surrounded::Context, 'assigning roles' do
   it 'will use classes as roles' do
     user = User.new('Jim')
 
-    context = ClassRoleAssignmentContext.new(user, self)
+    context = ClassRoleAssignmentContext.new(thing: user, the_test: self)
 
     assert context.check_user_response
   end
@@ -207,7 +207,7 @@ describe Surrounded::Context, 'assigning roles' do
   it 'does not use constants defined outside the context class' do
     special = User.new('Special')
     other = User.new('Other')
-    context = IgnoreExternalConstantsContext.new(user, special, other)
+    context = IgnoreExternalConstantsContext.new(user: user, special: special, other: other)
     assert_equal User, context.check_special
   end
 end

data/test/surrounded_test.rb

@@ -16,7 +16,7 @@ describe "Surrounded" do
   let(:external_user){ User.new("External User") }
 
   let(:context){
-    TestContext.new(jim, guille)
+    TestContext.new(user: jim, other_user: guille)
   }
 
   it "has access to objects in the context" do
@@ -46,7 +46,7 @@ describe "Surrounded", "added to an existing object" do
 
     other = User.new('Guille')
 
-    context = TestContext.new(thing, other)
+    context = TestContext.new(user: thing, other_user: other)
     assert context.access_other_object
   end
 end
@@ -61,4 +61,4 @@ describe "Surrounded", "added to an object through another module" do
     object.extend(SpecialSurrounding)
     assert object.respond_to?(:context, true)
   end
-end
+end

data/test/test_helper.rb

@@ -1,10 +1,6 @@
 require 'simplecov'
-require 'minitest/autorun' unless ENV['MUTANT']
-require 'coveralls'
-
-if ENV['COVERALLS']
-  Coveralls.wear!
-end
+require 'minitest/autorun'
+SimpleCov.start
 
 require 'surrounded'
 require 'surrounded/context'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surrounded
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 1.0.0
 platform: ruby
 authors:
 - "'Jim Gay'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: triad
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Create encapsulated environments for your objects.
@@ -149,4 +149,3 @@ test_files:
 - test/surrounded_context_test.rb
 - test/surrounded_test.rb
 - test/test_helper.rb
-has_rdoc: