surrounded 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 32e91c5123e8db80ef2b15289144c2cec4f5a774
-  data.tar.gz: 8ffdd46f4497eee0fc0c96f29de1efb0631879d6
+SHA256:
+  metadata.gz: 152c9c728084be8069384cf825cedf5ab827d4fd28b0710cbdd19229d8284bc7
+  data.tar.gz: 82a50b285aa5328084481c438d78f8ed3e17ba362bcad45c14efaf5ad1bf0fc3
 SHA512:
-  metadata.gz: a2c8b8e5b137b7b8b74c2642cdc490bbcab860dcd85ca0a08e9b67490ce0f1ff4c5b405821bb3daa1e3a643514e75023265cc902b0617a3cff1bee90a61a2480
-  data.tar.gz: a25fd8d9c292be440405e732ce59f5087a0100a628a0f424ad95a918f72e924377c8485eeeec4a70fa1d01dd900ad5828530ee693ab252d1b56ebfa569aa16ad
+  metadata.gz: 9f7cf841bf2c4ceeb27fd6bd2f11c4041cad7c28e1ce71574b5bbc1c201b0944a2481966b1c2349b3cbfd465a98f7627f1621fae0e0e8d2c2c9fcde42859577f
+  data.tar.gz: aa91c16fefb0cdc19f1b597d2fffd876c2f0bce15bcbcaacb3a713570acac350d8ff434a8c3d6177d4c9e1a79c620611f012d1aff2bcd24fef10ddf696bcd13b

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '41 18 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

data/.github/workflows/test.yml

@@ -0,0 +1,18 @@
+name: spec
+
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.7', '3.0', '3.1' ]
+    name: Ruby ${{ matrix.ruby }} sample
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake

data/Changelog.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.0]
+
+- Dropped support for Ruby below 2.7 to take advantage of the ellipsis for argument forwarding
+- Memoize the Negotiator methods for interface
+
+## [1.0.1]
+
+- Fix a bug where shortcut_triggers would not work with keyword initialize
+
 ## [1.0.0]
 
 - Drop deprecations around Context initialize method. It now requires keyword arguments. Non-keyword argumennts may be used with initialize_without_keywords

data/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 group :test do
   gem 'minitest'
   gem "simplecov"
-  gem 'codeclimate-test-reporter', '~> 1.0.8'
   gem 'casting'
 end
 

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 'Jim Gay'
+Copyright (c) 2013-2022 'Jim Gay'
 
 MIT License
 

data/README.md

@@ -1,7 +1,7 @@
 # ![Surrounded](http://saturnflyer.github.io/surrounded/images/surrounded.png "Surrounded")
 ## Be in control of business logic.
 
-[![Build Status](https://travis-ci.org/saturnflyer/surrounded.png?branch=master)](https://travis-ci.org/saturnflyer/surrounded)
+[![Build Status](https://github.com/saturnflyer/surrounded/actions/workflows/test.yml/badge.svg)](https://github.com/saturnflyer/surrounded/actions)
 [![Code Climate](https://codeclimate.com/github/saturnflyer/surrounded.png)](https://codeclimate.com/github/saturnflyer/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.
@@ -53,13 +53,13 @@ There are 2 things left to do:
 
 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 `initialize_without_keywords`:
+You should consider using explicit names when initializing now by using `initialize_without_keywords`:
 
 ```ruby
 class Employment
   extend Surrounded::Context
 
-  initialize_withou_keywords :employee, :boss
+  initialize_without_keywords :employee, :boss
 end
 
 user1 = User.find(1)
@@ -636,6 +636,22 @@ class Organization
 end
 ```
 
+If you want to change the way the singular verson of a role is used, override `singularize_name`:
+
+```ruby
+class Organization
+  extend Surrounded::Context
+
+  def singularize_name(name)
+    if name == "my special rule"
+      # do your thing
+    else
+      super # use the default
+    end
+  end
+end
+```
+
 ## Reusing context objects
 
 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:
@@ -824,7 +840,7 @@ context = ActiviatingAccount.new(some_object, some_account)
 context.triggers # => lists a Set of triggers
 # when using protect_triggers
 context.triggers # => lists a Set of triggers which may currently be called
-context.triggers # => lists a Set of all triggers (the same as if protect_triggers was _not_ used)
+context.all_triggers # => lists a Set of all triggers (the same as if protect_triggers was _not_ used)
 context.allow?(:trigger_name) # => returns a boolean if the trigger may be run
 
 # reuse the context object with new role players
@@ -835,6 +851,20 @@ context.rebind(activator: another_object, account: another_account)
 
 The dependencies are minimal. The plan is to keep it that way but allow you to configure things as you need. The [Triad](http://github.com/saturnflyer/triad) project was written specifically to manage the mapping of roles and objects to the modules which contain the behaviors. It is used in Surrounded to keep track of role player, roles, and role constant names but it is not a hard requirement. You may implement your own but presently you'll need to dive into the implementation to fully understand how. Future updates may provide better support and guidance.
 
+If you want to override the class used for mapping roles to behaviors, override the `role_map` method.
+
+```ruby
+class MyContext
+  extend Surrounded::Context
+
+  def role_map
+    @container ||= role_mapper_class.new(base: MySpecialDataContainer)
+  end
+end
+```
+
+The class you provide will be initialized with `new` and is expected to implement the methods: `:update`, `:each`, `:values`, and `:keys`.
+
 If you're using [Casting](http://github.com/saturnflyer/casting), for example, Surrounded will attempt to use that before extending an object, but it will still work without it.
 
 ## Support for other ways to apply behavior
@@ -918,9 +948,9 @@ class MyCustomContext
 end
 ```
 
-You can remember the method name by the convention that `remove` or `apply` describes it's function, `behavior` refers to the first argument (thet contsant holding the behaviors), and then the name of the role which refers to the role playing object: `remove_behavior_role`.
+You can remember the method name by the convention that `remove` or `apply` describes it's function, `behavior` refers to the first argument (the constant holding the behaviors), and then the name of the role which refers to the role playing object: `remove_behavior_role`.
 
-##Name collisions between methods and roles
+## Name collisions between methods and roles
 
 Lets say that you wish to create a context as below, intending to use instances of the following two classes as role players:
 

data/examples/bottles.rb

@@ -1,145 +1,135 @@
-require 'surrounded'
+require "surrounded"
+class CountdownSong
+  def initialize(max:, min:)
+    @max = max
+    @min = min
+  end
+  attr_reader :max, :min
+
+  def sing_with(verse_template)
+    max.downto(min).map { |num| verse(num, verse_template) }
+  end
+
+  def verse(number, verse_template)
+    verse_template.lyrics(number)
+  end
+end
+
+class BottleVerse
+  def self.lyrics(number)
+    new(bottle_number: number).lyrics
+  end
 
-class Countdown
   extend Surrounded::Context
-  
-  initialize :singer, :number, :location
-  
-  trigger :start do
-    singer.start
-  end
-  
-  trigger :continue do
-    singer.continue
-  end
-  
-  trigger :finish do
-    singer.announce_status
-  end
-  
-  role :singer do
-    def start
-      announce_full_status
-      take_action
-    end
-    
-    def continue
-      announce_status
-      pause
-      start
-    end
-    
-    def announce_full_status
-      output %{#{location.status}, #{location.inventory}}.capitalize
-    end
-    
-    def announce_status
-      output %{#{location.status}}.capitalize
+
+  initialize :bottle_number
+
+  trigger :lyrics do
+    "#{bottle_number} of beer on the wall, ".capitalize +
+    "#{bottle_number} of beer.\n" +
+    "#{bottle_number.action}, " +
+    "#{bottle_number.successor} of beer on the wall.\n"
+  end
+
+  role :bottle_number, :wrapper do
+    def self.handles(number)
+      BottleVerse.register_bottle_role(number, self)
     end
-    
-    def take_action
-      if location.empty?
-        output %{Go to the store and get some more}
-        next_part.finish
-      else
-        output %{#{location.subtraction}, pass it around}.capitalize
-        next_part.continue
-      end
+
+    def to_s
+      "#{quantity} #{container}"
     end
-    
-    def pause
-      output ""
+
+    def quantity
+      __getobj__.to_s
     end
-    
-    def next_part
-      context.class.new(singer, number.pred, location)
+
+    def container
+      "bottles"
     end
-  end
-  
-  role :number, :wrap do
-    def name
-      self.zero? ? 'no more' : to_i
+
+    def action
+      "Take #{pronoun} down and pass it around"
     end
-    
+
     def pronoun
-      self == 1 ? 'it' : 'one'
-    end
-    
-    def container
-      self == 1 ? 'bottle' : 'bottles'
+      "one"
     end
-    
-    def pred
-      self.zero? ? 99 : super
+
+    def successor
+      context.bottle_role_player(pred)
     end
   end
-  
-  role :location do
-    def empty?
-      number.zero?
-    end
-    
-    def inventory
-      %{#{number.name} #{number.container} of beer}
-    end
-    
-    def status
-      %{#{inventory} #{placement} #{name}}
-    end
-    
-    def subtraction
-      %{take #{number.pronoun} #{removal_strategy}}
-    end
+
+  # Inherit from existing role
+  def self.bottle_role(name, &block)
+    mod_name = RoleName(name)
+    klass = Class.new(BottleNumber, &block)
+    const_set(mod_name, klass)
   end
-end
 
-class Location
-  include Surrounded
-  
-  def placement
-    'on'
+  def self.register_bottle_role(number, klass)
+    @@registry ||= Hash.new { BottleNumber }
+    @@registry[number] = klass
   end
-  
-  def removal_strategy
-    'off'
+
+  def bottle_role_for(number)
+    @@registry[number]
   end
-  
-  def name
-    "the " + self.class.to_s.downcase
+
+  def map_role_bottle_number(num)
+    map_role(:bottle_number, bottle_role_for(num), num)
   end
-end
 
-class Wall < Location
-  def removal_strategy
-    'down'
+  def bottle_role_player(number)
+    bottle_role_for(number).new(number)
   end
-end
 
-class Box < Location
-  def placement
-    'in'
+  role :bottle_number_0, :bottle_role do
+    handles 0
+
+    def quantity
+      "no more"
+    end
+
+    def action
+      "Go to the store and buy some more"
+    end
+
+    def successor
+      context.bottle_role_player(99)
+    end
   end
-  
-  def removal_strategy
-    'out'
+
+  role :bottle_number_1, :bottle_role do
+    handles 1
+
+    def container
+      "bottle"
+    end
+
+    def pronoun
+      "it"
+    end
   end
 end
 
-class Chorus
-  include Surrounded
-  def output(value)
-    STDOUT.puts(value)
+class Bottles
+  def song_template(upper: 99, lower: 0)
+    CountdownSong.new(max: upper, min: lower)
   end
-end
 
-class Sheet
-  include Surrounded
-  def output(value)
-    File.open('bottles.txt', 'a') do |f|
-      f.puts(value)
-    end
+  def song
+    song_template.sing_with(BottleVerse)
+  end
+
+  def verses(upper, lower)
+    song_template(upper: upper, lower: lower).sing_with(BottleVerse)
+  end
+
+  def verse(number)
+    song_template.verse(number, BottleVerse)
   end
 end
 
-Countdown.new(Chorus.new, 3, Wall.new).start
-# Countdown.new(Sheet.new, 3, Box.new).start
+puts Bottles.new.song

data/lib/surrounded/access_control.rb

@@ -33,12 +33,10 @@ module Surrounded
       mod = Module.new
       mod.class_eval {
         define_method "disallow_#{name}?" do
-          begin
-            apply_behaviors
-            instance_exec(&block)
-          ensure
-            remove_behaviors
-          end
+          apply_behaviors
+          instance_exec(&block)
+        ensure
+          remove_behaviors
         end
       }
       const_set("SurroundedAccess#{name}", mod)
@@ -55,22 +53,16 @@ module Surrounded
       # in disallow blocks.
       def triggers
         all_triggers.select {|name|
-          method_restrictor = "disallow_#{name}?"
-          !self.respond_to?(method_restrictor, true) || !self.send(method_restrictor)
+          allow?(name)
         }.to_set
       end
 
       # Ask if the context will allow access to a trigger given the current players.
       def allow?(name)
-        unless self.respond_to?(name)
-          raise NoMethodError, %{undefined method `#{name}' for #{self.inspect}}
-        end
-        if self.respond_to?("disallow_#{name}?")
-          !self.public_send("disallow_#{name}?")
-        else
-          true
-        end
+        raise NoMethodError, %{undefined method `#{name}' for #{self.inspect}} unless self.respond_to?(name)
+        predicate = "disallow_#{name}?"
+        !self.respond_to?(predicate) || !self.public_send(predicate)
       end
     end
   end
-end
+end

data/lib/surrounded/context/initializing.rb

@@ -1,6 +1,7 @@
 module Surrounded
   module Context
     module Initializing
+      extend Seclusion
       # Shorthand for creating an instance level initialize method which
       # handles the mapping of the given arguments to their named role.
       def initialize_without_keywords(*setup_args, &block)
@@ -41,4 +42,4 @@ module Surrounded
       end
     end
   end
-end
+end

data/lib/surrounded/context/negotiator.rb

@@ -15,8 +15,9 @@ module Surrounded
           # circumvent method_missing
           mod.instance_methods(false).each do |meth|
             num = __LINE__; klass.class_eval %{
-              def #{meth}(*args, &block)
-                __behaviors__.instance_method(:#{meth}).bind(@object).call(*args, &block)
+              def #{meth}(...)
+                @#{meth}_method ||= __behaviors__.instance_method(:#{meth}).bind(@object)
+                @#{meth}_method.call(...)
               end
             }, __FILE__, num
           end
@@ -57,8 +58,8 @@ module Surrounded
         @object = object
       end
 
-      def method_missing(meth, *args, &block)
-        @object.send(meth, *args, &block)
+      def method_missing(meth, ...)
+        @object.send(meth, ...)
       end
 
       def respond_to_missing?(meth, include_private=false)
@@ -66,4 +67,4 @@ module Surrounded
       end
     end
   end
-end
+end

data/lib/surrounded/context/role_builders.rb

@@ -3,6 +3,7 @@ module Surrounded
     class InvalidRoleType < ::StandardError; end
 
     module RoleBuilders
+      extend Seclusion
 
       def self.extended(base)
         Surrounded::Exceptions.define(base, exceptions: :InvalidRoleType)

data/lib/surrounded/context/role_map.rb

@@ -6,12 +6,16 @@ module Surrounded
       extend Forwardable
 
       class << self
+        # Get the role map container and provide an alternative if desired
+        # Ex: RoleMap.from_base(SomeCustomContainer)
         def from_base(klass=::Triad)
-          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
+          unless const_defined?(:Container)
+            role_mapper = Class.new(self)
+            role_mapper.container_class=(klass)
+            Surrounded::Exceptions.define(role_mapper, exceptions: :ItemNotPresent, namespace: klass)
+            const_set(:Container, role_mapper)
+          end
+          const_get(:Container)
         end
 
         def container_class=(klass)
@@ -19,23 +23,28 @@ module Surrounded
         end
       end
 
+      def_delegators :container, :update, :each, :values, :keys
+
       def container
         @container ||= self.class.instance_variable_get(:@container_class).new
       end
 
+      # Check if a role exists in the map
       def role?(role)
         keys.include?(role)
       end
 
+      # Check if an object is playing a role in this map
       def role_player?(object)
         !values(object).empty?
-      rescue ::StandardError
+      rescue self.container.class::ItemNotPresent
         false
       end
 
+      # Get the object playing the given role
       def assigned_player(role)
         values(role).first
       end
     end
   end
-end
+end

data/lib/surrounded/context/seclusion.rb

@@ -0,0 +1,20 @@
+module Surrounded
+  module Context
+    module Seclusion
+      # Set a named constant and make it private
+      def private_const_set(name, const)
+        unless role_const_defined?(name)
+          const = const_set(name, const)
+          private_constant name.to_sym
+        end
+        const
+      end
+
+      # Create attr_reader for the named methods and make them private
+      def private_attr_reader(*method_names)
+        attr_reader(*method_names)
+        private(*method_names)
+      end
+    end
+  end
+end

data/lib/surrounded/context/trigger_controls.rb

@@ -54,7 +54,7 @@ module Surrounded
 
       def define_trigger(name)
         line = __LINE__; self.class_eval %{
-          def #{name}(*args, &block)
+          def #{name}(...)
             begin
               apply_behaviors
 
@@ -71,7 +71,7 @@ module Surrounded
         if method_defined?(name)
           %{super}
         else
-          %{self.send("__trigger_#{name}", *args, &block)}
+          %{self.send("__trigger_#{name}", ...)}
         end
       end
       
@@ -85,4 +85,4 @@ module Surrounded
       end
     end
   end
-end
+end

data/lib/surrounded/context.rb

@@ -1,6 +1,7 @@
 require 'set'
 require 'surrounded/exceptions'
 require 'surrounded/context/role_map'
+require 'surrounded/context/seclusion'
 require 'surrounded/context/role_builders'
 require 'surrounded/context/initializing'
 require 'surrounded/context/forwarding'
@@ -20,7 +21,7 @@ module Surrounded
   module Context
     def self.extended(base)
       base.class_eval {
-        extend RoleBuilders, Initializing, Forwarding, NameCollisionDetector
+        extend Seclusion, RoleBuilders, Initializing, Forwarding, NameCollisionDetector
 
         @triggers = Set.new
         include InstanceMethods
@@ -69,21 +70,6 @@ module Surrounded
       const_defined?(name, false)
     end
 
-    # Set a named constant and make it private
-    def private_const_set(name, const)
-      unless role_const_defined?(name)
-        const = const_set(name, const)
-        private_constant name.to_sym
-      end
-      const
-    end
-
-    # Create attr_reader for the named methods and make them private
-    def private_attr_reader(*method_names)
-      attr_reader(*method_names)
-      private(*method_names)
-    end
-
     # Conditional const_get for a named role behavior
     def role_const(name)
       if role_const_defined?(name)
@@ -119,10 +105,11 @@ module Surrounded
         self.class.triggers
       end
 
+      # Reuse the same context object but pass new values
       def rebind(**options_hash)
         clear_instance_variables
         begin
-          initialize(options_hash)
+          initialize(**options_hash)
         rescue ArgumentError
           initialize(*options_hash.values)
         end

data/lib/surrounded/shortcuts.rb

@@ -3,9 +3,21 @@ module Surrounded
     private
     
     def define_shortcut(name)
-      singleton_class.send(:define_method, name) do |*args|
-        instance = self.new(*args)
-        instance.public_send(name)
+      # if keyword initialize
+      if instance_method(:initialize).parameters.dig(0,0) == :keyreq
+        singleton_class.send(:define_method, name) do |**args|
+          instance = begin
+            self.new(**args)
+          end
+          instance.public_send(name)
+        end
+      else # non-keyword initialize
+        singleton_class.send(:define_method, name) do |*args|
+          instance = begin
+            self.new(*args)
+          end
+          instance.public_send(name)
+        end
       end
     end
 
@@ -16,4 +28,4 @@ module Surrounded
       super
     end
   end
-end
+end

data/lib/surrounded/version.rb

@@ -1,6 +1,6 @@
 module Surrounded
-  VERSION = "1.0.0"
-  
+  VERSION = "1.1.0"
+
   def self.version
     VERSION
   end

data/surrounded.gemspec

@@ -20,6 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "triad",  "~> 0.3.0"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake"
 end

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: 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/example_proxy_test.rb

@@ -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

data/test/initialization_test.rb

@@ -28,7 +28,7 @@ describe Surrounded::Context, '.initialize' do
     err = assert_raises(ArgumentError){
       KeywordContext.new(other_user: User.new('Amy'))
     }
-    assert_match(/missing keyword: user/, err.message)
+    assert_match(/missing keyword: :?user/, err.message)
   end
 end
 

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
@@ -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
@@ -149,4 +185,4 @@ describe Surrounded::Context, '.role' do
       end
     end
   end
-end
+end

data/test/test_helper.rb

@@ -1,6 +1,8 @@
 require 'simplecov'
 require 'minitest/autorun'
-SimpleCov.start
+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: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - "'Jim Gay'"
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-30 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.6.8
-signing_key: 
+rubygems_version: 3.3.23
+signing_key:
 specification_version: 4
 summary: Create encapsulated environments for your objects.
 test_files:

data/.travis.yml

@@ -1,19 +0,0 @@
-before_install:
-  - gem install bundler
-language: ruby
-cache: bundler
-rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.7
-  - ruby-head
-  - jruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-addons:
-  code_climate:
-    repo_token: 7488b157e7b7f48eac865a9f830fe90a39e6ac10b17f854e17b9529e1854762c
-after_success:
-  - bundle exec codeclimate-test-reporter