merge_enum 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f11e6fdb56034a498252cdfd1682977434abac7
-  data.tar.gz: 40462c704b94a9c87b7a7eeea633d23ba266af40
+  metadata.gz: 38f7ffbcb61ff421a338c08cb2b01db4811f89eb
+  data.tar.gz: 21a2e709d217ea3eb7db6b6fc58a96d8f455356f
 SHA512:
-  metadata.gz: d2f20337d0f8773b49a00dad126d2e45f1a18c985e781d37dca45e0c70040e44720c744f2555e732ef8a9a470b05b5a4e908ad515cac6bb280384f55232683cb
-  data.tar.gz: c991d180ff3bd84ea4090b79d4a3444cc3b6147954f10f1fef56d3d555ab772f3470b42a1bba700d9ee92cbb27c40a13e287a6c94d5c382f40c506cd716bb160
+  metadata.gz: b3d2a02cc175a108a19e39077aafe42ff1d46f82f8e7bbd879b7112524fd5a85f8cca72d0ede96e94282a0a29605ba1b2a78ca465bcf46a3c29059ff667a83ba
+  data.tar.gz: b1191ff673f06b96a7caebefa28ef527a561afc7a12d86554b5e5bcd3a65612810fedc276ea901a66c09ee764411fa7fa4987e20b68e32586d478236aeb2889d

data/README.md

@@ -1,7 +1,8 @@
 # MergeEnum
 
-複数のEnumeraleを合成するEnumerableです。  
-要素が必要になった時点で効率的に追加するように動作します。
+複数のEnumeraleを連結（合成）するEnumerableです。  
+要素が必要になった時点で追加するように動作します。  
+効率的なはずです。
 
 ## Installation
 
@@ -19,7 +20,6 @@ Or install it yourself as:
 
 ## Usage
 
-    > require 'merge_enum'
     > m_enum = MergeEnum::MergeEnumerable.new(
            [0,1,2,3,4,5,6,7,8,9],
            10...20,
@@ -27,7 +27,7 @@ Or install it yourself as:
            -> (c) { 30...40 },       # c => 25
            Proc.new { 40...50 },
            Proc.new { |c| 50...60 }, # c => 5
-           Proc.new { 70...80 },     # => never called
+           Proc.new { 60...70 },     # => never called
            first: 55
          )
     > m_enum.is_a? Enumerable

data/lib/merge_enum/extention/enumerable.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+module Enumerable
+
+  def merge_enum *args
+    MergeEnum::MergeEnumerable.new self, *args
+  end
+
+end
+

data/lib/merge_enum/merge_enumerable.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 module MergeEnum
 
   class MergeEnumerable
@@ -40,6 +40,15 @@ module MergeEnum
       self
     end
 
+    def concat arg
+      self.class.new *@collections, arg, @options
+    end
+
+    def concat! arg
+      @collections.push arg
+      self
+    end
+
   end
 
 end

data/lib/merge_enum/version.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
 module MergeEnum
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end
+

data/lib/merge_enum.rb

@@ -1,6 +1,9 @@
-require "merge_enum/version"
-require "merge_enum/merge_enumerable"
+# encoding: utf-8
+require 'merge_enum/version'
 
 module MergeEnum
+  autoload :MergeEnumerable, 'merge_enum/merge_enumerable'
 end
 
+require 'merge_enum/extention/enumerable'
+

data/spec/merge_enum/extention/enumerable_spec.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+require File.expand_path(File.join('../../', 'spec_helper'), File.dirname(__FILE__))
+
+describe Enumerable do
+
+  describe ":merge_enum Method" do
+    it "Enumerable" do
+      enm_1 = 0...100
+      enum = enm_1.to_a.merge_enum(
+        first: 200
+      )
+      expect(enum.count).to be 100
+
+      enum_2 = MergeEnum::MergeEnumerable.new(
+        enm_1,
+        first: 200
+      )
+      expect(enum.to_a).to eq(enum_2.to_a)
+    end
+    it "Enumerable, Proc, Lambda" do
+      enm_1 = 0...100
+      enm_2 = -> (c) { arg1 = c; 200...250 }
+      enm_3 = Proc.new { |c| arg2 = c; 300...330 }
+      enum = enm_1.to_a.merge_enum(
+        enm_2, enm_3,
+        first: 200
+      )
+      expect(enum.count).to be 180
+
+      enum_2 = MergeEnum::MergeEnumerable.new(
+        enm_1, enm_2, enm_3,
+        first: 200
+      )
+      expect(enum.to_a).to eq(enum_2.to_a)
+    end
+  end
+
+end
+

data/spec/merge_enum/{merge_emunerable.rb → merge_enumerable_spec.rb}

@@ -274,5 +274,48 @@ describe MergeEnum::MergeEnumerable do
     end
   end
 
+  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 }
+      enum = MergeEnum::MergeEnumerable.new(
+        enm_1, enm_2,
+        first: 130
+      )
+      expect(enum.concat enm_3).not_to be(enum)
+
+      enum_2 = MergeEnum::MergeEnumerable.new(
+        enm_1, enm_2, enm_3,
+        first: 130
+      )
+      expect(enum.concat(enm_3).to_a).to eq(enum_2.to_a)
+    end
+  end
+
+  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 }
+      enum = MergeEnum::MergeEnumerable.new(
+        enm_1, enm_2,
+        first: 130
+      )
+      expect(enum.concat! enm_3).to be(enum)
+
+      enum = MergeEnum::MergeEnumerable.new(
+        enm_1, enm_2,
+        first: 130
+      )
+
+      enum_2 = MergeEnum::MergeEnumerable.new(
+        enm_1, enm_2, enm_3,
+        first: 130
+      )
+      expect(enum.concat!(enm_3).to_a).to eq(enum_2.to_a)
+    end
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merge_enum
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - brightgenerous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,10 +51,12 @@ files:
 - README.md
 - Rakefile
 - lib/merge_enum.rb
+- lib/merge_enum/extention/enumerable.rb
 - lib/merge_enum/merge_enumerable.rb
 - lib/merge_enum/version.rb
 - merge_enum.gemspec
-- spec/merge_enum/merge_emunerable.rb
+- spec/merge_enum/extention/enumerable_spec.rb
+- spec/merge_enum/merge_enumerable_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -81,5 +83,6 @@ signing_key:
 specification_version: 4
 summary: merge enumerable
 test_files:
-- spec/merge_enum/merge_emunerable.rb
+- spec/merge_enum/extention/enumerable_spec.rb
+- spec/merge_enum/merge_enumerable_spec.rb
 - spec/spec_helper.rb