iterable 0.0.6.pre → 0.0.10.pre

data/lib/iterable_array.rb

@@ -5,6 +5,8 @@
 # Or the remix gem, maybe.
 require 'forwardable'
 
+require_relative './iterable_array/version.rb'
+
 require_relative './swapable.rb'
 require_relative './iterable_array/special_accessors.rb'
 require_relative './iterable_array/iterators.rb'
@@ -46,11 +48,11 @@ class IterableArray
 
     def initialize *args
         @array = Array.new(*args).extend Swapable
-        @progenitor_binding = binding
+        @progenitor = self
     end
 
     def bastardize
-        @array = self.new_with_binding @array
+        @array = self.new_with_progenitor @array
         @tracking = 0.5
         class << self
             def_delegators :@array, *@@special_accessors
@@ -80,15 +82,19 @@ class IterableArray
 
     # Necessary for allowing nested iteration with modifying iterators (like
     # :delete_if)
-    def new_with_binding array
+    # TODO - After refactoring to be a reference to the progenitor itself
+    # rather than a binding, need to simplify this... overly complex right
+    # now for what it does...
+    def new_with_progenitor array
         iter_ary = IterableArray.new array
-        iter_ary.take_progenitor_binding @progenitor_binding
+        iter_ary.take_progenitor @progenitor
         iter_ary
     end
 
-    def take_progenitor_binding progenitor_binding
-        @progenitor_binding = progenitor_binding
-        class << self; undef_method :take_progenitor_binding; end
+    # Not sure this method is worth the trouble
+    def take_progenitor progenitor
+        @progenitor = progenitor
+        class << self; undef_method :take_progenitor; end
     end
 end
 

data/lib/iterable_array/iterators.rb

@@ -2,14 +2,10 @@ class IterableArray
     # module Iterators
         private
         def catch_a_break
-            result = nil
-            begin
-                bastardize
-                result = yield
-            ensure
-                debastardize
-            end
-            result
+            bastardize
+            yield
+        ensure
+            debastardize
         end
 
         def increment_indices
@@ -176,7 +172,7 @@ class IterableArray
                     # iteration levels would not be able to adjust their indices
                     # to account for the change in array size.
                     if yield @array.at(@current_index)
-                        @progenitor_binding.eval "self.delete_at #{@current_index}"
+                        @progenitor.send :delete_at, @current_index
                     end
                     increment_indices
                 end
@@ -293,27 +289,24 @@ class IterableArray
             return @array.to_enum(:cycle, n) unless block_given?
 
             catch_a_break do
-                if n.nil?
-                    until @array.empty?
-                        @backward_index, @current_index, @forward_index = -1, 0, 1
-                        while @current_index < @array.size
-                            yield @array.at(@current_index)
-                            increment_indices
-                        end
-                    end
-                else
-                    n.times do
-                        @backward_index, @current_index, @forward_index = -1, 0, 1
-                        while @current_index < @array.size
-                            yield @array.at(@current_index)
-                            increment_indices
-                        end
+                cycle_conditional_helper n do
+                    @backward_index, @current_index, @forward_index = -1, 0, 1
+                    while @current_index < @array.size
+                        yield @array.at(@current_index)
+                        increment_indices
                     end
                 end
 
                 nil
             end
         end
+        
+        def cycle_conditional_helper n, &block
+            n.nil? ?
+                (yield until @array.empty?) :
+                n.times { yield }
+        end
+        private :cycle_conditional_helper
 
         def index obj = :undefined
             unless block_given?

data/lib/iterable_array/version.rb

@@ -0,0 +1,4 @@
+class IterableArray
+    # The version of IterableArray you are using
+    VERSION = '0.0.10.pre'
+end

data/lib/swapable.rb

@@ -1,4 +1,5 @@
 module Swapable
+    # to_iter doesn't really belong in Swapable
     def to_iter
         IterableArray.new self
     end
@@ -6,6 +7,10 @@ module Swapable
     def to_a
         self
     end
+    
+    def dup
+        (super).extend Swapable
+    end
 
     def swap_2_indices! arg1, arg2
         temper = at arg1
@@ -27,11 +32,11 @@ module Swapable
     alias_method :swap_indexes!, :swap_indices!
 
     def swap *args
-        dup.extend(Swapable).swap! *args
+        dup.swap! *args
     end
 
     def swap_indices *args
-        dup.extend(Swapable).swap_indices! *args
+        dup.swap_indices! *args
     end
     alias_method :swap_indexes, :swap_indices
 

metadata

@@ -1,31 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: iterable
 version: !ruby/object:Gem::Version
-  version: 0.0.6.pre
-  prerelease: 6
+  version: 0.0.10.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Scott L Steele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies: []
-description: ''
+description: ! 'Provides the class IterableArray, which implements all of the methods
+  of Array
+
+  (as of Ruby 1.9.3) in an iterable-aware fashion. I.e., behavior is defined to
+
+  the greatest extent possible for operations that modify an IterableArray from
+
+  within an iteration block (e.g. each, map, delete_if, reverse_each). To use,
+
+  call #to_iter on a pre-existing Array or use IterableArray.new; the
+
+  IterableArray should act identically to a regular Array except that it
+
+  responds logically to modifications during iteration.
+
+'
 email: ScottLSteele@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/iterable_array/iterator_specials.rb
+- lib/iterable_array/version.rb
 - lib/iterable_array/special_modifiers_noniterating.rb
-- lib/iterable_array/special_modifiers_iterating.rb
+- lib/iterable_array/iterators.rb
 - lib/iterable_array/special_accessors.rb
 - lib/iterable_array/plain_modifiers.rb
-- lib/iterable_array/iterators.rb
+- lib/iterable_array/iterator_specials.rb
+- lib/iterable_array/special_modifiers_iterating.rb
+- lib/iterable_array.rb
 - lib/swapable.rb
 - lib/iterable.rb
-- lib/iterable_array.rb
 homepage: https://github.com/scooter-dangle/iterable
 licenses:
 - ''
@@ -47,9 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Provides a fully iterable array object
 test_files: []
-has_rdoc: