hashie 2.0.3 → 2.0.4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 2.0.4
+
+* make #fetch method consistent with normal Hash markiz #94
+* various doc tweaks craiglittle #90
+
 ## 2.0.3
 
 * Hashie::Mash.new(abc: true).respond_to?(:abc?) works 7even #88

data/README.markdown

@@ -1,6 +1,3 @@
-**Note:** This documentation is for the unreleased version 2.0 of
-Hashie. See the [1-1-stable branch](https://github.com/intridea/hashie/tree/1-1-stable) for documentation of the released version.
-
 # Hashie [![Build Status](https://secure.travis-ci.org/intridea/hashie.png)](http://travis-ci.org/intridea/hashie) [![Dependency Status](https://gemnasium.com/intridea/hashie.png)](https://gemnasium.com/intridea/hashie)
 
 Hashie is a growing collection of tools that extend Hashes and make
@@ -14,11 +11,10 @@ Hashie is available as a RubyGem:
 
 ## Hash Extensions
 
-New to version 2.0 of Hashie, the library has been broken up into a
-number of atomically includeable Hash extension modules as described
-below. This provides maximum flexibility for users to mix and match
-functionality while maintaining feature parity with earlier versions of
-Hashie.
+The library is broken up into a number of atomically includeable Hash
+extension modules as described below. This provides maximum flexibility
+for users to mix and match functionality while maintaining feature parity
+with earlier versions of Hashie.
 
 Any of the extensions listed below can be mixed into a class by
 `include`-ing `Hashie::Extensions::ExtensionName`.
@@ -237,4 +233,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 ## Copyright
 
-Copyright (c) 2009-2011 Intridea, Inc. (http://intridea.com/). See LICENSE for details.
+Copyright (c) 2009-2013 Intridea, Inc. (http://intridea.com/). See LICENSE for details.

data/lib/hashie/mash.rb

@@ -114,8 +114,8 @@ module Hashie
       end
     end
 
-    def fetch(key, default_value = nil)
-      self[key] || block_given? && yield(key) || default_value || super(key)
+    def fetch(key, *args)
+      super(convert_key(key), *args)
     end
 
     def delete(key)

data/lib/hashie/version.rb

@@ -1,3 +1,3 @@
 module Hashie
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

data/spec/hashie/mash_spec.rb

@@ -297,19 +297,19 @@ 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 respond to a set key with a suffix' do
       %w(= ? ! _).each do |suffix|
         Hashie::Mash.new(:abc => 'def').should be_respond_to(:"abc#{suffix}")
       end
     end
-    
+
     it 'should respond to an unknown key with a suffix' do
       %w(= ? ! _).each do |suffix|
         Hashie::Mash.new(:abc => 'def').should be_respond_to(:"xyz#{suffix}")
       end
     end
-    
+
     it "should not respond to an unknown key without a suffix" do
       Hashie::Mash.new(:abc => 'def').should_not be_respond_to(:xyz)
     end
@@ -365,7 +365,7 @@ describe Hashie::Mash do
   end
 
   describe "#fetch" do
-    let(:hash) { {:one => 1} }
+    let(:hash) { {:one => 1, :other => false} }
     let(:mash) { Hashie::Mash.new(hash) }
 
     context "when key exists" do
@@ -373,6 +373,10 @@ describe Hashie::Mash do
         mash.fetch(:one).should eql(1)
       end
 
+      it "returns the value even if the value is falsy" do
+        mash.fetch(:other).should eql(false)
+      end
+
       context "when key has other than original but acceptable type" do
         it "returns the value" do
           mash.fetch('one').should eql(1)
@@ -390,6 +394,10 @@ describe Hashie::Mash do
         it "returns default value" do
           mash.fetch(:two, 8).should eql(8)
         end
+
+        it "returns default value even if it is falsy" do
+          mash.fetch(:two, false).should eql(false)
+        end
       end
 
       context "with block given" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashie
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -157,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -486186307453190267
+      hash: 2159890714195675822
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -486186307453190267
+      hash: 2159890714195675822
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23