lhs 11.0.0 → 11.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47b77a705ee21920e7c48515fdf200b60bb2be61
-  data.tar.gz: d85c7e29b814b6ddda3c0729c1adfb405cc6e873
+  metadata.gz: 0b33b5484ee3a16c6d834c1520bb907c5c84cc3e
+  data.tar.gz: 4f179bf4a46b0e109bcd079353186e61ec08c5d4
 SHA512:
-  metadata.gz: 6351281d1b7f3d3c5cc08fe91ac35f6a747d6ffa543a41b9a6737e2634bc714fe1a340453ab887030af652063afdd3305c4da811ef1bafaab8acb89ba0cd12bf
-  data.tar.gz: 8aef3ee080ad5d7b6d0937138434ab2758b3941dfdfcc4fddbc38beb5a1dc16507b2929a4069dbc8ee5fbb09c4a59757a1adbfc3f1bab0cb23f8644fa43f0cf1
+  metadata.gz: 56558afe98484a87c27bd99d379172f6166ba9d27c32662f35e0d88cb1d010223858a60fac2ae3714d6860ee24f03c665f0388a53878193874d4120939d66b70
+  data.tar.gz: ce2b1ba748bd7feb39858457d36dd8e3a8f6c3dcc9db11d156279e599f83e082315e8a008127e8b7285ea393c0e8a1029271e917e77f295cae85cdc56d539fb9

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

@@ -11,7 +11,7 @@ class LHS::Record
     end
 
     def persisted?
-      !href.nil?
+      !href.blank?
     end
 
     included do

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

@@ -125,13 +125,13 @@ class LHS::Record
         end
       end
 
-      def handle_include(included, data, sub_includes = nil, references = nil)
+      def handle_include(included, data, sub_includes = nil, reference = nil)
         return if data.blank? || skip_loading_includes?(data, included)
         options = options_for_data(data, included)
-        options = extend_with_references(options, references)
-        addition = load_include(options, data, sub_includes, references)
+        options = extend_with_reference(options, reference)
+        addition = load_include(options, data, sub_includes, reference)
         extend_raw_data!(data, addition, included)
-        expand_addition!(data, included) if no_expanded_data?(addition)
+        expand_addition!(data, included, options) if no_expanded_data?(addition)
       end
 
       def options_for_data(data, included = nil)
@@ -140,9 +140,10 @@ class LHS::Record
         url_option_for(data, included)
       end
 
-      def expand_addition!(data, included)
+      def expand_addition!(data, included, reference)
         addition = data[included]
         options = options_for_data(addition)
+        options = extend_with_reference(options, reference.except(:url))
         record = record_for_options(options) || self
         options = convert_options_to_endpoints(options) if record_for_options(options)
         expanded_data = begin
@@ -163,13 +164,13 @@ class LHS::Record
       end
 
       # Extends request options with options provided for this reference
-      def extend_with_references(options, references)
-        return options unless references
+      def extend_with_reference(options, reference)
+        return options unless reference
         options ||= {}
         if options.is_a?(Array)
-          options.map { |request_options| request_options.merge(references) if request_options.present? }
+          options.map { |request_options| request_options.merge(reference) if request_options.present? }
         elsif options.present?
-          options.merge(references)
+          options.merge(reference)
         end
       end
 

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "11.0.0"
+  VERSION = "11.0.1"
 end

data/spec/record/includes_spec.rb

@@ -334,32 +334,72 @@ describe LHS::Record do
   end
 
   context 'unexpanded response when requesting the included collection' do
-    it 'loads the collection and the single items, if not already expanded' do
+    before(:each) do
       class Customer < LHS::Record
         endpoint ':datastore/customer/:id'
       end
+    end
 
+    let!(:customer_request) do
       stub_request(:get, "#{datastore}/customer/1")
         .to_return(body: {
           places: {
             href: "#{datastore}/places"
           }
         }.to_json)
+    end
 
+    let!(:places_request) do
       stub_request(:get, "#{datastore}/places")
         .to_return(body: {
           items: [{ href: "#{datastore}/places/1" }]
         }.to_json)
+    end
 
-      item_request = stub_request(:get, "#{datastore}/places/1")
+    let!(:place_request) do
+      stub_request(:get, "#{datastore}/places/1")
         .to_return(body: {
           name: 'Casa Ferlin'
         }.to_json)
+    end
 
+    it 'loads the collection and the single items, if not already expanded' do
       place = Customer.includes(:places).find(1).places.first
-      assert_requested(item_request)
+      assert_requested(place_request)
       expect(place.name).to eq 'Casa Ferlin'
     end
+
+    context 'forwarding options' do
+      let!(:places_request) do
+        stub_request(:get, "#{datastore}/places")
+          .with(headers: { 'Authorization' => 'Bearer 123' })
+          .to_return(
+            body: {
+              items: [{ href: "#{datastore}/places/1" }]
+            }.to_json
+          )
+      end
+
+      let!(:place_request) do
+        stub_request(:get, "#{datastore}/places/1")
+          .with(headers: { 'Authorization' => 'Bearer 123' })
+          .to_return(
+            body: {
+              name: 'Casa Ferlin'
+            }.to_json
+          )
+      end
+
+      it 'forwards options used to expand those unexpanded items' do
+        place = Customer
+          .includes(:places)
+          .references(places: { headers: { 'Authorization' => 'Bearer 123' } })
+          .find(1)
+          .places.first
+        assert_requested(place_request)
+        expect(place.name).to eq 'Casa Ferlin'
+      end
+    end
   end
 
   context 'includes with options' do

data/spec/record/persisted_spec.rb

@@ -12,10 +12,20 @@ describe LHS::Record do
     end
 
     context 'for new record' do
-      subject { Feedback.new }
+      context 'with a nil href' do
+        subject { Feedback.new }
 
-      it 'is false' do
-        expect(subject.persisted?).to be(false)
+        it 'is false' do
+          expect(subject.persisted?).to be(false)
+        end
+      end
+
+      context 'with an empty href' do
+        subject { Feedback.new(href: '') }
+
+        it 'is false' do
+          expect(subject.persisted?).to be(false)
+        end
       end
     end
 

data/spec/record/request_spec.rb

@@ -1,6 +1,12 @@
 require 'rails_helper'
 
 describe LHS::Record do
+  before(:each) do
+    class Record < LHS::Record
+      endpoint 'http://datastore/feedbacks/:id'
+    end
+  end
+
   context 'url pattern' do
     let(:datastore) { 'http://local.ch/v2' }
 
@@ -18,4 +24,65 @@ describe LHS::Record do
       assert_requested(request)
     end
   end
+
+  context '#convert_options_to_endpoint' do
+    before(:each) do
+      class Record < LHS::Record
+        endpoint 'http://datastore/feedbacks/:id', params: { tracking: 123 }
+      end
+    end
+
+    it 'identifies endpoint by given url and merges back endpoint template parameters' do
+      options = LHS::Record.send(:convert_options_to_endpoints, url: 'http://datastore/feedbacks/1')
+      expect(options[:params][:id]).to eq '1'
+      expect(options[:url]).to eq 'http://datastore/feedbacks/:id'
+    end
+
+    it 'identifies endpoint by given url and merges back endpoint template parameters into an array, if array was given' do
+      options = LHS::Record.send(:convert_options_to_endpoints, [{ url: 'http://datastore/feedbacks/1' }])
+      expect(options[0][:params][:id]).to eq '1'
+      expect(options[0][:url]).to eq 'http://datastore/feedbacks/:id'
+    end
+
+    it 'returnes nil if endpoint was not found for the given url' do
+      options = LHS::Record.send(:convert_options_to_endpoints, url: 'http://datastore/reviews/1')
+      expect(options).to eq nil
+    end
+  end
+
+  context '#extend_with_reference' do
+    it 'extends given options with the one for the refernce' do
+      options = LHS::Record.send(:extend_with_reference, { url: 'http://datastore/feedbacks/1' }, { auth: { bearer: '123' } })
+      expect(options[:auth][:bearer]).to eq '123'
+    end
+
+    it 'extends given list of options with the one for the refernce' do
+      options = LHS::Record.send(:extend_with_reference, [{ url: 'http://datastore/feedbacks/1' }], auth: { bearer: '123' })
+      expect(options[0][:auth][:bearer]).to eq '123'
+    end
+  end
+
+  context '#options_for_data' do
+    it 'extract request options from raw data' do
+      options = LHS::Record.send(:url_option_for, LHS::Data.new({ href: 'http://datastore/feedbacks/1' }, nil, Record))
+      expect(options[:url]).to eq 'http://datastore/feedbacks/1'
+    end
+
+    it 'extract a list of request options from raw data if data is a collection' do
+      options = LHS::Record.send(:url_option_for, LHS::Data.new({ items: [{ href: 'http://datastore/feedbacks/1' }] }, nil, Record))
+      expect(options[0][:url]).to eq 'http://datastore/feedbacks/1'
+    end
+
+    it 'extract request options from raw nested data' do
+      options = LHS::Record.send(:url_option_for, LHS::Data.new({ reviews: { href: 'http://datastore/reviews/1' } }, nil, Record), :reviews)
+      expect(options[:url]).to eq 'http://datastore/reviews/1'
+    end
+  end
+
+  context '#record_for_options' do
+    it 'identifies lhs record from given options, as all request have to be done through LHS Records' do
+      record = LHS::Record.send(:record_for_options, url: 'http://datastore/feedbacks/1')
+      expect(record).to eq Record
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 11.0.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc