active_record_data_loader 1.0.2 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a76332e648af9f10d665eaab3fb442b18d708914
-  data.tar.gz: 012eb43c82d6bca82f97ece0d719faa07ea79c6c
+SHA256:
+  metadata.gz: ae90d445d9e578a618a7ff3858edcb00719055716647c6fec0374db385b0b935
+  data.tar.gz: cc51ca7b8093c2b43d5c8610130db5cbbd12811520a57f8cc0b4fe3e114a1eaa
 SHA512:
-  metadata.gz: 2f41b6aedb4c4cd4f02319cd3d13c50715a0e91bbfd0710e04caa2145054d26b20a4e7a2f69b295b28650a0ad8e111f322fbf008bda28f0db7fa6fa25428de24
-  data.tar.gz: 18d9fb81d1e5d273aab3d21bc2d12f5e28624636f6286deeaf0ccadfdbf20afe629583c96dde78ee32acaaa0b931a363fe32c2c8a77435eca32540875a8d3ee7
+  metadata.gz: be8f649f5b1240b081b20ce713c2da69596d278db2cf19009916dcaeac3e73493745114c6ec662b90b0ff18ad068f0c881fb345ff68cb15c54497cf97a5ec325
+  data.tar.gz: 490223f97f751eedcaad7de58846a01a5ff08a38762f30a9040b6dd65b05b2c2e5ac9fc71683f52ac8986a5c7c7748258904f6b380370813380a7e136581b4df

data/.github/workflows/build.yml

@@ -0,0 +1,51 @@
+name: Build
+
+on: [push, workflow_dispatch]
+
+jobs:
+  build:
+    name: Build + Test
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:11
+        ports:
+          - "2345:5432"
+        env:
+          POSTGRES_USER: test
+          POSTGRES_PASSWORD: test
+      mysql:
+        image: mysql:5
+        ports:
+          - "3306:3306"
+        env:
+          MYSQL_ROOT_PASSWORD: test
+          MYSQL_USER: test
+          MYSQL_PASSWORD: test
+          MYSQL_DATABASE: test
+    strategy:
+      matrix:
+        ruby: [2.5.9, 2.6.7, 2.7.3]
+        gemfile: [activerecord_5, rails, faker, ffaker]
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Wait for DBs to be ready
+        run: bundle exec rake wait_for_test_db
+
+      - name: Run tests
+        run: bundle exec rake
+
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.github_token }}

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '26 13 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

data/.github/workflows/gem-push.yml

@@ -0,0 +1,29 @@
+name: Ruby Gem
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{ secrets.RUBYGEMS_API_KEY }}"

data/.rubocop.yml

@@ -1,5 +1,23 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
+  NewCops: enable
+  SuggestExtensions: false
+
+Gemspec/RequireMFA:
+  Enabled: false
+
+Layout/LineLength:
+  Max: 110
+  Exclude: ["*.gemspec"]
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
 
 Lint/UnusedMethodArgument:
   AllowUnusedKeywordArguments: true
@@ -11,20 +29,41 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Exclude: ["spec/**/*", "*.gemspec"]
 
-Metrics/LineLength:
-  Max: 110
-  Exclude: ["*.gemspec"]
+Metrics/ClassLength:
+  Max: 150
+  Exclude: ["spec/**/*", "*.gemspec"]
 
 Metrics/MethodLength:
-  Max: 15
+  Max: 25
   Exclude: ["spec/**/*"]
 
-Style/FrozenStringLiteralComment:
-  Exclude: ["gemfiles/*"]
+Metrics/ParameterLists:
+  Max: 5
+  Exclude:
+    - "lib/active_record_data_loader/configuration.rb"
+    - "lib/active_record_data_loader/active_record/model_data_generator.rb"
+
+Style/CaseLikeIf:
+  Enabled: false
 
 Style/Documentation:
   Enabled: false
 
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Exclude: ["gemfiles/*"]
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 

data/CHANGELOG.md

@@ -1,10 +1,41 @@
 # Change log
 
+## [v1.3.1] - 2021-12-10
+
+[Diff](https://github.com/abeiderman/active_record_data_loader/compare/v1.3.0...v1.3.1)
+
+### Changes:
+* Fix bug with cycling through foreign key IDs when multiple foreign keys are in a unique index/constraint. It was cycling all foreign keys in the same order which meant that if a duplicate row was generated then it will continue to be generated. By shuffling the list of foreign key IDs after each cycle, it gives it a chance at coming up with unique values during retries.
+
+## [v1.3.0] - 2021-12-10
+
+[Diff](https://github.com/abeiderman/active_record_data_loader/compare/v1.2.0...v1.3.0)
+
+### Changes:
+* Replace the `:file` output option with simply accepting an optional file path as `output`. A SQL script file will be generated in addition to loading the data into the database.
+* Identify and handle unique indexes by attempting to generate unique values. Add configuration options for behavior around duplicate rows.
+
+## [v1.2.0] - 2021-11-14
+
+[Diff](https://github.com/abeiderman/active_record_data_loader/compare/v1.1.0...v1.2.0)
+
+### Changes:
+* Add `:file` output option for generating a SQL script instead of loading the data into the database.
+* Fix some connection handling issues when a custom connection factory is provided.
+
+## [v1.1.0] - 2021-05-01
+
+[Diff](https://github.com/abeiderman/active_record_data_loader/compare/v1.0.2...v1.1.0)
+
+### Changes:
+* Bump ruby version requirement to >= 2.5
+* Bump activerecord requirement to >= 5.0
+
 ## [v1.0.2] - 2019-07-05
 
 [Diff](https://github.com/abeiderman/active_record_data_loader/compare/v1.0.1...v1.0.2)
 
-### Enhancements:
+### Changes:
 * Add support for MySQL enums
 * Accept a connection factory lambda as part of the configuration
 
@@ -12,7 +43,7 @@
 
 [Diff](https://github.com/abeiderman/active_record_data_loader/compare/v1.0.0...v1.0.1)
 
-### Enhancements:
+### Changes:
 * Generate values for datetime column types. This also fixes the fact that `created_at` and `updated_at` were not being populated by default.
 
 ## [v1.0.0] - 2019-06-15
@@ -21,3 +52,8 @@ Initial stable release
 
 [v1.0.0]: https://github.com/abeiderman/active_record_data_loader/releases/tag/v1.0.0
 [v1.0.1]: https://github.com/abeiderman/active_record_data_loader/releases/tag/v1.0.1
+[v1.0.2]: https://github.com/abeiderman/active_record_data_loader/releases/tag/v1.0.2
+[v1.1.0]: https://github.com/abeiderman/active_record_data_loader/releases/tag/v1.1.0
+[v1.2.0]: https://github.com/abeiderman/active_record_data_loader/releases/tag/v1.2.0
+[v1.3.0]: https://github.com/abeiderman/active_record_data_loader/releases/tag/v1.3.0
+[v1.3.1]: https://github.com/abeiderman/active_record_data_loader/releases/tag/v1.3.1

data/CODE_OF_CONDUCT.md

@@ -55,8 +55,8 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at abeiderman@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
+reported by contacting the project team at active_record_data_loader@ossprojects.dev.
+All complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.
 Further details of specific enforcement policies may be posted separately.

data/Gemfile.lock

@@ -1,111 +1,109 @@
 PATH
   remote: .
   specs:
-    active_record_data_loader (1.0.2)
-      activerecord (>= 4.0)
+    active_record_data_loader (1.3.1)
+      activerecord (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activesupport (5.2.3)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.2.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (9.0.0)
-    ast (2.4.0)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    coveralls (0.8.23)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (>= 0.19.4, < 2.0)
-      tins (~> 1.6)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    i18n (1.6.0)
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    json (2.2.0)
-    method_source (0.9.2)
-    minitest (5.11.3)
-    mysql2 (0.5.2)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    pg (1.1.4)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    mysql2 (0.5.3)
+    parallel (1.21.0)
+    parser (3.0.3.2)
+      ast (~> 2.4.1)
+    pg (1.2.3)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-collection_matchers (1.1.3)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.68.1)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.23.0)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    ruby-progressbar (1.10.0)
-    simplecov (0.16.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.14.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sqlite3 (1.4.1)
-    term-ansicolor (1.7.1)
-      tins (~> 1.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tins (1.20.3)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.5.0)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov-lcov (0.8.0)
+    simplecov_json_formatter (0.1.3)
+    sqlite3 (1.4.2)
+    thor (1.1.0)
+    timecop (0.9.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
   active_record_data_loader!
   appraisal
   bundler (>= 1.16)
-  coveralls
   mysql2
   pg
   pry
-  rake (~> 12.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rspec-collection_matchers
   rubocop
+  simplecov
+  simplecov-lcov
   sqlite3
   timecop
 
 BUNDLED WITH
-   2.0.1
+   2.2.31