hashie-model 1.3.4 → 1.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/hashie-model.gemspec +1 -1
  2. data/lib/hashie_model/base.rb +1 -1
  3. data/lib/hashie_model/version.rb +1 -1
  4. metadata +2 -2
data/hashie-model.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "hashie-model"
8
- s.version = "1.3.4"
8
+ s.version = "1.3.5"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["ZenCash.com"]
data/lib/hashie_model/base.rb CHANGED
@@ -71,7 +71,7 @@ module HashieModel
71
71
  def merge(options)
72
72
  h = to_hash
73
73
  h.merge!(options.stringify_keys)
74
- self.class.new(h)
74
+ return h
75
75
  end
76
76
 
77
77
  def persisted?
data/lib/hashie_model/version.rb CHANGED
@@ -2,7 +2,7 @@ module HashieModel
2
2
  module Version
3
3
  MAJOR = 1
4
4
  MINOR = 3
5
- PATCH = 4
5
+ PATCH = 5
6
6
  BUILD = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hashie-model
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.4
4
+ version: 1.3.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -252,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
252
252
  version: '0'
253
253
  segments:
254
254
  - 0
255
- hash: 2908834969322424358
255
+ hash: -3878520047709018702
256
256
  required_rubygems_version: !ruby/object:Gem::Requirement
257
257
  none: false
258
258
  requirements: