merge_enum 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bafae3364065c9abe915758a6dd04295cd3fedb1
-  data.tar.gz: fede260331446d4c1de5dfcee837916aad302330
+  metadata.gz: 83c9df67a3bf180ed443689aa752ffb05daa2776
+  data.tar.gz: eafcdd7dfa4844eab8b96e1bb0dd31670ee19e58
 SHA512:
-  metadata.gz: 87d4c7b73e7604d0f93690da8a5a33b52ef4c4ca2c74a50f6a3a4c8f31e4de6775614deaa8b91c3cf0efcf5b3a47bab2f55c66ecdf534118e8b0384aa7f08f17
-  data.tar.gz: 3d02a507a2be532da38e62d277f84124290b67fe39ae3d202006cd25befd0ebdff359be540b22a90845a2e784ec608c0d6fa2bb9f8e5780fa241a4796088429b
+  metadata.gz: 6feac7d52703573869924e008a5dbea02ea08a2ec204a4e935147e1bc5e367cb4827c1d643790ba7bb77bc77e891fdc40e3b7db1db052e9a58866be60df973f4
+  data.tar.gz: 21a08e2bcf620c15a2e95e3aa978738c86b4a005dece07d97a1fd22a2c827d24bbc3fec8615644ffe084800fe1ee77124e51fc8ecf16574a086a286cbff5a5dd

data/README.md

@@ -1,11 +1,11 @@
 # MergeEnum
-###### ver 0.2.0
+###### ver 0.2.2
 
 複数のEnumerale(*1)を連結（合成）するEnumerableです。  
 要素が必要になった時点で追加するように動作します。  
-効率的なはずです。
+効率的です。
 
-(*1) `each`,`first`メソッドが定義されていれば、Enumerableでなくても可
+(*1) `each`,`first`メソッドが定義されていればEnumerableでなくてもよく、それを返すProc, Lambdaでもよい。
 
 ## Installation
 
@@ -42,12 +42,12 @@ Or install it yourself as:
     > m_enum.count
       => 55
 
-#### Enumerable#merge_enum から生成できるようにしました
+#### Enumerable#merge_enum から生成できる
 
     > m_enum = (0...10).merge_enum(first: 13)
       => #<MergeEnum::MergeEnumerable:0x007fa...>
 
-#### concat, concat! で連結できるようにしました
+#### concat, concat! で連結できる
 
     > m_enum = (0...10).merge_enum(first: 13)
       => #<MergeEnum::MergeEnumerable:0x007fb...>

data/lib/merge_enum/merge_enumerable.rb

@@ -24,18 +24,29 @@ module MergeEnum
           fst = opt_fst - cnt
           break if fst <= 0
         end
+        called_first = false
         if c.is_a? Proc
           if c.arity == 0
             c = c.call
           else
             c = c.call fst
+            called_first = true
           end
         end
-        c = c.first fst if fst
-        c.each do |i|
-          block.call i
+        if fst
+          c = c.first fst unless called_first
+          _cnt = 0
+          c.each.with_index 1 do |e, i|
+            block.call e
+            _cnt = i
+            break if fst <= _cnt
+          end
+          cnt += _cnt
+        else
+          c.each do |e|
+            block.call e
+          end
         end
-        cnt += c.count
       end
       self
     end

data/lib/merge_enum/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module MergeEnum
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end
 

data/spec/merge_enum/merge_enumerable_spec.rb

@@ -248,8 +248,8 @@ describe MergeEnum::MergeEnumerable do
     it "equality enumerator" do
       enum = MergeEnum::MergeEnumerable.new(
         0...100,
-        -> (c) { arg1 = c; 200...250 },
-        Proc.new { |c| arg2 = c; 300...330 },
+        -> (c) { 200...250 },
+        Proc.new { |c| 300...330 },
         first: 200
       )
       enum_sub = enum.each
@@ -262,14 +262,18 @@ describe MergeEnum::MergeEnumerable do
 
   describe "Whitebox" do
     it "call first method" do
-      ary = (0...100)
+      ary_1 = 0...100
+      ary_2 = 200...250
+      ary_3 = 300...330
       enum = MergeEnum::MergeEnumerable.new(
-        ary,
-        -> (c) { arg1 = c; 200...250 },
-        Proc.new { |c| arg2 = c; 300...330 },
+        ary_1,
+        -> (c) { ary_2 },
+        Proc.new { ary_3 },
         first: 200
       )
-      expect(ary).to receive(:first).with(200).and_return(ary)
+      expect(ary_1).to receive(:first).with(200).and_return(ary_1)
+      ary_2.stub(:first) { raise "unexpected" }
+      expect(ary_3).to receive(:first).with(50).and_return(ary_3)
       expect(enum.count).to be 180
     end
   end
@@ -277,8 +281,8 @@ describe MergeEnum::MergeEnumerable do
   describe ":concat Method" do
     it "equality enumerator" do
       enm_1 = 0...100
-      enm_2 = -> (c) { arg1 = c; 200...250 }
-      enm_3 = Proc.new { |c| arg2 = c; 300...330 }
+      enm_2 = -> (c) { 200...250 }
+      enm_3 = Proc.new { |c| 300...330 }
       enum = MergeEnum::MergeEnumerable.new(
         enm_1, enm_2,
         first: 130
@@ -296,8 +300,8 @@ describe MergeEnum::MergeEnumerable do
   describe ":concat! Method" do
     it "equality enumerator" do
       enm_1 = 0...100
-      enm_2 = -> (c) { arg1 = c; 200...250 }
-      enm_3 = Proc.new { |c| arg2 = c; 300...330 }
+      enm_2 = -> (c) { 200...250 }
+      enm_3 = Proc.new { |c| 300...330 }
       enum = MergeEnum::MergeEnumerable.new(
         enm_1, enm_2,
         first: 130

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merge_enum
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - brightgenerous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler