totally_lazy 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3229a338c39916c91506f35facbbfb43f2c95147
-  data.tar.gz: c4f0b6ffa654e6360b0dc57268b17329b1ccdfed
+  metadata.gz: 76f6d260b177c8aa5b64578b0091377494ce839b
+  data.tar.gz: 312fa25893fa88b9d4cdc32222da221c57151e1d
 SHA512:
-  metadata.gz: bea2ee197eddc5241277684ed67678c757a31256e261b5d488d876df66a54e42be56e6ec04ada9c5e414e4261ee6f0b090aa12691c1e74533e334500cd9c4541
-  data.tar.gz: 6dd14258d2aecb4081a33ae6fc6086144fd9d798807abed81a557ba642cf346a02ca311788bf5606b799d8152fdb0d18c22956f914be015b2bbc551805eb62df
+  metadata.gz: b70457704551cdc3892eb34f9a02fb089d5fa4c0f39e2d5f10705536db1cf03f3bd2a080b52e31ef02ab9d2413342764a61fba413da77fdb86cee6b7de2e4370
+  data.tar.gz: 518b3ef257b1825686154c90e6a541ef207012fba8443b2fd18b42805c3be849891aba64924a885126a388b47c343cc565b268dd2a7932053696882c568b217f

data/README.md

@@ -55,8 +55,8 @@ sequence(pair(1, 2), pair(3, 4)).filter(where(key:odd)) # lazily returns 1,3
 
 #### Sequences
 
-* sequence wraps whatever is passed without modification - e.g. sequence([1,2,3]).head returns the array [1,2,3]
-* sequence1 modifies what is passed if it's a single item - e.g. sequence1([1,2,3]).head returns the first element of 1
+* sequence modifies what is passed if it's a single item - e.g. sequence1([1,2,3]).head returns the first element of 1
+* sequence1 wraps whatever is passed without modification - e.g. sequence([1,2,3]).head returns the array [1,2,3]
 
 #### Generators
 

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/lib/option.rb

@@ -67,6 +67,10 @@ module Option
       sequence(get)
     end
 
+    def to_seq1
+      sequence1(get)
+    end
+
     def contains(item)
       value == item
     end
@@ -79,47 +83,51 @@ module Option
       sequence(value) << target_sequence
     end
 
+    def each(&block)
+      @content.each(&block)
+     end
+
     def map(predicate=nil, &block)
-      as_option(sequence(@content).map(predicate, &block))
+      sequence(@content).map(predicate, &block)
     end
 
     alias collect map
 
     def select(predicate=nil, &block)
-      as_option(sequence(@content).select(predicate, &block))
+      sequence(@content).select(predicate, &block)
     end
 
     alias find_all select
     alias filter select
 
     def reject(predicate=nil, &block)
-      as_option(sequence(@content).reject(predicate, &block))
+      sequence(@content).reject(predicate, &block)
     end
 
     alias unfilter reject
 
     def grep(pattern)
-      as_option(sequence(@content).grep(pattern))
+      sequence(@content).grep(pattern)
     end
 
     def drop(n)
-      as_option(sequence(@content).drop(n))
+      sequence(@content).drop(n)
     end
 
     def drop_while(&block)
-      as_option(sequence(@content).drop_while(&block))
+      @content.drop_while(&block)
     end
 
     def take(n)
-      as_option(sequence(@content).take(n))
+      sequence(@content).take(n)
     end
 
     def take_while(&block)
-      as_option(sequence(@content).take_while(&block))
+      sequence(@content).take_while(&block)
     end
 
     def flat_map(&block)
-      as_option(sequence(@content).flat_map(&block))
+      sequence(@content).flat_map(&block)
     end
 
     alias collect_concat flat_map
@@ -201,6 +209,14 @@ module Option
       empty
     end
 
+    def to_seq1
+      empty
+    end
+
+    def each(&block)
+      empty
+    end
+
     def contains(item)
       false
     end
@@ -217,46 +233,46 @@ module Option
     alias << join
 
     def map(predicate=nil, &block)
-      none
+      empty
     end
 
     alias collect map
 
     def select(predicate=nil, &block)
-      none
+      empty
     end
 
     alias find_all select
     alias filter select
 
     def reject(predicate=nil, &block)
-      none
+      empty
     end
 
     alias unfilter reject
 
     def grep(pattern)
-      none
+      empty
     end
 
     def drop(n)
-      none
+      empty
     end
 
     def drop_while(&block)
-      none
+      empty
     end
 
     def take(n)
-      none
+      empty
     end
 
     def take_while(&block)
-      none
+      empty
     end
 
     def flat_map(&block)
-      none
+      empty
     end
 
     alias collect_concat flat_map

data/lib/pair.rb

@@ -48,7 +48,7 @@ module Pair
     end
 
     def self.from_map(a_map)
-      sequence1(a_map).map { |k, v| Pair.new(k, v) }
+      sequence(a_map).map { |k, v| Pair.new(k, v) }
     end
 
     def to_s

data/lib/sequence.rb

@@ -44,7 +44,7 @@ module Sequences
   #   end
   # end
 
-  def sequence1(*items)
+  def sequence(*items)
     if items.size == 1
       if [Range, Hash, Array, Set].include?(items.first.class)
         Sequence.new(items.first)
@@ -57,9 +57,8 @@ module Sequences
       Sequence.new(items)
     end
   end
-  module_function :sequence1
 
-  def sequence(*items)
+  def sequence1(*items)
     if items.first.nil?
       empty
     else
@@ -67,7 +66,6 @@ module Sequences
     end
   end
 
-
   # Creates an empty sequence
   #
   # == Returns:
@@ -82,7 +80,7 @@ module Sequences
   end
 
   def deserialize(data)
-    sequence1(data).deserialize
+    sequence(data).deserialize
   end
 
   class Sequence < Enumerator
@@ -463,6 +461,7 @@ module Sequences
     def all
       to_a.flatten
     end
+    alias flatten all
 
     def sorting_by(*attr, &block)
       if attr.empty?

data/spec/option_spec.rb

@@ -29,6 +29,15 @@ describe 'Option' do
     pass
   end
 
+  it 'should support each' do
+    result = []
+    option(sequence(1,2,3)).each{|i| result << i+1}
+    expect(result).to eq([2,3,4])
+    result = []
+    option(none).each{|i| result << i+1}
+    expect(result).to eq([])
+  end
+
   it 'should get or else' do
     expect(option(1).get_or_else(2)).to eq(1)
     expect(option(empty).get_or_else(2)).to eq(2)
@@ -59,6 +68,11 @@ describe 'Option' do
     expect(none.to_seq).to eq(empty)
   end
 
+  it 'should convert to sequence1' do
+     expect(option([1,2,3]).to_seq1).to eq(sequence1([1,2,3]))
+     expect(none.to_seq1).to eq(empty)
+  end
+
   it 'should raise empty exception when calling get on none' do
     expect { option(empty).get }.to raise_error(NoSuchElementException)
   end
@@ -113,57 +127,57 @@ describe 'Option' do
   end
 
   it 'should support select' do
-    expect(option(2).filter(even)).to eq(some(2))
-    expect(option(2).find_all(even)).to eq(some(2))
-    expect(option(2).select(even)).to eq(some(2))
-    expect(option(2).filter(&:even?)).to eq(some(2))
-    expect(option(2).filter{|v| v == 2}).to eq(some(2))
-    expect(option(nil).filter(even)).to eq(none)
+    expect(option(2).filter(even)).to eq(sequence(2))
+    expect(option(2).find_all(even)).to eq(sequence(2))
+    expect(option(2).select(even)).to eq(sequence(2))
+    expect(option(2).filter(&:even?)).to eq(sequence(2))
+    expect(option(2).filter{|v| v == 2}).to eq(sequence(2))
+    expect(option(nil).filter(even)).to eq(empty)
   end
 
   it 'should support map' do
-    expect(option([{apple:1,pear:2},{melon:3}]).map{|h| h}).to eq(some([{apple:1,pear:2},{melon:3}]))
-    expect(option({apple:1,pear:2})).to eq(some({apple:1,pear:2}))
-    expect(option(1).map(as_string)).to eq(some('1'))
-    expect(option(1).collect(as_string)).to eq(some('1'))
-    expect(option(sequence(1, 2, 3)).map { |s| s.entries }).to eq(some([1, 2, 3]))
-    expect(option(nil).map(as_string)).to eq(none)
+    expect(option([{apple:1,pear:2},{melon:3}]).map{|h| h}).to eq([{apple:1,pear:2},{melon:3}])
+    expect(option(1).map(as_string)).to eq(sequence('1'))
+    expect(option(1).collect(as_string)).to eq(sequence('1'))
+    expect(option(sequence(1, 2, 3)).map { |s| s.entries }.to_a).to eq([[1, 2, 3]])
+    expect(option(1).map{|v| v+1}).to eq(sequence(2))
+    expect(option(nil).map(as_string)).to eq(empty)
   end
 
   it 'should support reject' do
-    expect(option(2).reject(odd)).to eq(some(2))
-    expect(option(2).unfilter(odd)).to eq(some(2))
-    expect(option(2).reject(&:odd?)).to eq(some(2))
-    expect(option(2).reject{|v| v == 1}).to eq(some(2))
-    expect(option(nil).reject(odd)).to eq(none)
+    expect(option(2).reject(odd)).to eq(sequence(2))
+    expect(option(2).unfilter(odd)).to eq(sequence(2))
+    expect(option(2).reject(&:odd?)).to eq(sequence(2))
+    expect(option(2).reject{|v| v == 1}).to eq(sequence(2))
+    expect(option(nil).reject(odd)).to eq(empty)
   end
 
   it 'should support grep' do
-    expect(option('apple').grep(/p/)).to eq(some('apple'))
-    expect(option(nil).grep(/p/)).to eq(none)
+    expect(option('apple').grep(/p/)).to eq(sequence('apple'))
+    expect(option(nil).grep(/p/)).to eq(empty)
   end
 
   it 'should support drop' do
-    expect(option(1).drop(1)).to eq(none)
-    expect(option(nil).drop(1)).to eq(none)
+    expect(option(1).drop(1)).to eq(empty)
+    expect(option(nil).drop(1)).to eq(empty)
   end
 
   it 'should support drop_while' do
-    expect(option(1).drop_while { |n| n < 5 }).to eq(none)
-    expect(option(nil).drop_while { |n| n < 5 }).to eq(none)
+    expect(option(sequence(1,7)).drop_while { |n| n < 5 }).to eq(sequence(7))
+    expect(option(nil).drop_while { |n| n < 5 }).to eq(empty)
   end
 
   it 'should support take' do
-    expect(option(1).take(2)).to eq(some(1))
-    expect(option(nil).take(2)).to eq(none)
+    expect(option(1).take(2)).to eq(sequence(1))
+    expect(option(nil).take(2)).to eq(empty)
   end
 
   it 'should support take_while' do
-    expect(option(nil).take_while { |n| n < 5 }).to eq(none)
+    expect(option(nil).take_while { |n| n < 5 }).to eq(empty)
   end
 
   it 'should support flat_map' do
-    expect(option(nil).flat_map{|v| v.first}).to eq(none)
+    expect(option(nil).flat_map{|v| v.first}).to eq(empty)
   end
 
 end

data/spec/sequence_spec.rb

@@ -42,7 +42,7 @@ describe 'Sequence' do
   end
 
   it 'should lazily shuffle the elements - throws NoSuchElementException if empty' do
-    expect(sequence1(1..50).shuffle.entries).not_to eq(sequence1(1..50).entries)
+    expect(sequence(1..50).shuffle.entries).not_to eq(sequence(1..50).entries)
     expect { empty.shuffle.first }.to raise_error(NoSuchElementException)
   end
 
@@ -153,6 +153,7 @@ describe 'Sequence' do
 
   it 'should return all as flattened array' do
     expect(sequence(sequence(1, 2, 3),sequence(4,5,6)).all).to eq([1,2,3,4,5,6])
+    expect(sequence(sequence(1, 2, 3),sequence(4,5,6)).flatten).to eq([1,2,3,4,5,6])
   end
 
   it 'should iterate empty' do
@@ -214,7 +215,7 @@ describe 'Sequence' do
   end
 
   it 'should convert sequence to a map' do
-    expect(sequence1(oops('apple',1,'pear',2)).to_map).to eq({apple:1,pear:2})
+    expect(sequence(oops('apple',1,'pear',2)).to_map).to eq({apple:1,pear:2})
   end
 
   def oops(*values)

data/totally_lazy.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: totally_lazy 0.0.14 ruby lib
+# stub: totally_lazy 0.0.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "totally_lazy"
-  s.version = "0.0.14"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Kingsley Hendrickse"]
-  s.date = "2015-10-31"
+  s.date = "2015-11-01"
   s.description = "Port of java functional library totally lazy to ruby"
   s.email = "kingsleyhendrickse@me.com"
   s.extra_rdoc_files = [
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kingsleyh/totally_lazy"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.6"
+  s.rubygems_version = "2.2.2"
   s.summary = "Port of java functional library totally lazy to ruby"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: totally_lazy
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Kingsley Hendrickse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Port of java functional library totally lazy to ruby