lhs 18.0.3 → 19.0.0.pre.endpoint.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88aa4428ed96338bf34f138fec43912692db335bd37ce4815606303f4746ac75
-  data.tar.gz: f2fe0526c31d1feaa7eadbcbfcdb97d94bf870b0196e5d61d472c1755c04c409
+  metadata.gz: 60c1866fb8e385600c90e837f0d178521da8c7f04b503ae10f3cac3b8f58f492
+  data.tar.gz: be19ef5e3896150c24db1fed8c41ee25c391969aa521fb5a0838cf269f2e7cd9
 SHA512:
-  metadata.gz: b474537163fb1aac0123d4e16a627499abdd7807953de68ac4800c71647befc7291c69a38391ce0359e6a051161a4a4dd200a41a3e5fc6f288a37f353ea048c0
-  data.tar.gz: f0e292a2197a066f28125b1df8ef6409ce7b7686baa5ff621961917079f06663efae0f298b077576ffda3fae81f0fc6c33d18306ed71d3445e099c0f98aef4f8
+  metadata.gz: 29d0ad3700c65f0cba51bcd53a550f9c9af9785d3bc044f1737ed7c0ba37a4d98da5e5ed3d1be445b0aede72dba248842953f9430c4e639a80957c4f1e2aabcf
+  data.tar.gz: e2a57c18e8ba7e0f05c2562c44bcf2e7c6a4e411cc609021e33c913b1dca9ee7619f84f6d7812d917549fdc74384bcb0f6e08489fdadc38f05bad480cfd24741

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'active_support'
+
+class LHS::Item < LHS::Proxy
+  module EndpointLookup
+    extend ActiveSupport::Concern
+
+    def url_for_persistance!(data, options)
+      return href if href.present?
+      endpoint = endpoint_for_persistance!(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
+
+    private
+
+    def endpoint_for_persistance!(data, options)
+      record.find_endpoint(merge_data_with_options(data, options))
+    end
+  end
+end

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

@@ -3,10 +3,16 @@
 require 'active_support'
 
 class LHS::Item < LHS::Proxy
+  autoload :EndpointLookup,
+    'lhs/concerns/item/endpoint_lookup'
 
   module Save
     extend ActiveSupport::Concern
 
+    included do
+      include EndpointLookup
+    end
+
     def save(options = nil)
       save!(options)
     rescue LHC::Error
@@ -16,7 +22,7 @@ class LHS::Item < LHS::Proxy
     def save!(options = {})
       options = options.present? ? options.dup : {}
       data = _data._raw.dup
-      url = url_for_persistance!(options, data)
+      url = url_for_persistance!(data, options)
       create_and_merge_data!(
         apply_default_creation_options(options, url, data)
       )
@@ -45,21 +51,5 @@ class LHS::Item < LHS::Proxy
       end
       true
     end
-
-    def endpoint_for_persistance(data, options)
-      record.find_endpoint(merge_data_with_options(data, options))
-    end
-
-    def url_for_persistance!(options, data)
-      return href if href.present?
-      endpoint = endpoint_for_persistance(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
   end
 end

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

@@ -3,10 +3,16 @@
 require 'active_support'
 
 class LHS::Item < LHS::Proxy
+  autoload :EndpointLookup,
+    'lhs/concerns/item/endpoint_lookup'
 
   module Update
     extend ActiveSupport::Concern
 
+    included do
+      include EndpointLookup
+    end
+
     def update(params, options = nil)
       update!(params, options)
     rescue LHC::Error => e
@@ -26,11 +32,13 @@ class LHS::Item < LHS::Proxy
     end
 
     def update!(params, options = {}, partial_update = false)
-      options ||= {}
+      options = options.present? ? options.dup : {}
       partial_record = _record.new(LHS::Data.new(params, _data.parent, _record))
       _data.merge_raw!(partial_record._data)
-      data_sent = partial_update ? partial_record._data : _data
-      url = href || record.find_endpoint(id: id).compile(id: id)
+      data = _data._raw.dup
+      partial_data = partial_record._data._raw.dup
+      url = url_for_persistance!(data, options)
+      data_sent = partial_update ? partial_data.extract!(*data.keys) : data
       response_data = record.request(
         options.merge(
           method: options.fetch(:method, :post),

data/lib/lhs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHS
-  VERSION = '18.0.3'
+  VERSION = '19.0.0.pre.endpoint.1'
 end

data/spec/item/partial_update_spec.rb

@@ -53,6 +53,48 @@ describe LHS::Item do
     end
   end
 
+  context 'with many placeholders' do
+    before do
+      class GrandChild < LHS::Record
+        endpoint 'http://host/v2/parents/{parent_id}/children/{child_id}/grand_children'
+        endpoint 'http://host/v2/parents/{parent_id}/children/{child_id}/grand_children/{id}'
+      end
+    end
+
+    let(:data) do
+      {
+        id: "aaa",
+        parent_id: "bbb",
+        child_id: 'ccc',
+        name: "Lorem"
+      }
+    end
+
+    let(:item) do
+      GrandChild.new(data)
+    end
+
+    it 'persists changes on the backend' do
+      stub_request(:get, 'http://host/v2/parents/bbb/children/ccc/grand_children/aaa')
+        .to_return(status: 200, body: data.to_json)
+      stub_request(:post, 'http://host/v2/parents/bbb/children/ccc/grand_children/aaa')
+        .with(body: { name: 'Steve' }.to_json)
+
+      grand_child = GrandChild.find(parent_id: 'bbb', child_id: 'ccc', id: 'aaa')
+      expect(grand_child.name).to eq('Lorem')
+      result = grand_child.partial_update(name: 'Steve')
+      expect(result).to eq true
+    end
+
+    it 'persists changes on the backend removing placeholder from body' do
+      stub_request(:post, 'http://host/v2/parents/bbb/children/ccc/grand_children/kkkk')
+        .with(body: { name: 'Steve' }.to_json)
+
+      result = item.partial_update(name: 'Steve', id: 'kkkk')
+      expect(result).to eq true
+    end
+  end
+
   context 'update!' do
     it 'raises if something goes wrong' do
       stub_request(:post, item.href)

data/spec/item/save_spec.rb

@@ -63,6 +63,34 @@ describe LHS::Item do
     end
   end
 
+  context 'with many placeholders' do
+    before do
+      class GrandChild < LHS::Record
+        endpoint 'http://host/v2/parents/{parent_id}/children/{child_id}/grand_children'
+        endpoint 'http://host/v2/parents/{parent_id}/children/{child_id}/grand_children/{id}'
+      end
+    end
+
+    let(:data) do
+      {
+        parent_id: "bbb",
+        child_id: 'ccc',
+        name: "Lorem"
+      }
+    end
+
+    let(:item) do
+      GrandChild.new(data)
+    end
+
+    it 'persists changes on the backend' do
+      stub_request(:post, 'http://host/v2/parents/bbb/children/ccc/grand_children')
+        .with(body: { name: "Lorem" }.to_json)
+
+      expect(item.save).to eq true
+    end
+  end
+
   context 'save!' do
     it 'raises if something goes wrong' do
       stub_request(:post, item.href)

data/spec/item/update_spec.rb

@@ -88,6 +88,7 @@ describe LHS::Item do
 
           class AppointmentProposal < LHS::Record
             endpoint 'http://bookings/bookings'
+
             def appointments_attributes=(attributes)
               self.appointments = attributes.map { |attribute| { 'date_time': attribute[:date] } }
             end
@@ -109,6 +110,40 @@ describe LHS::Item do
         end
       end
     end
+
+    context 'with many placeholders' do
+      before do
+        class GrandChild < LHS::Record
+          endpoint 'http://host/v2/parents/{parent_id}/children/{child_id}/grand_children'
+          endpoint 'http://host/v2/parents/{parent_id}/children/{child_id}/grand_children/{id}'
+        end
+      end
+
+      let(:data) do
+        {
+          id: "aaa",
+          parent_id: "bbb",
+          child_id: 'ccc',
+          name: "Lorem"
+        }
+      end
+
+      let(:item) do
+        GrandChild.new(data)
+      end
+
+      it 'persists changes on the backend' do
+        stub_request(:get, 'http://host/v2/parents/bbb/children/ccc/grand_children/aaa')
+          .to_return(status: 200, body: data.to_json)
+        stub_request(:post, 'http://host/v2/parents/bbb/children/ccc/grand_children/aaa')
+          .with(body: { name: 'Steve' }.to_json)
+
+        grand_child = GrandChild.find(parent_id: 'bbb', child_id: 'ccc', id: 'aaa')
+        expect(grand_child.name).to eq('Lorem')
+        result = grand_child.update(name: 'Steve')
+        expect(result).to eq true
+      end
+    end
   end
 
   context 'update!' do

data/spec/record/has_many_spec.rb

@@ -77,4 +77,44 @@ describe LHS::Record do
       expect(listing.parent.parent._raw).to eq location._raw
     end
   end
+
+  context 'explicit association class configuration overrules href class casting' do
+    before do
+      class Place < LHS::Record
+        endpoint 'http://places/places/{id}'
+        has_many :categories, class_name: 'NewCategory'
+      end
+
+      class NewCategory < LHS::Record
+        endpoint 'http://newcategories/newcategories/{id}'
+
+        def name
+          self['category_name']
+        end
+      end
+
+      class Category < LHS::Record
+        endpoint 'http://categories/categories/{id}'
+      end
+
+      stub_request(:get, "http://places/places/1")
+        .to_return(body: {
+          categories: [{
+            href: 'https://categories/categories/1'
+          }]
+        }.to_json)
+
+      stub_request(:get, "https://categories/categories/1")
+        .to_return(body: {
+          href: 'https://categories/categories/1',
+          category_name: 'Pizza'
+        }.to_json)
+    end
+
+    it 'explicit association configuration overrules href class casting' do
+      place = Place.includes(:categories).find(1)
+      expect(place.categories.first).to be_kind_of NewCategory
+      expect(place.categories.first.name).to eq('Pizza')
+    end
+  end
 end

data/spec/record/has_one_spec.rb

@@ -73,4 +73,44 @@ describe LHS::Record do
       expect(user.email).to eq 'steve@local.ch'
     end
   end
+
+  context 'explicit association class configuration overrules href class casting' do
+    before do
+      class Place < LHS::Record
+        endpoint 'http://places/places/{id}'
+        has_one :category, class_name: 'NewCategory'
+      end
+
+      class NewCategory < LHS::Record
+        endpoint 'http://newcategories/newcategories/{id}'
+
+        def name
+          self['category_name']
+        end
+      end
+
+      class Category < LHS::Record
+        endpoint 'http://categories/categories/{id}'
+      end
+
+      stub_request(:get, "http://places/places/1")
+        .to_return(body: {
+          category: {
+            href: 'https://categories/categories/1'
+          }
+        }.to_json)
+
+      stub_request(:get, "https://categories/categories/1")
+        .to_return(body: {
+          href: 'https://categories/categories/1',
+          category_name: 'Pizza'
+        }.to_json)
+    end
+
+    it 'explicit association configuration overrules href class casting' do
+      place = Place.includes(:category).find(1)
+      expect(place.category).to be_kind_of NewCategory
+      expect(place.category.name).to eq('Pizza')
+    end
+  end
 end

data/spec/record/options_spec.rb

@@ -119,7 +119,7 @@ describe LHS::Record do
       context 'update' do
         before do
           stub_request(:post, "http://datastore/v2/records/123").to_return(body: {}.to_json)
-          body = LHS::Data.new({ href: 'http://datastore/v2/records/123', name: 'steve' }, nil, Record)
+          body = { href: 'http://datastore/v2/records/123', name: 'steve' }
           expect(LHC).to receive(:request)
             .with(options.merge(method: :post, url: "http://datastore/v2/records/123", body: body))
             .and_call_original

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 18.0.3
+  version: 19.0.0.pre.endpoint.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -228,6 +228,7 @@ files:
 - lib/lhs/concerns/data/to_hash.rb
 - lib/lhs/concerns/inspect.rb
 - lib/lhs/concerns/item/destroy.rb
+- lib/lhs/concerns/item/endpoint_lookup.rb
 - lib/lhs/concerns/item/save.rb
 - lib/lhs/concerns/item/update.rb
 - lib/lhs/concerns/item/validation.rb
@@ -465,13 +466,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - Ruby >= 2.3.0
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: 'REST services accelerator: Rails gem providing an easy, active-record-like