merge_enum 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a35388e5d97c57ace35fe87acd5d49240ed8e2ab
-  data.tar.gz: 3bfcd7d2e5134d5ef8130cda8b0b9096ed67acbf
+  metadata.gz: 96107e05d17a2500c015995a885805dee8f73201
+  data.tar.gz: 754eb0bb61e65a5d7310470a3886d0fee53a8b50
 SHA512:
-  metadata.gz: f67bf685781bce9dd9583cea2c706948cca6892ce88d578e7adfd025ca704c11384ed6c0d83413edab0a2b5e1cb5b2a030fb2460dbf5dfca90b6bbb9818c09ed
-  data.tar.gz: 9b7a441d6e75fcf7b683426cee580f7750766d7bfd8b2971255dcb82231f00cc4443272ce814189a12afce17217896ce20a5c8d8ed953041ed2a0f1c41b03916
+  metadata.gz: df4f49e52cc5aba2650d7d59f78052b06ba1af8e0e4add8671903d840af01aecb3315879a197cee4f7cee78a17bcc0cc7f0f7e5d3489806db53c37e05bc935e3
+  data.tar.gz: 629aeff7a46a81ac042c58312a6fef454d29f265eef485d92ea22125f2145225c89a42ae319d935eb5ac1563ece08b71b9baee1a5c4fcdd075d0af174675a410

data/Gemfile

@@ -2,6 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in merge_enum.gemspec
 gemspec
-
-gem 'rspec', '~> 3.0.0.beta2'
-

data/README.md

@@ -1,5 +1,5 @@
 # MergeEnum
-###### ver 0.5.0
+###### ver 0.7.0
 
 複数のEnumerale(*1)を連結（合成）するEnumerableです。  
 要素が必要になった時点で追加するように動作します。  
@@ -91,6 +91,8 @@ Or install it yourself as:
             　- `:first`   : `Integer`: 要素を取得する最大サイズ  
             　- `:compact` : `Proc|bool`: nilを判定して除去する  
             　- `:select`  : `Proc`: nil,falseを返す要素を除去する  
+            　- `:map`     : `Proc`: 要素を変換する  
+            　- `:cache`   : `bool`: 要素をキャッシュする
 
 * `Enumerable#merge_enum(enum_2, enum_3, ... , options = {})`  
     レシーバ自身を`enum_1`として、`MergeEnumerable.new(enum_1, enum_2, enum_3, ... , options)`を返します

data/lib/merge_enum/merge_enumerable.rb

@@ -28,17 +28,22 @@ module MergeEnum
       end
 
       # options
-      opt_fst = @options[:first]
-      opt_fst = opt_fst.to_i if opt_fst
+      opt_fst = option_first @options
       (opt_proc, _proc) = merge_options_proc @options
-      opt_map = map_proc @options
+      (opt_map, _map) = map_proc @options
+      opt_fill = @options[:fill]
 
       # local variables
       cnt = 0
       fst = nil
       cache = [] if opt_cache
 
-      @collections.each do |c|
+      cs = if opt_fst and opt_fill
+             @collections + [opt_fill]
+           else
+             @collections
+           end
+      cs.each do |c|
         if opt_fst
           fst = opt_fst - cnt
           break if fst <= 0
@@ -69,8 +74,8 @@ module MergeEnum
           c = c.first fst unless called_first or _proc
           _cnt = 0
           c.each do |e|
-            next if _proc and not opt_proc.call(e, cnt)
-            e = opt_map.call(e, cnt)
+            next if _proc and not opt_proc.call e, cnt
+            e = opt_map.call e, cnt if _map
             block.call e
             cache.push e if cache
             cnt += 1
@@ -80,8 +85,8 @@ module MergeEnum
         else
           # without first option
           c.each do |e|
-            next if _proc and not opt_proc.call(e, cnt)
-            e = opt_map.call(e, cnt)
+            next if _proc and not opt_proc.call e, cnt
+            e = opt_map.call e, cnt if _map
             block.call e
             cache.push e if cache
             cnt += 1
@@ -96,6 +101,23 @@ module MergeEnum
 
     private
 
+    def option_first options
+      opt_fst = options[:first]
+      if opt_fst
+        if opt_fst.is_a? Proc
+          arity = opt_fst.arity.abs
+          case arity
+          when 0
+            opt_fst = opt_fst.call
+          else
+            opt_fst = opt_fst.call *Array.new(arity, nil)
+          end
+        end
+        opt_fst = opt_fst.to_i
+      end
+      opt_fst
+    end
+
     def merge_options_proc options
       opts = []
 
@@ -151,19 +173,20 @@ module MergeEnum
         unless opt_map.is_a? Proc
           raise ":map is must be a Proc"
         end
-        case opt_map.arity
+        arity = opt_map.arity.abs
+        case arity
         when 0
-          -> (e, i) { opt_map.call }
+          [-> (e, i) { opt_map.call }, true]
         when 1
-          -> (e, i) { opt_map.call e }
+          [-> (e, i) { opt_map.call e }, true]
         when 2
-          opt_map
+          [opt_map, true]
         else
           args = Array.new arity - 2, nil
-          -> (e, i) { opt_map.call e, i, *args }
+          [-> (e, i) { opt_map.call e, i, *args }, true]
         end
       else
-        -> (e, i) { e }
+        [-> (e, i) { e }, false]
       end
     end
 
@@ -179,19 +202,23 @@ module MergeEnum
     end
 
     def merge_options opts
+      raise "opts must be a Hash" if opts and not opts.is_a? Hash
       self.class.new *@collections, (@options.merge opts || {})
     end
 
     def merge_options! opts
+      raise "opts must be a Hash" if opts and not opts.is_a? Hash
       @options.merge! opts || {}
       self
     end
 
     def replace_options opts
+      raise "opts must be a Hash" if opts and not opts.is_a? Hash
       self.class.new *@collections, opts || {}
     end
 
     def replace_options! opts
+      raise "opts must be a Hash" if opts and not opts.is_a? Hash
       @options = opts || {}
       self
     end

data/lib/merge_enum/version.rb

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

data/merge_enum.gemspec

@@ -19,5 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 0"
+
+  spec.add_development_dependency 'rspec', '~> 3.0.0.rc1'
+  spec.add_development_dependency 'simplecov', "~> 0"
+
+  spec.add_development_dependency 'rspec_term', '~> 0.3', '>= 0.3.0'
 end

data/spec/merge_enum/merge_enumerable_spec.rb

@@ -67,13 +67,8 @@ describe MergeEnum::MergeEnumerable do
     end
   end
 
-  describe ".new nil" do
-    let(:enum) { Target.new nil }
-    test_error self, :enum, line: __LINE__
-  end
-
-  ["hoge", "foo", "bar"].each do |val|
-    describe ".new '#{val}'" do
+  [nil, "hoge", "foo", "bar"].each do |val|
+    describe ".new #{val.inspect}" do
       let(:enum) { Target.new val }
       test_error self, :enum, line: __LINE__
     end
@@ -104,7 +99,7 @@ describe MergeEnum::MergeEnumerable do
 
       context "<positive>" do
         [1, 2, 50].each do |val|
-          describe "#{val}" do
+          describe "#{val.inspect}" do
             let(:first) { val }
             test_empty self, :enum, line: __LINE__
           end
@@ -113,7 +108,7 @@ describe MergeEnum::MergeEnumerable do
 
       context "<negative>" do
         [-1, -2, -50].each do |val|
-          describe "#{val}" do
+          describe "#{val.inspect}" do
             let(:first) { val }
             test_empty self, :enum, line: __LINE__
           end
@@ -137,7 +132,7 @@ describe MergeEnum::MergeEnumerable do
 
       context "<illegal>" do
         ["hoge", "foo", "bar"].each do |val|
-          describe "'#{val}'" do
+          describe "#{val.inspect}" do
             let(:first) { val }
             test_empty self, :enum, line: __LINE__
           end
@@ -222,7 +217,7 @@ describe MergeEnum::MergeEnumerable do
 
       context "<positive>" do
         [1, 2, 50].each do |val|
-          describe "#{val}" do
+          describe "#{val.inspect}" do
             let(:first) { val }
             test_empty self, :enum, line: __LINE__
           end
@@ -231,7 +226,7 @@ describe MergeEnum::MergeEnumerable do
 
       context "<negative>" do
         [-1, -2, -50].each do |val|
-          describe "#{val}" do
+          describe "#{val.inspect}" do
             let(:first) { val }
             test_empty self, :enum, line: __LINE__
           end
@@ -255,7 +250,7 @@ describe MergeEnum::MergeEnumerable do
 
       context "<illegal>" do
         ["hoge", "foo", "bar"].each do |val|
-          describe "'#{val}'" do
+          describe "#{val.inspect}" do
             let(:first) { val }
             test_empty self, :enum, line: __LINE__
           end
@@ -329,6 +324,78 @@ describe MergeEnum::MergeEnumerable do
       let(:ary) { 0...100 }
       test_all self, :enum, 0...100, line: __LINE__
     end
+
+    describe "Proc.new { 0...100 }" do
+      let(:ary) {
+        ary = Proc.new { 0...100 }
+        allow(ary).to receive(:call).once.and_return 0...100
+        ary
+      }
+      test_all self, :enum, 0...100, line: __LINE__
+    end
+
+    describe "Proc.new { |e| 0...100 }" do
+      let(:ary) {
+        ary = Proc.new { |e| 0...100 }
+        allow(ary).to receive(:call).once.and_return 0...100
+        ary
+      }
+      test_all self, :enum, 0...100, line: __LINE__
+    end
+
+    describe "Proc.new { |e, i| 0...100 }" do
+      let(:ary) {
+        ary = Proc.new { |e, i| 0...100 }
+        allow(ary).to receive(:call).once.and_return 0...100
+        ary
+      }
+      test_all self, :enum, 0...100, line: __LINE__
+    end
+
+    describe "Proc.new { |e, i, x, y, z| 0...100 }" do
+      let(:ary) {
+        ary = Proc.new { |e, i, x, y, z| 0...100 }
+        allow(ary).to receive(:call).once.and_return 0...100
+        ary
+      }
+      test_all self, :enum, 0...100, line: __LINE__
+    end
+
+    describe "-> { 0...100 }" do
+      let(:ary) {
+        ary = -> { 0...100 }
+        allow(ary).to receive(:call).once.and_return 0...100
+        ary
+      }
+      test_all self, :enum, 0...100, line: __LINE__
+    end
+
+    describe "-> { |e| 0...100 }" do
+      let(:ary) {
+        ary = -> (c) { 0...100 }
+        allow(ary).to receive(:call).once.and_return 0...100
+        ary
+      }
+      test_all self, :enum, 0...100, line: __LINE__
+    end
+
+    describe "-> (e, i) { 0...100 }" do
+      let(:ary) {
+        ary = -> (e, i) { 0...100 }
+        allow(ary).to receive(:call).once.and_return 0...100
+        ary
+      }
+      test_all self, :enum, 0...100, line: __LINE__
+    end
+
+    describe "-> (e, i, x, y, z) { 0...100 }" do
+      let(:ary) {
+        ary = -> (e, i, x, y, z) { 0...100 }
+        allow(ary).to receive(:call).once.and_return 0...100
+        ary
+      }
+      test_all self, :enum, 0...100, line: __LINE__
+    end
   end
 
   describe ".new" do
@@ -403,6 +470,16 @@ describe MergeEnum::MergeEnumerable do
           test_all self, :enum, (31...100).step(2), line: __LINE__
         end
 
+        describe "Proc.new { |e, i| e.nil? or e < 30 }" do
+          let(:compact) { Proc.new { |e, i| e.nil? or e < 30 } }
+          test_all self, :enum, (31...100).step(2), line: __LINE__
+        end
+
+        describe "Proc.new { |e, i, x, y, z| e.nil? or e < 30 }" do
+          let(:compact) { Proc.new { |e, i, x, y, z| e.nil? or e < 30 } }
+          test_all self, :enum, (31...100).step(2), line: __LINE__
+        end
+
         describe "-> { true }" do
           let(:compact) { -> { true } }
           test_all self, :enum, [], line: __LINE__
@@ -422,6 +499,16 @@ describe MergeEnum::MergeEnumerable do
           let(:compact) { -> (e) { e.nil? or e < 30 } }
           test_all self, :enum, (31...100).step(2), line: __LINE__
         end
+
+        describe "-> (e, i) { e.nil? or e < 30 }" do
+          let(:compact) { -> (e, i) { e.nil? or e < 30 } }
+          test_all self, :enum, (31...100).step(2), line: __LINE__
+        end
+
+        describe "-> (e, i, x, y, z) { e.nil? or e < 30 }" do
+          let(:compact) { -> (e, i, x, y, z) { e.nil? or e < 30 } }
+          test_all self, :enum, (31...100).step(2), line: __LINE__
+        end
       end
     end
   end
@@ -482,6 +569,16 @@ describe MergeEnum::MergeEnumerable do
           test_all self, :enum, (1...30).step(2), line: __LINE__
         end
 
+        describe "Proc.new { |e, i| not e.nil? and e < 30 }" do
+          let(:select) { Proc.new { |e, i| not e.nil? and e < 30 } }
+          test_all self, :enum, (1...30).step(2), line: __LINE__
+        end
+
+        describe "Proc.new { |e, i, x, y, z| not e.nil? and e < 30 }" do
+          let(:select) { Proc.new { |e, i, x, y, z| not e.nil? and e < 30 } }
+          test_all self, :enum, (1...30).step(2), line: __LINE__
+        end
+
         describe "-> { true }" do
           let(:select) { -> { true } }
           test_all self, :enum, (0...100).map { |e| e.odd? ? e : nil }, line: __LINE__
@@ -501,6 +598,16 @@ describe MergeEnum::MergeEnumerable do
           let(:select) { -> (e) { not e.nil? and e < 30 } }
           test_all self, :enum, (1...30).step(2), line: __LINE__
         end
+
+        describe "-> (e, i) { not e.nil? and e < 30 }" do
+          let(:select) { -> (e, i) { not e.nil? and e < 30 } }
+          test_all self, :enum, (1...30).step(2), line: __LINE__
+        end
+
+        describe "-> (e, i, x, y, z) { not e.nil? and e < 30 }" do
+          let(:select) { -> (e, i, x, y, z) { not e.nil? and e < 30 } }
+          test_all self, :enum, (1...30).step(2), line: __LINE__
+        end
       end
     end
   end
@@ -548,6 +655,92 @@ describe MergeEnum::MergeEnumerable do
     end
   end
 
+  describe ".new" do
+    let(:enum) { Target.new ary, fill: fill }
+    describe "0...100," do
+      let(:ary) { 0...100 }
+
+      describe "fill:" do
+        describe "nil" do
+          let(:fill) { nil }
+
+          test_all self, :enum, 0...100, line: __LINE__
+        end
+
+        describe "true" do
+          let(:fill) { true }
+
+          test_all self, :enum, 0...100, line: __LINE__
+        end
+
+        describe "false" do
+          let(:fill) { false }
+
+          test_all self, :enum, 0...100, line: __LINE__
+        end
+      end
+    end
+  end
+
+  describe ".new" do
+    let(:enum) { Target.new ary, first: first, fill: fill }
+    describe "0...100," do
+      let(:ary) { 0...100 }
+      describe "first:" do
+        describe "150," do
+          let(:first) { 150 }
+
+          [nil, "hoge", "foo", "bar"].each do |val|
+            describe "fill: #{val.inspect}" do
+              let(:fill) { val }
+              test_interrupt self, :enum, (0...100).to_a, line: __LINE__
+            end
+          end
+
+          describe "fill:" do
+            describe "200...300" do
+              let(:fill) { 200...300 }
+
+              test_all self, :enum, (0...100).to_a + (200...250).to_a, line: __LINE__
+            end
+
+            describe "Proc.new { 200...300 }" do
+              let(:fill) { Proc.new { 200...300 } }
+
+              test_all self, :enum, (0...100).to_a + (200...250).to_a, line: __LINE__
+            end
+
+            describe "Proc.new { |c| 200...300 }" do
+              let(:fill) {
+                _proc = Proc.new { |c| 200...300 }
+                expect(_proc).to receive(:call).with(50).once.and_return 200...300
+                _proc
+              }
+
+              test_equal self, :enum, (0...100).to_a + (200...250).to_a, line: __LINE__
+            end
+
+            describe "-> { 200...300 }" do
+              let(:fill) { -> { 200...300 } }
+
+              test_all self, :enum, (0...100).to_a + (200...250).to_a, line: __LINE__
+            end
+
+            describe "-> (c) { 200...300 }" do
+              let(:fill) {
+                _proc = -> (c) { 200...300 }
+                expect(_proc).to receive(:call).with(50).once.and_return 200...300
+                _proc
+              }
+
+              test_equal self, :enum, (0...100).to_a + (200...250).to_a, line: __LINE__
+            end
+          end
+        end
+      end
+    end
+  end
+
   describe ".new" do
     let(:enum) { Target.new ary1, ary2 }
     describe "0...100, 200...250" do
@@ -623,7 +816,7 @@ describe MergeEnum::MergeEnumerable do
         describe "130" do
           let(:ary1) {
             ary = Proc.new { |c| 0...100 }
-            allow(ary).to receive(:call).once.with(130).and_return(0...100)
+            allow(ary).to receive(:call).once.with(130).and_return 0...100
             ary
           }
           let(:first) { 130 }
@@ -631,7 +824,7 @@ describe MergeEnum::MergeEnumerable do
           context "<all>" do
             let(:ary2) {
               ary = Proc.new { |c| 200...250 }
-              allow(ary).to receive(:call).once.with(30).and_return(200...250)
+              allow(ary).to receive(:call).once.with(30).and_return 200...250
               ary
             }
             test_equal self, :enum, (0...100).to_a + (200...230).to_a, line: __LINE__
@@ -650,7 +843,7 @@ describe MergeEnum::MergeEnumerable do
         describe "200" do
           let(:ary1) {
             ary = Proc.new { |c| 0...100 }
-            allow(ary).to receive(:call).once.with(200).and_return(0...100)
+            allow(ary).to receive(:call).once.with(200).and_return 0...100
             ary
           }
           let(:ary2) { Proc.new { |c| 200...250 } }
@@ -687,7 +880,7 @@ describe MergeEnum::MergeEnumerable do
         describe "50" do
           let(:ary1) {
             ary = -> (c) { 0...100 }
-            allow(ary).to receive(:call).once.with(50).and_return(0...100)
+            allow(ary).to receive(:call).once.with(50).and_return 0...100
             ary
           }
           let(:ary2) {
@@ -702,7 +895,7 @@ describe MergeEnum::MergeEnumerable do
         describe "130" do
           let(:ary1) {
             ary = -> (c) { 0...100 }
-            allow(ary).to receive(:call).once.with(130).and_return(0...100)
+            allow(ary).to receive(:call).once.with(130).and_return 0...100
             ary
           }
           let(:first) { 130 }
@@ -710,7 +903,7 @@ describe MergeEnum::MergeEnumerable do
           context "<all>" do
             let(:ary2) {
               ary = -> (c) { 200...250 }
-              allow(ary).to receive(:call).once.with(30).and_return(200...250)
+              allow(ary).to receive(:call).once.with(30).and_return 200...250
               ary
             }
             test_equal self, :enum, (0...100).to_a + (200...230).to_a, line: __LINE__
@@ -729,7 +922,7 @@ describe MergeEnum::MergeEnumerable do
         describe "200" do
           let(:ary1) {
             ary = -> (c) { 0...100 }
-            allow(ary).to receive(:call).once.with(200).and_return(0...100)
+            allow(ary).to receive(:call).once.with(200).and_return 0...100
             ary
           }
           let(:ary2) { -> (c) { 200...250 } }
@@ -788,7 +981,7 @@ describe MergeEnum::MergeEnumerable do
         describe "50" do
           let(:ary1) {
             ary = Proc.new { |c| 0...100 }
-            allow(ary).to receive(:call).once.with(50).and_return(0...100)
+            allow(ary).to receive(:call).once.with(50).and_return 0...100
             ary
           }
           let(:ary2) {
@@ -1049,17 +1242,78 @@ describe MergeEnum::MergeEnumerable do
   describe ".new" do
     describe "0...100, Array.new(10, nil), Proc.new { |c| 200...250 }, first: 130, compact: true, map: -> (e) { e * 2 }" do
       let(:enum) { Target.new 0...100, Array.new(10, nil), Proc.new { |c| 200...250 }, first: 130, compact: true, map: map }
-      let(:map) {
-        _proc = -> (e) { raise "using stub" }
-        expect(_proc).to receive(:call).exactly(130).times do |e|
-          e * 2
+
+      describe "map: nil" do
+        let(:map) { nil }
+        subject { enum.to_a }
+        it { is_expected.to eq (0...100).to_a + (200...230).to_a }
+      end
+
+      describe "map: false" do
+        let(:map) { false }
+        subject { enum.to_a }
+        it { is_expected.to eq (0...100).to_a + (200...230).to_a }
+      end
+
+      describe "map: true" do
+        let(:map) { true }
+        subject { enum.to_a }
+        it { expect { is_expected }.to raise_error }
+      end
+
+      ["hoge", "foo", "bar"].each do |m|
+        describe "map: #{m.inspect}" do
+          let(:map) { m }
+          subject { enum.to_a }
+          it { expect { is_expected }.to raise_error }
         end
-        _proc
-      }
-      subject { enum.to_a }
-      it {
-        is_expected.to eq ((0...100).to_a + (200...230).to_a).map{ |e| e * 2 }
-      }
+      end
+
+      describe "map: -> { 100 }" do
+        let(:map) {
+          _proc = -> { raise "using stub" }
+          expect(_proc).to receive(:call).with(no_args).exactly(130).times.and_return 100
+          _proc
+        }
+        subject { enum.to_a }
+        it { is_expected.to eq Array.new(130, 100) }
+      end
+
+      describe "map: -> (e) { e * 2 }" do
+        let(:map) {
+          _proc = -> (e) { raise "using stub" }
+          expect(_proc).to receive(:call).exactly(130).times do |e|
+            e * 2
+          end
+          _proc
+        }
+        subject { enum.to_a }
+        it { is_expected.to eq ((0...100).to_a + (200...230).to_a).map{ |e| e * 2 } }
+      end
+
+      describe "map: -> (e, i) { i }" do
+        let(:map) {
+          _proc = -> (e, i) { raise "using stub" }
+          expect(_proc).to receive(:call).exactly(130).times do |e, i|
+            i
+          end
+          _proc
+        }
+        subject { enum.to_a }
+        it { is_expected.to eq (0...130).to_a }
+      end
+
+      describe "map: -> (e, i, x, y, z) { i }" do
+        let(:map) {
+          _proc = -> (e, i, x, y, z) { raise "using stub" }
+          expect(_proc).to receive(:call).exactly(130).times do |e, i|
+            i
+          end
+          _proc
+        }
+        subject { enum.to_a }
+        it { is_expected.to eq (0...130).to_a }
+      end
     end
   end
 
@@ -1074,11 +1328,7 @@ describe MergeEnum::MergeEnumerable do
           expect(_proc).to receive(:call).exactly(10).times.and_return 0...100
           _proc
         }
-        it {
-          10.times do
-            enum.to_a
-          end
-        }
+        it { 10.times { enum.to_a } }
       end
 
       describe "cache: true" do
@@ -1089,9 +1339,7 @@ describe MergeEnum::MergeEnumerable do
           _proc
         }
         it {
-          10.times do
-            enum.to_a
-          end
+          10.times { enum.to_a }
           enum.options! cache: false
           enum.to_a
         }
@@ -1141,44 +1389,60 @@ describe MergeEnum::MergeEnumerable do
         it { is_expected.to eq ary }
       end
 
-      context "#merge_optons nil" do
-        subject { enum.merge_options(nil).to_a }
-        it { is_expected.to eq ary }
+      [true, 1, "hoge"].each do |opt|
+        context "#merge_optons #{opt.inspect}" do
+          subject { enum.merge_options(opt).to_a }
+          it { expect { is_expected }.to raise_error }
+        end
       end
 
-      context "#merge_optons! nil" do
-        subject { enum.merge_options!(nil).to_a }
-        it { is_expected.to eq ary }
+      [true, 1, "hoge"].each do |opt|
+        context "#merge_optons! #{opt.inspect}" do
+          subject { enum.merge_options!(opt).to_a }
+          it { expect { is_expected }.to raise_error }
+        end
       end
 
-      context "#replace_optons nil" do
-        subject { enum.replace_options(nil).to_a }
-        it { is_expected.to eq ary }
+      [true, 1, "hoge"].each do |opt|
+        context "#replace_optons #{opt.inspect}" do
+          subject { enum.replace_options(opt).to_a }
+          it { expect { is_expected }.to raise_error }
+        end
       end
 
-      context "#replace_optons! nil" do
-        subject { enum.replace_options!(nil).to_a }
-        it { is_expected.to eq ary }
+      [true, 1, "hoge"].each do |opt|
+        context "#replace_optons! #{opt.inspect}" do
+          subject { enum.replace_options!(opt).to_a }
+          it { expect { is_expected }.to raise_error }
+        end
       end
 
-      context "#merge_optons {}" do
-        subject { enum.merge_options({}).to_a }
-        it { is_expected.to eq ary }
+      [nil, false, {}].each do |opt|
+        context "#merge_optons #{opt.inspect}" do
+          subject { enum.merge_options(opt).to_a }
+          it { is_expected.to eq ary }
+        end
       end
 
-      context "#merge_optons! {}" do
-        subject { enum.merge_options!({}).to_a }
-        it { is_expected.to eq ary }
+      [nil, false, {}].each do |opt|
+        context "#merge_optons! #{opt.inspect}" do
+          subject { enum.merge_options!(opt).to_a }
+          it { is_expected.to eq ary }
+        end
       end
 
-      context "#replace_optons {}" do
-        subject { enum.replace_options({}).to_a }
-        it { is_expected.to eq ary }
+      [nil, false, {}].each do |opt|
+        context "#replace_optons #{opt.inspect}" do
+          subject { enum.replace_options(opt).to_a }
+          it { is_expected.to eq ary }
+        end
       end
 
-      context "#replace_optons! {}" do
-        subject { enum.replace_options!({}).to_a }
-        it { is_expected.to eq ary }
+      [nil, false, {}].each do |opt|
+        context "#replace_optons! #{opt.inspect}" do
+          subject { enum.replace_options!(opt).to_a }
+          it { is_expected.to eq ary }
+        end
       end
 
       context "#merge_optons({ first: 160 })" do
@@ -1211,44 +1475,32 @@ describe MergeEnum::MergeEnumerable do
         it { is_expected.to eq ary[0...80] }
       end
 
-      context "#merge_optons nil" do
-        subject { enum.merge_options(nil).to_a }
-        it { is_expected.to eq ary[0...80] }
-      end
-
-      context "#merge_optons! nil" do
-        subject { enum.merge_options!(nil).to_a }
-        it { is_expected.to eq ary[0...80] }
-      end
-
-      context "#replace_optons nil" do
-        subject { enum.replace_options(nil).to_a }
-        it { is_expected.to eq ary }
-      end
-
-      context "#replace_optons! nil" do
-        subject { enum.replace_options!(nil).to_a }
-        it { is_expected.to eq ary }
-      end
-
-      context "#merge_optons {}" do
-        subject { enum.merge_options({}).to_a }
-        it { is_expected.to eq ary[0...80] }
+      [nil, false, {}].each do |opt|
+        context "#merge_optons #{opt.inspect}" do
+          subject { enum.merge_options(opt).to_a }
+          it { is_expected.to eq ary[0...80] }
+        end
       end
 
-      context "#merge_optons! {}" do
-        subject { enum.merge_options!({}).to_a }
-        it { is_expected.to eq ary[0...80] }
+      [nil, false, {}].each do |opt|
+        context "#merge_optons! #{opt.inspect}" do
+          subject { enum.merge_options!(opt).to_a }
+          it { is_expected.to eq ary[0...80] }
+        end
       end
 
-      context "#replace_optons {}" do
-        subject { enum.replace_options({}).to_a }
-        it { is_expected.to eq ary }
+      [nil, false, {}].each do |opt|
+        context "#replace_optons #{opt.inspect}" do
+          subject { enum.replace_options(opt).to_a }
+          it { is_expected.to eq ary }
+        end
       end
 
-      context "#replace_optons! {}" do
-        subject { enum.replace_options!({}).to_a }
-        it { is_expected.to eq ary }
+      [nil, false, {}].each do |opt|
+        context "#replace_optons! #{opt.inspect}" do
+          subject { enum.replace_options!(opt).to_a }
+          it { is_expected.to eq ary }
+        end
       end
 
       context "#merge_optons({ first: 160 })" do
@@ -1277,7 +1529,7 @@ describe MergeEnum::MergeEnumerable do
         {}, { first: 100 }, { compact: true },
         { hoge: "hoge", foo: "foo" }
       ].each do |opts|
-        describe "0...100, #{opts}" do
+        describe "0...100, #{opts.inspect}" do
           let(:enum) { Target.new 0...100, opts }
 
           context "<@options>" do
@@ -1290,7 +1542,7 @@ describe MergeEnum::MergeEnumerable do
             { first: 100 }, { compact: true },
             { hoge: "hoge", foo: "foo" }
           ].each do |opts_2|
-            describe "#merge_options(#{opts_2})" do
+            describe "#merge_options(#{opts_2.inspect})" do
               let(:enum_2) { enum.merge_options opts_2 }
 
               context "<eq>" do
@@ -1306,7 +1558,7 @@ describe MergeEnum::MergeEnumerable do
               end
             end
 
-            describe "#merge_options!(#{opts_2})" do
+            describe "#merge_options!(#{opts_2.inspect})" do
               let(:enum_2) { enum.merge_options! opts_2 }
 
               context "<eq>" do
@@ -1322,7 +1574,7 @@ describe MergeEnum::MergeEnumerable do
               end
             end
 
-            describe "#replace_options(#{opts_2})" do
+            describe "#replace_options(#{opts_2.inspect})" do
               let(:enum_2) { enum.replace_options opts_2 }
 
               context "<eq>" do
@@ -1341,7 +1593,7 @@ describe MergeEnum::MergeEnumerable do
               end
             end
 
-            describe "#replace_options!(#{opts_2})" do
+            describe "#replace_options!(#{opts_2.inspect})" do
               let(:enum_2) { enum.replace_options! opts_2 }
 
               context "<eq>" do

data/spec/spec_helper.rb

@@ -1,9 +1,35 @@
 # encoding: utf-8
 require 'rubygems'
-require 'merge_enum'
 
 RSpec.configure do |config|
   config.color = true
   config.order = :random
 end
 
+require 'simplecov'
+SimpleCov.start do
+  add_filter do |file|
+    not file.filename =~ /^#{SimpleCov.root}\/lib/
+  end
+end
+
+require 'merge_enum'
+
+require 'rspec_term'
+RSpecTerm.configure do |config|
+  config.success_url = 'https://raw.githubusercontent.com/brightgenerous/rspec_term/master/images/success.jpg'
+  config.running_url = 'https://raw.githubusercontent.com/brightgenerous/rspec_term/master/images/running.jpg'
+  config.failure_url = 'https://raw.githubusercontent.com/brightgenerous/rspec_term/master/images/failure.jpg'
+  config.nothing_url = 'https://raw.githubusercontent.com/brightgenerous/rspec_term/master/images/nothing.jpg'
+  config.tmp_dir = '/tmp/rspec_term'
+  config.coverage do
+    SimpleCov.result.covered_percent
+  end
+  config.coverage_url do |coverage|
+    case coverage
+      when 100
+        'https://raw.githubusercontent.com/brightgenerous/rspec_term/master/images/coverage_100.jpg'
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merge_enum
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - brightgenerous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,64 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_term
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: Merge those like Enumerable
 email:
 - katou.akihiro@gmail.com