iterable 0.0.10.pre → 0.0.11.pre

data/lib/array.rb

@@ -0,0 +1,5 @@
+class Array
+    def to_iter
+        IterableArray.new self
+    end
+end

data/lib/iterable.rb

@@ -1,2 +1 @@
-require_relative './iterable_array.rb'
-
+require "#{File.expand_path File.dirname(__FILE__)}/iterable_array"

data/lib/iterable_array.rb

@@ -5,16 +5,23 @@
 # Or the remix gem, maybe.
 require 'forwardable'
 
-require_relative './iterable_array/version.rb'
+base_path = File.expand_path File.dirname __FILE__
+
+require "#{base_path}/iterable_array/version.rb"
+
+require "#{base_path}/swapable.rb"
+require "#{base_path}/array.rb"
+# Required for ruby 1.8 compatibility by IterableArray#shuffle! during iteration
+require "#{base_path}/sampler.rb" unless [].respond_to? :sample
+
+require "#{base_path}/iterable_array/special_accessors.rb"
+require "#{base_path}/iterable_array/iterators.rb"
+require "#{base_path}/iterable_array/iterator_specials.rb"
+require "#{base_path}/iterable_array/special_modifiers_noniterating.rb"
 
-require_relative './swapable.rb'
-require_relative './iterable_array/special_accessors.rb'
-require_relative './iterable_array/iterators.rb'
-require_relative './iterable_array/iterator_specials.rb'
-require_relative './iterable_array/special_modifiers_noniterating.rb'
 # The following are not yet modules.
-require_relative './iterable_array/special_modifiers_iterating.rb'
-require_relative './iterable_array/plain_modifiers.rb'
+require "#{base_path}/iterable_array/special_modifiers_iterating.rb"
+require "#{base_path}/iterable_array/plain_modifiers.rb"
 
 class IterableArray
     extend Forwardable
@@ -32,7 +39,10 @@ class IterableArray
     @@iterator_specials = [ :tracking, :tracking=, :invert_tracking, ]
 
     @@plain_accessors   = [ :frozen?, :==, :[]=, :size, :length, :to_a, :to_s, :to_json, :to_enum, :include?, :hash, :to_ary, :fetch, :inspect, :at, :join, :empty?, :member?, :pack, :shelljoin, ]
-    @@special_accessors = [ :<<, :concat, :&, :|, :*, :+, :-, :[], :drop, :dup, :compact, :sample, :slice, :<=>, :eql?, :indices, :indexes, :values_at, :assoc, :rassoc, :first, :sort, :last, :flatten, :reverse, :shuffle, :push, :replace, :rotate, :swap, :swap_indices, :take, :transpose, :uniq, ]
+    @@plain_accessors.push :choice if Array.new.respond_to? :choice
+    @@plain_accessors.push :nitems if Array.new.respond_to? :nitems
+    @@special_accessors = [ :<<, :concat, :&, :|, :*, :+, :-, :[], :drop, :dup, :compact, :slice, :<=>, :eql?, :indices, :indexes, :values_at, :assoc, :rassoc, :first, :sort, :last, :flatten, :reverse, :shuffle, :push, :replace, :rotate, :swap, :swap_indices, :take, :transpose, :uniq, ]
+    @@special_accessors.push :sample if Array.new.respond_to? :sample
 
     @@plain_modifiers   = [ :delete, :delete_at, ]
     @@special_modifiers = [ :clear, :compact!, :flatten!, :insert, :move, :move_from, :shift, :shuffle!, :sort!, :sort_by!, :unshift, :pop, :reverse!, :rotate!, :slice!, :swap!, :swap_indices!, :uniq!, ]
@@ -72,9 +82,20 @@ class IterableArray
         remove_methods *@@special_modifiers
     end
 
-    def remove_methods *ary
-        ary.each do |meth|
-            singleton_class.class_exec { remove_method meth }
+    if Class.respond_to? :class_exec and Object.respond_to? :singleton_class
+        def remove_methods *ary
+            ary.each do |meth|
+                singleton_class.class_exec { remove_method meth }
+            end
+        end
+    else
+        # Object#singleton_class isn't available in Ruby 1.8
+        # The following Ruby 1.8-compatible version is appreciably
+        # slower in Ruby 1.9 than the version using Object#singleton_class
+        def remove_methods *ary
+            ary.each do |methd|
+                eval "class << self; remove_method :'#{methd}'; end"
+            end
         end
     end
 
@@ -96,5 +117,11 @@ class IterableArray
         @progenitor = progenitor
         class << self; undef_method :take_progenitor; end
     end
+
+    public
+
+    def to_iter
+        self
+    end
 end
 

data/lib/iterable_array/iterators.rb

@@ -44,7 +44,7 @@ class IterableArray
             ##################################################
             starter = args.first
             the_final = args.at 1
-            ender = -> { the_final or length }
+            ender = lambda { the_final or length }
 
             #############
             # Iteration #
@@ -404,9 +404,7 @@ class IterableArray
 
         def comb_perm_generator methd, ary, n
             out = []
-            ary.method(methd)[ n, &(->(item) {
-                out << item
-            }) ]
+            ary.send(methd, n) { |item| out << item }
             out
         end
 

data/lib/iterable_array/special_modifiers_iterating.rb

@@ -174,6 +174,9 @@ class IterableArray
                 @array.shuffle!
 
                 locations = []
+                # For Ruby 1.8, where Array#sample does not exist
+                locations = Sampler.new [] unless locations.respond_to? :sample
+
                 @array.to_a.each_with_index { |item, location| locations << location if item == current_item }
 
                 center_indices_at locations.sample

data/lib/iterable_array/version.rb

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

data/lib/sampler.rb

@@ -0,0 +1,11 @@
+class Sampler < Array
+    if Array.new.respond_to? :choice
+        alias_method :sample, :choice
+    else
+        # Don't need to allow args if this is just being
+        # used in the implementation of IterableArray#shuffle!
+        def sample
+            at rand size
+        end
+    end
+end

data/lib/swapable.rb

@@ -7,15 +7,13 @@ module Swapable
     def to_a
         self
     end
-    
+
     def dup
         (super).extend Swapable
     end
 
-    def swap_2_indices! arg1, arg2
-        temper = at arg1
-        self[arg1] = at arg2
-        self[arg2] = temper
+    def swap_2_indices! i1, i2
+        self[i1], self[i2] = self[i2], self[i1]
         self
     end
     protected :swap_2_indices!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iterable
 version: !ruby/object:Gem::Version
-  version: 0.0.10.pre
+  version: 0.0.11.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
-dependencies: []
+date: 2013-07-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Provides the class IterableArray, which implements all of the methods
   of Array
 
@@ -40,7 +56,9 @@ files:
 - lib/iterable_array/iterator_specials.rb
 - lib/iterable_array/special_modifiers_iterating.rb
 - lib/iterable_array.rb
+- lib/array.rb
 - lib/swapable.rb
+- lib/sampler.rb
 - lib/iterable.rb
 homepage: https://github.com/scooter-dangle/iterable
 licenses:
@@ -68,3 +86,4 @@ signing_key:
 specification_version: 3
 summary: Provides a fully iterable array object
 test_files: []
+has_rdoc: