lhs 18.0.0 → 18.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dd8872b9c48b4fa2acd3f2298aa3ae666fa38f1b2ebebeea5117d52b50f0577
-  data.tar.gz: 47447df65903e2c126f58d9886721f68986f0afbf338a0823cff22b0965e5eeb
+  metadata.gz: d04ba2057e1535e9a26b924e5bc9d3e9a86ddf77e6c626f1c7375ea808d928a0
+  data.tar.gz: 25532cfc5d304b31e1d61de0e9e059d7ffe94ae147a9c362d3410e6f4979cb75
 SHA512:
-  metadata.gz: 6f8e362f9169f983d86a4874995ce5344617929f6e33385f0d23ed2f5e2de291ce8a62a9d05284edae29ac5b475ec8507051de803bb6b91b4b8291e483221a23
-  data.tar.gz: 8839be8d44bcb8a4298e407bc898a39691d7282c812dae3b6c8625f8a5196b5b8bb05633228e70a07d9fba3dd8c0b15aefb0de6eaac551575c03af4f5855e408
+  metadata.gz: 455ded1d51459437e1887c6f81ddf13d4a7f0df80f7b22dc6a7194b0d5e2a30461e410986a406fdda3d7918f639065a1d3d38314504727c6dcbd8381b106122c
+  data.tar.gz: 7d5341a694feea1b308823bc7e997128b0ae0f209ed8997473c69804babcbdd1def2d4d6eb5ccaa38ce84a97415e1e8450b9cfb0a4455dbe5d50d921bf5bc8fb

data/lib/lhs/concerns/item/destroy.rb

@@ -9,8 +9,30 @@ class LHS::Item < LHS::Proxy
 
     def destroy(options = {})
       options ||= {}
-      _data._request = _data.class.request(options.merge(method: :delete, url: href))._request
+      options = options.merge(method: :delete)
+      data = _data._raw.dup
+      url = url_for_deletion!(options, data)
+      options = options.merge(url: url)
+      _data._request = _data.class.request(options)._request
       _data
     end
+
+    private
+
+    def url_for_deletion!(options, data)
+      return href if href.present?
+      endpoint = endpoint_for_deletion(data, options)
+      endpoint.compile(
+        merge_data_with_options(data, options)
+      ).tap do
+        endpoint.remove_interpolated_params!(data)
+        endpoint.remove_interpolated_params!(options.fetch(:params, {}))
+        options.merge!(endpoint.options.merge(options)) if endpoint.options
+      end
+    end
+
+    def endpoint_for_deletion(data, options)
+      record.find_endpoint(merge_data_with_options(data, options))
+    end
   end
 end

data/lib/lhs/concerns/item/save.rb

@@ -48,14 +48,6 @@ class LHS::Item < LHS::Proxy
       record.find_endpoint(merge_data_with_options(data, options))
     end
 
-    def merge_data_with_options(data, options)
-      if options && options[:params]
-        data.merge(options[:params])
-      else
-        data
-      end
-    end
-
     def url_for_persistance!(options, data)
       return href if href.present?
       endpoint = endpoint_for_persistance(data, options)

data/lib/lhs/proxy.rb

@@ -57,4 +57,12 @@ class LHS::Proxy
     return { params: { id: as_record.id } } if as_record.id
     {}
   end
+
+  def merge_data_with_options(data, options)
+    if options && options[:params]
+      data.merge(options[:params])
+    else
+      data
+    end
+  end
 end

data/lib/lhs/version.rb

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

data/spec/item/destroy_spec.rb

@@ -60,5 +60,54 @@ describe LHS::Item do
         item.destroy
       end
     end
+
+    context 'when item does not have any href' do
+      let(:business_data) do
+        {
+          id: '12345',
+          name: 'localsearch'
+        }
+      end
+
+      let(:business_collection) do
+        [business_data]
+      end
+
+      before do
+        class Business < LHS::Record
+          endpoint 'https://uberall/businesses'
+          endpoint 'https://uberall/businesses/{id}'
+        end
+
+        stub_request(:get, "https://uberall/businesses")
+          .to_return(body: business_collection.to_json)
+
+        stub_request(:delete, "https://uberall/businesses/12345")
+          .to_return(body: {
+            status: 'SUCCESS',
+            response: {
+              success: true
+            }
+          }.to_json)
+      end
+
+      it "destroys the item using it's own id (data)" do
+        business = Business.fetch.first
+        expect(business.destroy._raw).to eq business_data
+      end
+
+      context 'item does not have an id' do
+        let(:business_data) do
+          {
+            name: 'localsearch'
+          }
+        end
+
+        it 'destroy the item using the id passed as options' do
+          business = Business.fetch.first
+          expect(business.destroy(params: { id: '12345' })._raw).to eq business_data
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 18.0.0
+  version: 18.0.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors