lhs 15.3.1 → 15.3.2

data/lib/lhs/data.rb

@@ -18,7 +18,8 @@ class LHS::Data
   delegate :instance_methods, :items_key, :limit_key, :total_key, :pagination_key, to: :class
 
   # prevent clashing with attributes of underlying data
-  attr_accessor :_proxy, :_raw, :_parent, :_record, :_request, :_endpoint
+  attr_accessor :_proxy, :_parent, :_record, :_request, :_endpoint
+  attr_reader :_raw
 
   def initialize(input, parent = nil, record = nil, request = nil, endpoint = nil)
     self._raw = raw_from_input(input)
@@ -47,12 +48,12 @@ class LHS::Data
 
   def _root
     root = self
-    root = root._parent while root && root._parent
+    root = root._parent while root&._parent
     root
   end
 
   def parent
-    if _parent && _parent._record
+    if _parent&._record
       _parent._record.new(_parent, false)
     else
       _parent
@@ -65,7 +66,7 @@ class LHS::Data
 
   # enforce internal data structure to have deep symbolized keys
   def _raw=(raw)
-    raw.to_hash.deep_symbolize_keys! if raw && raw.respond_to?(:to_hash)
+    raw.to_hash.deep_symbolize_keys! if raw&.respond_to?(:to_hash)
     @_raw = raw
   end
 

data/lib/lhs/endpoint.rb

@@ -5,6 +5,6 @@ class LHS::Endpoint
     template, record = LHS::Record::Endpoints.all.detect do |template, _record|
       LHC::Endpoint.match?(url, template)
     end
-    record.endpoints.detect { |endpoint| endpoint.url == template } if record
+    record&.endpoints&.detect { |endpoint| endpoint.url == template }
   end
 end

data/lib/lhs/item.rb

@@ -28,6 +28,14 @@ class LHS::Item < LHS::Proxy
     true
   end
 
+  def respond_to?(sym, include_all = false)
+    if sym == :to_ary
+      false
+    else
+      super(sym, include_all)
+    end
+  end
+
   protected
 
   def method_missing(name, *args, &_block)

data/lib/lhs/pagination/base.rb

@@ -27,7 +27,6 @@ module LHS::Pagination
     def offset
       data._raw.dig(*_record.pagination_key(:body)) || self.class::DEFAULT_OFFSET
     end
-    alias current_page offset
     alias start offset
 
     def pages_left

data/lib/lhs/problems/base.rb

@@ -67,7 +67,7 @@ module LHS::Problems
     end
 
     def empty?
-      all? { |_k, v| v && v.empty? && !v.is_a?(String) }
+      all? { |_k, v| v&.empty? && !v.is_a?(String) }
     end
 
     private

data/lib/lhs/record.rb

@@ -61,7 +61,7 @@ class LHS::Record
   delegate :_proxy, :_endpoint, :merge_raw!, :select, :becomes, to: :_data
 
   def initialize(data = nil, apply_customer_setters = true)
-    data = LHS::Data.new({}, nil, self.class) unless data
+    data ||= LHS::Data.new({}, nil, self.class)
     data = LHS::Data.new(data, nil, self.class) unless data.is_a?(LHS::Data)
     define_singleton_method(:_data) { data }
     apply_custom_setters! if apply_customer_setters

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = '15.3.1'
+  VERSION = '15.3.2'
 end

data/spec/autoloading_spec.rb

@@ -6,14 +6,14 @@ describe LHS, type: :request do
         because it's necessary for endpoint-to-record-class-discovery",
     cleanup_before: false do
       all_endpoints = LHS::Record::Endpoints.all
-      expect(all_endpoints['http://datastore/v2/users']).to be
-      expect(all_endpoints['http://datastore/v2/users/{id}']).to be
+      expect(all_endpoints['http://datastore/v2/users']).to be_present
+      expect(all_endpoints['http://datastore/v2/users/{id}']).to be_present
       expect(
         User.endpoints.detect { |endpoint| endpoint.url == 'http://datastore/v2/users' }
-      ).to be
+      ).to be_present
       expect(
         User.endpoints.detect { |endpoint| endpoint.url == 'http://datastore/v2/users/{id}' }
-      ).to be
+      ).to be_present
     end
   end
 end

data/spec/collection/accessors_spec.rb

@@ -14,7 +14,7 @@ describe LHS::Collection do
       }
     end
 
-    before(:each) do
+    before do
       class Record < LHS::Record
         endpoint 'http://datastore/records`'
       end

data/spec/collection/collection_items_spec.rb

@@ -5,7 +5,7 @@ describe LHS::Collection do
   let(:items) { [{ name: 'Steve' }] }
   let(:collection) { Account.where }
 
-  before(:each) do
+  before do
     LHC.config.placeholder('datastore', datastore)
     class Account < LHS::Record
       endpoint '{+datastore}/accounts'

data/spec/collection/configurable_spec.rb

@@ -5,7 +5,7 @@ describe LHS::Collection do
   let(:limit) { 10 }
   let(:total) { 20 }
 
-  before(:each) do
+  before do
     LHC.config.placeholder('search', search)
     class Search < LHS::Record
       configuration items_key: :docs, limit_key: :size, pagination_key: :start, pagination_strategy: :start, total_key: :totalResults

data/spec/collection/meta_data_spec.rb

@@ -26,7 +26,7 @@ describe LHS::Collection do
 
   let(:datastore) { 'http://local.ch/v2' }
 
-  before(:each) do
+  before do
     LHC.config.placeholder('datastore', datastore)
     class Feedback < LHS::Record
       endpoint '{+datastore}/feedbacks'

data/spec/collection/to_a_spec.rb

@@ -16,7 +16,7 @@ describe LHS::Collection do
 
     let(:subject) { collection.to_a }
 
-    before(:each) do
+    before do
       class Record < LHS::Record
         endpoint 'http://datastore/records`'
       end

data/spec/collection/to_ary_spec.rb

@@ -6,7 +6,7 @@ describe LHS::Collection do
   let(:collection) { Record.where }
 
   context 'to_ary' do
-    before(:each) do
+    before do
       class Record < LHS::Record
         endpoint 'http://datastore/records`'
       end
@@ -25,10 +25,14 @@ describe LHS::Collection do
     let(:subject) { collection.to_ary }
 
     it 'returns an array' do
-      expect(subject).to be
+      expect(subject).to be_present
       expect(subject).to be_kind_of Array
       expect(subject[0]).to be_kind_of Record
       expect(subject[0].name).to eq 'Steve'
     end
+
+    it 'responds to to_ary' do
+      expect(subject.respond_to?(:to_ary)).to eq true
+    end
   end
 end

data/spec/collection/without_object_items_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Collection do
   let(:datastore) { 'http://local.ch/v2' }
 
-  before(:each) do
+  before do
     LHC.config.placeholder('datastore', datastore)
     class Account < LHS::Record
       endpoint '{+datastore}/accounts/{id}'

data/spec/complex/reduce_spec.rb

@@ -171,7 +171,7 @@ describe LHS::Complex do
       )
     end
 
-    it 'reduces another complex multi-level example' do
+    it 'reduces another complex multi-level example (single plus array)' do
       expect(LHS::Complex.reduce([
         { entries: :products },
         { entries: [:customer, :contracts] }
@@ -180,7 +180,7 @@ describe LHS::Complex do
       )
     end
 
-    it 'reduces another complex multi-level example' do
+    it 'reduces another complex multi-level example (single hash plus array)' do
       expect(LHS::Complex.reduce([
         { entries: { customer: :contracts } },
         { entries: [:customer, :content_ads] }

data/spec/concerns/record/request_spec.rb

@@ -21,7 +21,7 @@ describe LHS::Record::Request do
       expect(subject.send(:prepare_options_for_include_all_request!, abc: 'def')).to eq(abc: 'def')
     end
 
-    it 'calls correct prepare method for a Hash' do
+    it 'calls correct prepare method for a Hash (collection)' do
       expect(subject).to receive(:prepare_option_for_include_all_request!)
         .with(abc: 'def').and_return('ignore')
       expect(subject).to receive(:prepare_option_for_include_all_request!)

data/spec/data/collection_spec.rb

@@ -9,7 +9,7 @@ describe LHS::Data do
     LHS::Data.new(json, nil, Record)
   end
 
-  before(:each) do
+  before do
     class Record < LHS::Record
       endpoint '{+datastore}/v2/data'
     end

data/spec/data/equality_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe LHS::Data do
   context 'equality' do
-    before(:each) do
+    before do
       class Record < LHS::Record
         endpoint 'http://local.ch/records'
       end

data/spec/data/inspect_spec.rb

@@ -6,7 +6,7 @@ describe LHS::Data do
       expect(data.inspect).to eq string.gsub(/  +/, '').strip
     end
 
-    before(:each) do
+    before do
       class Record < LHS::Record
         endpoint 'http://local.ch/records'
         endpoint 'http://local.ch/records/{id}'

data/spec/data/is_item_or_collection_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 describe LHS::Data do
-  before(:each) do
+  before do
     class Record < LHS::Record
       endpoint 'http://local.ch/records'
     end

data/spec/data/item_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 describe LHS::Data do
-  before(:each) do
+  before do
     class Record < LHS::Record
       endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
       endpoint '{+datastore}/v2/feedbacks'

data/spec/data/merge_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 describe LHS::Data do
-  before(:each) do
+  before do
     class Record < LHS::Record
       endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
       endpoint '{+datastore}/v2/feedbacks'

data/spec/data/parent_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 describe LHS::Data do
-  before(:each) do
+  before do
     class Record < LHS::Record
       endpoint 'http://local.ch/records'
     end

data/spec/data/raw_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 describe LHS::Data do
-  before(:each) do
+  before do
     class Record < LHS::Record
       endpoint '{+datastore}/v2/entries/{entry_id}/content-ads/{campaign_id}/feedbacks'
       endpoint '{+datastore}/v2/{campaign_id}/feedbacks'

data/spec/data/respond_to_spec.rb

@@ -1,21 +1,21 @@
 require 'rails_helper'
 
 describe LHS::Data do
-  before(:each) do
+  before do
     class Record < LHS::Record
       map :test_mapping?, ->(_item) { true }
     end
   end
 
   context '#respond_to?' do
-    it 'it is true for mappings that are defined' do
+    it 'is true for mappings that are defined' do
       data = LHS::Data.new({ 'campaign' => { 'id' => 123 } }, nil, Record)
 
       expect(data.respond_to?(:test_mapping?)).to be(true)
     end
 
     # proxy for this example is LHC::Collection which implements total
-    it 'it is true for calls forwarded to proxy' do
+    it 'is true for calls forwarded to proxy' do
       data = LHS::Data.new({ 'items' => [{ 'campaign' => { 'id' => 123 } }] }, nil, Record)
 
       expect(data.respond_to?(:total)).to be(true)

data/spec/data/root_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 describe LHS::Data do
-  before(:each) do
+  before do
     class Record < LHS::Record
       endpoint '{+datastore}/v2/entries/{entry_id}/content-ads/{campaign_id}/feedbacks'
       endpoint '{+datastore}/v2/{campaign_id}/feedbacks'

data/spec/data/select_spec.rb

@@ -9,7 +9,7 @@ describe LHS::Data do
     LHS::Data.new(raw, nil, Record)
   end
 
-  before(:each) do
+  before do
     class Record < LHS::Record
       endpoint '{+datastore}/v2/data'
     end

data/spec/data/to_ary_spec.rb

@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+describe LHS::Data do
+  before(:each) do
+    class Record < LHS::Record
+      endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
+      endpoint '{+datastore}/v2/feedbacks'
+    end
+  end
+
+  let(:json) do
+    load_json(:feedbacks)
+  end
+
+  let(:data) do
+    LHS::Data.new(json, nil, Record)
+  end
+
+  let(:item) do
+    data[0]
+  end
+
+  it 'does not respond to to_ary' do
+    expect(item.respond_to?(:to_ary)).to eq false
+  end
+end

data/spec/data/to_json_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 describe LHS::Data do
-  before(:each) do
+  before do
     class Record < LHS::Record
       endpoint '{+datastore}/v2/{campaign_id}/feedbacks'
       endpoint '{+datastore}/v2/feedbacks'

data/spec/endpoint/for_url_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe LHS::Endpoint do
   context 'for url' do
-    before(:each) do
+    before do
       class Record < LHS::Record
         endpoint '{+datastore}/entries/{entry_id}/content-ads/{campaign_id}/feedbacks'
         endpoint '{+datastore}/{campaign_id}/feedbacks'

data/spec/item/access_errors_spec.rb

@@ -4,7 +4,7 @@ describe LHS::Item do
 
   context 'make errors available' do
 
-    before(:each) do
+    before do
       class Presence < LHS::Record
         endpoint 'http://opm/presences'
       end

data/spec/item/accessors_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe LHS::Item do
   context 'accessors' do
-    before(:each) do
+    before do
       class Record < LHS::Record
         endpoint 'http://datastore/records'
       end

data/spec/item/add_error_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 describe LHS::Item do
-  before(:each) do
+  before do
     class Record < LHS::Record
     end
   end

data/spec/item/becomes_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 describe LHS::Item do
-  before(:each) do
+  before do
     class Location < LHS::Record
       endpoint 'http://sync/locations'
       endpoint 'http://sync/locations/{id}'