hamster 0.1.20 → 0.1.21

data/History.rdoc

@@ -1,3 +1,21 @@
+=== 0.1.21 / 2010-01-08
+
+* Implement List#sort. (Very, VERY inefficient implementation!)
+
+* Implement List#sort_by. (Very, VERY inefficient implementation!)
+
+* Implement Set#to_set.
+
+* Implement Set#inspect.
+
+* Implement Set#first (aliased as #head).
+
+* Implement Set#sort. (Very, VERY inefficient implementation!)
+
+* Implement Set#sort_by. (Very, VERY inefficient implementation!)
+
+* Implement List#join.
+
 === 0.1.20 / 2010-01-07
 
 * Implement Stack#clear.

data/lib/hamster/list.rb

@@ -2,8 +2,6 @@ require 'monitor'
 
 module Hamster
 
-  Undefined = Object.new
-
   class << self
 
     def list(*items)
@@ -22,11 +20,11 @@ module Hamster
     alias_method :range, :interval
 
     def repeat(item)
-      Sequence.new(item)
+      Stream.new(item) { repeat(item) }
     end
 
     def replicate(number, item)
-      Sequence.new(item).take(number)
+      repeat(item).take(number)
     end
 
     def iterate(item, &block)
@@ -37,6 +35,8 @@ module Hamster
 
   module List
 
+    Undefined = Object.new
+
     def empty?
       false
     end
@@ -170,7 +170,7 @@ module Hamster
 
     def partition(&block)
       return self unless block_given?
-      Stream.new(filter(&block)) { EmptyList.cons(reject(&block)) }
+      Stream.new(filter(&block)) { Sequence.new(reject(&block)) }
     end
 
     def append(other)
@@ -201,7 +201,7 @@ module Hamster
     end
 
     def zip(other)
-      Stream.new(EmptyList.cons(other.head).cons(head)) { tail.zip(other.tail) }
+      Stream.new(Sequence.new(other.head).cons(head)) { tail.zip(other.tail) }
     end
 
     def cycle
@@ -209,17 +209,16 @@ module Hamster
     end
 
     def split_at(number)
-      # Stream.new(take(number)) { EmptyList.cons(drop(number)) }
-      EmptyList.cons(drop(number)).cons(take(number))
+      Sequence.new(drop(number)).cons(take(number))
     end
 
     def span(&block)
-      return EmptyList.cons(EmptyList).cons(self) unless block_given?
-      Stream.new(take_while(&block)) { EmptyList.cons(drop_while(&block)) }
+      return Sequence.new(EmptyList).cons(self) unless block_given?
+      Stream.new(take_while(&block)) { Sequence.new(drop_while(&block)) }
     end
 
     def break(&block)
-      return EmptyList.cons(EmptyList).cons(self) unless block_given?
+      return Sequence.new(EmptyList).cons(self) unless block_given?
       span { |item| !yield(item) }
     end
 
@@ -227,6 +226,19 @@ module Hamster
       EmptyList
     end
 
+    def sort
+      sort_by { |item| item }
+    end
+
+    def sort_by(&block)
+      return sort unless block_given?
+      Hamster.list(*to_a.sort_by(&block))
+    end
+
+    def join(sep = nil)
+      to_a.join(sep)
+    end
+
     def eql?(other)
       return false unless other.is_a?(List)
 
@@ -293,7 +305,7 @@ module Hamster
     attr_reader :head, :tail
     alias_method :first, :head
 
-    def initialize(head, tail = self)
+    def initialize(head, tail = EmptyList)
       @head = head
       @tail = tail
     end

data/lib/hamster/set.rb

@@ -120,6 +120,20 @@ module Hamster
       filter { |item| pattern === item }.map(&block)
     end
 
+    def head
+      each { |item| return item }
+      nil
+    end
+    alias_method :first, :head
+
+    def sort
+      to_list.sort
+    end
+
+    def sort_by(&block)
+      to_list.sort_by(&block)
+    end
+
     def eql?(other)
       other.is_a?(self.class) && @trie.eql?(other.instance_eval{@trie})
     end
@@ -131,6 +145,7 @@ module Hamster
     alias_method :clone, :dup
     alias_method :uniq, :dup
     alias_method :nub, :dup
+    alias_method :to_set, :dup
 
     def to_a
       reduce([]) { |a, item| a << item }
@@ -141,6 +156,10 @@ module Hamster
       reduce(Hamster.list) { |list, item| list.cons(item) }
     end
 
+    def inspect
+      "{#{to_a.inspect[1..-2]}}"
+    end
+
   end
 
 end

data/lib/hamster/version.rb

@@ -1,5 +1,5 @@
 module Hamster
 
-  VERSION = "0.1.20".freeze
+  VERSION = "0.1.21".freeze
 
 end

data/spec/hamster/list/join_spec.rb

@@ -0,0 +1,77 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'hamster/list'
+
+describe Hamster::List do
+
+  describe "#join" do
+
+    describe "doesn't run out of stack space on a really big" do
+
+      it "stream" do
+        @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
+      end
+
+      it "list" do
+        @list = (0...STACK_OVERFLOW_DEPTH).reduce(Hamster.list) { |list, i| list.cons(i) }
+      end
+
+      after do
+        @list.join
+      end
+
+    end
+
+    describe "with a separator" do
+
+      [
+        [[], ""],
+        [["A"], "A"],
+        [["A", "B", "C"], "A|B|C"]
+      ].each do |values, expected|
+
+        describe "on #{values.inspect}" do
+
+          before do
+            original = Hamster.list(*values)
+            @result = original.join("|")
+          end
+
+          it "returns #{expected.inspect}" do
+            @result.should == expected
+          end
+
+        end
+
+      end
+
+    end
+
+    describe "without a separator" do
+
+      [
+        [[], ""],
+        [["A"], "A"],
+        [["A", "B", "C"], "ABC"]
+      ].each do |values, expected|
+
+        describe "on #{values.inspect}" do
+
+          before do
+            original = Hamster.list(*values)
+            @result = original.join
+          end
+
+          it "returns #{expected.inspect}" do
+            @result.should == expected
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/list/sort_by_spec.rb

@@ -0,0 +1,75 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'hamster/list'
+
+describe Hamster::List do
+
+  describe "#sort_by" do
+
+    describe "doesn't run out of stack space on a really big" do
+
+      it "stream" do
+        @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
+      end
+
+      it "list" do
+        @list = (0...STACK_OVERFLOW_DEPTH).reduce(Hamster.list) { |list, i| list.cons(i) }
+      end
+
+      after do
+        @list.sort_by { |item| item }
+      end
+
+    end
+
+    [
+      [[], []],
+      [["A"], ["A"]],
+      [["Ichi", "Ni", "San"], ["Ni", "San", "Ichi"]],
+    ].each do |values, expected|
+
+      describe "on #{values.inspect}" do
+
+        before do
+          @original = Hamster.list(*values)
+        end
+
+        describe "with a block" do
+
+          before do
+            @result = @original.sort_by { |item| item.length }
+          end
+
+          it "preserves the original" do
+            @original.should == Hamster.list(*values)
+          end
+
+          it "returns #{expected.inspect}" do
+            @result.should == Hamster.list(*expected)
+          end
+
+        end
+
+        describe "without a block" do
+
+          before do
+            @result = @original.sort_by
+          end
+
+          it "preserves the original" do
+            @original.should == Hamster.list(*values)
+          end
+
+          it "returns #{expected.sort.inspect}" do
+            @result.should == Hamster.list(*expected.sort)
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/list/sort_spec.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'hamster/list'
+
+describe Hamster::List do
+
+  describe "#sort" do
+
+    describe "doesn't run out of stack space on a really big" do
+
+      it "stream" do
+        @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
+      end
+
+      it "list" do
+        @list = (0...STACK_OVERFLOW_DEPTH).reduce(Hamster.list) { |list, i| list.cons(i) }
+      end
+
+      after do
+        @list.sort
+      end
+
+    end
+
+    [
+      [[], []],
+      [["A"], ["A"]],
+      [["C", "A", "B"], ["A", "B", "C"]],
+    ].each do |values, expected|
+
+      describe "on #{values.inspect}" do
+
+        before do
+          @original = Hamster.list(*values)
+          @result = @original.sort
+        end
+
+        it "preserves the original" do
+          @original.should == Hamster.list(*values)
+        end
+
+        it "returns #{expected.inspect}" do
+          @result.should == Hamster.list(*expected)
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/set/head_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'hamster/set'
+
+describe Hamster::Set do
+
+  [:head, :first].each do |method|
+
+    describe "##{method}" do
+
+      [
+        [[], nil],
+        [["A"], "A"],
+        [[1, 2, 3], 1],
+      ].each do |values, expected|
+
+        describe "on #{values.inspect}" do
+
+          before do
+            original = Hamster.set(*values)
+            @result = original.send(method)
+          end
+
+          it "returns #{expected.inspect}" do
+            @result.should == expected
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/set/inspect_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'hamster/set'
+
+describe Hamster::List do
+
+  describe "#inspect" do
+
+    describe "doesn't run out of stack space on a really big" do
+
+      it "stream" do
+        @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
+      end
+
+      it "list" do
+        @list = (0...STACK_OVERFLOW_DEPTH).reduce(Hamster.list) { |list, i| list.cons(i) }
+      end
+
+      after do
+        @list.inspect
+      end
+
+    end
+
+    [
+      [[], "{}"],
+      [["A"], "{\"A\"}"],
+      [[1, 2, 3], "{1, 2, 3}"]
+    ].each do |values, expected|
+
+      describe "on #{values.inspect}" do
+
+        before do
+          original = Hamster.set(*values)
+          @result = original.inspect
+        end
+
+        it "returns #{expected.inspect}" do
+          @result.should == expected
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/set/sort_by_spec.rb

@@ -0,0 +1,60 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'hamster/set'
+require 'hamster/list'
+
+describe Hamster::List do
+
+  describe "#sort_by" do
+
+    [
+      [[], []],
+      [["A"], ["A"]],
+      [["Ichi", "Ni", "San"], ["Ni", "San", "Ichi"]],
+    ].each do |values, expected|
+
+      describe "on #{values.inspect}" do
+
+        before do
+          @original = Hamster.set(*values)
+        end
+
+        describe "with a block" do
+
+          before do
+            @result = @original.sort_by { |item| item.length }
+          end
+
+          it "preserves the original" do
+            @original.should == Hamster.set(*values)
+          end
+
+          it "returns #{expected.inspect}" do
+            @result.should == Hamster.list(*expected)
+          end
+
+        end
+
+        describe "without a block" do
+
+          before do
+            @result = @original.sort_by
+          end
+
+          it "preserves the original" do
+            @original.should == Hamster.set(*values)
+          end
+
+          it "returns #{expected.sort.inspect}" do
+            @result.should == Hamster.list(*expected.sort)
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/set/sort_spec.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'hamster/set'
+require 'hamster/list'
+
+describe Hamster::Set do
+
+  describe "#sort" do
+
+    [
+      [[], []],
+      [["A"], ["A"]],
+      [["C", "A", "B"], ["A", "B", "C"]],
+    ].each do |values, expected|
+
+      describe "on #{values.inspect}" do
+
+        before do
+          @original = Hamster.set(*values)
+          @result = @original.sort
+        end
+
+        it "preserves the original" do
+          @original.should == Hamster.set(*values)
+        end
+
+        it "returns #{expected.inspect}" do
+          @result.should == Hamster.list(*expected)
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/set/to_set_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'hamster/set'
+
+describe Hamster::Set do
+
+  describe "#to_set" do
+
+    [
+      [],
+      ["A"],
+      ["A", "B", "C"],
+    ].each do |values|
+
+      describe "on #{values.inspect}" do
+
+        before do
+          @original = Hamster.set(*values)
+          @result = @original.to_set
+        end
+
+        it "returns self" do
+          @result.should equal(@original)
+        end
+
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hamster
 version: !ruby/object:Gem::Version 
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors: 
 - Simon Harris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 +11:00
+date: 2010-01-08 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - spec/hamster/list/head_spec.rb
 - spec/hamster/list/include_spec.rb
 - spec/hamster/list/inspect_spec.rb
+- spec/hamster/list/join_spec.rb
 - spec/hamster/list/map_spec.rb
 - spec/hamster/list/maximum_spec.rb
 - spec/hamster/list/minimum_spec.rb
@@ -94,6 +95,8 @@ files:
 - spec/hamster/list/reject_spec.rb
 - spec/hamster/list/reverse_spec.rb
 - spec/hamster/list/size_spec.rb
+- spec/hamster/list/sort_by_spec.rb
+- spec/hamster/list/sort_spec.rb
 - spec/hamster/list/span_spec.rb
 - spec/hamster/list/split_at_spec.rb
 - spec/hamster/list/tail_spec.rb
@@ -113,15 +116,20 @@ files:
 - spec/hamster/set/eql_spec.rb
 - spec/hamster/set/filter_spec.rb
 - spec/hamster/set/grep_spec.rb
+- spec/hamster/set/head_spec.rb
 - spec/hamster/set/include_spec.rb
+- spec/hamster/set/inspect_spec.rb
 - spec/hamster/set/map_spec.rb
 - spec/hamster/set/none_spec.rb
 - spec/hamster/set/reduce_spec.rb
 - spec/hamster/set/reject_spec.rb
 - spec/hamster/set/remove_spec.rb
 - spec/hamster/set/size_spec.rb
+- spec/hamster/set/sort_by_spec.rb
+- spec/hamster/set/sort_spec.rb
 - spec/hamster/set/to_a_spec.rb
 - spec/hamster/set/to_list.rb
+- spec/hamster/set/to_set_spec.rb
 - spec/hamster/set/uniq_spec.rb
 - spec/hamster/stack/clear_spec.rb
 - spec/hamster/stack/construction_spec.rb