dbee-active_record 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ad362290b7ac95e9ad1c466868f81bad354df55b9772742c9bf6591f9f762d
-  data.tar.gz: 0ff078fc8e40af83f984729f3320856af95cf95b3562f97bc17b0b8787342a12
+  metadata.gz: 6b68d2e6c79fa4d3bb1ff26726983750cc112f60af4355eee8795cd748d9be9c
+  data.tar.gz: 5e0a15f3f85f465d7bc6fc79a9c74c6847e72be6a5a4ac25ec626f54bec985c4
 SHA512:
-  metadata.gz: 93b68e1d07bfe82c469d1169d7e94fa2dece7a7f32fc01adcf895356bdfa285d7d1352b1a37e3bd7b50e1023551160988b4dc7a49c97d904b1b4c37d77d1e676
-  data.tar.gz: 44aa0eda58e8d5f50f9d99d1b44a81ade7781ba9cad9cf35b47e6b3dcab2f2699c69898e774b33c3a00c535b4927481b3bb62411856f607ff78b24e34dd320a5
+  metadata.gz: 23bb62872a7c2412f0e8745b392b93fbd0c5bc1c7cfaefdc6503f9add73566b774378a69efe82eea53ee9f20c461585d163b96cc715541133b825f4906f87b89
+  data.tar.gz: cff34e878e7abb09865d88893af53e4d578077742ed4768fcee6c612c546e44a5a4f340ea2f9f6051a60ce2a62d484fce411c15487a69da00ad04fa5cf8a512e

data/.circleci/config.yml

@@ -0,0 +1,84 @@
+version: 2.1
+
+orbs:
+  status_to_ms_teams: bluemarblepayroll/status_to_ms_teams_pure_bash@1.0.0
+
+jobs:
+  build:
+    parameters:
+      use-bundler-cache:
+        type: boolean
+        default: true
+
+    docker:
+      - image: circleci/ruby:2.6.6-buster
+        environment:
+          FORBID_FOCUSED_SPECS: 1
+          AR_VERSION: 5
+      - image: mysql@sha256:f3515b6a6502d872d5a37db78e4d225c0fcbf8da65d1faf8ce4609c92e2cbaf0
+        environment:
+          MYSQL_DATABASE: dbee_test
+          MYSQL_ALLOW_EMPTY_PASSWORD: 1
+          MYSQL_USER: root
+        command:
+          mysqld --sql_mode=TRADITIONAL,NO_AUTO_VALUE_ON_ZERO
+    working_directory: ~/dbee-active_record
+    steps:
+      - checkout
+      - run: sudo apt-get --allow-releaseinfo-change update
+      - run: sudo apt-get update && sudo apt-get install -y git curl libmcrypt-dev default-mysql-client
+      - run: dockerize -wait tcp://localhost:3306 -timeout 1m
+      - run: cp spec/config/database.yaml.ci spec/config/database.yaml
+      - run: mysql -h 127.0.0.1 -u root -e 'CREATE DATABASE IF NOT EXISTS dbee_test;'
+
+      # TODO: wrap bundler caching logic into an Orb:
+      - when:
+          condition: << parameters.use-bundler-cache >>
+          steps:
+            - restore_cache:
+                key: v1.0.0-build-ruby-dependency-cache-{{ checksum "dbee-active_record.gemspec" }}-{{ checksum "Gemfile" }}-{{ checksum ".ruby-version" }}
+
+      - run: bundle install --path vendor/bundle
+
+      - when:
+          condition: << parameters.use-bundler-cache >>
+          steps:
+            - save_cache:
+                key: v1.0.0-build-ruby-dependency-cache-{{ checksum "dbee-active_record.gemspec" }}-{{ checksum "Gemfile" }}-{{ checksum ".ruby-version" }}
+                paths:
+                  - vendor/bundle
+
+      - store_artifacts:
+          path: Gemfile.lock
+
+      - run: bundle exec rubocop
+
+      - run: COVERAGE=true bundle exec rspec -r rspec_junit_formatter --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
+
+      - store_test_results:
+          path: test-results
+
+      - store_artifacts:
+          path: coverage
+
+      - status_to_ms_teams/report:
+          webhook_url: $MS_TEAMS_WEBHOOK_URL
+
+workflows:
+  version: 2.1
+  build:
+    jobs:
+      - build:
+          context: org-global
+  monthly-gem-dependency-refresh-check:
+    triggers:
+      - schedule:
+          cron: '0 0 1 * *'
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - build:
+          context: org-global
+          use-bundler-cache: false

data/.rubocop.yml

@@ -6,7 +6,7 @@ Layout/LineLength:
   Max: 100
 
 Metrics/AbcSize:
-  Max: 17
+  Max: 20
   Exclude:
     - spec/db_helper.rb
 
@@ -23,7 +23,7 @@ Metrics/BlockLength:
     - dbee-active_record.gemspec
 
 Metrics/ClassLength:
-  Max: 140
+  Max: 150
 
 Metrics/MethodLength:
   Max: 25

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.3.0 (October 4th, 2021)
+
+### Additions:
+
+* Support for Dbee::Query#offset.
 # 2.2.0 (March 11th, 2021)
 
 ### Additions:

data/README.md

@@ -1,10 +1,10 @@
 # Dbee Active Record Provider
 
-[![Gem Version](https://badge.fury.io/rb/dbee-active_record.svg)](https://badge.fury.io/rb/dbee-active_record) [![Build Status](https://travis-ci.org/bluemarblepayroll/dbee-active_record.svg?branch=master)](https://travis-ci.org/bluemarblepayroll/dbee-active_record) [![Maintainability](https://api.codeclimate.com/v1/badges/7f74a4e546bebb603cce/maintainability)](https://codeclimate.com/github/bluemarblepayroll/dbee-active_record/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/7f74a4e546bebb603cce/test_coverage)](https://codeclimate.com/github/bluemarblepayroll/dbee-active_record/test_coverage) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![CircleCI](https://circleci.com/bb/bluemarble-ondemand/dbee-active_record/tree/master.svg?style=svg&circle-token=088be69cf3978bc526add53690e4919eb2fcce5c)](https://circleci.com/bb/bluemarble-ondemand/dbee-active_record/tree/master)
 
 Dbee does not ship with a SQL generator by default.  This library plugs into Dbee to provide SQL generation via ActiveRecord.  Technically speaking: this library does not use ActiveRecord for anything except connection information.  All actual SQL generation is performed using Arel.  There is no actual coupling of your domain ActiveRecord subclasses to Dbee.
 
-This library is a plugin for [Dbee](https://github.com/bluemarblepayroll/dbee).  The Dbee repositories README file contains information about how to use the Data Model and Query API's.
+This library is a plugin for Dbee.  The Dbee repositories README file contains information about how to use the Data Model and Query API's.
 
 ## Installation
 
@@ -76,7 +76,7 @@ Note: ensure you have proper authorization before trying to publish new versions
 After code changes have successfully gone through the Pull Request review process then the following steps should be followed for publishing new versions:
 
 1. Merge Pull Request into master
-2. Update `lib/dbee-active_record/version.rb` using [semantic versioning](https://semver.org/)
+2. Update `version.rb` using [semantic versioning](https://semver.org/)
 3. Install dependencies: `bundle`
 4. Update `CHANGELOG.md` with release notes
 5. Commit & push master to remote and ensure CI builds master successfully

data/dbee-active_record.gemspec

@@ -17,15 +17,7 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.bindir      = 'exe'
   s.executables = []
-  s.homepage    = 'https://github.com/bluemarblepayroll/dbee-active_record'
   s.license     = 'MIT'
-  s.metadata    = {
-    'bug_tracker_uri' => 'https://github.com/bluemarblepayroll/dbee-active_record/issues',
-    'changelog_uri' => 'https://github.com/bluemarblepayroll/dbee-active_record/blob/master/CHANGELOG.md',
-    'documentation_uri' => 'https://www.rubydoc.info/gems/dbee-active_record',
-    'homepage_uri' => s.homepage,
-    'source_code_uri' => s.homepage
-  }
 
   s.required_ruby_version = '>= 2.5'
 
@@ -42,7 +34,7 @@ Gem::Specification.new do |s|
     end
 
   s.add_dependency('activerecord', activerecord_version)
-  s.add_dependency('dbee', '~>3')
+  s.add_dependency('dbee', '~>3', '>=3.1.0')
 
   s.add_development_dependency('guard-rspec', '~>4.7')
   s.add_development_dependency('mysql2', '~>0.5')
@@ -50,6 +42,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('pry-byebug')
   s.add_development_dependency('rake', '~> 13')
   s.add_development_dependency('rspec', '~> 3.8')
+  s.add_development_dependency('rspec_junit_formatter')
   s.add_development_dependency('rubocop', '~> 1')
   s.add_development_dependency('rubocop-rake')
   s.add_development_dependency('rubocop-rspec')

data/lib/dbee/providers/active_record_provider/expression_builder.rb

@@ -62,6 +62,7 @@ module Dbee
 
           add_partitioners(base_table, from_model.partitioners)
           add_limit(query.limit)
+          add_offset(query.offset)
 
           statement.group(group_by_columns) if requires_group_by && !group_by_columns.empty?
         end
@@ -140,6 +141,14 @@ module Dbee
           self
         end
 
+        def add_offset(offset)
+          offset = offset ? offset.to_i : nil
+
+          build(statement.skip(offset))
+
+          self
+        end
+
         def add_partitioners(table, partitioners)
           partitioners.each do |partitioner|
             arel_column = table[partitioner.name]

data/lib/dbee/providers/active_record_provider/version.rb

@@ -10,7 +10,7 @@
 module Dbee
   module Providers
     class ActiveRecordProvider
-      VERSION = '2.2.0'
+      VERSION = '2.3.0'
     end
   end
 end

data/spec/fixtures/active_record_snapshots/two_table_query.yaml

@@ -7,6 +7,7 @@ query:
     - key_path: members.id
     - key_path: members.account_number
   limit: 12
+  offset: 25
 sqlite_readable: |+
   SELECT
    "theaters"."id" AS 'id',
@@ -16,6 +17,7 @@ sqlite_readable: |+
   FROM "theaters" "theaters"
   LEFT OUTER JOIN "members" "members" ON "members"."tid" = "theaters"."id" AND "members"."partition" = "theaters"."partition"
   LIMIT 12
+  OFFSET 25
 sqlite_not_readable: |+
   SELECT
    "t0"."id" AS 'c0',
@@ -25,6 +27,7 @@ sqlite_not_readable: |+
   FROM "theaters" "t0"
   LEFT OUTER JOIN "members" "t1" ON "t1"."tid" = "t0"."id" AND "t1"."partition" = "t0"."partition"
   LIMIT 12
+  OFFSET 25
 mysql_readable: |+
   SELECT
    `theaters`.`id` AS 'id',
@@ -34,6 +37,7 @@ mysql_readable: |+
   FROM `theaters` `theaters`
   LEFT OUTER JOIN `members` `members` ON `members`.`tid` = `theaters`.`id` AND `members`.`partition` = `theaters`.`partition`
   LIMIT 12
+  OFFSET 25
 mysql_not_readable: |+
   SELECT
    `t0`.`id` AS 'c0',
@@ -43,3 +47,4 @@ mysql_not_readable: |+
   FROM `theaters` `t0`
   LEFT OUTER JOIN `members` `t1` ON `t1`.`tid` = `t0`.`id` AND `t1`.`partition` = `t0`.`partition`
   LIMIT 12
+  OFFSET 25

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbee-active_record
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Matthew Ruggio
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,6 +48,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +135,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -236,11 +256,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".editorconfig"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
+- ".tool-versions"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -283,15 +304,10 @@ files:
 - spec/fixtures/active_record_snapshots/two_table_query_with_pivoting.yaml
 - spec/fixtures/models.yaml
 - spec/spec_helper.rb
-homepage: https://github.com/bluemarblepayroll/dbee-active_record
+homepage:
 licenses:
 - MIT
-metadata:
-  bug_tracker_uri: https://github.com/bluemarblepayroll/dbee-active_record/issues
-  changelog_uri: https://github.com/bluemarblepayroll/dbee-active_record/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/dbee-active_record
-  homepage_uri: https://github.com/bluemarblepayroll/dbee-active_record
-  source_code_uri: https://github.com/bluemarblepayroll/dbee-active_record
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:

data/.travis.yml

@@ -1,32 +0,0 @@
-env:
-  global:
-    - CC_TEST_REPORTER_ID=036a8fd92cf0c323c9704c041015837d14889e47de936bab18287626ff3372c1
-    - DISABLE_RSPEC_FOCUS=true
-language: ruby
-services:
-  - mysql
-rvm:
-  # Build on the latest stable of all supported Rubies (https://www.ruby-lang.org/en/downloads/):
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-env:
-  - AR_VERSION=5
-  - AR_VERSION=6
-cache: bundler
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-  - cp spec/config/database.yaml.ci spec/config/database.yaml
-  - mysql -e 'CREATE DATABASE IF NOT EXISTS dbee_test;'
-script:
-  - bundle exec rubocop
-  - bundle exec rspec spec --format documentation
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-addons:
-  # https://docs.travis-ci.com/user/uploading-artifacts/
-  artifacts:
-    paths:
-      - Gemfile.lock