hamster 0.2.3 → 0.2.4

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 0.2.4 / 2010-01-18
+
+* Fix List#cadr and friends under JRuby.
+
+* Remove redundant locking (speed up).
+
+* Make reverse "lazy" (ish).
+
+* Fixed: StackOverflow calling List#head and List#tail on very large lazy lists.
+
+* Alias #reduce as #foldr.
+
 === 0.2.3 / 2010-01-18
 
 * Implement Set#group_by.

data/lib/hamster/hash.rb

@@ -77,6 +77,7 @@ module Hamster
     end
     def_delegator :self, :reduce, :inject
     def_delegator :self, :reduce, :fold
+    def_delegator :self, :reduce, :foldr
 
     def filter
       return self unless block_given?

data/lib/hamster/list.rb

@@ -1,5 +1,5 @@
 require 'forwardable'
-require 'monitor'
+require 'thread'
 
 require 'hamster/tuple'
 require 'hamster/hash'
@@ -99,6 +99,7 @@ module Hamster
     end
     def_delegator :self, :reduce, :inject
     def_delegator :self, :reduce, :fold
+    def_delegator :self, :reduce, :foldr
 
     def filter(&block)
       return self unless block_given?
@@ -251,7 +252,9 @@ module Hamster
     def_delegator :self, :append, :+
 
     def reverse
-      reduce(EmptyList) { |list, item| list.cons(item) }
+      Stream.new do
+        reduce(EmptyList) { |list, item| list.cons(item) }
+      end
     end
 
     def minimum(&block)
@@ -492,13 +495,13 @@ module Hamster
     end
 
     def respond_to?(name, include_private = false)
-      super || CADR === name
+      super || CADR === name.to_s
     end
 
     private
 
     def method_missing(name, *args, &block)
-      if CADR === name
+      if CADR === name.to_s
         accessor($1)
       else
         super
@@ -543,7 +546,7 @@ module Hamster
 
     def initialize(&block)
       @block = block
-      @mutex = Mutex.new
+      @lock = Mutex.new
     end
 
     def head
@@ -555,18 +558,23 @@ module Hamster
     end
 
     def empty?
-      list = target
-      while list.is_a?(Stream)
-        list = list.target
-      end
-      list.empty?
+      target.empty?
     end
 
     protected
 
     def target
-      @mutex.synchronize do
-        unless defined?(@target)
+      # conjure
+      list = conjure
+      while list.is_a?(Stream)
+        list = list.conjure
+      end
+      list
+    end
+
+    def conjure
+      @lock.synchronize do
+        unless @block.nil?
           @target = @block.call
           @block = nil
         end

data/lib/hamster/set.rb

@@ -75,6 +75,7 @@ module Hamster
     end
     def_delegator :self, :reduce, :inject
     def_delegator :self, :reduce, :fold
+    def_delegator :self, :reduce, :foldr
 
     def filter
       return self unless block_given?

data/lib/hamster/version.rb

@@ -1,5 +1,5 @@
 module Hamster
 
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.4".freeze
 
 end

data/spec/hamster/hash/reduce_spec.rb

@@ -4,7 +4,7 @@ require 'hamster/hash'
 
 describe Hamster::Hash do
 
-  [:reduce, :inject, :fold].each do |method|
+  [:reduce, :inject, :fold, :foldr].each do |method|
 
     describe "##{method}" do
 

data/spec/hamster/list/cadr_spec.rb

@@ -4,23 +4,27 @@ require 'hamster/list'
 
 describe Hamster::List do
 
-  describe "#cadr" do
-
-    [
-      [[], :car, nil],
-      [["A"], :car, "A"],
-      [["A", "B", "C"], :car, "A"],
-      [["A", "B", "C"], :cadr, "B"],
-      [["A", "B", "C"], :caddr, "C"],
-      [["A", "B", "C"], :cadddr, nil],
-      [["A", "B", "C"], :caddddr, nil],
-      [[], :cdr, Hamster.list],
-      [["A"], :cdr, Hamster.list],
-      [["A", "B", "C"], :cdr, Hamster.list("B", "C")],
-      [["A", "B", "C"], :cddr, Hamster.list("C")],
-      [["A", "B", "C"], :cdddr, Hamster.list],
-      [["A", "B", "C"], :cddddr, Hamster.list],
-    ].each do |values, method, expected|
+  [
+    [[], :car, nil],
+    [["A"], :car, "A"],
+    [["A", "B", "C"], :car, "A"],
+    [["A", "B", "C"], :cadr, "B"],
+    [["A", "B", "C"], :caddr, "C"],
+    [["A", "B", "C"], :cadddr, nil],
+    [["A", "B", "C"], :caddddr, nil],
+    [[], :cdr, Hamster.list],
+    [["A"], :cdr, Hamster.list],
+    [["A", "B", "C"], :cdr, Hamster.list("B", "C")],
+    [["A", "B", "C"], :cddr, Hamster.list("C")],
+    [["A", "B", "C"], :cdddr, Hamster.list],
+    [["A", "B", "C"], :cddddr, Hamster.list],
+  ].each do |values, method, expected|
+
+    describe "##{method}" do
+
+      it "is responded to" do
+        Hamster.list.respond_to?(method).should == true
+      end
 
       describe "on #{values.inspect}" do
 
@@ -29,10 +33,6 @@ describe Hamster::List do
           @result = @original.send(method)
         end
 
-        it "responds to #{method}" do
-          @original.respond_to?(method, false).should == true
-        end
-
         it "preserves the original" do
           @original.should == Hamster.list(*values)
         end

data/spec/hamster/list/head_spec.rb

@@ -6,6 +6,18 @@ describe Hamster::List do
 
   [:head, :first].each do |method|
 
+    describe "on a really big list" do
+
+      before do
+        @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
+      end
+
+      it "doesn't run out of stack" do
+        lambda { @list.filter(&:nil?).head }.should_not raise_error
+      end
+
+    end
+
     describe "##{method}" do
 
       [

data/spec/hamster/list/reduce_spec.rb

@@ -4,7 +4,7 @@ require 'hamster/list'
 
 describe Hamster::List do
 
-  [:reduce, :inject, :fold].each do |method|
+  [:reduce, :inject, :fold, :foldr].each do |method|
 
     describe "##{method}" do
 

data/spec/hamster/list/reverse_spec.rb

@@ -18,6 +18,10 @@ describe Hamster::List do
 
     end
 
+    it "is lazy" do
+      lambda { Hamster.stream { fail }.reverse }.should_not raise_error
+    end
+
     [
       [[], []],
       [["A"], ["A"]],

data/spec/hamster/list/tail_spec.rb

@@ -6,6 +6,18 @@ describe Hamster::List do
 
   describe "#tail" do
 
+    describe "on a really big list" do
+
+      before do
+        @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
+      end
+
+      it "doesn't run out of stack" do
+        lambda { @list.filter(&:nil?).tail }.should_not raise_error
+      end
+
+    end
+
     [
       [[], []],
       [["A"], []],

data/spec/hamster/set/reduce_spec.rb

@@ -4,7 +4,7 @@ require 'hamster/set'
 
 describe Hamster::Set do
 
-  [:reduce, :inject, :fold].each do |method|
+  [:reduce, :inject, :fold, :foldr].each do |method|
 
     describe "##{method}" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hamster
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Simon Harris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 +11:00
+date: 2010-01-19 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency