array_floe 1.0.0 → 1.1.0

data/README.rdoc

@@ -1,10 +1,16 @@
 = array_floe
 
+== Overview
+
 This small extension to ruby's Array class simplifies the reasonably-common
 need to specially handle "floe"--i.e., <b>f</b>irst, <b>l</b>ast, <b>o</b>dd, <b>e</b>ven--when
 iterating through the elements of an array.  It's particularly handy for
 generating CSS classes.
 
+Full Rdoc is available at http://rubydoc.info/gems/array_floe
+
+== Usage
+
 The gem provides two additional iterators, Array#each_with_floe and
 Array#each_with_index_floe, that provide a "floe" object for each element
 in the array:
@@ -38,7 +44,7 @@ of "first", "last", "odd", and "even" as appropriate:
 
     [:a, :b, :c, :d].each_with_floe.collect{|element, floe| floe.to_s} #=> [ "first even", "odd", "even", "last odd" ]
 
-<code>floe.to_s</code> is particularly useful when generating HTML.  For
+<code>floe.to_s</code> is particularly useful to construct CSS classes when generating HTML.  For
 example, this haml[http://haml-lang.com/] snippet:
 
     %table
@@ -65,12 +71,18 @@ would yield this HTML snippet:
 
 == Installing
 
-<code>% sudo gem install array_floe<code>
+Standard installation from http://rubygems.org/gems/array_floe
 
-or, if you're using bundler[http://gembundler.com/]:
+    % sudo gem install array_floe
+
+or, if you're using bundler[http://gembundler.com/], include this line in your Gemfile:
 
     gem "array_floe"
 
+== Ruby Versions
+
+Tested on ruby 1.8.7 and 1.9.2
+
 == Copyright
 
 Released under the MIT License.  See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/array_floe.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{array_floe}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ronen barzel"]

data/lib/array_floe.rb

@@ -1,3 +1,5 @@
+require 'enumerator' unless defined?(Enumerator)
+
 class Array
 
   # The class for the "floe" object that constructed by
@@ -61,7 +63,7 @@ class Array
         yield(element, FirstLastOddEven.new(i, size))
       end
     else
-      Enumerable::Enumerator.new(self, :each_with_floe)
+      to_enum(:each_with_floe)
     end
   end
   
@@ -82,7 +84,7 @@ class Array
         yield(element, i, FirstLastOddEven.new(i, size))
       end
     else
-      Enumerable::Enumerator.new(self, :each_with_index_floe)
+      to_enum(:each_with_index_floe)
     end
   end
 end

data/spec/array_floe_spec.rb

@@ -2,80 +2,112 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "ArrayFloe" do
 
-  let (:a1) { Array(0...1) }
-  let (:a5) { Array(0...5) }
+  let (:enumerator) { defined?(Enumerator) ? Enumerator : Enumerable::Enumerator } # ruby 1.9 vs. 1.8
 
-  ["each_with_floe", "each_with_index_floe"].each do |method|
+  let (:a1) { [:a] }
+  let (:a5) { [:a, :b, :c, :d, :e] }
 
-    context method do
+  context "each_with_floe" do
 
-      it "has correct arity" do
-        a5.send(method) do |*args|
-          args.size == (method == "each_with_index_floe" ? 3 : 2)
-        end
+    it "correctly reports first" do
+      a5.each_with_floe do |item, floe|
+        floe.first?.should == (item == :a)
       end
+    end
 
-      it "correctly reports first" do
-        a5.send(method) do |*args|
-          item = args.first
-          floe = args.last
-          floe.first?.should == (item == 0)
-        end
+    it "correctly reports last" do
+      a5.each_with_floe do |item, floe|
+        floe.last?.should == (item == :e)
       end
+    end
 
-      it "correctly reports last" do
-        a5.send(method) do |*args|
-          item = args.first
-          floe = args.last
-          floe.last?.should == (item == 4)
-        end
+    it "correctly reports odd" do
+      a5.each_with_floe do |item, floe|
+        floe.odd?.should == [:b, :d].include?(item)
       end
+    end
 
-      it "correctly reports odd" do
-        a5.send(method) do |*args|
-          item = args.first
-          floe = args.last
-          floe.odd?.should == (item % 2  == 1)
-        end
+    it "correctly reports even" do
+      a5.each_with_floe do |item, floe|
+        floe.even?.should == [:a, :c, :e].include?(item)
       end
+    end
 
-      it "correctly reports even" do
-        a5.send(method) do |*args|
-          item = args.first
-          floe = args.last
-          floe.even?.should == (item % 2  == 0)
-        end
-      end
+    it "returns an enumerator" do
+      a5.each_with_floe.should be_an_instance_of enumerator
+    end
+
+    it "iterates on the array entries" do
+      a5.each_with_floe.collect{|item, floe| item}.should == a5
+    end
+
+    it "constructs floe strings" do
+      a5.each_with_floe.collect{ |item, floe| floe.to_s }.should == [
+        "first even",
+        "odd",
+        "even",
+        "odd",
+        "last even"
+      ]
+    end
+
+    it "constructs floe string with first last and even when size == 1" do
+      a1.each_with_floe.collect{|item, floe| floe.to_s}.should == [ "first last even" ]
+    end
+  end
 
-      it "returns an enumerator" do
-        a5.send(method).should be_an_instance_of Enumerable::Enumerator
-        a5.send(method).find{|args| args.last.last? }.first.should == 4
+  context "each_with_index_floe" do
+
+    it "passes the index" do
+      a5.each_with_index_floe do |item, i, floe|
+        a5[i].should == item
       end
+    end
 
-      it "iterates on the array entries" do
-        a5.send(method).collect(&:first).should == a5
+    it "correctly reports first" do
+      a5.each_with_index_floe do |item, i, floe|
+        floe.first?.should == (item == :a)
       end
+    end
 
-      if method == "each_with_index_floe"
-        it "passes the index" do
-          a5.send(method).collect{|args| args[1]}.should == a5
-        end
+    it "correctly reports last" do
+      a5.each_with_index_floe do |item, i, floe|
+        floe.last?.should == (item == :e)
       end
+    end
 
-      it "constructs floe strings" do
-        a5.send(method).collect{ |args| args.last.to_s }.should == [
-          "first even",
-          "odd",
-          "even",
-          "odd",
-          "last even"
-        ]
+    it "correctly reports odd" do
+      a5.each_with_index_floe do |item, i, floe|
+        floe.odd?.should == [:b, :d].include?(item)
       end
+    end
 
-      it "constructs first and last floe string when size == 1" do
-        a1.send(method).collect{|args| args.last.to_s}.should == [ "first last even" ]
+    it "correctly reports even" do
+      a5.each_with_index_floe do |item, i, floe|
+        floe.even?.should == [:a, :c, :e].include?(item)
       end
+    end
+
+    it "returns an enumerator" do
+      a5.each_with_index_floe.should be_an_instance_of enumerator
+    end
+
+    it "iterates on the array entries" do
+      a5.each_with_index_floe.collect{|item, i, floe| item}.should == a5
+    end
+
+    it "constructs floe strings" do
+      a5.each_with_index_floe.collect{ |item, i, floe| floe.to_s }.should == [
+        "first even",
+        "odd",
+        "even",
+        "odd",
+        "last even"
+      ]
+    end
 
+    it "constructs floe string with first last and even when size == 1" do
+      a1.each_with_index_floe.collect{|item, i, floe| floe.to_s}.should == [ "first last even" ]
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: array_floe
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - ronen barzel