lhs 25.0.0 → 25.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75364b152de7b958acefbb09ab084ca96dd15f1daad2465ab80db56584f5f600
-  data.tar.gz: 1456ffc9b3a696bc871248981364f7012deeb921647d88493041db4d40effea5
+  metadata.gz: 92e9ccdfc62407ecb0d4ba6b6ce18b28628ecaad229586f589eb7167fe8ff0de
+  data.tar.gz: 26924759db03d133fbfc8dee9be190e8238fa0fc3036f7b79b13636e881f785e
 SHA512:
-  metadata.gz: c271c49bce686c2686ef1d80b535433aba05f1cd58dc98b2265cc8cc63149faa9b3094e0cf82acf8f0afd80721fbbfa5369aea1ffb091e0b14ce35120bc400fc
-  data.tar.gz: a24a6debcbe0866a73167eee9b44a3adc7cda111bcd4971e77982d14d44e2bda3cce3eaa63666e257f60f5653a3e013321eb622ca2d6e152cae9b03fce79839d
+  metadata.gz: 4186ce186f51e95872532c943c93a402b1d23160d35b123f2fa4c01a1e589ffc863b5f6345c8071c606545539e91e789d75bed7efefcef0546677fe852a56d3d
+  data.tar.gz: b31b7ab8443d71a735397127f389d8dda1f9add35fa318e92ba0172f65172d21928181120a56c953227d0051778646745c8c510c04967e17ba0c24ddd60723ea

data/.github/workflows/rubocop.yml

@@ -0,0 +1,27 @@
+name: Rubocop
+
+on: push
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+      - name: Cache Ruby Gems
+        uses: actions/cache@v2
+        with:
+          path: /.tmp/vendor/bundle
+          key: ${{ runner.os }}-gems-latest-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-latest-
+      - name: Bundle Install
+        run: |
+          bundle config path /.tmp/vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: Run Rubocop
+        run: |
+          bundle exec rubocop

data/.github/workflows/test-active-support-5.yml

@@ -0,0 +1,27 @@
+name: Test ActiveSupport v5
+
+on: push
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+      - name: Cache Ruby Gems
+        uses: actions/cache@v2
+        with:
+          path: /.tmp/vendor/bundle
+          key: ${{ runner.os }}-gems-v5-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-v5-
+      - name: Bundle Install ActiveSupport v5
+        run: |
+          bundle config path /.tmp/vendor/bundle
+          BUNDLE_GEMFILE=Gemfile.activesupport5 bundle install --jobs 4 --retry 3
+      - name: Run Tests
+        run: |
+          BUNDLE_GEMFILE=Gemfile.activesupport5 bundle exec rspec

data/.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Test
+
+on: push
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+      - name: Cache Ruby Gems
+        uses: actions/cache@v2
+        with:
+          path: /.tmp/vendor/bundle
+          key: ${{ runner.os }}-gems-latest-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-latest-
+      - name: Bundle Install
+        run: |
+          bundle config path /.tmp/vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: Run Tests
+        run: |
+          bundle exec rspec

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.5
+ruby-2.7.2

data/README.md

@@ -80,6 +80,7 @@ record.review # "Lunch was great
         * [Pagination strategy](#pagination-strategy)
            * [Pagination strategy: offset (default)](#pagination-strategy-offset-default)
            * [Pagination strategy: page](#pagination-strategy-page)
+           * [Pagination strategy: total_pages](#pagination-strategy-total-pages)
            * [Pagination strategy: start](#pagination-strategy-start)
            * [Pagination strategy: link](#pagination-strategy-link)
         * [Pagination keys](#pagination-keys)
@@ -1253,6 +1254,41 @@ In parallel:
   GET https://service.example.com/records?limit=100&page=3
 ```
 
+##### Pagination strategy: total_pages
+
+The `total_pages` strategy is based on the `page` strategy with the only difference
+that the responding api provides `total_pages` over `total_items`.
+
+```ruby
+# app/models/transaction.rb
+
+class Transaction < LHS::Record
+  configuration pagination_strategy: 'total_pages', pagination_key: 'page', total_key: 'total_pages'
+
+  endpoint '{+service}/transactions'
+end
+```
+
+```ruby
+# app/controllers/some_controller.rb
+
+Record.all
+
+```
+```
+GET https://service.example.com/transactions?limit=100
+{
+  items: [{...}, ...],
+  total_pages: 3,
+  limit: 100,
+  page: 1
+}
+In parallel:
+  GET https://service.example.com/records?limit=100&page=2
+  GET https://service.example.com/records?limit=100&page=3
+```
+
+
 ##### Pagination strategy: start
 
 In comparison to the `offset` strategy, the `start` strategy indicates with which item the current page starts. 

data/lib/lhs.rb

@@ -58,6 +58,8 @@ module LHS
       'lhs/pagination/offset'
     autoload :Page,
       'lhs/pagination/page'
+    autoload :TotalPages,
+      'lhs/pagination/total_pages'
     autoload :Start,
       'lhs/pagination/start'
     autoload :Link,

data/lib/lhs/collection.rb

@@ -14,7 +14,7 @@ class LHS::Collection < LHS::Proxy
 
   METHOD_NAMES_EXLCUDED_FROM_WRAPPING = %w(to_a to_ary map).freeze
 
-  delegate :select, :length, :size, to: :_collection
+  delegate :select, :length, :size, :insert, to: :_collection
   delegate :_record, :_raw, to: :_data
   delegate :limit, :count, :total, :offset, :current_page, :start,
            :next?, :previous?, to: :_pagination

data/lib/lhs/concerns/autoload_records.rb

@@ -32,7 +32,7 @@ module AutoloadRecords
         end
 
         def self.require_direct_inheritance
-          model_files.map do |file|
+          model_files.sort.map do |file|
             next unless File.read(file).match('LHS::Record')
             require_dependency file
             file.split('models/').last.gsub('.rb', '').classify
@@ -41,7 +41,9 @@ module AutoloadRecords
 
         def self.require_inheriting_records(parents)
           model_files.each do |file|
-            next if parents.none? { |parent| File.read(file).match(parent) }
+            file_content = File.read(file)
+            next if parents.none? { |parent| file_content.match(/\b#{parent}\b/) }
+            next if file_content.match?('extend ActiveSupport::Concern')
             require_dependency file
           end
         end

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

@@ -14,7 +14,7 @@ class LHS::Collection < LHS::Proxy
 
       attr_accessor :raw
       delegate :length, :size, :first, :last, :sample, :[], :present?, :blank?, :empty?,
-               :<<, :push, to: :raw
+               :<<, :push, :insert, to: :raw
 
       def initialize(raw, parent, record)
         self.raw = raw
@@ -39,7 +39,7 @@ class LHS::Collection < LHS::Proxy
       def compact
         dup.tap do |collection|
           collection.compact! if collection.raw.present?
-        end
+        end.as_json # do not return an internal collection!
       end
 
       def compact!

data/lib/lhs/concerns/data/extend.rb

@@ -9,11 +9,11 @@ class LHS::Data
 
     # Extends already fetched data (self) with additionally
     # fetched data (addition) using the given key
-    def extend!(addition, key)
+    def extend!(addition, key = nil)
       addition = cast_relation_class_for_extension(addition, key)
       if collection?
         extend_collection!(addition, key)
-      elsif self[key]._raw.is_a? Array
+      elsif _raw.is_a?(Array) || self[key]._raw.is_a?(Array)
         extend_array!(addition, key)
       elsif item?
         extend_item!(addition, key)
@@ -22,14 +22,14 @@ class LHS::Data
 
     private
 
-    def cast_relation_class_for_extension(addition, key)
-      return addition if _record.nil? || _record._relations.nil? || _record._relations[key].nil?
+    def cast_relation_class_for_extension(addition, key = nil)
+      return addition if _record.nil? || key.nil? || _record._relations.nil? || _record._relations[key].nil?
       addition.becomes(_record._relations[key][:record_class_name].constantize, errors: addition.errors, warnings: addition.warnings)
     end
 
-    def extend_collection!(addition, key)
+    def extend_collection!(addition, key = nil)
       map do |item|
-        item_raw = item._raw[key]
+        item_raw = key ? item._raw[key] : item._raw
         item_raw.blank? ? [nil] : item_raw
       end
         .flatten
@@ -45,25 +45,25 @@ class LHS::Data
         end
     end
 
-    def extend_array!(addition, key)
-      self[key].zip(addition) do |item, additional_item|
+    def extend_array!(addition, key = nil)
+      (key ? self[key] : self).zip(addition) do |item, additional_item|
         item._raw.merge!(additional_item._raw) if additional_item.present?
       end
     end
 
-    def extend_item!(addition, key)
+    def extend_item!(addition, key = nil)
       return if addition.nil?
       if addition.collection?
         extend_item_with_collection!(addition, key)
       else # simple case merges hash into hash
-        _raw[key.to_sym].merge!(addition._raw)
+        (key ? _raw[key.to_sym] : _raw).merge!(addition._raw)
       end
     end
 
-    def extend_item_with_collection!(addition, key)
-      target = self[key]
+    def extend_item_with_collection!(addition, key = nil)
+      target = (key ? self[key] : self)
       if target._raw.is_a? Array
-        self[key] = addition.map(&:_raw)
+        self[key] = addition.map(&:_raw) if key
       else # hash with items
         extend_item_with_hash_containing_items!(target, addition)
       end
@@ -72,7 +72,11 @@ class LHS::Data
     def extend_item_with_hash_containing_items!(target, addition)
       LHS::Collection.nest(input: target._raw, value: [], record: self) # inits the nested collection
       if LHS::Collection.access(input: target._raw, record: self).empty?
-        LHS::Collection.nest(input: target._raw, value: addition.reject { |item| item.nil? }, record: self)
+        LHS::Collection.nest(
+          input: target._raw,
+          value: addition.reject { |item| item.nil? },
+          record: self
+        )
       else
         LHS::Collection.access(input: target._raw, record: self).each_with_index do |item, index|
           item.merge!(addition[index])

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

@@ -22,6 +22,8 @@ class LHS::Record
         case pagination_strategy.to_sym
         when :page
           LHS::Pagination::Page
+        when :total_pages
+          LHS::Pagination::TotalPages
         when :start
           LHS::Pagination::Start
         when :link

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

@@ -29,7 +29,10 @@ class LHS::Record
         if options.is_a?(Hash)
           options.deep_merge(LHS::OptionBlocks::CurrentOptionBlock.options)
         elsif options.is_a?(Array)
-          options.map { |option| option.deep_merge(LHS::OptionBlocks::CurrentOptionBlock.options) }
+          options.map do |option|
+            return LHS::OptionBlocks::CurrentOptionBlock.options unless option
+            option.deep_merge(LHS::OptionBlocks::CurrentOptionBlock.options)
+          end
         end
       end
 
@@ -118,7 +121,7 @@ class LHS::Record
         else
           options = options_for_data(data, included)
           options = extend_with_reference(options, reference)
-          addition = load_include(options, data, sub_includes, reference)
+          addition = load_existing_includes(options, data, sub_includes, reference)
           data.extend!(addition, included)
           expand_addition!(data, included, reference) unless expanded_data?(addition)
         end
@@ -277,6 +280,21 @@ class LHS::Record
         end
       end
 
+      def load_existing_includes(options, data, sub_includes, references)
+        if data.collection? && data.any?(&:blank?)
+          # filter only existing items
+          loaded_includes = load_include(options.compact, data.compact, sub_includes, references)
+          # fill up skipped items before returning
+          data.each_with_index do |item, index|
+            next if item.present?
+            loaded_includes.insert(index, {})
+          end
+          loaded_includes
+        else
+          load_include(options, data, sub_includes, references)
+        end
+      end
+
       # Load additional resources that are requested with include
       def load_include(options, _data, sub_includes, references)
         record = record_for_options(options) || self
@@ -303,11 +321,22 @@ class LHS::Record
       end
 
       # Continues loading included resources after one complete batch/level has been fetched
-      def continue_including(data, including, referencing)
-        handle_includes(including, data, referencing) if including.present? && data.present?
+      def continue_including(data, included, reference)
+        return data if included.blank? || data.blank?
+        expand_data!(data, included, reference) unless expanded_data?(data)
+        handle_includes(included, data, reference)
         data
       end
 
+      def expand_data!(data, _included, reference)
+        options = options_for_data(data)
+        options = extend_with_reference(options, reference)
+        record = record_for_options(options) || self
+        options = convert_options_to_endpoints(options) if record_for_options(options)
+        expanded_data = record.request(options)
+        data.extend!(expanded_data)
+      end
+
       # Loads all included/linked resources,
       # paginates itself to ensure all records are fetched
       def load_all_included!(record, options)

data/lib/lhs/pagination/total_pages.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class LHS::Pagination::TotalPages < LHS::Pagination::Page
+
+  def total
+    (data._raw.dig(*_record.total_key) || 0) * limit
+  end
+  alias count total
+end

data/lib/lhs/version.rb

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

data/spec/dummy/app/models/concerns/dummy_customer/some_concern.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class DummyCustomer < Providers::CustomerSystem
+  module SomeConcern
+    extend ActiveSupport::Concern
+
+    # dont auto load this again with LHS as it would raise an exception
+  end
+end

data/spec/dummy/app/models/dummy_customer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class DummyCustomer < Providers::CustomerSystem
+  include SomeConcern
   endpoint 'http://customers'
   endpoint 'http://customers/{id}'
 end

data/spec/pagination/total_pages_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe LHS::Record do
+  context 'pagination' do
+
+    let(:page_1_json) do
+      {
+        items: [1, 2],
+        total_pages: 3,
+        page: 1,
+        limit: 2
+      }.to_json
+    end
+
+    let(:page_2_json) do
+      {
+        items: [3, 4],
+        total_pages: 3,
+        page: 2,
+        limit: 2
+      }.to_json
+    end
+
+    let(:page_3_json) do
+      {
+        items: [5, 6],
+        total_pages: 3,
+        page: 3,
+        limit: 2
+      }.to_json
+    end
+
+    before do
+      class Feedback < LHS::Record
+        configuration pagination_strategy: :total_pages, total_key: :total_pages, pagination_key: :page
+        endpoint 'http://local.ch/v2/feedbacks'
+      end
+      stub_request(:get, 'http://local.ch/v2/feedbacks?limit=100').to_return(body: page_1_json)
+      stub_request(:get, 'http://local.ch/v2/feedbacks?limit=2&page=2').to_return(body: page_2_json)
+      stub_request(:get, 'http://local.ch/v2/feedbacks?limit=2&page=3').to_return(body: page_3_json)
+    end
+
+    it 'responds to limit_value' do
+      feedbacks = Feedback.all.fetch
+      expect(feedbacks.length).to eq 6
+      expect(feedbacks.count).to eq 6
+      expect(feedbacks.items.as_json).to eq [1, 2, 3, 4, 5, 6]
+    end
+  end
+end

data/spec/record/compact_spec.rb

@@ -66,6 +66,11 @@ describe LHS::Record do
   end
 
   context '.compact' do
+
+    it 'does NOT return an internal data type, but the Record class' do
+      expect(places.compact.class).to eq User
+    end
+
     it 'removes linked resouces which could not get fetched' do
       expect(places.compact.length).to eq 1
       expect(places.length).not_to eq 1 # leaves the original intact

data/spec/record/includes_after_expansion_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe LHS::Record do
+  context 'includes records after expansion' do
+
+    before do
+      class User < LHS::Record
+        endpoint 'http://users/{id}'
+      end
+
+      class Places < LHS::Record
+        endpoint 'http://users/{id}/places'
+        endpoint 'http://places/{id}'
+      end
+
+      class Contracts < LHS::Record
+        endpoint 'http://places/{place_id}/contracts'
+      end
+
+      stub_request(:get, 'http://users/1')
+        .to_return(
+          body: {
+            places: {
+              href: 'http://users/1/places'
+            }
+          }.to_json
+        )
+
+      stub_request(:get, 'http://users/1/places?limit=100')
+        .to_return(
+          body: {
+            items: [
+              { href: 'http://places/345' }
+            ],
+            total: 1,
+            offset: 0,
+            limit: 10
+          }.to_json
+        )
+
+      stub_request(:get, 'http://places/345')
+        .to_return(
+          body: {
+            contracts: {
+              href: "http://places/345/contracts?offset=0&limit=10"
+            }
+          }.to_json
+        )
+
+      stub_request(:get, 'http://places/345/contracts?offset=0&limit=10')
+        .to_return(
+          body: {
+            items: [
+              {
+                product: { name: 'OPL' }
+              }
+            ]
+          }.to_json
+        )
+
+    end
+
+    it 'includes resources after expanding plain links' do
+      user = User.includes(places: :contracts).find(1)
+      expect(
+        user.places.first.contracts.first.product.name
+      ).to eq 'OPL'
+    end
+  end
+end

data/spec/record/includes_missing_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe LHS::Record do
+
+  context 'merge request options ' do
+    before do
+      class Record < LHS::Record
+        endpoint 'http://records/{id}'
+      end
+
+      stub_request(:get, 'http://records/1')
+        .to_return(body: {
+          place_attributes: [
+            { href: 'https://attributes/bar' },
+            { href: 'https://attributes/restaurant' },
+            { href: 'https://attributes/cafe' }
+          ]
+        }.to_json)
+
+      stub_request(:get, "https://attributes/restaurant?limit=100")
+        .to_return(body: {}.to_json)
+      stub_request(:get, "https://attributes/restaurant")
+        .to_return(body: {}.to_json)
+      stub_request(:get, "https://attributes/bar?limit=100")
+        .to_return(body: {
+          group: {
+            href: 'https://group/general'
+          }
+        }.to_json)
+      stub_request(:get, "https://attributes/cafe?limit=100")
+        .to_return(body: {
+          group: {
+            href: 'https://group/general'
+          }
+        }.to_json)
+      stub_request(:get, "https://group/general?limit=100&status=active")
+        .to_return(body: {
+          name: 'General'
+        }.to_json)
+    end
+
+    context 'missing referenced options due to none existance of include' do
+
+      it 'does not raise when trying to merge options with the options block' do
+        LHS.options(throttle: { break: '80%' }) do
+          record = Record
+            .references(place_attributes: { group: { params: { status: 'active' } } })
+            .includes([{ place_attributes: :group }])
+            .find(1)
+          expect(record.place_attributes[0].group.name).to eq 'General'
+          expect(record.place_attributes[1].group).to eq nil
+          expect(record.place_attributes[2].group.name).to eq 'General'
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 25.0.0
+  version: 25.1.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -241,28 +241,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".bundler-version"
+- ".github/workflows/rubocop.yml"
+- ".github/workflows/test-active-support-5.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.localch.yml"
 - ".rubocop.yml"
 - ".ruby-version"
 - Gemfile
-- Gemfile.activesupport4
 - Gemfile.activesupport5
 - LICENSE
 - README.md
 - Rakefile
-- cider-ci.yml
-- cider-ci/bin/bundle
-- cider-ci/bin/ruby_install
-- cider-ci/bin/ruby_version
-- cider-ci/jobs/rspec-activesupport-4.yml
-- cider-ci/jobs/rspec-activesupport-5.yml
-- cider-ci/jobs/rspec-activesupport-latest.yml
-- cider-ci/jobs/rubocop.yml
-- cider-ci/task_components/bundle.yml
-- cider-ci/task_components/rspec.yml
-- cider-ci/task_components/rubocop.yml
-- cider-ci/task_components/ruby.yml
 - docs/accessing-data-in-lhs.png
 - friday.yml
 - lhs.gemspec
@@ -331,6 +321,7 @@ files:
 - lib/lhs/pagination/offset.rb
 - lib/lhs/pagination/page.rb
 - lib/lhs/pagination/start.rb
+- lib/lhs/pagination/total_pages.rb
 - lib/lhs/problems/base.rb
 - lib/lhs/problems/errors.rb
 - lib/lhs/problems/nested/base.rb
@@ -389,6 +380,7 @@ files:
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
+- spec/dummy/app/models/concerns/dummy_customer/some_concern.rb
 - spec/dummy/app/models/dummy_customer.rb
 - spec/dummy/app/models/dummy_record.rb
 - spec/dummy/app/models/dummy_record_with_auto_oauth_provider.rb
@@ -465,6 +457,7 @@ files:
 - spec/pagination/link/total_spec.rb
 - spec/pagination/offset/pages_left_spec.rb
 - spec/pagination/parameters_spec.rb
+- spec/pagination/total_pages_spec.rb
 - spec/proxy/create_sub_resource_spec.rb
 - spec/proxy/load_spec.rb
 - spec/proxy/record_identification_spec.rb
@@ -504,8 +497,10 @@ files:
 - spec/record/href_for_spec.rb
 - spec/record/ignore_errors_spec.rb
 - spec/record/immutable_chains_spec.rb
+- spec/record/includes_after_expansion_spec.rb
 - spec/record/includes_expanded_spec.rb
 - spec/record/includes_first_page_spec.rb
+- spec/record/includes_missing_spec.rb
 - spec/record/includes_spec.rb
 - spec/record/includes_warning_spec.rb
 - spec/record/item_key_spec.rb
@@ -554,7 +549,7 @@ homepage: https://github.com/local-ch/lhs
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -570,8 +565,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.1.4
+signing_key:
 specification_version: 4
 summary: 'REST services accelerator: Rails gem providing an easy, active-record-like
   interface for http (hypermedia) json services'
@@ -619,6 +614,7 @@ test_files:
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
+- spec/dummy/app/models/concerns/dummy_customer/some_concern.rb
 - spec/dummy/app/models/dummy_customer.rb
 - spec/dummy/app/models/dummy_record.rb
 - spec/dummy/app/models/dummy_record_with_auto_oauth_provider.rb
@@ -695,6 +691,7 @@ test_files:
 - spec/pagination/link/total_spec.rb
 - spec/pagination/offset/pages_left_spec.rb
 - spec/pagination/parameters_spec.rb
+- spec/pagination/total_pages_spec.rb
 - spec/proxy/create_sub_resource_spec.rb
 - spec/proxy/load_spec.rb
 - spec/proxy/record_identification_spec.rb
@@ -734,8 +731,10 @@ test_files:
 - spec/record/href_for_spec.rb
 - spec/record/ignore_errors_spec.rb
 - spec/record/immutable_chains_spec.rb
+- spec/record/includes_after_expansion_spec.rb
 - spec/record/includes_expanded_spec.rb
 - spec/record/includes_first_page_spec.rb
+- spec/record/includes_missing_spec.rb
 - spec/record/includes_spec.rb
 - spec/record/includes_warning_spec.rb
 - spec/record/item_key_spec.rb

data/Gemfile.activesupport4

@@ -1,5 +0,0 @@
-source 'https://rubygems.org/'
-
-gemspec
-gem 'activesupport', '~> 4.2.11'
-gem 'bundler', '~> 1.17.3'

data/cider-ci.yml

@@ -1,6 +0,0 @@
-jobs:
-  include:
-    - cider-ci/jobs/rspec-activesupport-4.yml
-    - cider-ci/jobs/rspec-activesupport-5.yml
-    - cider-ci/jobs/rspec-activesupport-latest.yml
-    - cider-ci/jobs/rubocop.yml

data/cider-ci/bin/bundle

@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-export PATH=~/.rubies/$RUBY/bin:$PATH
-rm -f .bundle/config
-
-if [ ! -f ~/.rubies/$RUBY/bin/bundle ]; then
-  gem install bundler
-fi
-
-# install bundler v. 1.17.3 in order to be able to run the tests with
-# ACTIVESUPPORT=4 because rails (= 4.2.0) depends on bundler (< 2.0, >= 1.3.0)
-gem install bundler:1.17.3
-
-sed "s/^source 'https:\/\/rubygems\.intra\.local\.ch'*/source 'http\:\/\/52.29.7.59:9292'/g" Gemfile > Gemfile.tmp
-mv Gemfile.tmp Gemfile
-
-DIGEST=$(git ls-tree HEAD --\
-  cider-ci.yml cider-ci Gemfile.lock \
-  | openssl dgst -sha1 | cut -d ' ' -f 2)
-
-if [ ! -z ${ACTIVESUPPORT:-} ]; then
-  DIGEST=$(echo "$DIGEST $ACTIVESUPPORT")
-fi
-
-DIGEST=$(echo "$DIGEST $PATH" \
- | openssl dgst -sha1 | cut -d ' ' -f 2)
-
-echo "DIGEST"
-echo "${DIGEST}"
-
-CACHE_SIGNATURE_FILE="/tmp/bundle_cache_signature_${DIGEST}"
-
-if [ ! -f  $CACHE_SIGNATURE_FILE ] ; then
-  if [ ! -z ${ACTIVESUPPORT:-} ]; then
-    if [ ! -z ${BUNDLER:-} ]; then
-      echo "BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle $BUNDLER install"
-      BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle $BUNDLER install
-    else
-      echo "BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle install"
-      BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle install
-    fi
-  else
-    echo "bundle install"
-    bundle $BUNDLER install
-  fi
-  touch $CACHE_SIGNATURE_FILE
-fi
-
-echo "bundle install"
-bundle $BUNDLER install

data/cider-ci/bin/ruby_install

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-export PATH=~/.rubies/$RUBY/bin:$PATH
-
-if [ ! -d ~/.rubies/$RUBY ]; then
-  ruby-install --no-install-deps $RUBY
-fi

data/cider-ci/bin/ruby_version

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-if [ -f ./.ruby-version ]; then
- echo ".ruby-version file found"
-fi
-
-if [ ! -f ./.ruby-version ]; then
-  echo ".ruby-version file not found" 
-  exit 1
-fi 
-
-IFS='-' read -ra EXPLODED_RUBY <<< "$RUBY"
-
-if [ "${#EXPLODED_RUBY[@]}" == "1" ]; then
-  echo 'No engine/version separator "-" found in .ruby-version file.'
-  exit 1
-fi
-
-if [ "${#EXPLODED_RUBY[@]}" != "1" ] && [ "${#EXPLODED_RUBY[@]}" != "2" ]; then
-  echo "Unknown format of .ruby-version file"
-  exit 1
-fi
-
-echo $RUBY

data/cider-ci/jobs/rspec-activesupport-4.yml

@@ -1,27 +0,0 @@
-rspec-active-support-v4:
-  name: 'rspec with ActiveSupport v4'
-
-  run_when:
-    'some HEAD has been updated':
-      type: branch
-      include_match: ^.*$
-
-  context:
-
-    script_defaults:
-      template_environment_variables: true
-
-    task_defaults:
-      environment_variables:
-        ACTIVESUPPORT: '4'
-        BUNDLER: '_1.17.3_'
-      max_trials: 2
-      dispatch_storm_delay_duration: 1 Seconds
-      include:
-        - cider-ci/task_components/ruby.yml
-        - cider-ci/task_components/bundle.yml
-        - cider-ci/task_components/rspec.yml
-
-    tasks:
-      all-rspec:
-        name: All rspec tests, using ActiveSupport v4

data/cider-ci/jobs/rspec-activesupport-5.yml

@@ -1,26 +0,0 @@
-rspec-active-support-v5:
-  name: 'rspec with ActiveSupport v5'
-
-  run_when:
-    'some HEAD has been updated':
-      type: branch
-      include_match: ^.*$
-
-  context:
-
-    script_defaults:
-      template_environment_variables: true
-
-    task_defaults:
-      environment_variables:
-        ACTIVESUPPORT: '5'
-      max_trials: 2
-      dispatch_storm_delay_duration: 1 Seconds
-      include:
-        - cider-ci/task_components/ruby.yml
-        - cider-ci/task_components/bundle.yml
-        - cider-ci/task_components/rspec.yml
-
-    tasks:
-      all-rspec:
-        name: All rspec tests, using ActiveSupport v5

data/cider-ci/jobs/rspec-activesupport-latest.yml

@@ -1,24 +0,0 @@
-rspec-active-support-latest:
-  name: 'rspec with ActiveSupport latest'
-
-  run_when:
-    'some HEAD has been updated':
-      type: branch
-      include_match: ^.*$
-
-  context:
-
-    script_defaults:
-      template_environment_variables: true
-
-    task_defaults:
-      max_trials: 2
-      dispatch_storm_delay_duration: 1 Seconds
-      include:
-        - cider-ci/task_components/ruby.yml
-        - cider-ci/task_components/bundle.yml
-        - cider-ci/task_components/rspec.yml
-
-    tasks:
-      all-rspec:
-        name: All rspec tests, using ActiveSupport latest

data/cider-ci/jobs/rubocop.yml

@@ -1,18 +0,0 @@
-rubocop:
-  name: 'Rubocop'
-
-  run_when:
-    'some HEAD has been updated':
-      type: branch
-      include_match: ^.*$
-
-  context:
-
-    tasks:
-
-      rubocop:
-        
-        include:        
-          - cider-ci/task_components/ruby.yml
-          - cider-ci/task_components/bundle.yml
-          - cider-ci/task_components/rubocop.yml

data/cider-ci/task_components/bundle.yml

@@ -1,22 +0,0 @@
-traits:
-  ruby-install: true
-  Bash: true
-
-trial_attachments:
-  gemfile:
-    include_match: Gemfile
-    content_type: text/plain
-
-environment_variables:
-  BUNDLER:
-    read_and_replace_with: .bundler-version
-
-scripts:
-
-  bundle:
-    exclusive_executor_resource: ruby-install_{{$RUBY}}
-    timeout: 20 Minutes
-    body: cider-ci/bin/bundle
-    start_when:
-      'ruby installed':
-        script_key: ruby-install

data/cider-ci/task_components/rspec.yml

@@ -1,37 +0,0 @@
-ports:
-  CAPYBARA_PORT:
-    min: 8000
-    max: 8999
-  PHANTOMJS_PORT:
-    min: 44600
-    max: 44999
-
-environment_variables:
-  RUBY:
-    read_and_replace_with: .ruby-version
-  BUNDLER:
-    read_and_replace_with: .bundler-version
-
-scripts:
-  rspec:
-    body: |
-      #!/usr/bin/env bash
-      set -eux
-      mkdir -p tmp/cache
-      export PATH=~/.rubies/$RUBY/bin:$PATH
-      if [ ! -z ${ACTIVESUPPORT:-} ]; then BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle $BUNDLER exec rspec; else bundle exec rspec; fi
-    
-    start_when:
-      'bundled':
-        script_key: bundle
-
-trial_attachments:
-  logs:
-    include_match: log\/.*\.log$
-    content_type: text/plain
-  image-screenshots:
-    include_match: tmp\/capybara\/.*\.png$
-    content_type: image/png
-  html-screenshots:
-    include_match: tmp\/capybara\/.*\.html$
-    content_type: text/html

data/cider-ci/task_components/rubocop.yml

@@ -1,29 +0,0 @@
-trial_attachments:
-  logs:
-    include_match: tmp\/checkstyle.json$
-    content_type: application/json
-
-tree_attachments:
-  logs:
-    include_match: tmp\/checkstyle.json$
-    content_type: application/json
-
-environment_variables:
-  RUBY:
-    read_and_replace_with: .ruby-version
-  RESULT_PATH: 'tmp/checkstyle.json'
-
-max_trials: 1
-
-scripts:
-  rubocop:
-    start_when:
-      'bundled':
-        script_key: bundle
-    body: |
-      #!/usr/bin/env bash
-      set -eux
-      mkdir -p tmp/cache
-      export PATH=~/.rubies/$RUBY/bin:$PATH
-      bundle exec rubocop --config .rubocop.yml \
-        --format json --out $RESULT_PATH --format progress

data/cider-ci/task_components/ruby.yml

@@ -1,15 +0,0 @@
-environment_variables:
-  RUBY:
-    read_and_replace_with: .ruby-version
-
-scripts:
-  ruby-version:
-    body: cider-ci/bin/ruby_version
-  ruby-install:
-    exclusive_executor_resource: ruby-install_{{$RUBY}}
-    timeout: 20 Minutes
-    body: cider-ci/bin/ruby_install
-    start_when:
-      'ruby version checked':
-        script_key: ruby-version
-