lhs 24.1.0 → 24.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a87032458b0558f6659a20e25b28b4f2523533fb9775f44148adeca6c4109263
-  data.tar.gz: 3395b718c795e0128bb8e33d646b2319720c6280c9eff1f32f498485a3f9bad4
+  metadata.gz: 00243f3b3ea3dd2e97864c126dc7b8177c3f6e38cd217aba7c1a2843d9215d4c
+  data.tar.gz: 2c63934cbc1752513d1336997d2c9743c40b518d31b177d30f18a6ffe00ea99a
 SHA512:
-  metadata.gz: d0ac63a7eaed408a1612ff55db6388f3b375458d60ee9e4e6ea70f9399800a022456c4cce030a593b902ffc775c4a9deac17b7a801613ac7df4b69ca199d5849
-  data.tar.gz: 64135aa329e9127e04664a43746cd1e4d57236d3dc7ea405e74553cd0b9ef3cd01d479f70ff4dc66c44930010fae56be8780e719a0504bde6907def5832d5c7a
+  metadata.gz: 492a78447b6b7985bed8a82025a95551f94943f6e712d09863ca99d3952bb16a26da46a88d6fc1edc5cb744dae230eab22319a038c3a0e67e76747e406afd2aa
+  data.tar.gz: 274eacd3f4815d81514b7273d6613851be0eb6427cd7c9fca1c0a8105cd5a28e62e1f5b740ad31331446a10d2cfe6fdc13c64808fb957511cbcf6b4e7790dc99

data/lib/lhs/concerns/collection/internal_collection.rb

@@ -47,7 +47,7 @@ class LHS::Collection < LHS::Proxy
           if item.is_a?(LHS::Data) && item._request && !item._request.response.success?
             nil
           else
-            item
+            cast_item(item)
           end
         end.compact
       end
@@ -55,10 +55,18 @@ class LHS::Collection < LHS::Proxy
       private
 
       def cast_item(item)
-        record_by_href = LHS::Record.for_url(item[:href]) if item[:href]
         data = LHS::Data.new(item, @parent, @record)
-        return (record_by_href || @record).new(data) if record_by_href || @record
-        data
+        (record_by_href(item) || @record)&.new(data) || data
+      end
+
+      def record_by_href(item)
+        return if plain_value?(item) || item[:href].blank?
+
+        LHS::Record.for_url(item[:href])
+      end
+
+      def plain_value?(item)
+        item.is_a?(String) || item.is_a?(Numeric) || item.is_a?(TrueClass) || item.is_a?(FalseClass)
       end
     end
   end

data/lib/lhs/version.rb

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

data/spec/record/compact_spec.rb

@@ -6,6 +6,11 @@ describe LHS::Record do
   before do
     class Place < LHS::Record
       endpoint 'http://datastore/places/{id}'
+      endpoint 'http://datastore/users/{user_id}/places/{id}'
+
+      def display_name
+        "*#{name}*"
+      end
     end
 
     class User < LHS::Record
@@ -24,14 +29,24 @@ describe LHS::Record do
         items: [
           {
             href: 'http://datastore/users/123/places/789'
+          }, {
+            href: 'http://datastore/users/123/places/790'
           }
         ],
-        total: 4,
+        total: 2,
         offset: 0,
         limit: 10
       }.to_json)
 
     stub_request(:get, 'http://datastore/users/123/places/789?limit=100')
+      .to_return(
+        body: {
+          href: 'http://datastore/users/123/places/789?limit=100',
+          name: 'Mc Donalds'
+        }.to_json
+      )
+
+    stub_request(:get, 'http://datastore/users/123/places/790?limit=100')
       .to_return(
         status: 404,
         body: {
@@ -51,17 +66,25 @@ describe LHS::Record do
   end
 
   context '.compact' do
-
     it 'removes linked resouces which could not get fetched' do
-      expect(places.compact.length).to eq 0
-      expect(places.length).not_to eq 0 # leaves the original intact
+      expect(places.compact.length).to eq 1
+      expect(places.length).not_to eq 1 # leaves the original intact
+    end
+  end
+
+  context 'record casting' do
+    let(:expected_display_name) { '*Mc Donalds*' }
+
+    it 'finds the right record class' do
+      expect(places.first.display_name).to eq expected_display_name
+      expect(places.compact.map(&:display_name)).to eq [expected_display_name]
     end
   end
 
   context '.compact!' do
     it 'removes linked resouces which could not get fetched' do
-      expect(places.compact!.length).to eq 0
-      expect(places.length).to eq 0 # and changes the original intact
+      expect(places.compact!.length).to eq 1
+      expect(places.length).to eq 1 # and changes the original intact
     end
   end
 end

data/spec/record/references_spec.rb

@@ -8,6 +8,14 @@ describe LHS::Record do
       class Customer < LHS::Record
         endpoint 'http://datastore/customers/{id}'
       end
+
+      class User < LHS::Record
+        endpoint 'http://datastore/users/{id}'
+        endpoint 'http://datastore/customers/{customer_id}/users/{id}'
+        def reversed_name
+          name.split.reverse.join(' ')
+        end
+      end
     end
 
     let!(:customer_request) do
@@ -18,6 +26,9 @@ describe LHS::Record do
           },
           'contact_addresses' => {
             'href' => "http://datastore/contact_addresses"
+          },
+          'users' => {
+            'href' => 'http://datastore/customers/1/users'
           }
         }.to_json)
     end
@@ -49,5 +60,37 @@ describe LHS::Record do
       assert_requested(electronic_addresses_request)
       assert_requested(contact_addresses_request)
     end
+
+    describe 'mapping related classes correctly' do
+      before do
+        stub_request(:get, 'http://datastore/customers/1/users?limit=100').to_return(
+          status: 200,
+          body: {
+            href: 'http://datastore/customers/1/users?offset=0&limit=100',
+            items: [
+              { href: 'http://datastore/customers/1/users/1' }
+            ],
+            total: 1,
+            offset: 0,
+            limit: 10
+          }.to_json
+        )
+
+        stub_request(:get, 'http://datastore/customers/1/users/1?limit=100')
+          .with(headers: { 'Authentication' => 'Bearer 123' })
+          .to_return(body: { href: 'http://datastore/users/1', name: 'Elizabeth Baker' }.to_json)
+      end
+
+      it 'maps correctly' do
+        users = Customer
+          .includes(:users)
+          .references(users: referencing_options)
+          .find(1)
+          .users
+
+        expect(users.first.reversed_name).to be_present
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 24.1.0
+  version: 24.1.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -552,7 +552,7 @@ homepage: https://github.com/local-ch/lhs
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -568,8 +568,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby >= 2.3.0
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: 'REST services accelerator: Rails gem providing an easy, active-record-like
   interface for http (hypermedia) json services'