enumex 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6651c8a9336684d0e1cd34331e9d69ce75b7770d
-  data.tar.gz: ba8c16d31f15303c0ec6be0336201aae786c561d
+  metadata.gz: 90e5f8ea91ff80f4e2db270a0b150ffde3958409
+  data.tar.gz: c392358418b8e5b27db1c50d9b79bd68f860fda3
 SHA512:
-  metadata.gz: b174dc6ce15e5fabc5eae0097888c4381dff8781f44de955ddca5d0275cb292b78256b88458be2db8f001122b95fc1f460f8bb2acd8178bdac67489cb9b42981
-  data.tar.gz: 509b2bbb3653178598391135a2cee51683e237ae545dcb169d2b5df71a561364688833ac51c694516a1a5785f453b204464a747e4ab5a94af8eff4b548410525
+  metadata.gz: b5fe35bdbc63eec57698a26253bc84c29f68909f216c8e233aa812d38aec9ce48d67e95d220565069e15192850cec1f941a78d7a5409835112aed970ccc5207b
+  data.tar.gz: eda9ff34b9e15dffa26d652b6ebdfc900c49a36562f16aa7eb1ecd87b7ecb96f9cb60277f2b14e1209a94c36ba2c5a23e75c87917d7814a724f947716fdc764e

data/README.md

@@ -40,4 +40,18 @@ enumex((1..10).each) {|n|
 }.post_action.every_once(3).times {
   puts "sleep"
 }
+```
+
+```ruby
+using Enumex
+
+enumex.post_action.every_once(3).times {
+  print "Fizz"
+}.every_once(5).times {
+  print "Buzz"
+}.every_time {
+  print "\n"
+}.attach_to((1..100).each) do |n|
+  print "#{n}: "
+end
 ```

data/enumex.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |gem|
   gem.version       = Enumex::VERSION
   gem.authors       = ['m4oda']
   gem.email         = 'e5ww2sze@gmail.com'
-  gem.description   = 'Enumex is a utility for Enumerator.'
-  gem.summary       = 'Enumex is a utility for Enumerator.'
+  gem.description   = 'Enumex is a utility to attach preprocessing and postprocessing to Enumerator.'
+  gem.summary       = 'Enumex is a utility to attach preprocessing and postprocessing to Enumerator.'
   gem.homepage      = 'https://github.com/m4oda/enumex'
   gem.license       = 'MIT'
   gem.require_paths = ['lib']

data/lib/enumex.rb

@@ -2,23 +2,9 @@ require 'forwardable'
 require 'enumex/version'
 
 module Enumex
-  # Enumex.attach_to([1, 2, 3, 4, 5].each) {|n|
-  #   puts n
-  # }.every_once(3).times {
-  #   puts "\n"
-  # }
-  #
-  # enm = Enumex.every_once(3).times do
-  #   "\n"
-  # end
-  #
-  # enum.attach_to([1, 2, 3, 4, 5].each) do |n|
-  #   puts n
-  # end
-
   autoload :Base, 'enumex/base'
-  autoload :Action, 'enumex/action'
-  autoload :Actions, 'enumex/actions'
+  autoload :ActionContainer, 'enumex/action_container'
+  autoload :ActionContainers, 'enumex/action_containers'
 
   module Extenders
     autoload :EveryOnceExtender, 'enumex/extenders/every_once_extender'
@@ -34,11 +20,11 @@ module Enumex
   Extenders.constants.map {|nm|
     Extenders.const_get(nm)
   }.each do |klass|
-    Action.instance_eval { include klass::Port }
+    ActionContainer.instance_eval { include klass::Port }
   end
 
   refine Object do
-    define_method :enumex, ->(enumerator = nil, &block) do
+    define_method :enumex, ->(enumerator=nil, &block) do
       Enumex.new(enumerator, &block)
     end
   end

data/lib/enumex/action_container.rb

@@ -0,0 +1,20 @@
+module Enumex
+  class ActionContainer
+    extend Forwardable
+
+    def_delegators :@root,
+                   :attach_to, :enumerator, :block, :run,
+                   *ActionContainers.types.map {|nm| "#{nm}_action" }
+
+    attr_reader :extenders
+
+    def initialize(root)
+      @root = root
+      @extenders = []
+    end
+
+    private
+
+    attr_reader :root
+  end
+end

data/lib/enumex/{actions.rb → action_containers.rb}

@@ -1,5 +1,5 @@
 module Enumex
-  class Actions
+  class ActionContainers
     class << self
       def types
         [:post, :pre]
@@ -14,7 +14,7 @@ module Enumex
       define_method nm, -> do
         name = "@#{nm}"
         v = instance_variable_get(name)
-        v ? v : instance_variable_set(name, Action.new(base))
+        v ? v : instance_variable_set(name, ActionContainer.new(base))
       end
     end
 

data/lib/enumex/base.rb

@@ -1,36 +1,45 @@
 module Enumex
   class Base
-    attr_reader :enumerator, :extenders
+    attr_reader :enumerator
 
     def attach_to(enumerator, &block)
+      raise TypeError unless enumerator.is_a?(Enumerator)
+
       @enumerator = enumerator
       @block = block
 
       actions.empty? ? self : run
     end
 
-    Actions.types.each do |nm|
+    ActionContainers.types.each do |nm|
       define_method "#{nm}_action", -> { actions.public_send(nm) }
     end
 
-    def run
-      actions.reset
+    private
 
-      enumerator.each do |*args|
-        actions.pre.extenders.any? {|ext| ext.execute(*args) }
+    attr_reader :block
 
-        block.call(*args).tap do |result|
-          actions.post.extenders.each {|ext| ext.execute(*args) }
-        end
-      end
+    def actions
+      @actions ||= ActionContainers.new(self)
     end
 
-    private
+    def run
+      return unless enumerator
 
-    attr_reader :block
+      enm = new_enumerator
+      block ? enm.each(&block) : enm
+    end
 
-    def actions
-      @actions ||= Actions.new(self)
+    def new_enumerator
+      Enumerator.new do |y|
+        actions.reset
+        enumerator.each do |*args|
+          actions.pre.extenders.each {|e| e.execute(*args) }
+          result = y.yield(*args)
+          actions.post.extenders.each {|e| e.execute(*args) }
+          result
+        end
+      end
     end
   end
 end

data/lib/enumex/extenders/every_once_extender.rb

@@ -21,7 +21,7 @@ module Enumex
         executor.block = block
         base.extenders << self if block_given?
 
-        base.enumerator ? base.run : base
+        base.enumerator ? base.attach_to(base.enumerator, &base.block) : base
       end
 
       private

data/lib/enumex/extenders/every_time_extender.rb

@@ -3,7 +3,7 @@ module Enumex
     class EveryTimeExtender
       Port = Module.new do
         def every_time(&block)
-          EveryTimeExtender.new(self, &block).value
+          EveryTimeExtender.new(self, &block).instance_eval { evaluate }
         end
       end
 
@@ -11,7 +11,6 @@ module Enumex
         @base = base
         @block = block
         base.extenders << self if block_given?
-        base.enumerator ? base.run : base
       end
 
       def reset
@@ -21,13 +20,13 @@ module Enumex
         block.call(*args) if block
       end
 
-      def value
-        base.enumerator ? base.run : base
-      end
-
       private
 
       attr_reader :base, :block
+
+      def evaluate
+        base.enumerator ? base.attach_to(base.enumerator, &base.block) : base
+      end
     end
   end
 end

data/lib/enumex/version.rb

@@ -1,3 +1,3 @@
 module Enumex
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: enumex
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - m4oda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2016-11-27 00:00:00.000000000 Z
 dependencies: []
-description: Enumex is a utility for Enumerator.
+description: Enumex is a utility to attach preprocessing and postprocessing to Enumerator.
 email: e5ww2sze@gmail.com
 executables: []
 extensions: []
@@ -19,8 +19,8 @@ files:
 - README.md
 - enumex.gemspec
 - lib/enumex.rb
-- lib/enumex/action.rb
-- lib/enumex/actions.rb
+- lib/enumex/action_container.rb
+- lib/enumex/action_containers.rb
 - lib/enumex/base.rb
 - lib/enumex/extenders/every_once_extender.rb
 - lib/enumex/extenders/every_time_extender.rb
@@ -48,5 +48,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Enumex is a utility for Enumerator.
+summary: Enumex is a utility to attach preprocessing and postprocessing to Enumerator.
 test_files: []

data/lib/enumex/action.rb

@@ -1,16 +0,0 @@
-module Enumex
-  class Action
-    extend Forwardable
-
-    def_delegators :@root,
-                   :attach_to, :enumerator, :run,
-                   *Actions.types.map {|nm| "#{nm}_action" }
-
-    attr_reader :root, :extenders
-
-    def initialize(root)
-      @root = root
-      @extenders = []
-    end
-  end
-end