surrounded 0.8.4 → 0.9.0

data/test/role_context_method_test.rb

@@ -3,18 +3,18 @@ require 'test_helper'
 describe Surrounded::Context, '.role' do
   class RoleContextTester
     extend Surrounded::Context
-
+ 
     role_methods :admin do
     end
   end
-
+ 
   describe 'modules' do
     it 'creates a module' do
       role = RoleContextTester.const_get(:Admin)
       refute_instance_of Class, role
       assert_kind_of Module, role
     end
-
+ 
     it 'marks the constant private' do
       error = assert_raises(NameError){
         RoleContextTester::Admin
@@ -22,21 +22,21 @@ describe Surrounded::Context, '.role' do
       assert_match(/private constant/i, error.message)
     end
   end
-
+ 
   class WrapperRoleContext
     extend Surrounded::Context
-
+ 
     role :admin, :wrap do
-
+ 
     end
   end
-
+ 
   describe 'wrappers' do
     it 'creates a wrapper' do
       role = WrapperRoleContext.const_get('Admin')
       assert_includes(role.ancestors, SimpleDelegator)
     end
-
+ 
     it 'marks the constant private' do
       error = assert_raises(NameError){
         WrapperRoleContext::Admin
@@ -44,97 +44,103 @@ describe Surrounded::Context, '.role' do
       assert_match(/private constant/i, error.message)
     end
   end
-  if test_rebinding_methods?
-    class InterfaceContext
-      extend Surrounded::Context
-
-      initialize(:admin, :other)
-
-      role :admin, :interface do
-        def hello
-          'hello from admin'
-        end
-      end
-
-      trigger :admin_hello do
-        admin.hello
-      end
-    end
-
-    class Hello
-      include Surrounded
+  class InterfaceContext
+    extend Surrounded::Context
+ 
+    initialize(:admin, :other)
+ 
+    role :admin, :interface do
       def hello
-        'hello'
+        'hello from admin'
       end
     end
-
-    describe 'interfaces' do
-      let(:context){
-        InterfaceContext.new(Hello.new, Hello.new)
+ 
+    trigger :admin_hello do
+      admin.hello
+    end
+  end
+ 
+  class Hello
+    include Surrounded
+    def hello
+      'hello'
+    end
+  end
+ 
+  describe 'interfaces' do
+    let(:context){
+      InterfaceContext.new(Hello.new, Hello.new)
+    }
+    it 'sets interface objects to use interface methods before singleton methods' do
+      assert_equal 'hello from admin', context.admin_hello
+    end
+ 
+    it 'marks the inteface constant private' do
+      error = assert_raises(NameError){
+        InterfaceContext::AdminInterface
       }
-      it 'sets interface objects to use interface methods before singleton methods' do
-        assert_equal 'hello from admin', context.admin_hello
-      end
-
-      it 'marks the inteface constant private' do
-        error = assert_raises(NameError){
-          InterfaceContext::AdminInterface
-        }
-        assert_match(/private constant/i, error.message)
-      end
-
-      it 'creates a private accessor method' do
-        assert_respond_to(context, :admin)
-      end
+      assert_match(/private constant/i, error.message)
+    end
+ 
+    it 'creates a private accessor method' do
+      assert_respond_to(context, :admin)
     end
   end
-
+ 
   describe 'unknown' do
     it 'raises an error' do
       assert_raises(Surrounded::Context::InvalidRoleType){
         class UnknownRole
           extend Surrounded::Context
-
+ 
           role :admin, :unknown do
           end
         end
       }
     end
   end
-
+ 
   describe 'custom default' do
+    include Surrounded # the test is a role player here
+ 
     it 'allows the use of custom default role types' do
       class CustomDefaultWrap
         extend Surrounded::Context
-
+ 
         self.default_role_type = :wrap
-        apply_roles_on(:initialize)
-
-        initialize(:admin)
-
+ 
+        initialize(:admin, :the_test)
+ 
         role :admin do
         end
+ 
+        trigger :check_admin_type do
+          the_test.assert_kind_of SimpleDelegator, admin
+        end
       end
-      context = CustomDefaultWrap.new(Object.new)
-      assert_kind_of(SimpleDelegator, context.send(:admin))
+      context = CustomDefaultWrap.new(Object.new, self)
+      context.check_admin_type
     end
-
-    it 'allows the setting of custom default role time for all Surrounded::Contexts' do
+ 
+    it 'allows the setting of custom default role type for all Surrounded::Contexts' do
       begin
         old_default = Surrounded::Context.default_role_type
         Surrounded::Context.default_role_type = :wrap
         class CustomGlobalDefault
           extend Surrounded::Context
-          apply_roles_on(:initialize)
-
-          initialize(:admin)
-
+ 
+          initialize(:admin, :the_test)
+ 
           role :admin do
           end
+ 
+          trigger :check_admin_type do
+            the_test.assert_kind_of SimpleDelegator, admin
+          end
         end
-
-        context = CustomGlobalDefault.new(Object.new)
-        assert_kind_of(SimpleDelegator, context.send(:admin))
+ 
+        context = CustomGlobalDefault.new(Object.new, self)
+        context.check_admin_type
       ensure
         Surrounded::Context.default_role_type = old_default
       end

data/test/surrounded_context_test.rb

@@ -46,8 +46,9 @@ describe Surrounded::Context, '.trigger' do
 
   it 'preserves arguments and blocks' do
     result = context.block_method('argument') do |*args, obj|
-      "Having an #{args.first} with #{obj}"
+      "Having an #{args.first} with #{obj.class}"
     end
+    assert_equal "Having an argument with TestContext", result
   end
 
   it 'allows usage of regular methods for triggers' do

data/test/test_helper.rb

@@ -36,16 +36,3 @@ class TestContext
   end
   trigger :regular_method_trigger
 end
-
-# This is a different implementation of module_method_rebinding?
-# created in order to check that the behavior of the code is correct.
-#
-# This method is used in tests and module_method_rebinding? is used
-# in the library code.
-def test_rebinding_methods?
-  unbound = Enumerable.instance_method(:count)
-  unbound.bind(Object.new)
-  true
-rescue TypeError
-  false
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surrounded
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - "'Jim Gay'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: triad
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/bottles.rb
 - examples/rails.rb
+- images/body-bg.png
+- images/highlight-bg.jpg
+- images/hr.png
+- images/octocat-icon.png
+- images/surrounded.png
+- images/tar-gz-icon.png
+- images/zip-icon.png
+- index.html
+- javascripts/main.js
+- javascripts/scale.fix.js
 - lib/surrounded.rb
 - lib/surrounded/access_control.rb
 - lib/surrounded/context.rb
@@ -74,10 +85,16 @@ files:
 - lib/surrounded/context/negotiator.rb
 - 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/shortcuts.rb
 - lib/surrounded/version.rb
+- params.json
+- stylesheets/print.css
+- stylesheets/pygment_trac.css
+- stylesheets/styles.css
+- stylesheets/stylesheet.css
 - surrounded.gemspec
 - test/context_access_test.rb
 - test/context_shortcuts_test.rb
@@ -85,6 +102,7 @@ files:
 - test/example_proxy_test.rb
 - test/example_threaded_test.rb
 - test/example_wrapper_test.rb
+- test/override_methods_test.rb
 - test/role_context_method_test.rb
 - test/surrounded_context_test.rb
 - test/surrounded_test.rb
@@ -120,6 +138,7 @@ test_files:
 - test/example_proxy_test.rb
 - test/example_threaded_test.rb
 - test/example_wrapper_test.rb
+- test/override_methods_test.rb
 - test/role_context_method_test.rb
 - test/surrounded_context_test.rb
 - test/surrounded_test.rb