hamsterdam 1.0.9 → 1.0.10

data/lib/hamsterdam.rb

@@ -16,6 +16,10 @@ module Hamsterdam
       ::Hamster.list(*values)
     end
 
+    def self.queue(*values)
+      ::Hamster.queue(*values)
+    end
+
     def self.internal_hash_class
       ::Hamster::Hash
     end
@@ -55,6 +59,10 @@ module Hamsterdam
     internals.list(*values)
   end
 
+  def self.queue(*values)
+    internals.queue(*values)
+  end
+
   def self.internal_hash_class
     internals.internal_hash_class
   end

data/lib/hamsterdam/clj.rb

@@ -1,65 +1,34 @@
 
-class Java::ClojureLang::PersistentHashMap
-  alias_method :put, :assoc
-  alias_method :delete, :without
-  alias_method :==, :equals
-end
-
-# java_import 'clojure.lang.PersistentList$EmptyList'
-# class EmptyList
-#   def inspect
-#     to_a.inspect
-#   end
-# end
-#
-# class Java::ClojureLang::PersistentList
-#   def inspect
-#     to_a.inspect
-#   end
-# end
-#
-# class Java::ClojureLang::PersistentHashSet
-#   def inspect
-#     to_set.inspect
-#   end
-#
-#   def -(other)
-#     reject { |e| other.include?(e) }
-#   end
-#
-#   alias_method :add, :cons
-# end
-
 module Hamsterdam
   module Clojure
+    java_import 'clojure.lang.PersistentList$EmptyList'
+    List = Java::ClojureLang::PersistentList
+    Hash = Java::ClojureLang::PersistentHashMap
+    Set = Java::ClojureLang::PersistentHashSet
+    Queue = Java::ClojureLang::PersistentQueue
+
     def self.hash(h = nil)
       if h.nil?
-        Java::ClojureLang::PersistentHashMap::EMPTY
+        Hash::EMPTY
       else
-        Java::ClojureLang::PersistentHashMap.create(h)
+        Hash.create(h)
       end
     end
 
     def self.internal_hash_class
-      Java::ClojureLang::PersistentHashMap
+      Hash
     end
 
-    # def self.set(*values)
-    #   Java::ClojureLang::PersistentHashSet.create(values)
-    # end
-
-    # def self.list(*values)
-    #   values.reverse.inject(Java::ClojureLang::PersistentList::EMPTY) do |list, value|
-    #     list.cons(value)
-    #   end
-    # end
-
     def self.set(*values)
-      ::Hamster.set(*values)
+      Set.create(values)
     end
 
     def self.list(*values)
-      ::Hamster.list(*values)
+      List.create(values).pop
+    end
+
+    def self.queue(*values)
+      Queue.create(values)
     end
 
     def self.symbolize_keys(hash)
@@ -74,4 +43,170 @@ module Hamsterdam
   end
 end
 
+class Hamsterdam::Clojure::Hash
+  alias_method :put, :assoc
+  alias_method :delete, :without
+  alias_method :==, :equals
+end
+
+class Hamsterdam::Clojure::Queue
+  alias_method :dequeue, :pop
+  alias_method :enqueue, :cons
+
+  def inspect
+    to_a.inspect
+  end
+
+  def self.create(values)
+    values.inject(Hamsterdam::Clojure::Queue::EMPTY) do |queue, val|
+      queue.cons(val)
+    end
+  end
+end
+
+class Hamsterdam::Clojure::EmptyList
+  def inspect
+    "[]"
+  end
+
+  alias_method :to_ary, :to_a
+
+  def reverse
+    self
+  end
+
+  def reject(&block)
+    self
+  end
+
+  def reduce(initial)
+    initial
+  end
+
+  def map
+    self
+  end
+
+  def compact
+    self
+  end
+
+  def to_set
+    Java::ClojureLang::PersistentHashSet::EMPTY
+  end
+
+  def flatten
+    self
+  end
+
+  def uniq
+    self
+  end
+
+  def last
+    nil
+  end
+
+  def delete(entry)
+    self
+  end
+end
+
+class Hamsterdam::Clojure::List
+
+  def inspect
+    to_a.inspect
+  end
+
+  alias_method :to_ary, :to_a
+
+  def reverse
+    make_list to_a.reverse
+  end
+
+  def reject(&block)
+    make_list to_a.reject(&block)
+  end
+
+  def flatten
+    make_list to_a.flatten
+  end
+
+  def uniq
+    make_list to_a.uniq
+  end
+
+  def last
+    to_a.reverse.first
+  end
+
+  def compact
+    reject { |e| e.nil? }
+  end
+
+  def reduce(initial, &block)
+    to_a.inject(initial, &block)
+  end
+  alias_method :inject, :reduce
+
+  def map(&block)
+    make_list to_a.map(&block)
+  end
+
+  def delete(entry)
+    reject { |i| i == entry }
+  end
+
+  def to_set
+    Hamsterdam::Clojure::Set.create(to_a)
+  end
+
+  private
+  def make_list(array)
+    Hamsterdam::Clojure::List.create(array).pop
+  end
+end
+
+class Hamsterdam::Clojure::Set
+
+  def inspect
+    to_a.inspect.sub(/^\[/, "{").sub(/\]$/, "}")
+  end
+
+  def reject(&block)
+    make_set to_a.reject(&block)
+  end
+
+  def subtract(enumerable)
+    reject { |e| enumerable.include?(e) }
+  end
+
+  def reduce(initial, &block)
+    to_a.inject(initial, &block)
+  end
+
+  def map(&block)
+    make_set to_a.map(&block)
+  end
+
+  def flatten
+    make_set to_a.flatten
+  end
+
+  def compact
+    reject { |e| e.nil? }
+  end
+
+  alias_method :delete, :disjoin
+  alias_method :to_ary, :to_a
+  alias_method :add, :cons
+  alias_method :-, :subtract
+  alias_method :inject, :reduce
+
+  private
+  def make_set(array)
+    Hamsterdam::Clojure::Set.create(array)
+  end
+end
+
 Hamsterdam.internals = Hamsterdam::Clojure

data/lib/hamsterdam/version.rb

@@ -1,3 +1,3 @@
 module Hamsterdam
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end

data/spec/collections_spec.rb

@@ -0,0 +1,137 @@
+require 'spec_helper'
+
+describe "Hamsterdam's immutable persistent data structures" do
+
+  describe "list" do
+    describe "an empty list" do
+      subject { Hamsterdam.list }
+
+      it "is a conforming empty list" do
+        subject.should == subject
+        subject.inspect.should == "[]"
+        subject.reverse.should == subject
+        subject.cons(1).should == Hamsterdam.list(1)
+        subject.reject { |i| i % 2 == 0 }.should == subject
+        subject.reduce(0) { |total, i| total + i }.should == 0
+        subject.map { |i| i+1 }.should == subject
+        subject.compact.should == subject
+        subject.flatten.should == subject
+        subject.uniq.should == subject
+        subject.last.should == nil
+        subject.to_a.should == []
+        subject.to_ary.should == []
+        subject.to_set.should == Hamsterdam.set
+      end
+    end
+
+    describe "a populated list" do
+      subject { Hamsterdam.list("a", "b", "c") }
+
+      it "is a conforming list" do
+        subject.should == subject
+
+        subject.to_ary.should == ["a", "b", "c"]
+        subject.to_a.should == ["a", "b", "c"]
+        subject.cons("d").should == Hamsterdam.list("d", "a", "b", "c")
+        subject.inspect.should == ["a", "b", "c"].inspect
+        subject.reverse.should == Hamsterdam.list("c", "b", "a")
+        subject.reject { |char| char == "b" }.should == Hamsterdam.list("a", "c")
+        subject.cons(Hamsterdam.list("d")).flatten.should == Hamsterdam.list("d", "a", "b", "c")
+        subject.cons("a").uniq.should == subject
+        subject.last.should == "c"
+        subject.cons(nil).compact.should == subject
+        subject.reduce("Word: ") { |str, char| "#{str}#{char}"}.should == "Word: abc"
+        subject.inject("Word: ") { |str, char| "#{str}#{char}"}.should == "Word: abc"
+        subject.map { |char| "#{char}!" }.should == Hamsterdam.list("a!", "b!", "c!")
+        subject.to_set.should == Hamsterdam.set("a", "b", "c")
+      end
+    end
+  end
+
+  describe "set" do
+    describe "an empty set" do
+      subject { Hamsterdam.set }
+
+      it "is a conforming empty set" do
+        subject.should == subject
+        subject.inspect.should == "{}"
+        subject.reject { |i| i % 2 == 0 }.should == subject
+        (subject - [1,2,3]).should == subject
+        subject.add("a").should == Hamsterdam.set("a")
+        subject.reduce(0) { |total, i| total + i }.should == 0
+        subject.map { |i| i+1 }.should == subject
+        subject.compact.should == subject
+        subject.flatten.should == subject
+        subject.delete("a").should == subject
+        subject.to_a.should == []
+        subject.to_ary.should == []
+      end
+    end
+
+    describe "a populated set" do
+      subject { Hamsterdam.set("a", "b", "c", "a") }
+
+      it "is a conforming list" do
+        subject.should == subject
+
+        subject.add("d").should == Hamsterdam.set("d", "a", "b", "c")
+        subject.inspect.should =~ /^\{"(a|b|c)", "(a|b|c)", "(a|b|c)"\}$/
+        subject.reject { |char| char == "b" }.should == Hamsterdam.set("a", "c")
+        (subject - ["c", "a"]).should == Hamsterdam.set("b")
+        subject.add(Hamsterdam.set("d")).flatten.should == Hamsterdam.set("d", "a", "b", "c")
+        subject.add(nil).compact.should == subject
+        subject.reduce("Word: ") { |str, char| "#{str}#{char}"}.should =~ /^Word: (a|b|c)(a|b|c)(a|b|c)$/
+        subject.inject("Word: ") { |str, char| "#{str}#{char}"}.should =~ /^Word: (a|b|c)(a|b|c)(a|b|c)$/
+        subject.map { |char| "#{char}!" }.should == Hamsterdam.set("a!", "b!", "c!")
+        subject.to_ary.sort.should == ["a", "b", "c"]
+        subject.to_a.sort.should == ["a", "b", "c"]
+      end
+    end
+  end
+
+  describe "hash" do
+    describe "an empty hash" do
+      subject { Hamsterdam.hash}
+
+      it "is a conforming empty hash" do
+        subject.should == subject
+        subject.put("hey", "now").should == Hamsterdam.hash("hey" => "now")
+        subject.delete("hey").should == subject
+      end
+    end
+
+    describe "a populated hash" do
+      subject { Hamsterdam.hash(foo: "a", bar: "b", qux: "c") }
+
+      it "is a confirming populated hash" do
+        subject.should == subject
+        subject.put(:foot, "bart").should == Hamsterdam.hash(foo: "a", bar: "b", qux: "c", foot: "bart")
+        subject.delete(:bar).should == Hamsterdam.hash(foo: "a", qux: "c")
+      end
+    end
+  end
+
+  describe "queue" do
+    describe "an empty queue" do
+      subject { Hamsterdam.queue }
+
+      it "is a conforming empty queue" do
+        subject.should == subject
+        subject.inspect.should == [].inspect
+        subject.dequeue.should == subject
+        subject.enqueue("a").should == Hamsterdam.queue("a")
+      end
+    end
+
+    describe "a populated queue" do
+      subject { Hamsterdam.queue("a", "b", "c") }
+
+      it "is a conforming populated queue" do
+        subject.should == subject
+        subject.inspect.should == ["a", "b", "c"].inspect
+        subject.dequeue.should == Hamsterdam.queue("b", "c")
+        subject.enqueue("d").should == Hamsterdam.queue("a", "b", "c", "d")
+      end
+    end
+  end
+end

data/spec/hamsterdam_spec.rb

@@ -52,6 +52,21 @@ describe "Hamsterdam structures" do
         l.to_a.should == ["a", "b", "c", "a"]
       end
     end
+
+    describe "#queue" do
+      it "provides an empty queue" do
+        q = Hamsterdam.queue
+        q.should be_empty
+      end
+
+      it "provides a queue populated with passed values" do
+        q = Hamsterdam.queue("a", "b", "c", "d")
+        q.should_not be_empty
+        q.should have(4).items
+        q.peek.should == "a"
+        q.dequeue.to_a.should == ["b", "c", "d"]
+      end
+    end
   end
 
   describe "Struct.define" do

metadata

@@ -1,163 +1,146 @@
 --- !ruby/object:Gem::Specification
 name: hamsterdam
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 1.0.9
+  version: 1.0.10
+  prerelease: 
 platform: ruby
 authors:
 - David Crosby
-autorequire:
+- Patrick Bacon
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hamster
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 description: Immutable Struct-like record structures based on Hamster.
 email:
 - david.crosby@atomicobject.com
+- bacon@atomicobject.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - CHANGELOG
-- !binary |-
-  bGliL2hhbXN0ZXJkYW0ucmI=
-- !binary |-
-  bGliL2hhbXN0ZXJkYW0vY2xqLnJi
-- !binary |-
-  bGliL2hhbXN0ZXJkYW0vdmVyc2lvbi5yYg==
-- !binary |-
-  c3BlYy9oYW1zdGVyZGFtX3NwZWMucmI=
-- !binary |-
-  c3BlYy9zcGVjX2hlbHBlci5yYg==
-- !binary |-
-  c3BlYy9zdXBwb3J0L2hhbXN0ZXJkYW1faGVscGVycy5yYg==
+- lib/hamsterdam/clj.rb
+- lib/hamsterdam/version.rb
+- lib/hamsterdam.rb
+- spec/collections_spec.rb
+- spec/hamsterdam_spec.rb
+- spec/spec_helper.rb
+- spec/support/hamsterdam_helpers.rb
 homepage: https://github.com/atomicobject/hamsterdam
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 2
-      version: !binary |-
-        MA==
-  none: false
+      hash: -1856113987643234250
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 2
-      version: !binary |-
-        MA==
-  none: false
+      hash: -1856113987643234250
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.25
+signing_key: 
 specification_version: 3
 summary: Immutable Struct-like record structures based on Hamster.
 test_files:
-- !binary |-
-  c3BlYy9oYW1zdGVyZGFtX3NwZWMucmI=
-- !binary |-
-  c3BlYy9zcGVjX2hlbHBlci5yYg==
-- !binary |-
-  c3BlYy9zdXBwb3J0L2hhbXN0ZXJkYW1faGVscGVycy5yYg==
+- spec/collections_spec.rb
+- spec/hamsterdam_spec.rb
+- spec/spec_helper.rb
+- spec/support/hamsterdam_helpers.rb