lhs 12.2.0 → 12.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73ccff4b48445ae9b548d688af83448b607dd635
-  data.tar.gz: d786114a63d3d8d8eeb87495d84e1823c0cfcd50
+  metadata.gz: f8cf5dca801873de0a2f1dce552f1c0a0fed9193
+  data.tar.gz: cfcc3159765215d4319c26c8dca56cc82bca8263
 SHA512:
-  metadata.gz: a2320ec4f39b5255536ab3d5a1819aac8919b4199e852b8968e3866d5a7144edb53c3a64ccdce11b4627de8bd990b360b5a5069f7ac4ac95624235e7aa5b5d38
-  data.tar.gz: 03af49fcdce27f7000e3446429f532b2d005dcc1de19cc17e1de177da534cb859e8dfba6ea29c9cfe49b32007e338a82c975c0304ce8b0686e0a179a56407396
+  metadata.gz: 3605514ae588fe9ddfd1fb2e4496d9e39512dcf2830873c86844dbddf118776baf7507ac3d949a279e6a8bebc1f28dd43a1cd14bf1435b1834a779582b2834b2
+  data.tar.gz: 9e10cc9fb96fc06dc42541908b1daec77bc0cedd1162d042fd92595c0a388226d22e47892dd9d7cb20e283624a6dfcb65d88c1ca3080a1ca4f50b8396c10f1f8

data/lib/lhs/proxy.rb

@@ -17,6 +17,7 @@ class LHS::Proxy
 
   # prevent clashing with attributes of underlying data
   attr_accessor :_data, :_loaded
+  delegate :_record, to: :_data, allow_nil: true
 
   def initialize(data)
     self._data = data
@@ -33,12 +34,24 @@ class LHS::Proxy
   end
 
   def reload!(options = nil)
-    raise 'No href found' unless _data.href
     options = {} if options.blank?
-
-    data = _data.class.request(options.merge(url: _data.href, method: :get))
+    data = _data.class.request(
+      options.merge(method: :get).merge(reload_options)
+    )
     _data.merge_raw!(data)
     self._loaded = true
     self
   end
+
+  private
+
+  def as_record
+    @as_record ||= becomes(_record)
+  end
+
+  def reload_options
+    return { url: _data.href } if _data.href
+    return { params: { id: as_record.id } } if as_record.id
+    {}
+  end
 end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "12.2.0"
+  VERSION = "12.2.1"
 end

data/spec/record/reload_by_id_spec.rb

@@ -0,0 +1,41 @@
+require 'rails_helper'
+
+describe LHS::Record do
+  before(:each) do
+    class Record < LHS::Record
+      endpoint 'http://datastore/records'
+      endpoint 'http://datastore/records/:id'
+    end
+
+    class AnotherRecord < LHS::Record
+      endpoint 'http://datastore/otherrecords'
+      endpoint 'http://datastore/otherrecords/:id'
+
+      def id
+        another_id
+      end
+    end
+  end
+
+  context 'reload!' do
+    it 'reloads the record by id' do
+      stub_request(:post, "http://datastore/records")
+        .to_return(body: { id: 1, name: 'Steve' }.to_json)
+      record = Record.create!(name: 'Steve')
+      stub_request(:get, "http://datastore/records/1")
+        .to_return(body: { id: 1, name: 'Steve', async: 'data' }.to_json)
+      record.reload!
+      expect(record.async).to eq 'data'
+    end
+
+    it 'reloads the record by id if a record method defines the actual id' do
+      stub_request(:post, "http://datastore/otherrecords")
+        .to_return(body: { another_id: 2, name: 'Can' }.to_json)
+      record = AnotherRecord.create!(name: 'Can')
+      stub_request(:get, "http://datastore/otherrecords/2")
+        .to_return(body: { id: 2, name: 'Can', async: 'data' }.to_json)
+      record.reload!
+      expect(record.async).to eq 'data'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 12.2.0
+  version: 12.2.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -373,6 +373,7 @@ files:
 - spec/record/pagination_spec.rb
 - spec/record/persisted_spec.rb
 - spec/record/references_spec.rb
+- spec/record/reload_by_id_spec.rb
 - spec/record/request_spec.rb
 - spec/record/save_spec.rb
 - spec/record/scope_chains_spec.rb
@@ -543,6 +544,7 @@ test_files:
 - spec/record/pagination_spec.rb
 - spec/record/persisted_spec.rb
 - spec/record/references_spec.rb
+- spec/record/reload_by_id_spec.rb
 - spec/record/request_spec.rb
 - spec/record/save_spec.rb
 - spec/record/scope_chains_spec.rb