hashie-model 1.2.3 → 1.3.0

data/hashie-model.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hashie-model}
-  s.version = "1.2.3"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{ZenCash.com}]
-  s.date = %q{2011-12-04}
-  s.description = %q{Hashie + ActiveModel 3, offering declared properties, validations, JSON serialization/deserialization}
+  s.date = %q{2012-01-24}
+  s.description = %q{Hashie2 + ActiveModel 3, offering declared properties, validations, JSON serialization/deserialization}
   s.email = %q{istvan@zencash.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -27,27 +27,27 @@ Gem::Specification.new do |s|
     "lib/hashie_model/money.rb",
     "lib/hashie_model/spec/matchers.rb",
     "lib/hashie_model/version.rb",
-    "vendor/hashie/lib/hashie.rb",
-    "vendor/hashie/lib/hashie/clash.rb",
-    "vendor/hashie/lib/hashie/dash.rb",
-    "vendor/hashie/lib/hashie/extensions/coercion.rb",
-    "vendor/hashie/lib/hashie/extensions/deep_merge.rb",
-    "vendor/hashie/lib/hashie/extensions/indifferent_access.rb",
-    "vendor/hashie/lib/hashie/extensions/key_conversion.rb",
-    "vendor/hashie/lib/hashie/extensions/merge_initializer.rb",
-    "vendor/hashie/lib/hashie/extensions/method_access.rb",
-    "vendor/hashie/lib/hashie/extensions/structure.rb",
-    "vendor/hashie/lib/hashie/hash.rb",
-    "vendor/hashie/lib/hashie/hash_extensions.rb",
-    "vendor/hashie/lib/hashie/mash.rb",
-    "vendor/hashie/lib/hashie/trash.rb",
-    "vendor/hashie/lib/hashie/version.rb"
+    "vendor/hashie2/lib/hashie2.rb",
+    "vendor/hashie2/lib/hashie2/clash.rb",
+    "vendor/hashie2/lib/hashie2/dash.rb",
+    "vendor/hashie2/lib/hashie2/extensions/coercion.rb",
+    "vendor/hashie2/lib/hashie2/extensions/deep_merge.rb",
+    "vendor/hashie2/lib/hashie2/extensions/indifferent_access.rb",
+    "vendor/hashie2/lib/hashie2/extensions/key_conversion.rb",
+    "vendor/hashie2/lib/hashie2/extensions/merge_initializer.rb",
+    "vendor/hashie2/lib/hashie2/extensions/method_access.rb",
+    "vendor/hashie2/lib/hashie2/extensions/structure.rb",
+    "vendor/hashie2/lib/hashie2/hash.rb",
+    "vendor/hashie2/lib/hashie2/hash_extensions.rb",
+    "vendor/hashie2/lib/hashie2/mash.rb",
+    "vendor/hashie2/lib/hashie2/trash.rb",
+    "vendor/hashie2/lib/hashie2/version.rb"
   ]
   s.homepage = %q{http://github.com/doublewide/hashie-model}
   s.licenses = [%q{MIT}]
   s.require_paths = [%q{lib}]
   s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Hashie + ActiveModel 3.x}
+  s.summary = %q{Hashie2 + ActiveModel 3.x}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/hashie-model.rb

@@ -1,13 +1,13 @@
 require 'active_model'
 
-# Load vendored Hashie unless it is already loaded.
+# Load vendored Hashie2 unless it is already loaded.
 # We must have version >= 2.0 in order to get the Conversions API.
-if defined?(Hashie)
-  raise "Hashie >= 2.0.0 required by HashieModel." unless Hashie::VERSION.split('.').first.to_i >= 2
+if defined?(Hashie2)
+  raise "Hashie2 >= 2.0.0 required by Hashie2Model." unless Hashie2::VERSION.split('.').first.to_i >= 2
 else
-  $:.unshift File.expand_path(File.join('..', 'vendor', 'hashie', 'lib'), File.dirname(__FILE__))
+  $:.unshift File.expand_path(File.join('..', 'vendor', 'hashie2', 'lib'), File.dirname(__FILE__))
 end
-require 'hashie'
+require 'hashie2'
 
 require 'active_support'
 require 'active_support/core_ext'

data/lib/hashie_model/base.rb

@@ -1,8 +1,8 @@
 module HashieModel
-  class Base < Hashie::Dash
+  class Base < Hashie2::Dash
     extend ActiveModel::Naming
     
-    include Hashie::Extensions::Coercion
+    include Hashie2::Extensions::Coercion
     
     include ActiveModel::AttributeMethods
     include ActiveModel::Conversion

data/lib/hashie_model/version.rb

@@ -1,8 +1,8 @@
 module HashieModel
   module Version
     MAJOR = 1
-    MINOR = 2
-    PATCH = 3
+    MINOR = 3
+    PATCH = 0
     BUILD = nil
     
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/clash.rb

@@ -1,20 +1,20 @@
-require 'hashie/hash'
+require 'hashie2/hash'
 
-module Hashie
+module Hashie2
   #
   # A Clash is a "Chainable Lazy Hash". Inspired by libraries such as Arel,
   # a Clash allows you to chain together method arguments to build a 
   # hash, something that's especially useful if you're doing something
   # like constructing a complex options hash. Here's a basic example:
   # 
-  #     c = Hashie::Clash.new.conditions(:foo => 'bar').order(:created_at)
+  #     c = Hashie2::Clash.new.conditions(:foo => 'bar').order(:created_at)
   #     c # => {:conditions => {:foo => 'bar'}, :order => :created_at}
   #
   # Clash provides another way to create sub-hashes by using bang notation.
   # You can dive into a sub-hash by providing a key with a bang and dive
   # back out again with the _end! method. Example:
   #
-  #     c = Hashie::Clash.new.conditions!.foo('bar').baz(123)._end!.order(:created_at)
+  #     c = Hashie2::Clash.new.conditions!.foo('bar').baz(123)._end!.order(:created_at)
   #     c # => {:conditions => {:foo => 'bar', :baz => 123}, :order => :created_at}
   #
   # Because the primary functionality of Clash is to build options objects,
@@ -39,7 +39,7 @@ module Hashie
     # Jump back up a level if you are using bang method
     # chaining. For example:
     #
-    # c = Hashie::Clash.new.foo('bar')
+    # c = Hashie2::Clash.new.foo('bar')
     # c.baz!.foo(123) # => c[:baz]
     # c.baz!._end! # => c
     def _end!

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/dash.rb

@@ -1,7 +1,7 @@
-require 'hashie/hash'
+require 'hashie2/hash'
 require 'set'
 
-module Hashie
+module Hashie2
   # A Dash is a 'defined' or 'discrete' Hash, that is, a Hash
   # that has a set of defined keys that are accessible (with
   # optional defaults) and only those keys may be set or read.
@@ -12,8 +12,8 @@ module Hashie
   #
   # It is preferrable to a Struct because of the in-class
   # API for defining properties as well as per-property defaults.
-  class Dash < Hashie::Hash
-    include Hashie::PrettyInspect
+  class Dash < Hashie2::Hash
+    include Hashie2::PrettyInspect
     alias_method :to_s, :inspect
 
     # Defines a property on the Dash. Options are

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/extensions/coercion.rb

@@ -1,4 +1,4 @@
-module Hashie
+module Hashie2
   module Extensions
     module Coercion
       def self.included(base)
@@ -34,7 +34,7 @@ module Hashie
         #
         # @example Coerce a "user" subhash into a User object
         #   class Tweet < Hash
-        #     include Hashie::Extensions::Coercion
+        #     include Hashie2::Extensions::Coercion
         #     coerce_key :user, User
         #   end
         def coerce_key(key, into)
@@ -62,7 +62,7 @@ module Hashie
         #
         # @example Coerce all hashes into this special type of hash
         #   class SpecialHash < Hash
-        #     include Hashie::Extensions::Coercion
+        #     include Hashie2::Extensions::Coercion
         #     coerce_value Hash, SpecialHash
         #
         #     def initialize(hash = {})

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/extensions/deep_merge.rb

@@ -1,4 +1,4 @@
-module Hashie
+module Hashie2
   module Extensions
     module DeepMerge
       # TODO: Implement deep merging.

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/extensions/indifferent_access.rb

@@ -1,4 +1,4 @@
-module Hashie
+module Hashie2
   module Extensions
     # IndifferentAccess gives you the ability to not care
     # whether your hash has string or symbol keys. Made famous
@@ -12,8 +12,8 @@ module Hashie
     #
     # @example
     #   class MyHash < Hash
-    #     include Hashie::Extensions::MergeInitializer
-    #     include Hashie::Extensions::IndifferentAccess
+    #     include Hashie2::Extensions::MergeInitializer
+    #     include Hashie2::Extensions::IndifferentAccess
     #   end
     #
     #   h = MyHash.new(:foo => 'bar', 'baz' => 'blip')
@@ -38,7 +38,7 @@ module Hashie
       # a hash without modifying the actual class. This is what
       # allows IndifferentAccess to spread to sub-hashes.
       def self.inject!(hash)
-        (class << hash; self; end).send :include, Hashie::Extensions::IndifferentAccess
+        (class << hash; self; end).send :include, Hashie2::Extensions::IndifferentAccess
         hash.convert!
       end
 
@@ -64,7 +64,7 @@ module Hashie
 
       def convert_value(value)
         if hash_lacking_indifference?(value)
-          Hashie::Extensions::IndifferentAccess.inject(value.dup)
+          Hashie2::Extensions::IndifferentAccess.inject(value.dup)
         elsif value.is_a?(::Array)
           value.dup.replace(value.map { |e| convert_value(e) })
         else

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/extensions/key_conversion.rb

@@ -1,4 +1,4 @@
-module Hashie
+module Hashie2
   module Extensions
     module StringifyKeys
       # Convert all keys in the hash to strings.

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/extensions/merge_initializer.rb

@@ -1,4 +1,4 @@
-module Hashie
+module Hashie2
   module Extensions
     # The MergeInitializer is a super-simple mixin that allows
     # you to initialize a subclass of Hash with another Hash
@@ -8,7 +8,7 @@ module Hashie
     #
     # @example
     #   class MyHash < Hash
-    #     include Hashie::Extensions::MergeInitializer
+    #     include Hashie2::Extensions::MergeInitializer
     #   end
     #
     #   h = MyHash.new(:abc => 'def')

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/extensions/method_access.rb

@@ -1,4 +1,4 @@
-module Hashie
+module Hashie2
   module Extensions
     # MethodReader allows you to access keys of the hash
     # via method calls. This gives you an OStruct like way
@@ -12,7 +12,7 @@ module Hashie
     #
     # @example
     #   class User < Hash
-    #     include Hashie::Extensions::MethodReader
+    #     include Hashie2::Extensions::MethodReader
     #   end
     #
     #   user = User.new
@@ -49,7 +49,7 @@ module Hashie
     #
     # @example
     #   class MyHash < Hash
-    #     include Hashie::Extensions::MethodWriter
+    #     include Hashie2::Extensions::MethodWriter
     #   end
     #
     #   h = MyHash.new
@@ -86,7 +86,7 @@ module Hashie
     #
     # @example
     #   class MyHash < Hash
-    #     include Hashie::Extensions::MethodQuery
+    #     include Hashie2::Extensions::MethodQuery
     #   end
     #
     #   h = MyHash.new

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/extensions/structure.rb

@@ -1,4 +1,4 @@
-module Hashie
+module Hashie2
   module Extensions
     # The Structure extension provides facilities for declaring
     # properties that a Hash can have. This provides for the
@@ -7,8 +7,8 @@ module Hashie
     #
     # @example
     #   class RestrictedHash < Hash
-    #     include Hashie::Extensions::MergeInitializer
-    #     include Hashie::Extensions::Structure
+    #     include Hashie2::Extensions::MergeInitializer
+    #     include Hashie2::Extensions::Structure
     #
     #     key :first
     #     key :second, :default => 'foo'

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/hash.rb

@@ -1,17 +1,17 @@
-require 'hashie/hash_extensions'
+require 'hashie2/hash_extensions'
 
-module Hashie
-  # A Hashie Hash is simply a Hash that has convenience
+module Hashie2
+  # A Hashie2 Hash is simply a Hash that has convenience
   # functions baked in such as stringify_keys that may
   # not be available in all libraries.
   class Hash < Hash
-    include Hashie::HashExtensions
+    include Hashie2::HashExtensions
 
     # Converts a mash back to a hash (with stringified keys)
     def to_hash
       out = {}
       keys.each do |k|
-        out[k] = Hashie::Hash === self[k] ? self[k].to_hash : self[k]
+        out[k] = Hashie2::Hash === self[k] ? self[k].to_hash : self[k]
       end
       out
     end

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/hash_extensions.rb

@@ -1,4 +1,4 @@
-module Hashie
+module Hashie2
   module HashExtensions
     def self.included(base)
       # Don't tread on existing extensions of Hash by
@@ -27,7 +27,7 @@ module Hashie
 
     # Convert this hash into a Mash
     def to_mash
-      ::Hashie::Mash.new(self)
+      ::Hashie2::Mash.new(self)
     end
   end
 

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/mash.rb

@@ -1,6 +1,6 @@
-require 'hashie/hash'
+require 'hashie2/hash'
 
-module Hashie
+module Hashie2
   # Mash allows you to create pseudo-objects that have method-like
   # accessors for hash keys. This is useful for such implementations
   # as an API-accessing library that wants to fake robust objects
@@ -42,8 +42,8 @@ module Hashie
   #   mash.author!.name = "Michael Bleigh"
   #   mash.author # => <Mash name="Michael Bleigh">
   #
-  class Mash < Hashie::Hash
-    include Hashie::PrettyInspect
+  class Mash < Hashie2::Hash
+    include Hashie2::PrettyInspect
     alias_method :to_s, :inspect
 
     # If you pass in an existing hash, it will

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/trash.rb

@@ -1,13 +1,13 @@
-require 'hashie/dash'
+require 'hashie2/dash'
 
-module Hashie
+module Hashie2
   # A Trash is a 'translated' Dash where the keys can be remapped from a source
   # hash.
   #
   # Trashes are useful when you need to read data from another application,
   # such as a Java api, where the keys are named differently from how we would
   # in Ruby.
-  class Trash < Hashie::Dash
+  class Trash < Hashie2::Dash
 
     # Defines a property on the Trash. Options are as follows:
     #

data/vendor/{hashie/lib/hashie → hashie2/lib/hashie2}/version.rb

@@ -1,3 +1,3 @@
-module Hashie
+module Hashie2
   VERSION = '2.0.0.beta'
 end

data/vendor/hashie2/lib/hashie2.rb

@@ -0,0 +1,23 @@
+module Hashie2
+  autoload :Clash,          'hashie2/clash'
+  autoload :Dash,           'hashie2/dash'
+  autoload :Hash,           'hashie2/hash'
+  autoload :HashExtensions, 'hashie2/hash_extensions'
+  autoload :Mash,           'hashie2/mash'
+  autoload :PrettyInspect,  'hashie2/hash_extensions'
+  autoload :Trash,          'hashie2/trash'
+
+  module Extensions
+    autoload :Coercion,          'hashie2/extensions/coercion'
+    autoload :DeepMerge,         'hashie2/extensions/deep_merge'
+    autoload :KeyConversion,     'hashie2/extensions/key_conversion'
+    autoload :IndifferentAccess, 'hashie2/extensions/indifferent_access'
+    autoload :MergeInitializer,  'hashie2/extensions/merge_initializer'
+    autoload :MethodAccess,      'hashie2/extensions/method_access'
+    autoload :MethodQuery,       'hashie2/extensions/method_access'
+    autoload :MethodReader,      'hashie2/extensions/method_access'
+    autoload :MethodWriter,      'hashie2/extensions/method_access'
+    autoload :StringifyKeys,     'hashie2/extensions/key_conversion'
+    autoload :SymbolizeKeys,     'hashie2/extensions/key_conversion'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashie-model
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000Z
+date: 2012-01-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2164419520 !ruby/object:Gem::Requirement
+  requirement: &2176959840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164419520
+  version_requirements: *2176959840
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164417960 !ruby/object:Gem::Requirement
+  requirement: &2176959360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164417960
+  version_requirements: *2176959360
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2164414860 !ruby/object:Gem::Requirement
+  requirement: &2176958880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164414860
+  version_requirements: *2176958880
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &2164413120 !ruby/object:Gem::Requirement
+  requirement: &2176958400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164413120
+  version_requirements: *2176958400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164411340 !ruby/object:Gem::Requirement
+  requirement: &2176992980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2164411340
+  version_requirements: *2176992980
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &2164406020 !ruby/object:Gem::Requirement
+  requirement: &2176992500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0.beta3
   type: :development
   prerelease: false
-  version_requirements: *2164406020
+  version_requirements: *2176992500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2164402580 !ruby/object:Gem::Requirement
+  requirement: &2176992020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2164402580
+  version_requirements: *2176992020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164390320 !ruby/object:Gem::Requirement
+  requirement: &2176991540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2164390320
+  version_requirements: *2176991540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2164387020 !ruby/object:Gem::Requirement
+  requirement: &2176991060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2164387020
+  version_requirements: *2176991060
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2164385040 !ruby/object:Gem::Requirement
+  requirement: &2176990580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164385040
+  version_requirements: *2176990580
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2164381040 !ruby/object:Gem::Requirement
+  requirement: &2176990100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164381040
+  version_requirements: *2176990100
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2164377920 !ruby/object:Gem::Requirement
+  requirement: &2176989620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164377920
+  version_requirements: *2176989620
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2164375060 !ruby/object:Gem::Requirement
+  requirement: &2176989140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164375060
+  version_requirements: *2176989140
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2164372820 !ruby/object:Gem::Requirement
+  requirement: &2176988660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164372820
+  version_requirements: *2176988660
 - !ruby/object:Gem::Dependency
   name: guard-yard
-  requirement: &2164370600 !ruby/object:Gem::Requirement
+  requirement: &2176988180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164370600
+  version_requirements: *2176988180
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2164369040 !ruby/object:Gem::Requirement
+  requirement: &2176987700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,8 +186,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164369040
-description: Hashie + ActiveModel 3, offering declared properties, validations, JSON
+  version_requirements: *2176987700
+description: Hashie2 + ActiveModel 3, offering declared properties, validations, JSON
   serialization/deserialization
 email: istvan@zencash.com
 executables: []
@@ -206,21 +206,21 @@ files:
 - lib/hashie_model/money.rb
 - lib/hashie_model/spec/matchers.rb
 - lib/hashie_model/version.rb
-- vendor/hashie/lib/hashie.rb
-- vendor/hashie/lib/hashie/clash.rb
-- vendor/hashie/lib/hashie/dash.rb
-- vendor/hashie/lib/hashie/extensions/coercion.rb
-- vendor/hashie/lib/hashie/extensions/deep_merge.rb
-- vendor/hashie/lib/hashie/extensions/indifferent_access.rb
-- vendor/hashie/lib/hashie/extensions/key_conversion.rb
-- vendor/hashie/lib/hashie/extensions/merge_initializer.rb
-- vendor/hashie/lib/hashie/extensions/method_access.rb
-- vendor/hashie/lib/hashie/extensions/structure.rb
-- vendor/hashie/lib/hashie/hash.rb
-- vendor/hashie/lib/hashie/hash_extensions.rb
-- vendor/hashie/lib/hashie/mash.rb
-- vendor/hashie/lib/hashie/trash.rb
-- vendor/hashie/lib/hashie/version.rb
+- vendor/hashie2/lib/hashie2.rb
+- vendor/hashie2/lib/hashie2/clash.rb
+- vendor/hashie2/lib/hashie2/dash.rb
+- vendor/hashie2/lib/hashie2/extensions/coercion.rb
+- vendor/hashie2/lib/hashie2/extensions/deep_merge.rb
+- vendor/hashie2/lib/hashie2/extensions/indifferent_access.rb
+- vendor/hashie2/lib/hashie2/extensions/key_conversion.rb
+- vendor/hashie2/lib/hashie2/extensions/merge_initializer.rb
+- vendor/hashie2/lib/hashie2/extensions/method_access.rb
+- vendor/hashie2/lib/hashie2/extensions/structure.rb
+- vendor/hashie2/lib/hashie2/hash.rb
+- vendor/hashie2/lib/hashie2/hash_extensions.rb
+- vendor/hashie2/lib/hashie2/mash.rb
+- vendor/hashie2/lib/hashie2/trash.rb
+- vendor/hashie2/lib/hashie2/version.rb
 homepage: http://github.com/doublewide/hashie-model
 licenses:
 - MIT
@@ -236,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3106623459412527516
+      hash: 441566808007730713
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,5 +248,5 @@ rubyforge_project:
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Hashie + ActiveModel 3.x
+summary: Hashie2 + ActiveModel 3.x
 test_files: []

data/vendor/hashie/lib/hashie.rb

@@ -1,23 +0,0 @@
-module Hashie
-  autoload :Clash,          'hashie/clash'
-  autoload :Dash,           'hashie/dash'
-  autoload :Hash,           'hashie/hash'
-  autoload :HashExtensions, 'hashie/hash_extensions'
-  autoload :Mash,           'hashie/mash'
-  autoload :PrettyInspect,  'hashie/hash_extensions'
-  autoload :Trash,          'hashie/trash'
-
-  module Extensions
-    autoload :Coercion,          'hashie/extensions/coercion'
-    autoload :DeepMerge,         'hashie/extensions/deep_merge'
-    autoload :KeyConversion,     'hashie/extensions/key_conversion'
-    autoload :IndifferentAccess, 'hashie/extensions/indifferent_access'
-    autoload :MergeInitializer,  'hashie/extensions/merge_initializer'
-    autoload :MethodAccess,      'hashie/extensions/method_access'
-    autoload :MethodQuery,       'hashie/extensions/method_access'
-    autoload :MethodReader,      'hashie/extensions/method_access'
-    autoload :MethodWriter,      'hashie/extensions/method_access'
-    autoload :StringifyKeys,     'hashie/extensions/key_conversion'
-    autoload :SymbolizeKeys,     'hashie/extensions/key_conversion'
-  end
-end