lhs 19.3.1 → 19.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 669cef0e159dd9cf27896026b327a188039ccf72c5174f3f6deb2d7b76145e19
-  data.tar.gz: 37dab1444e3a13ac30dd1550b3c23615dbabfc180d6c2341ed4650cc2c07d6cc
+  metadata.gz: eec02ca16e6732bb24ad68d18099937f48734dd000326fdfa07cd0365d3a0622
+  data.tar.gz: 2e327627fdd24ae4588499376847512ff76d514f90666cbb9115bdcecae0403a
 SHA512:
-  metadata.gz: 942329f656407706aff6d47913c5dde509faa4947cc368d9fd45255dd048724c98cf5747564e74e0a2ee2cfff6a9755f2e6a5bd73cc35f486faa5bfb777d8fab
-  data.tar.gz: 2e3ea61a601b67d8018a9c9d7e0c5ba480c11185662703b316c11134eb4aa9c5e4feccbb12bda0af84d9a293d331e2fa9a2766e08166152e5bcabf654d8ac666
+  metadata.gz: b31fd1517f82df7b7d789888c2f878a9a9ce2f6ac6686b2193210f9a3c5d156f705852bac48974ae495dca7b6da374cec44dd3f0188cdea26891237c459465ea
+  data.tar.gz: cf095950ddf9e8e00369f73051b8350dc86e5d3922679d50121983f9414bd343eae85d3e1d44e5a768daa2ba4b2eb24bdbe33737230ecdd5d63ec9cf6b3cf52d

data/lib/lhs/concerns/record/merge.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'active_support'
+
+class LHS::Record
+
+  module Merge
+    extend ActiveSupport::Concern
+
+    def merge(other)
+      _record.new(_data.to_h.merge(other.to_h))
+    end
+
+    def merge!(other)
+      _data._raw.merge!(other.to_h)
+    end
+
+    def deep_merge(other)
+      _record.new(_data.to_h.deep_merge(other.to_h))
+    end
+
+    def deep_merge!(other)
+      _data._raw.deep_merge!(other.to_h)
+    end
+  end
+end

data/lib/lhs/record.rb

@@ -27,6 +27,8 @@ class LHS::Record
     'lhs/concerns/record/last'
   autoload :Mapping,
     'lhs/concerns/record/mapping'
+  autoload :Merge,
+    'lhs/concerns/record/merge'
   autoload :Model,
     'lhs/concerns/record/model'
   autoload :Pagination,
@@ -63,6 +65,7 @@ class LHS::Record
   include Last
   include LHS::Inspect
   include Mapping
+  include Merge
   include Model
   include Pagination
   include Request

data/lib/lhs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHS
-  VERSION = '19.3.1'
+  VERSION = '19.4.0'
 end

data/spec/record/force_merge_spec.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe LHS::Record do
+  context 'merge' do
+
+    before do
+      class Change < LHS::Record
+        endpoint 'https://onboarding/places/{id}/change'
+      end
+    end
+
+    it 'merges a given hash' do
+      stub_request(:get, "https://onboarding/places/1/change")
+        .to_return(body: { entry: { name: 'Steve', address: 'Zurich' }, products: ['LBP'] }.to_json)
+      record = Change.find(1)
+      record.merge!(entry: { name: 'Paul' })
+      expect(record.entry.name).to eq 'Paul'
+      expect(record.entry.address).to eq nil
+      expect(record.products.to_a).to eq ['LBP']
+    end
+
+    it 'merges! a given hash' do
+      stub_request(:get, "https://onboarding/places/1/change")
+        .to_return(body: { entry: { name: 'Steve', address: 'Zurich' }, products: ['LBP'] }.to_json)
+      record = Change.find(1)
+      new_record = record.merge(entry: { name: 'Paul' })
+      expect(new_record.entry.name).to eq 'Paul'
+      expect(new_record.entry.address).to eq nil
+      expect(new_record.products.to_a).to eq ['LBP']
+      expect(record.entry.name).to eq 'Steve'
+      expect(record.entry.address).to eq 'Zurich'
+      expect(record.products.to_a).to eq ['LBP']
+    end
+
+    it 'deep_merge! a given hash' do
+      stub_request(:get, "https://onboarding/places/1/change")
+        .to_return(body: { entry: { name: 'Steve', address: 'Zurich' } }.to_json)
+      record = Change.find(1)
+      record.deep_merge!(entry: { name: 'Paul' })
+      expect(record.entry.name).to eq 'Paul'
+      expect(record.entry.address).to eq 'Zurich'
+    end
+
+    it 'deep_merge a given hash' do
+      stub_request(:get, "https://onboarding/places/1/change")
+        .to_return(body: { entry: { name: 'Steve', address: 'Zurich' } }.to_json)
+      record = Change.find(1)
+      new_record = record.deep_merge(entry: { name: 'Paul' })
+      expect(new_record.entry.name).to eq 'Paul'
+      expect(new_record.entry.address).to eq 'Zurich'
+      expect(record.entry.name).to eq 'Steve'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 19.3.1
+  version: 19.4.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -251,6 +251,7 @@ files:
 - lib/lhs/concerns/record/first.rb
 - lib/lhs/concerns/record/last.rb
 - lib/lhs/concerns/record/mapping.rb
+- lib/lhs/concerns/record/merge.rb
 - lib/lhs/concerns/record/model.rb
 - lib/lhs/concerns/record/pagination.rb
 - lib/lhs/concerns/record/relations.rb
@@ -410,6 +411,7 @@ files:
 - spec/record/find_in_parallel_spec.rb
 - spec/record/find_spec.rb
 - spec/record/first_spec.rb
+- spec/record/force_merge_spec.rb
 - spec/record/handle_includes_errors_spec.rb
 - spec/record/has_many_spec.rb
 - spec/record/has_one_spec.rb
@@ -613,6 +615,7 @@ test_files:
 - spec/record/find_in_parallel_spec.rb
 - spec/record/find_spec.rb
 - spec/record/first_spec.rb
+- spec/record/force_merge_spec.rb
 - spec/record/handle_includes_errors_spec.rb
 - spec/record/has_many_spec.rb
 - spec/record/has_one_spec.rb