surrounded 0.9.11 → 1.1.0

data/test/context_shortcuts_test.rb

@@ -17,10 +17,35 @@ class ShortcutContext
   end
 end
 
+class ShortcutContextNoKeywords
+  extend Surrounded::Context
+  shortcut_triggers
+
+  initialize_without_keywords :user, :other
+
+  trigger :shorty do
+    user.speak
+  end
+
+  role :user do
+    def speak
+      'it works, shorty!'
+    end
+  end
+end
+
 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
+end
+
+describe Surrounded::Context, 'shortcuts with initialize_without_keywords' do
+  let(:user){ User.new("Jim") }
+  let(:other){ User.new("Guille") }
+  it 'creates shortcut class methods for triggers' do
+    assert_equal 'it works, shorty!', ShortcutContextNoKeywords.shorty(user, 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
@@ -77,7 +77,7 @@ describe ProxyContext do
   end
 
   it 'passes missing methods up the ancestry of the object' do
-    err = ->{ context.admin_missing_method }.must_raise(NoMethodError)
+    err = _{ context.admin_missing_method }.must_raise(NoMethodError)
 
     assert_match(/ProxyUser.*name="Jim"/, err.message)
   end
@@ -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

@@ -53,11 +53,35 @@ describe Surrounded::Context, '.role' do
       def hello
         'hello from admin'
       end
+
+      def splat_args(*args)
+        args
+      end
+
+      def keyword_args(**kwargs)
+        kwargs
+      end
+
+      def mixed_args(*args, **kwargs)
+        [args, kwargs]
+      end
     end
  
     trigger :admin_hello do
       admin.hello
     end
+
+    trigger :splat_args do |*args|
+      admin.splat_args(*args)
+    end
+
+    trigger :keyword_args do |**kwargs|
+      admin.keyword_args(**kwargs)
+    end
+
+    trigger :mixed_args do |*args, **kwargs|
+      admin.mixed_args(*args, **kwargs)
+    end
   end
  
   class Hello
@@ -69,7 +93,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
@@ -85,6 +109,18 @@ describe Surrounded::Context, '.role' do
     it 'creates a private accessor method' do
       assert context.respond_to?(:admin, true)
     end
+
+    it 'works with multiple args' do
+      assert_equal context.splat_args("one", "two"), %w[ one two ]
+    end
+
+    it 'works with multiple keyword args' do
+      assert_equal context.keyword_args(one: "one", two: "two"), { one: "one", two: "two" }
+    end
+
+    it 'works with multiple mixed args' do
+      assert_equal context.mixed_args("one", :two, three: "three", four: "four"), [["one", :two], { three: "three", four: "four" }]
+    end
   end
  
   describe 'unknown' do
@@ -121,7 +157,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,11 +178,11 @@ 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
       end
     end
   end
-end
+end

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,8 @@
 require 'simplecov'
-require 'minitest/autorun' unless ENV['MUTANT']
-require 'coveralls'
-
-if ENV['COVERALLS']
-  Coveralls.wear!
-end
+require 'minitest/autorun'
+SimpleCov.enable_coverage :branch
+SimpleCov.add_filter %r{version.rb}
+SimpleCov.start unless defined?(Coverage)
 
 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.1.0
 platform: ruby
 authors:
 - "'Jim Gay'"
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2022-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: triad
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -60,10 +46,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/codeql-analysis.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".pullreview.yml"
 - ".simplecov"
-- ".travis.yml"
 - Changelog.md
 - Gemfile
 - LICENSE.txt
@@ -80,6 +67,7 @@ files:
 - lib/surrounded/context/negotiator.rb
 - lib/surrounded/context/role_builders.rb
 - lib/surrounded/context/role_map.rb
+- lib/surrounded/context/seclusion.rb
 - lib/surrounded/context/trigger_controls.rb
 - lib/surrounded/east_oriented.rb
 - lib/surrounded/exceptions.rb
@@ -109,7 +97,7 @@ homepage: http://github.com/saturnflyer/surrounded
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,9 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.23
+signing_key:
 specification_version: 4
 summary: Create encapsulated environments for your objects.
 test_files:
@@ -149,4 +136,3 @@ test_files:
 - test/surrounded_context_test.rb
 - test/surrounded_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/.travis.yml

@@ -1,16 +0,0 @@
-before_install:
-  - gem install bundler
-language: ruby
-cache: bundler
-rvm:
-  - 2.3.1
-  - 2.2.5
-  - 2.1.10
-  - ruby-head
-  - jruby-head
-env:
-- COVERALLS=true
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head