about_pos 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fec989b13e7dd8f14816edee14e295e2e0da207c
-  data.tar.gz: 03161410f565e475d604d9e46db00ba3d32e3986
+  metadata.gz: d97da717a18d64ca3817fd3ee1525325c7887ba3
+  data.tar.gz: e0f34a75858202f72b57e13d19f1e957681211a7
 SHA512:
-  metadata.gz: ec6a38347b1457ea15a4f558bff26c6c3dbf204cdf4e2c1e375e8ca71c2929570ed54b791fc54128ecac672ff289e98148784f3bc707fae7c82485a57c17c7cc
-  data.tar.gz: 3f7c496157c6a8ed2a08339bae3204e2af74761f3a62e1377302730493446dfd8db558f58ce2acfe7b708ad787bd64c8df9909fe982fc2b8bdf517191e791a21
+  metadata.gz: cf3bf9d44a5104d4457d73dc3c00c7123b05f87b56a27637bed0f3bea8d9ef820dbff46be5e545adef42d1275528f7e6ff9120ae35f28f8ea8b530e0ac187469
+  data.tar.gz: e8eb2e70c7354174662951f869930c98c3ced65acb49f6c6a73a7e0bf04d09be958ba1aa997ffb46836cd3ef51a436354a7a4dd341e8b4d4b2d8f43ea9a93d39

data/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0

data/bin/test

@@ -2,9 +2,9 @@
 # -*- bash -*-
 #
 #
+files="specs/$1.rb"
 set -u -e -o pipefail
 
-files="specs/$@.rb"
 if [[ -f "$files" ]]; then
   shift
 else

data/lib/about_pos.rb

@@ -4,65 +4,54 @@ class About_Pos
   No_Next = Class.new(RuntimeError)
   No_Prev = Class.new(RuntimeError)
 
-  class << self
-
-    def Detect
-      self::Detect
-    end
-
-    def Back arr, &blok
-      Move(:back, arr, &blok)
-    end
-
-    def Forward arr, &blok
-      Move(:forward, arr, &blok)
-    end
+  class Enum
 
-    private
-    def Move dir, arr
-      size = arr.size
+    include Enumerable
 
+    def initialize dir, arr
+      @arr = arr
       if dir == :forward
-        real_index = 0
-        seq = arr
+        @real_index = 0
       else
-        real_index = (size - 1) - 0
-        seq = arr.reverse
+        @real_index = (@arr.size - 1) - 0
       end
 
-      meta = Meta.new(dir, real_index, arr)
+      @meta = Meta.new(dir, @real_index, arr)
+    end
 
-      seq.each_with_index { |v, i|
-        yield meta.value, meta.real_index, meta
-        if meta.next?
-          meta = meta.next
-        else
-          break
+    def each
+      return nil if @arr.empty?
+      has_next = false
+      begin
+        result = yield @meta.value, @meta.real_index, @meta
+        has_next = @meta.next?
+        if has_next
+          @meta.next!
         end
-      }
+      end while has_next
     end
 
-  end # === class self ===
-
-  class Detect
+  end # === class Enum
 
-    class << self
+  class << self
 
-      def Back arr
-        About_Pos.Back(arr) { |v,i,m|
-          break if yield(v,i,m)
-        }
+    def Back arr
+      if block_given?
+        Back(arr).each { |v,i,m| yield v, i, m }
+      else
+        Enum.new(:back, arr)
       end
+    end
 
-      def Forward arr
-        About_Pos.Forward(arr) { |v,i,m|
-          break if yield(v,i,m)
-        }
+    def Forward arr
+      if block_given?
+        Forward(arr).each { |v,i,m| yield v, i, m }
+      else
+        Enum.new(:forward, arr)
       end
+    end
 
-    end # === class self
-
-  end # === class Detect
+  end # === class self ===
 
   class Meta
 
@@ -71,11 +60,32 @@ class About_Pos
       @data       = {}
       @dir        = dir
       @last_index = arr.size - 1
-
       @real_index = real_index
+      @prev       = prev
+    end
 
-      @next = nil
-      @prev = prev
+    def data
+      @data
+    end
+
+    def data= d
+      @data = d
+    end
+
+    def [] k
+      @data[@real_index] ||= {}
+      @data[@real_index][k]
+    end
+
+    def []= k, v
+      self[k]
+      @data[@real_index][k] = v
+    end
+
+    def dup
+      d = super
+      d.data= @data
+      d
     end
 
     def value
@@ -106,6 +116,18 @@ class About_Pos
     end
 
     def next
+      m = dup
+      m.next!
+      m
+    end
+
+    def prev
+      m = dup
+      m.prev!
+      m
+    end
+
+    def next!
       @msg ||= if forward?
                  "This is the last position."
                else
@@ -113,16 +135,16 @@ class About_Pos
                end
       raise No_Next, @msg if !next?
 
-      @next ||= begin
-                  if forward?
-                    Meta.new(dir, real_index + 1, arr, self)
-                  else
-                    Meta.new(dir, real_index - 1, arr, self)
-                  end
-                end
+      if forward?
+        @real_index = @real_index + 1
+      else
+        @real_index = @real_index - 1
+      end
+
+      value
     end
 
-    def prev
+    def prev!
       @msg ||= if forward?
                  "This is the first position."
                else
@@ -130,13 +152,13 @@ class About_Pos
                end
       raise No_Prev, @msg if !prev?
 
-      @prev ||= begin
-                  if forward?
-                    Meta.new(dir, real_index - 1, arr)
-                  else
-                    Meta.new(dir, real_index + 1, arr)
-                  end
-                end
+      if forward?
+        @real_index = real_index - 1
+      else
+        @real_index = real_index + 1
+      end
+
+      value
     end
 
     def dir
@@ -179,14 +201,6 @@ class About_Pos
       real_index == last_index
     end
 
-    def [] k
-      @data[k]
-    end
-
-    def []= k, v
-      @data[k] = v
-    end
-
   end # === class Meta ===
 
 

data/specs/Detect.rb

@@ -1,11 +1,11 @@
 
-describe :Detect do
+describe :detect do
 
   describe :Back do
 
     it "returns first value that is truthy" do
       tracks = []
-      result = About_Pos.Detect.Back([1,2,3,4]) do |v,i,m|
+      result = About_Pos.Back([1,2,3,4]).detect do |v,i,m|
         tracks << v
         v == 2
       end
@@ -18,7 +18,7 @@ describe :Detect do
 
     it "returns first value that is truthy" do
       tracks = []
-      result = About_Pos.Detect.Forward([1,2,3,4,5]) do |v,i,m|
+      result = About_Pos.Forward([1,2,3,4,5]).detect do |v,i,m|
         tracks << v
         v == 3
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: about_pos
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler