tree_methods 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab96d2d92b494cfc332be9008d479d69b0d921f4ed3e62dbef96a6f48d10458
-  data.tar.gz: 7e3d7e03769d31579017aa5863cfc56e2957c81e42dfb53f4c23b64004620dda
+  metadata.gz: 0ba0354c6ba024e1ed9768365b7a17484619ecdb5475f459c6c327a5a3f14dea
+  data.tar.gz: 0bd0d539df290319fc543ea89b11ae4a24dc084858317c39bc84e931c7993133
 SHA512:
-  metadata.gz: fad481f6d603919461baefa1c150c15efb66289776381589f33dcf629b222d21d0c1ab1d44dc42eeb1c4510c5123ba05eb0ef4fb3103d8678a68fc0bee8936e2
-  data.tar.gz: ff0df081b3eb0bfed369d3df96c691043aa4ece7a5a444fad6a7c4ad6a976209d92f623dc0dc69ac16d3103990364fd83122ce77e887fbaab4068dad5c84546e
+  metadata.gz: d20413db23e7d67403c886972699fab7ccbbb997c91dd227058fe899a06f289db1253c29035ab78eb6fa7df171d6278ecb57aa3a6e150b332b3d84c152c91460
+  data.tar.gz: bb56a86771cd117475864131c1ee73b4d09ea36f848d53d17696bbc3f2ac958bfbae0453f68b8b85266c7947d6d4b55a0be1659d71bf64c5700032d7d13996a7

data/lib/tree_methods/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TreeMethods
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/tree_methods.rb

@@ -1,18 +1,52 @@
 # frozen_string_literal: true
 
 require_relative "tree_methods/version"
-require_relative "tree_methods/enumerable_tree_methods"
-require_relative "tree_methods/object_tree_methods"
 
 module TreeMethods
   class Error < StandardError; end
-end
 
-module Enumerable
-  include EnumerableTreeMethods # FIXME
+  def follow(include_self = false, &block) 
+    result = include_self ? [self] : []
+    follow_implementation(result, &block)
+    result
+  end
+
+  def preorder(include_self = true, &block)
+    result = include_self ? [self] : []
+    preorder_implementation(result, &block)
+    result
+  end
+  
+  def postorder(include_self = true, &block)
+    result = []
+    postorder_implementation(result, &block)
+    include_self ? result + [self] : result
+  end
+
+private
+  def follow_implementation(result, &block)
+    if follower = block.call(self)
+      result << follower
+      follower.send(:follow_implementation, result, &block)
+    end
+  end
+
+  def preorder_implementation(result, &block)
+    block.call(self).each { |node|
+      result << node
+      node.send(:preorder_implementation, result, &block)
+    }
+  end
+
+  def postorder_implementation(result, &block)
+    block.call(self).each { |node|
+      node.send(:postorder_implementation, result, &block)
+      result << node
+    }
+  end
 end
 
 class Object
-  include ObjectTreeMethods # FIXME Whoa!
+  include TreeMethods # FIXME Whoa!
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tree_methods
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Claus Rasmussen
@@ -23,8 +23,6 @@ files:
 - README.md
 - Rakefile
 - lib/tree_methods.rb
-- lib/tree_methods/enumerable_tree_methods.rb
-- lib/tree_methods/object_tree_methods.rb
 - lib/tree_methods/version.rb
 - sig/tree_methods.rbs
 homepage: http://www.nowhere.com/

data/lib/tree_methods/enumerable_tree_methods.rb

@@ -1,32 +0,0 @@
-module EnumerableTreeMethods
-  def preorder(include_self = true, &block)
-    result = include_self ? [self] : []
-    preorder_implementation(result, &block)
-    result
-  end
-  
-  def postorder(include_self = true, &block)
-    result = []
-    postorder_implementation(result, &block)
-    include_self ? result + [self] : result
-  end
-
-private
-  def preorder_implementation(result, &block)
-    block.call(self).each { |node|
-      result << node
-      node.send(:preorder_implementation, result, &block)
-    }
-  end
-
-  def postorder_implementation(result, &block)
-    block.call(self).each { |node|
-      node.send(:postorder_implementation, result, &block)
-      result << node
-    }
-  end
-end
-
-
-
-

data/lib/tree_methods/object_tree_methods.rb

@@ -1,16 +0,0 @@
-module ObjectTreeMethods
-  def follow(include_self = false, &block) 
-    result = include_self ? [self] : []
-    follow_implementation(result, &block)
-    result
-  end
-
-private
-  def follow_implementation(result, &block)
-    if follower = block.call(self)
-      result << follower
-      follower.send(:follow_implementation, result, &block)
-    end
-  end
-end
-