surrounded 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06fdae60ee9aa6572db5ba8151e49bfba7257501
-  data.tar.gz: dbed795a64a2ed83a405725e4a0bbf826952cc32
+  metadata.gz: 36e7bbdfc696cc211fbf80ab3f1c63f60b9d36ee
+  data.tar.gz: a43d73f2915efb6a66dd4cb027a5f9bab34c058f
 SHA512:
-  metadata.gz: b930aaf822c3a9b77c8fb9390e8dd32d64077b3ede2f6cd8f347f429b07ad8b60c899585cf1453a0c7359d3eab48af0b73c64f19a33a10213d5ce6cb2b27fcfe
-  data.tar.gz: 00d58b00643d05d17f4ece1f7b1092104f4747535fe67368441fcfe57f0a52d2ebc31a4fba39569601d7d99d37a321cedc8f7be3fe713d88ee7d687d71b0d5ff
+  metadata.gz: a3b5072dac15714ce52bfa92d6bff0ccf3756f80ec9cf3ca9c722e50220f27658f58ede2c89f36f2fa29e2e0c0a0524a13021e301c68064a13b50742590de4b6
+  data.tar.gz: 1e52f4a952f68aa1ca5773647115752237ea362c485859ab80964f1e5ea44f9a0bd4737072203fd346fc22b8607874fbb4852ec25d4619f677ef9b4cbc4dbe18

data/lib/surrounded/context.rb

@@ -1,6 +1,17 @@
 require 'set'
 require 'surrounded/context/role_map'
-require 'redcard'
+
+# Some features are only available in versions of Ruby
+# where this method is true
+def module_method_rebinding?
+  return @__module_method_rebinding__ if defined?(@__module_method_rebinding__)
+  sample_method = Enumerable.instance_method(:to_a)
+  @__module_method_rebinding__ = begin
+    !!sample_method.bind(Object.new)
+  rescue TypeError
+    false
+  end
+end
 
 module Surrounded
   module Context
@@ -17,9 +28,11 @@ module Surrounded
       @default_role_type = type
     end
 
-    def new(*)
-      instance = super
-      instance.instance_variable_set('@__apply_role_policy', __apply_role_policy)
+    def new(*args, &block)
+      instance = allocate
+      instance.send(:preinitialize)
+      instance.send(:initialize, *args, &block)
+      instance.send(:postinitialize)
       instance
     end
 
@@ -63,7 +76,7 @@ module Surrounded
       klass.send(:include, Surrounded)
     end
 
-    if RedCard.check '2.0'
+    if module_method_rebinding?
       def interface(name, &block)
         class_basename = name.to_s.gsub(/(?:^|_)([a-z])/){ $1.upcase }
         interface_name = class_basename + 'Interface'
@@ -90,10 +103,10 @@ module Surrounded
 
       class_eval "
         def initialize(#{setup_args.join(',')})
-          @__apply_role_policy = :#{__apply_role_policy}
+          preinitialize
           arguments = method(__method__).parameters.map{|arg| eval(arg[1].to_s) }
           map_roles(#{setup_args}.zip(arguments))
-          apply_roles if __apply_role_policy == :initialize
+          postinitialize
         end
       "
     end
@@ -146,6 +159,14 @@ module Surrounded
 
       private
 
+      def preinitialize
+        @__apply_role_policy = self.class.send(:__apply_role_policy)
+      end
+
+      def postinitialize
+        apply_roles if __apply_role_policy == :initialize
+      end
+
       def role_map
         @role_map ||= RoleMap.new
       end

data/lib/surrounded/version.rb

@@ -1,3 +1,3 @@
 module Surrounded
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/surrounded.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "triad",  "~> 0.1.2"
-  spec.add_dependency "redcard","~> 1.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/example_proxy_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-if RedCard.check '2.0'
+if test_rebinding_methods?
 
 # If you want to use wrappers, here's how you could
 class ProxyContext
@@ -52,4 +52,4 @@ describe ProxyContext do
   end
 end
 
-end # RedCard.check '2.0'
+end

data/test/role_context_method_test.rb

@@ -1,6 +1,5 @@
 require 'test_helper'
 
-
 describe Surrounded::Context, '.role' do
   class RoleContextTester
     extend Surrounded::Context
@@ -20,7 +19,7 @@ describe Surrounded::Context, '.role' do
       error = assert_raises(NameError){
         RoleContextTester::Admin
       }
-      assert_match /private constant/, error.message
+      assert_match(/private constant/, error.message)
     end
   end
 
@@ -42,10 +41,10 @@ describe Surrounded::Context, '.role' do
       error = assert_raises(NameError){
         WrapperRoleContext::Admin
       }
-      assert_match /private constant/, error.message
+      assert_match(/private constant/, error.message)
     end
   end
-  if RedCard.check '2.0'
+  if test_rebinding_methods?
     class InterfaceContext
       extend Surrounded::Context
 
@@ -80,7 +79,7 @@ describe Surrounded::Context, '.role' do
         error = assert_raises(NameError){
           InterfaceContext::AdminInterface
         }
-        assert_match /private constant/, error.message
+        assert_match(/private constant/, error.message)
       end
 
       it 'creates a private accessor method' do

data/test/test_helper.rb

@@ -25,4 +25,17 @@ class TestContext
   trigger :access_other_object do
     user.other_user.name
   end
+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.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - '''Jim Gay'''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: triad
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.2
-- !ruby/object:Gem::Dependency
-  name: redcard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement