hashie 1.1.0 → 1.2.0

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - rbx
   - ree
   - ruby-head
+  - jruby

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hashie (1.1.0)
+    hashie (1.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -23,6 +23,7 @@ GEM
     thor (0.14.6)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/lib/hashie/hash.rb

@@ -7,11 +7,12 @@ module Hashie
   class Hash < Hash
     include Hashie::HashExtensions
 
-    # Converts a mash back to a hash (with stringified keys)
-    def to_hash
+    # Converts a mash back to a hash.
+    def to_hash(options = {})
       out = {}
       keys.each do |k|
-        out[k] = Hashie::Hash === self[k] ? self[k].to_hash : self[k]
+        key = options[:symbolize_keys] ? k.to_sym : k.to_s
+        out[key] = Hashie::Hash === self[k] ? self[k].to_hash : self[k]
       end
       out
     end

data/lib/hashie/hash_extensions.rb

@@ -38,7 +38,7 @@ module Hashie
     end
 
     def hashie_inspect
-      ret = "<##{self.class.to_s}"
+      ret = "#<#{self.class.to_s}"
       stringify_keys.keys.sort.each do |key|
         ret << " #{key}=#{self[key].inspect}"
       end

data/lib/hashie/mash.rb

@@ -55,7 +55,13 @@ module Hashie
       default ? super(default) : super(&blk)
     end
 
-    class << self; alias [] new; end
+    class << self
+      alias [] new
+
+      def subkey_class
+        self
+      end
+    end
 
     def id #:nodoc:
       key?("id") ? self["id"] : super
@@ -104,6 +110,9 @@ module Hashie
     def key?(key)
       super(convert_key(key))
     end
+    alias_method :has_key?, :key?
+    alias_method :include?, :key?
+    alias_method :member?, :key?
 
     # Performs a deep_update on a duplicate of the
     # current mash.
@@ -177,7 +186,7 @@ module Hashie
           val.dup
         when ::Hash
           val = val.dup if duping
-          self.class.new(val)
+          self.class.subkey_class.new.merge(val)
         when Array
           val.collect{ |e| convert_value(e) }
         else

data/lib/hashie/version.rb

@@ -1,3 +1,3 @@
 module Hashie
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/hashie/dash_spec.rb

@@ -28,12 +28,12 @@ describe DashTest do
 
   it('subclasses Hashie::Hash') { should respond_to(:to_mash) }
 
-  its(:to_s) { should == '<#DashTest count=0 email="bob@example.com" first_name="Bob">' }
+  its(:to_s) { should == '#<DashTest count=0 email="bob@example.com" first_name="Bob">' }
 
   it 'lists all set properties in inspect' do
     subject.first_name = 'Bob'
     subject.email = 'bob@example.com'
-    subject.inspect.should == '<#DashTest count=0 email="bob@example.com" first_name="Bob">'
+    subject.inspect.should == '#<DashTest count=0 email="bob@example.com" first_name="Bob">'
   end
 
   its(:count) { should be_zero }

data/spec/hashie/hash_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Hash do
+describe Hashie::Hash do
   it "should be convertible to a Hashie::Mash" do
     mash = Hashie::Hash[:some => "hash"].to_mash
     mash.is_a?(Hashie::Mash).should be_true
@@ -19,4 +19,14 @@ describe Hash do
     hash.should == Hashie::Hash[:a => "hey", 123 => "bob"]
     stringified_hash.should == Hashie::Hash["a" => "hey", "123" => "bob"]
   end
-end
+
+  describe '#to_hash' do
+    it 'should convert it to a hash with string keys by default' do
+      Hashie::Hash.new.merge(:a => 'hey', :b => 'foo').to_hash.should == {'a' => 'hey', 'b' => 'foo'}
+    end
+
+    it 'should convert to a hash with symbol keys if :symbolize_keys is passed in' do
+      Hashie::Hash.new.merge('a' => 'hey', 'b' => 'doo').to_hash(:symbolize_keys => true).should == {:a => 'hey', :b => 'doo'}
+    end
+  end
+end

data/spec/hashie/mash_spec.rb

@@ -225,16 +225,6 @@ describe Hashie::Mash do
     it 'should respond to a set key' do
       Hashie::Mash.new(:abc => 'def').should be_respond_to(:abc)
     end
-
-    it "should delegate properly using delegate library" do
-      class MashDelegate < DelegateClass(Hashie::Mash)
-      end
-
-      delegate = MashDelegate.new(Hashie::Mash.new(:foo => 100))
-      delegate.foo.should == 100
-      delegate.should respond_to(:foo)
-      expect { delegate.bar }.to raise_error(NoMethodError)
-    end
   end
 
   context "#initialize" do
@@ -276,13 +266,15 @@ describe Hashie::Mash do
       initial.test?.should be_true
     end
 
-    describe "to_json" do
+    describe '.subkey_class' do
+      it 'should be able to define a subkey class different from itself' do
+        class CustomSubkeyHash < Hashie::Mash
+          def self.subkey_class; Hashie::Mash end
+        end
 
-      it "should render to_json" do
-        @mash.foo = :bar
-        @mash.bar = {"homer" => "simpson"}
-        expected = {"foo" => "bar", "bar" => {"homer" => "simpson"}}
-        JSON.parse(@mash.to_json).should == expected
+        subhash = CustomSubkeyHash.new(:subhash => {:abc => :def})[:subhash]
+        subhash.should_not be_kind_of(CustomSubkeyHash)
+        subhash.should be_kind_of(Hashie::Mash)
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'json'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashie
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-29 00:00:00.000000000 Z
+date: 2011-10-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70102343819800 !ruby/object:Gem::Requirement
+  requirement: &70100391048320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70102343819800
+  version_requirements: *70100391048320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70102343818980 !ruby/object:Gem::Requirement
+  requirement: &70100391047700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70102343818980
+  version_requirements: *70100391047700
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70102343818420 !ruby/object:Gem::Requirement
+  requirement: &70100391047200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102343818420
+  version_requirements: *70100391047200
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70102343817640 !ruby/object:Gem::Requirement
+  requirement: &70100391046540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102343817640
+  version_requirements: *70100391046540
 description: Hashie is a small collection of tools that make hashes more powerful.
   Currently includes Mash (Mocking Hash) and Dash (Discrete Hash).
 email:
@@ -73,7 +73,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - hashie.gemspec
 - lib/hashie.rb
 - lib/hashie/clash.rb
@@ -104,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1452450375686029254
+      hash: 839965074967514567
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,10 +112,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1452450375686029254
+      hash: 839965074967514567
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Your friendly neighborhood hash toolkit.

data/VERSION

@@ -1 +0,0 @@
-1.0.0