hashie 2.0.2 → 2.0.3

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
+  - 2.0.0
   - 1.8.7
   - 1.9.2
   - rbx

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 2.0.3
+
+* Hashie::Mash.new(abc: true).respond_to?(:abc?) works 7even #88
+* Fix #replace jimeh #68
+
+## 2.0.2
+
+* adding symbolize_keys back to to_hash cromulus #85
+
 ## 2.0.1
 
 * remove Mash#object_id override matschaffer #81

data/lib/hashie/dash.rb

@@ -127,6 +127,13 @@ module Hashie
       super(property.to_s, value)
     end
 
+    def replace(other_hash)
+      other_hash = self.class.defaults.merge(other_hash)
+      (keys - other_hash.keys).each { |key| delete(key) }
+      other_hash.each { |key, value| self[key] = value }
+      self
+    end
+
     private
 
       def initialize_attributes(attributes)

data/lib/hashie/extensions/coercion.rb

@@ -20,6 +20,12 @@ module Hashie
 
           super(key, value)
         end
+
+        def replace(other_hash)
+          (keys - other_hash.keys).each { |key| delete(key) }
+          other_hash.each { |key, value| self[key] = value }
+          self
+        end
       end
 
       module ClassMethods

data/lib/hashie/extensions/indifferent_access.rb

@@ -27,7 +27,7 @@ module Hashie
         base.class_eval do
           alias_method :regular_writer, :[]=
           alias_method :[]=, :indifferent_writer
-          %w(default update fetch delete key? values_at).each do |m|
+          %w(default update replace fetch delete key? values_at).each do |m|
             alias_method "regular_#{m}", m
             alias_method m, "indifferent_#{m}"
           end
@@ -95,7 +95,13 @@ module Hashie
       def indifferent_values_at(*indices); indices.map{|i| self[i] }                             end
 
       def indifferent_access?; true end
-      
+
+      def indifferent_replace(other_hash)
+        (keys - other_hash.keys).each { |key| delete(key) }
+        other_hash.each { |key, value| self[key] = value }
+        self
+      end
+
       protected
 
       def hash_lacking_indifference?(other)

data/lib/hashie/mash.rb

@@ -175,29 +175,35 @@ module Hashie
       self
     end
 
-   # Will return true if the Mash has had a key
-   # set in addition to normal respond_to? functionality.
-   def respond_to?(method_name, include_private=false)
-     return true if key?(method_name)
-     super
-   end
-
-   def method_missing(method_name, *args, &blk)
-     return self.[](method_name, &blk) if key?(method_name)
-     match = method_name.to_s.match(/(.*?)([?=!_]?)$/)
-     case match[2]
-     when "="
-       self[match[1]] = args.first
-     when "?"
-       !!self[match[1]]
-     when "!"
-       initializing_reader(match[1])
-     when "_"
-       underbang_reader(match[1])
-     else
-       default(method_name, *args, &blk)
-     end
-   end
+    def replace(other_hash)
+      (keys - other_hash.keys).each { |key| delete(key) }
+      other_hash.each { |key, value| self[key] = value }
+      self
+    end
+
+    # Will return true if the Mash has had a key
+    # set in addition to normal respond_to? functionality.
+    def respond_to?(method_name, include_private=false)
+      return true if key?(method_name) || method_name.to_s.slice(/[=?!_]\Z/)
+      super
+    end
+
+    def method_missing(method_name, *args, &blk)
+      return self.[](method_name, &blk) if key?(method_name)
+      match = method_name.to_s.match(/(.*?)([?=!_]?)$/)
+      case match[2]
+      when "="
+        self[match[1]] = args.first
+      when "?"
+        !!self[match[1]]
+      when "!"
+        initializing_reader(match[1])
+      when "_"
+        underbang_reader(match[1])
+      else
+        default(method_name, *args, &blk)
+      end
+    end
 
     protected
 

data/lib/hashie/version.rb

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

data/spec/hashie/clash_spec.rb

@@ -39,4 +39,12 @@ describe Hashie::Clash do
     @c.where(:abc => 'def').where(:hgi => 123)
     @c.should == {:where => {:abc => 'def', :hgi => 123}}
   end
+
+  it 'should be able to replace all of its own keys with #replace' do
+    @c.foo(:bar).hello(:world)
+    @c.replace(:baz => 123, :hgi => 123).should == {:baz => 123, :hgi => 123}
+    @c.should == {:baz => 123, :hgi => 123}
+    @c[:foo].should be_nil
+    @c[:hello].should be_nil
+  end
 end

data/spec/hashie/dash_spec.rb

@@ -170,6 +170,33 @@ describe DashTest do
       described_class.defaults.should == { :count => 0 }
     end
   end
+
+  describe '#replace' do
+    before { subject.replace(:first_name => "Cain") }
+
+    it 'return self' do
+      subject.replace(:email => "bar").to_hash.
+        should == {"email" => "bar", "count" => 0}
+    end
+
+    it 'sets all specified keys to their corresponding values' do
+      subject.first_name.should == "Cain"
+    end
+
+    it 'leaves only specified keys and keys with default values' do
+      subject.keys.sort.should == ['count', 'first_name']
+      subject.email.should be_nil
+      subject.count.should == 0
+    end
+
+    context 'when replacing keys with default values' do
+      before { subject.replace(:count => 3) }
+
+      it 'sets all specified keys to their corresponding values' do
+        subject.count.should == 3
+      end
+    end
+  end
 end
 
 describe Hashie::Dash, 'inheritance' do

data/spec/hashie/extensions/coercion_spec.rb

@@ -58,15 +58,45 @@ describe Hashie::Extensions::Coercion do
 
       instance[:foo].should be_coerced
     end
+
+    context 'when #replace is used' do
+      before { subject.coerce_key :foo, :bar, Coercable }
+
+      let(:instance) do
+        subject.new(:foo => "bar").
+          replace(:foo => "foz", :bar => "baz", :hi => "bye")
+      end
+
+      it "should coerce relevant keys" do
+        instance[:foo].should be_coerced
+        instance[:bar].should be_coerced
+        instance[:hi].should_not respond_to(:coerced?)
+      end
+
+      it "should set correct values" do
+        instance[:hi].should == "bye"
+      end
+    end
   end
 
   describe '.coerce_value' do
     context 'with :strict => true' do
       it 'should coerce any value of the exact right class' do
         subject.coerce_value String, Coercable
-        
+
         instance[:foo] = "bar"
         instance[:bar] = "bax"
+        instance[:hi]  = :bye
+        instance[:foo].should be_coerced
+        instance[:bar].should be_coerced
+        instance[:hi].should_not respond_to(:coerced?)
+      end
+
+      it 'should coerce values from a #replace call' do
+        subject.coerce_value String, Coercable
+
+        instance[:foo] = :bar
+        instance.replace(:foo => "bar", :bar => "bax")
         instance[:foo].should be_coerced
         instance[:bar].should be_coerced
       end

data/spec/hashie/extensions/indifferent_access_spec.rb

@@ -71,4 +71,29 @@ describe Hashie::Extensions::IndifferentAccess do
       Hash.new.should_not be_respond_to(:indifferent_access?)
     end
   end
+
+  describe '#replace' do
+    subject do
+      IndifferentHash.new(:foo => 'bar').replace(:bar => 'baz', :hi => 'bye')
+    end
+
+    it 'returns self' do
+      subject.should be_a(IndifferentHash)
+    end
+
+    it 'should remove old keys' do
+      [:foo, 'foo'].each do |k|
+        subject[k].should be_nil
+        subject.key?(k).should be_false
+      end
+    end
+
+    it 'creates new keys with indifferent access' do
+      [:bar, 'bar', :hi, 'hi'].each { |k| subject.key?(k).should be_true }
+      subject[:bar].should  == 'baz'
+      subject['bar'].should == 'baz'
+      subject[:hi].should   == 'bye'
+      subject['hi'].should  == 'bye'
+    end
+  end
 end

data/spec/hashie/mash_spec.rb

@@ -183,6 +183,33 @@ describe Hashie::Mash do
       end
     end
 
+    describe '#replace' do
+      before do
+        subject.replace(:middle_name => "Cain",
+          :details => {:city => "Imagination"})
+      end
+
+      it 'return self' do
+        subject.replace(:foo => "bar").to_hash.should == {"foo" => "bar"}
+      end
+
+      it 'sets all specified keys to their corresponding values' do
+        subject.middle_name?.should be_true
+        subject.details?.should be_true
+        subject.middle_name.should == "Cain"
+        subject.details.city?.should be_true
+        subject.details.city.should == "Imagination"
+      end
+
+      it 'leaves only specified keys' do
+        subject.keys.sort.should == ['details', 'middle_name']
+        subject.first_name?.should be_false
+        subject.should_not respond_to(:first_name)
+        subject.last_name?.should be_false
+        subject.should_not respond_to(:last_name)
+      end
+    end
+
     describe 'delete' do
       it 'should delete with String key' do
         subject.delete('details')
@@ -270,6 +297,22 @@ 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
   end
 
   context "#initialize" do

data/spec/hashie/trash_spec.rb

@@ -52,6 +52,16 @@ describe Hashie::Trash do
       trash.firstName = 'Franklin'
       trash.first_name.should == 'Franklin'
     end
+
+    it 'writes to a translated property using #replace' do
+      trash.replace(:firstName => 'Franklin')
+      trash.first_name.should == 'Franklin'
+    end
+
+    it 'writes to a non-translated property using #replace' do
+      trash.replace(:first_name => 'Franklin')
+      trash.first_name.should == 'Franklin'
+    end
   end
 
   describe ' initializing with a Hash' do

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: hashie
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,43 +47,49 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Hashie is a small collection of tools that make hashes more powerful.
@@ -134,25 +145,45 @@ files:
 homepage: https://github.com/intridea/hashie
 licenses:
 - MIT
-metadata: {}
 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: -486186307453190267
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -486186307453190267
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Your friendly neighborhood hash toolkit.
-test_files: []
+test_files:
+- spec/hashie/clash_spec.rb
+- spec/hashie/dash_spec.rb
+- spec/hashie/extensions/coercion_spec.rb
+- spec/hashie/extensions/deep_merge_spec.rb
+- spec/hashie/extensions/indifferent_access_spec.rb
+- spec/hashie/extensions/key_conversion_spec.rb
+- spec/hashie/extensions/merge_initializer_spec.rb
+- spec/hashie/extensions/method_access_spec.rb
+- spec/hashie/hash_spec.rb
+- spec/hashie/mash_spec.rb
+- spec/hashie/trash_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1308b1b5e87e1b28328361a0b2f2d084839e7864
-  data.tar.gz: 2db28fef4c8dc89369658de62b59e046e2076ddb
-SHA512:
-  metadata.gz: 7fa20289e9e8a0c57737ed4b79f3c7ea95dd907b8ce5912e75448b1dfe99b4df8b0197bc3719d0ba9db4f995d9d6492cd1a2d0bd0cd1dba748c14d209d4823db
-  data.tar.gz: 838e995acf432ebf669768a68d62797c601823ea521a93b448a584ecf9257323376c1632b5c45e324e2ced4a06265e27417fae15d189ecb8f0e8692a7ba9ad3b