hamsterdam 1.0.11 → 1.0.12

data/CHANGELOG

@@ -1,3 +1,6 @@
+Hamsterdam v1.0.12
+  * Updates to be compatible with Hamster 3.0 (doesn't work with older versions). No longer works with Ruby 1.9 due to a dependency of Hamster 3.0.
+
 Hamsterdam v1.0.5
   * Added hamsterdam/clj to allow for optionally using the Clojure PersistentHashMap isntead of a Hamster hash as the backing data structure
 

data/lib/hamsterdam.rb

@@ -5,19 +5,19 @@ module Hamsterdam
   module Hamster
 
     def self.hash(*hash)
-      ::Hamster.hash(*hash)
+      ::Hamster::Hash[*hash]
     end
 
     def self.set(*values)
-      ::Hamster.set(*values)
+      ::Hamster::Set[*values]
     end
 
     def self.list(*values)
-      ::Hamster.list(*values)
+      ::Hamster::List[*values]
     end
 
     def self.queue(*values)
-      ::Hamster.queue(*values)
+      ::Hamster::Deque[*values]
     end
 
     def self.internal_hash_class
@@ -25,11 +25,13 @@ module Hamsterdam
     end
 
     def self.symbolize_keys(hash)
-      hash.reduce(hash) do |memo,k,v|
-        if Symbol === k
+      hash.entries.reduce(hash) do |memo, entry|
+        key = entry.first
+        value = entry.last
+        if Symbol === key
           memo
         else
-          memo.delete(k).put(k.to_sym, v)
+          memo.delete(key).put(key.to_sym, value)
         end
       end
     end
@@ -203,4 +205,31 @@ module Hamsterdam
     end
   end
 end
+
+module Hamster
+  class Hash
+    def inspect
+      to_hash.to_s.gsub(/=>/, " => ")
+    end
+  end
+
+  module List
+    def inspect
+      to_a.inspect
+    end
+  end
+
+  class Set
+    def inspect
+      to_a.inspect.sub(/^\[/, "{").sub(/\]$/, "}")
+    end
+  end
+
+  class Deque
+    def inspect
+      to_a.inspect
+    end
+  end
+end
+
 Hamsterdam.internals = Hamsterdam::Hamster

data/lib/hamsterdam/clj.rb

@@ -7,16 +7,6 @@ module Hamsterdam
     Set = Java::ClojureLang::PersistentHashSet
     Queue = Java::ClojureLang::PersistentQueue
 
-    #
-    # As of Java 8, PersistentHashMap#merge throws ArgumentError: wrong number of arguments (1 for 3).
-    # Converting away Clojure map via #to_hash, then merging, then re-Clojuring it seems to bypass this issue.
-    #
-    class Hash
-      def merge(a)
-        Hamsterdam.hash(to_hash.merge(a))
-      end
-    end
-
     def self.hash(h = nil)
       if h.nil?
         Hash::EMPTY

data/lib/hamsterdam/version.rb

@@ -1,3 +1,3 @@
 module Hamsterdam
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

data/spec/hamsterdam_spec.rb

@@ -63,7 +63,7 @@ describe "Hamsterdam structures" do
         q = Hamsterdam.queue("a", "b", "c", "d")
         q.should_not be_empty
         q.size.should eq(4)
-        q.peek.should == "a"
+        q.first.should == "a"
         q.dequeue.to_a.should == ["b", "c", "d"]
       end
     end
@@ -248,14 +248,14 @@ describe "Hamsterdam structures" do
     it "does a nice job with other Hamsterdam structs" do
       wheel1 = Hamstest::Wheel.new x: 50, y: 100, radius: 5.0, label: "front"
       wheel2 = Hamstest::Wheel.new x: 100, y: 100, radius: 5.0, label: "back"
-      car = Hamstest::Vehicle.new wheels: Hamster.list(wheel1, wheel2), body_style: "sedan"
+      car = Hamstest::Vehicle.new wheels: Hamster::List[wheel1, wheel2], body_style: "sedan"
       expected = "<Vehicle wheels: [<Wheel x: 50 y: 100 radius: 5.0 label: \"front\">, <Wheel x: 100 y: 100 radius: 5.0 label: \"back\">] body_style: \"sedan\">"
       car.inspect.should == expected
       car.to_s.should == expected
     end
 
     it "does a nice job with Hamster Lists, Sets, and Hashes" do
-      thinger = Hamstest::Thinger.new a_hash: Hamster.hash(red: "fish"), a_set: Hamster.set(42), a_list: Hamster.list(:oh, :the, :things)
+      thinger = Hamstest::Thinger.new a_hash: Hamster::Hash[red: "fish"], a_set: Hamster::Set[42], a_list: Hamster::List[:oh, :the, :things]
       expected = "<Thinger a_hash: {:red => \"fish\"} a_set: {42} a_list: [:oh, :the, :things]>"
       thinger.inspect.should == expected
       thinger.to_s.should == expected

data/spec/spec_helper.rb

@@ -3,6 +3,11 @@ PROJECT_ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
 $LOAD_PATH << "#{PROJECT_ROOT}/lib"
 $LOAD_PATH << "#{PROJECT_ROOT}/spec"
 
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default)
+Bundler.require(:test)
+
 require 'simplecov' # SimpleCov must come first!
 # This start/config code could alternatively go in .simplecov in project root:
 SimpleCov.start do 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: hamsterdam
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  prerelease:
+  version: 1.0.12
 platform: ruby
 authors:
 - David Crosby
@@ -9,78 +10,96 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: hamster
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  name: hamster
+        version: '3.0'
+    none: false
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: !binary |-
+          MA==
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  name: rake
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: !binary |-
+          MA==
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  name: rspec
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: !binary |-
+          MA==
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  name: simplecov
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: !binary |-
+          MA==
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  name: pry
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Immutable Struct-like record structures based on Hamster.
 email:
 - david.crosby@atomicobject.com
@@ -89,40 +108,54 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG
 - README.md
-- lib/hamsterdam.rb
-- lib/hamsterdam/clj.rb
-- lib/hamsterdam/version.rb
-- spec/collections_spec.rb
-- spec/hamsterdam_spec.rb
-- spec/spec_helper.rb
-- spec/support/hamsterdam_helpers.rb
+- CHANGELOG
+- !binary |-
+  bGliL2hhbXN0ZXJkYW0ucmI=
+- !binary |-
+  bGliL2hhbXN0ZXJkYW0vY2xqLnJi
+- !binary |-
+  bGliL2hhbXN0ZXJkYW0vdmVyc2lvbi5yYg==
+- !binary |-
+  c3BlYy9jb2xsZWN0aW9uc19zcGVjLnJi
+- !binary |-
+  c3BlYy9oYW1zdGVyZGFtX3NwZWMucmI=
+- !binary |-
+  c3BlYy9zcGVjX2hlbHBlci5yYg==
+- !binary |-
+  c3BlYy9zdXBwb3J0L2hhbXN0ZXJkYW1faGVscGVycy5yYg==
 homepage: https://github.com/atomicobject/hamsterdam
 licenses: []
-metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 1.8.24
 signing_key:
-specification_version: 4
+specification_version: 3
 summary: Immutable Struct-like record structures based on Hamster.
 test_files:
-- spec/collections_spec.rb
-- spec/hamsterdam_spec.rb
-- spec/spec_helper.rb
-- spec/support/hamsterdam_helpers.rb
+- !binary |-
+  c3BlYy9jb2xsZWN0aW9uc19zcGVjLnJi
+- !binary |-
+  c3BlYy9oYW1zdGVyZGFtX3NwZWMucmI=
+- !binary |-
+  c3BlYy9zcGVjX2hlbHBlci5yYg==
+- !binary |-
+  c3BlYy9zdXBwb3J0L2hhbXN0ZXJkYW1faGVscGVycy5yYg==

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 46ac44d756fe02074bd23fcd6e58cbb741a062e2
-  data.tar.gz: a6a9636649b347d1c715dc8fb60a49b1b93a6e3b
-SHA512:
-  metadata.gz: 8418a7690e341ae3c377aa83a5c3e5d452c27957c6000fa4cf2159293f27f55b3ede0b9371d3c5fc1194ca8c2b0a686d66f8edc6af09b984a82da4fa503a3610
-  data.tar.gz: 2c4ef6e353c68a4cbc33814a3b3baaf773b75c94a437ea52fde53ea691dfeb9b60e865356c95ca06c9ddb49dec47b5f929c16ea37d3b9d1614f6bd174dae7893