deep_preloader 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2905039099c3093587202144bffb2241e17c0f524a7e5b391f94f6526e08b1b3
-  data.tar.gz: 03d23e36bbed2e1f6070d7afde2ee27764c8317e4ea28d4e4f5ef624c789d4b4
+  metadata.gz: 7d624c81fa1de1077266d5b3da945c551e3a3d0756e1c5f1b55f67e868dde0df
+  data.tar.gz: 83d4214703de49d03770af58abf27f1e6963cac88594534dcbba1d6e47d4746a
 SHA512:
-  metadata.gz: 6cab0b0b8ac3c49d1610cd1915198fd784bdb29023d4d88f3401b75d35fe673efaa1c4578ca9e4ed74dab3bc234b78ba0c193e446f894c17ba1ec42fd3e44847
-  data.tar.gz: 8793d51feefa4dea2e3c8ab3f31d5756776b5b44a8edfc856c1d961f9ac46463ff8037cda4c7aec4742f6a3f56ae85c5f0c17ff8410c79b92a74b6fb012a4334
+  metadata.gz: f21d5b3c98a221ab90504d771a6e353deabe042a656679e11f8eb64699561eb433ba8da10700f4eec2131dd53a46c2875e5af7cece4c4e6e30e264e20c9f6a52
+  data.tar.gz: 4aefe1fb5e9eba21037730a2ccbab9de657b5bcc14c937687fb58f66729cb0c7ab411323d1b1ed0094811939d0fcd22f73250d340db7e8c1bc96e858a7fa6167

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

@@ -0,0 +1,31 @@
+name: Publish Ruby Gem
+
+on:
+  push:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+
+    - 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_AUTH_TOKEN}}"

data/.github/workflows/test.yml

@@ -0,0 +1,50 @@
+name: Run Tests
+
+on:
+  pull_request:
+    branches: "**"
+
+permissions:
+  contents: read
+  checks: write
+  pull-requests: write
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['2.7', '3.1', '3.2']
+        include:
+          - ruby-version: '2.7'
+            bundle-gemfile: gemfiles/activerecord_5_2.gemfile
+          - ruby-version: '3.1'
+            bundle-gemfile: gemfiles/activerecord_6_1.gemfile
+          - ruby-version: '3.2'
+            bundle-gemfile: gemfiles/activerecord_7_0.gemfile
+    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.bundle-gemfile }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec --profile 10 --format RspecJunitFormatter --out test_results/rspec.xml --format progress
+    - name: Upload result
+      uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        name: rspec_${{ matrix.ruby-version }}.xml
+        path: test_results/rspec.xml
+    - name: Test Report
+      uses: dorny/test-reporter@v1
+      if: always()
+      with:
+        name: Rspec Tests - ${{ matrix.ruby-version }}
+        path: test_results/rspec.xml
+        reporter: java-junit

data/gemfiles/activerecord_7_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rspec_junit_formatter"
+gem "activerecord", "~> 7.0.0"
+
+gemspec path: "../"

data/lib/deep_preloader/polymorphic_spec.rb

@@ -15,7 +15,7 @@ class DeepPreloader::PolymorphicSpec < DeepPreloader::AbstractSpec
   end
 
   def initialize(specs_by_type = {})
-    @specs_by_type = specs_by_type
+    @specs_by_type = specs_by_type.transform_keys(&:to_s)
   end
 
   def polymorphic?
@@ -35,7 +35,7 @@ class DeepPreloader::PolymorphicSpec < DeepPreloader::AbstractSpec
         if specs_by_type[k]
           specs_by_type[k].merge!(v)
         else
-          specs_by_type[k] = v
+          specs_by_type[k] = v.deep_dup
         end
       end
     else
@@ -54,6 +54,10 @@ class DeepPreloader::PolymorphicSpec < DeepPreloader::AbstractSpec
 
   alias eql? ==
 
+  def deep_dup
+    self.class.new(specs_by_type.deep_dup)
+  end
+
   def inspect
     "PolySpec#{specs_by_type.inspect}"
   end

data/lib/deep_preloader/spec.rb

@@ -11,11 +11,11 @@ class DeepPreloader::Spec < DeepPreloader::AbstractSpec
       end
     when Hash
       assoc_specs = data.each_with_object({}) do |(k, v), h|
-        h[k.to_sym] = parse(v)
+        h[k.to_s] = parse(v)
       end
       self.new(assoc_specs)
     when String, Symbol
-      self.new({ data.to_sym => nil })
+      self.new({ data.to_s => nil })
     when DeepPreloader::AbstractSpec
       data
     when nil
@@ -26,7 +26,7 @@ class DeepPreloader::Spec < DeepPreloader::AbstractSpec
   end
 
   def initialize(association_specs = {})
-    @association_specs = association_specs
+    @association_specs = association_specs.transform_keys(&:to_s)
   end
 
   def merge!(other)
@@ -38,7 +38,7 @@ class DeepPreloader::Spec < DeepPreloader::AbstractSpec
         if association_specs[k]
           association_specs[k].merge!(v)
         else
-          association_specs[k] = v
+          association_specs[k] = v.deep_dup
         end
       end
     else
@@ -57,6 +57,10 @@ class DeepPreloader::Spec < DeepPreloader::AbstractSpec
 
   alias eql? ==
 
+  def deep_dup
+    self.class.new(association_specs.deep_dup)
+  end
+
   def inspect
     "Spec#{association_specs.inspect}"
   end

data/lib/deep_preloader/version.rb

@@ -1,3 +1,3 @@
 class DeepPreloader
-  VERSION = '1.0.2'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_preloader
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -171,7 +171,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/gem-push.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -185,6 +186,7 @@ files:
 - deep_preloader.gemspec
 - gemfiles/activerecord_5_2.gemfile
 - gemfiles/activerecord_6_1.gemfile
+- gemfiles/activerecord_7_0.gemfile
 - lib/deep_preloader.rb
 - lib/deep_preloader/abstract_spec.rb
 - lib/deep_preloader/polymorphic_spec.rb
@@ -211,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Explicit preloader for ActiveRecord

data/.circleci/config.yml

@@ -1,103 +0,0 @@
-version: 2.1
-
-executors:
-  ruby:
-    parameters:
-      ruby-version:
-        type: string
-        default: "2.6"
-      gemfile:
-        type: string
-        default: "Gemfile"
-    docker:
-      - image: circleci/ruby:<< parameters.ruby-version >>
-        environment:
-          BUNDLE_JOBS: 3
-          BUNDLE_RETRY: 3
-          BUNDLE_PATH: vendor/bundle
-          RAILS_ENV: test
-          BUNDLE_GEMFILE: << parameters.gemfile >>
-
-jobs:
-  test:
-    parameters:
-      ruby-version:
-        type: string
-      gemfile:
-        type: string
-    executor:
-      name: ruby
-      ruby-version: << parameters.ruby-version >>
-      gemfile: << parameters.gemfile >>
-    parallelism: 1
-    steps:
-      - checkout
-
-      - run:
-          # Remove the non-appraisal gemfile for safety: we never want to use it.
-          name: Prepare bundler
-          command: bundle -v
-
-      - run:
-          name: Compute a gemfile lock
-          command: bundle lock && cp "${BUNDLE_GEMFILE}.lock" /tmp/gem-lock
-
-      - restore_cache:
-          keys:
-            - deep_preloader-<< parameters.ruby-version >>-{{ checksum "/tmp/gem-lock" }}
-            - deep_preloader-
-
-      - run:
-          name: Bundle Install
-          command: bundle check || bundle install
-
-      - save_cache:
-          key: deep_preloader-<< parameters.ruby-version >>-{{ checksum "/tmp/gem-lock" }}
-          paths:
-            - vendor/bundle
-
-      - run:
-          name: Run rspec
-          command: bundle exec rspec --profile 10 --format RspecJunitFormatter --out test_results/rspec.xml --format progress
-
-      - store_test_results:
-          path: test_results
-
-  publish:
-    executor: ruby
-    steps:
-       - checkout
-       - run:
-           name: Setup Rubygems
-           command: |
-             mkdir ~/.gem &&
-             echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials &&
-             chmod 0600 ~/.gem/credentials
-       - run:
-           name: Publish to Rubygems
-           command: |
-             gem build deep_preloader.gemspec
-             gem push deep_preloader-*.gem
-
-workflows:
-  version: 2.1
-  build:
-    jobs:
-      - test:
-          name: 'ruby 2.6 ActiveRecord 5.2'
-          ruby-version: "2.6"
-          gemfile: gemfiles/activerecord_5_2.gemfile
-      - test:
-          name: 'ruby 2.7 ActiveRecord 5.2'
-          ruby-version: "2.7"
-          gemfile: gemfiles/activerecord_5_2.gemfile
-      - test:
-          name: 'ruby 3.0 ActiveRecord 6.1'
-          ruby-version: "3.0"
-          gemfile: gemfiles/activerecord_6_1.gemfile
-      - publish:
-          filters:
-            branches:
-              only: master
-            tags:
-              ignore: /.*/