totally_lazy 0.1.11 → 0.1.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzYxMTA5ZGE2YTIyZTM2Mzk1YzJiNjgwYTdlNGQ1ZjkwNmMzYzkwZg==
+    NzNiZGM3ZGU2ODAwMTFlZjMxYzg2NzAxYzI5YzA2YzU5YmQyZGNlMA==
   data.tar.gz: !binary |-
-    NDMxYzEyM2VlYzQ3NWVjZDMyMmM4NTEzY2Q2Y2IyZDkzYjQwMWMyNg==
+    NGQ5ZDc1ZTQ4YWFkZmExMzJlMDAwMGI2NTEwYjA1MWMxZDQxY2JmOQ==
 SHA512:
   metadata.gz: !binary |-
-    YTUwYTRjNWNkZTUwYWI2YzRkYWUzZmZmMDRmOTdkOWY4YTA0ZTliNjNlNTY1
-    NThjNDMwZmExYTk1ZjQwOGMxNmVlYjZmZjQ3Mjk2MDE3MjhlOTY2NzJhN2U4
-    NzhmYWRjYjVkZDQyZmIxMGVlNTc3MzNjMWJkOWExZTZhYmVhOTc=
+    YzZjYzZiNTI1M2QwMjNmNGRmNjQzYjA1NjY3YTUxNDk3OTNlYjQ1NTAwNzU3
+    NzlmNGZiZWQxMDNkNDNmNGUxMTQ0MTYxMGE2NGRhMTcwMDg2MjExOTI5NGU4
+    ODZmZTVlN2YyMTAzZDQ4ZTZhY2E1ODU2MTdiNDJiOGZiNDI3YTM=
   data.tar.gz: !binary |-
-    NmRmYzgzZDIyYzk1NDRlNzRlNmQ0ZDY1ZTEwNTgyMTA5MDE4NDkxN2I4OGU5
-    MWEyMTRlNWYzM2EyNzMzODQ4NWUwZDkzMTc3ZTcwMmI0YWY0ZThkZWMyM2Iy
-    NmM1M2M2OWU3MDYyNDRlYTk0Y2VjMzk4ZThkZDQyMmExMTZlOGE=
+    ZGI0ZjdmYWQ0MjViOWU4Y2Q2ODdmYjlkYTUxNWFkOGM5MDAwNDIyM2MxN2Vm
+    NjJkN2FhZWE3ZWMxN2U4ZmQ0MzI0NGY1NDlkNzE5MDFiZGQxOWFhZjk2MDlh
+    OWNiNDVmZjZhOTk1OWRiN2ZiOWVlODdlZmI2YWFkMDkxZWQzOTI=

data/Rakefile

@@ -24,7 +24,7 @@ task :guard do
   system('bundle exec guard')
 end
 
-version = "#{File.read('VERSION').to_s}.#{ENV['BUILD_NUMBER'].to_s}"
+version = "#{File.read('VERSION').to_s}.#{ENV['BUILD_NUMBER'].nil? ? 'devbuild' : ENV['BUILD_NUMBER'].to_s}"
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|

data/lib/functions.rb

@@ -2,6 +2,13 @@ require 'concurrent/executors'
 require 'concurrent/promise'
 
 module Functions
+  def monoid(fn, id)
+    fn.define_singleton_method(:identity) do
+      id
+    end
+    fn
+  end
+
   def returns(value)
     -> { value }
   end

data/lib/numbers.rb

@@ -1,6 +1,6 @@
 module Numbers
   def sum
-    ->(a, b) { a + b }
+    monoid(->(a, b) { a + b }, 0)
   end
 
   def even
@@ -34,5 +34,4 @@ module Numbers
   def mod(divisor)
     ->(number) { number % divisor }
   end
-
 end

data/lib/sequence.rb

@@ -128,18 +128,25 @@ module Sequences
 
     def reduce(fn=nil, &block)
       assert_funcs(fn, block_given?)
-      @enumerator.inject { |accumulator, value|
-        block_given? ? block.call(accumulator, value) : fn.(accumulator, value)
-      }
+      _fn = block_given? ? ->(a, b) { block.call(a, b) } : fn
+      accumulator = seed(@enumerator, fn)
+      while has_next(@enumerator)
+        accumulator = _fn.(accumulator, @enumerator.next)
+      end
+      accumulator
     end
 
     alias reduce_left reduce
 
     def reduce_right(fn=nil, &block)
       assert_funcs(fn, block_given?)
-      Enumerators::reverse(@enumerator).inject { |accumulator, value|
-        block_given? ? block.call(value, accumulator) : fn.(value, accumulator)
-      }
+      _fn = block_given? ? ->(a, b) { block.call(a, b) } : fn
+      reversed = Enumerators::reverse(@enumerator)
+      accumulator = seed(reversed, fn)
+      while has_next(reversed)
+        accumulator = _fn.(reversed.next, accumulator)
+      end
+      accumulator
     end
 
     def find(fn_pred=nil, &block_pred)
@@ -251,6 +258,11 @@ module Sequences
     def assert_funcs(fn, block_given)
       raise 'Cannot pass both lambda and block expressions' if !fn.nil? && block_given
     end
+
+    def seed(enumerator, fn)
+      enumerator.rewind
+      !fn.nil? && fn.respond_to?(:identity) ? fn.identity : enumerator.next
+    end
   end
 
   def group(key, enumerator)

data/lib/strings.rb

@@ -1,6 +1,6 @@
 module Strings
   def join(separator='')
-    ->(a, b) { "#{a}#{separator}#{b}" }
+    monoid(->(a, b) { "#{a}#{separator}#{b}" }, '')
   end
 
   def to_characters

data/spec/sequence_spec.rb

@@ -104,6 +104,10 @@ describe 'Sequence' do
     expect(sequence('1', '2', '3').reduce_left(join)).to eq('123')
   end
 
+  it 'should support reduce of empty sequence' do
+    expect(empty.reduce(sum)).to eq(0)
+  end
+
   it 'should support fold_right' do
     expect(empty.fold_right(4, sum)).to eq(4)
     expect(sequence(1).fold_right(4, sum)).to eq(5)
@@ -117,12 +121,12 @@ describe 'Sequence' do
   end
 
   it 'should support reduce_right' do
-    # expect(sequence().reduce_right(sum)).to eq(0)   <-- need a monoid to do this
+    expect(empty.reduce_right(sum)).to eq(0)
     expect(sequence(1).reduce_right(sum)).to eq(1)
     expect(sequence(1, 2).reduce_right(sum)).to eq(3)
     expect(sequence(1, 2, 3).reduce_right(sum)).to eq(6)
     expect(sequence(1, 2, 3).reduce_right { |a, b| a+b }).to eq(6)
-    # expect(sequence().reduce_right(join)).to eq('')    <-- need a monoid to do this
+    expect(empty.reduce_right(join)).to eq('')
     expect(sequence('1').reduce_right(join)).to eq('1')
     expect(sequence('1', '2').reduce_right(join)).to eq('12')
     expect(sequence('1', '2', '3').reduce_right(join)).to eq('123')
@@ -296,6 +300,4 @@ describe 'Sequence' do
     strings_block = sequence(1, 2).map_concurrently { |value| to_string.(value) }
     expect(strings_block).to eq(sequence('1', '2'))
   end
-
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: totally_lazy
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Raymond Barlow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec