surrounded 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ebcadc33e8f51d132862e8b648a6d4a2bd15cc0
-  data.tar.gz: 1626655dd9057674364a2e3ba8ced482e89b156e
+  metadata.gz: 38ccce9051567f5c868f6bf3886a1ed6a7f88886
+  data.tar.gz: 55256f9f23f0e5369426b6a5b8abc5ab8e08f3ae
 SHA512:
-  metadata.gz: 514db8e6ef0df0df0e9ffba94df4ea3217c6fd8eb37d4bc187913599695b4bfdfd5610062ffb8a31f700d884eef4ef91890204052906f60641ff164e46f19046
-  data.tar.gz: a982f5d589c10ca7984273f4ced59520252a8425b5266b35beca3e1fdd5e93823ec80ce65f2397fb460514625c2c9c6a1883e95d106c6e41906cfe28f6e4520b
+  metadata.gz: ff8264560362b3b41d266abc4498937ca5521c725533febd0d28916af5349235faeb45cb84df0775ce0ee4ae32dbf83e3d9c4e0b8e0bd2d8021e7690e5747898
+  data.tar.gz: 6a96f9ddf345233bcbac765eb28eceec2da8d60756d7adaece9093b111abca093af8915b90dc9b071a6ff922b4531efc933f4487be379f5fd8613ed9c63a6cc7

data/LICENSE.txt

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

data/README.md

@@ -71,6 +71,16 @@ context = Employment.new(employee: user1, boss: user2)
 
 This will allow you to prepare your accessing code to use keywords.
 
+If you need to override the initializer with additional work, you have the ability to use a block to be evaluated in the context of the initialized object.
+
+```ruby
+initialize :role1, :role3 do
+  map_role(:role3, 'SomeRoleConstantName', initialize_the_object_to_play)
+end
+```
+
+This block will be called _after_ the default initialization is done.
+
 ## Defining behaviors for roles
 
 Behaviors for your roles are easily defined just like you define a method. Provide your role a block and define methods there.
@@ -866,7 +876,7 @@ You can remember the method name by the convention that `remove` or `apply` desc
 
 If you use this library, it's important to understand it.
 
-As much as possible, when you use the Surrounded DSL for creating triggers, roles, initialize methods, and others you'll likely fine the actual method definitions created in a module and then find that module included in your class.
+As much as possible, when you use the Surrounded DSL for creating triggers, roles, initialize methods, and others you'll likely find the actual method definitions created in a module and then find that module included in your class.
 
 This is a design choice which allows you to override any standard behavior more easily.
 

data/lib/surrounded/context/initializing.rb

@@ -3,42 +3,46 @@ module Surrounded
     module Initializing
       # 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)
-        private_attr_reader(*setup_args)
-      
-        mod = Module.new
-        line = __LINE__
-        mod.class_eval "
-          def initialize(#{setup_args.join(',')})
-            map_roles(#{setup_args.to_s}.zip([#{setup_args.join(',')}]))
-          end
-        ", __FILE__, line
-        const_set("ContextInitializer", mod)
-        include mod
+      def initialize_without_keywords(*setup_args, &block)
+        parameters = setup_args.join(',')
+        default_initializer(parameters, setup_args, &block)
       end
-      def initialize(*setup_args)
+      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)
+        initialize_without_keywords(*setup_args, &block)
+      end
+
+      def keyword_initialize(*setup_args, &block)
+        parameters = setup_args.map{|a| "#{a}:"}.join(',')
+        default_initializer(parameters, setup_args, &block)
+      end
+      alias initialize_with_keywords keyword_initialize
+
+      def initializer_block
+        @initializer_block
       end
 
-      def keyword_initialize(*setup_args)
+      def apply_initializer_block(instance)
+        instance.instance_eval(&initializer_block) if initializer_block
+      end
+
+      def default_initializer(params, setup_args, &block)
         private_attr_reader(*setup_args)
 
         parameters = setup_args.map{|a| "#{a}:"}.join(',')
-
+        @initializer_block = block || nil
         mod = Module.new
-        line = __LINE__
-        mod.class_eval %{
-          def initialize(#{parameters})
+        line = __LINE__; mod.class_eval %{
+          def initialize(#{params})
             @role_map = role_mapper_class.new
             map_roles(#{setup_args.to_s}.zip([#{setup_args.join(',')}]))
+            self.class.apply_initializer_block(self)
           end
         }, __FILE__, line
         const_set("ContextInitializer", mod)
         include mod
       end
-      alias initialize_with_keywords keyword_initialize
     end
   end
 end

data/lib/surrounded/context.rb

@@ -118,7 +118,7 @@ module Surrounded
 
       def rebind(options_hash)
         clear_instance_variables
-        initialize(options_hash)
+        initialize(**options_hash)
       rescue ArgumentError
         initialize(*options_hash.values)
         self

data/lib/surrounded/version.rb

@@ -1,5 +1,5 @@
 module Surrounded
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
   
   def self.version
     VERSION

data/surrounded.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "triad",  "~> 0.2.0"
+  spec.add_dependency "triad",  "~> 0.2.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/surrounded_context_test.rb

@@ -106,7 +106,9 @@ end
 class RoleAssignmentContext
   extend Surrounded::Context
 
-  initialize(:user, :other_user)
+  initialize(:user, :other_user) do
+    self.instance_variable_set(:@defined_by_initializer_block, 'yup')
+  end
 
   def user_ancestors
     user.singleton_class.ancestors
@@ -207,6 +209,10 @@ describe Surrounded::Context, 'assigning roles' do
     context = IgnoreExternalConstantsContext.new(user, special, other)
     assert_equal User, context.check_special
   end
+
+  it 'applies a provided block to the instance' do
+    assert_equal 'yup', context.instance_variable_get(:@defined_by_initializer_block)
+  end
 end
 
 class CollectionContext
@@ -284,7 +290,9 @@ begin
   class Keyworder
     extend Surrounded::Context
 
-    keyword_initialize :this, :that
+    keyword_initialize :this, :that do
+      self.instance_variable_set(:@defined_by_initializer_block, 'yes')
+    end
   end
 
   describe Surrounded::Context, 'keyword initializers' do
@@ -298,6 +306,10 @@ begin
       }
       assert_match(/missing keyword: that/, err.message)
     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
   end
 rescue SyntaxError
   STDOUT.puts "No support for keywords"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surrounded
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - "'Jim Gay'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: triad
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement