iknow_view_models 2.9.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53525088a6e3b8f394861ea5326ee235d94eb69a7b49b346ca09f26894e62f38
-  data.tar.gz: e394ad428ee6131d5dcdf7107ca5fea22d23eb41ab6bc6c5ba96626343180f89
+  metadata.gz: a9b87bb5a0377e13f42a5468d35a918f7555cad606a85a8ec20217862c9e3382
+  data.tar.gz: 84b0c4a23ed0749dc27a029cc93958f2571e047ce327214c174386e26ce921a3
 SHA512:
-  metadata.gz: 342baae02e08f68f1f4b624c153bb9fd00144f21aef38c5623144899a4554730fd98651411e26528e05f40b16fa51136235ae1831ebc25bb4860904de465aef8
-  data.tar.gz: af565e5b9374ce950178437a16def8cda1b50639d2e98e5c367be5af0cacaff85ddcb7f0fc57a1a4309466e3f682760ae8a213f0ac9ed740eeed4bd9b975736e
+  metadata.gz: 0d2b3aafd5900d7cccd209c7526a39ad6099d670e4a15586e9b64b28a0211d153bef4dadca7d3ab4ed2a7203167e0022565e28bb8337669175c2d0d2257a6593
+  data.tar.gz: b8e28fca052e4664244704d876d94242d1ca4c2b40d696095011a5d795921d31dd5a588133e22ee813540e56a9cacfc77158b50b6df70288e1e59e6a3fa87fc3

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

@@ -0,0 +1,31 @@
+name: Publish Ruby Gem
+
+on:
+  push:
+    branches: [ "v2.x" ]
+
+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,65 @@
+name: Run Tests
+
+on:
+  pull_request:
+    branches: "**"
+
+permissions:
+  contents: read
+  checks: write
+  pull-requests: write
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:13-alpine
+        ports:
+          - "5432:5432"
+        env:
+          POSTGRES_DB: iknow_view_models
+          POSTGRES_USER: rails
+          POSTGRES_PASSWORD: password
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+        include:
+          - ruby-version: '2.7'
+            bundle-gemfile: gemfiles/rails_5_2.gemfile
+          - ruby-version: '3.0'
+            bundle-gemfile: gemfiles/rails_6_0.gemfile
+          - ruby-version: '3.1'
+            bundle-gemfile: gemfiles/rails_6_1.gemfile
+          - ruby-version: '3.2'
+            bundle-gemfile: gemfiles/rails_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 }}
+      DATABASE_URL: "postgres://rails:password@localhost:5432/iknow_view_models"
+
+    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 rake test
+    - name: Upload result
+      uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        path: test/reports/
+        name: test_results_${{ matrix.ruby-version }}
+    - name: Test Report
+      uses: dorny/test-reporter@v1
+      if: always()
+      with:
+        name: Minitest Tests - ${{ matrix.ruby-version }}
+        path: test/reports/*.xml
+        reporter: java-junit

data/Appraisals

@@ -1,9 +1,19 @@
-appraise "rails-5-2" do
-  gem "activerecord", "~> 5.2.0"
-  gem "activesupport", "~> 5.2.0"
+appraise 'rails-5-2' do
+  gem 'activerecord', '~> 5.2.0'
+  gem 'activesupport', '~> 5.2.0'
 end
 
-appraise "rails-6-0-beta" do
-  gem "activerecord", "~> 6.0.0.beta"
-  gem "activesupport", "~> 6.0.0.beta"
+appraise 'rails-6-0' do
+  gem 'activerecord', '~> 6.0.0'
+  gem 'activesupport', '~> 6.0.0'
+end
+
+appraise 'rails-6-1' do
+  gem 'activerecord', '~> 6.1.0'
+  gem 'activesupport', '~> 6.1.0'
+end
+
+appraise 'rails-7-0' do
+  gem 'activerecord', '~> 7.0.0'
+  gem 'activesupport', '~> 7.0.0'
 end

data/gemfiles/{rails_6_0_beta.gemfile → rails_6_0.gemfile}

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "minitest-ci"
-gem "activerecord", "~> 6.0.0.beta"
-gem "activesupport", "~> 6.0.0.beta"
+gem "activerecord", "~> 6.0.0"
+gem "activesupport", "~> 6.0.0"
 
 gemspec path: "../"

data/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "minitest-ci"
+gem "activerecord", "~> 6.1.0"
+gem "activesupport", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_7_0.gemfile

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

data/iknow_view_models.gemspec

@@ -20,13 +20,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.7.3'
+
   spec.add_dependency "activerecord", ">= 5.0"
   spec.add_dependency "activesupport", ">= 5.0"
 
   spec.add_dependency "acts_as_manual_list"
   spec.add_dependency "deep_preloader"
   spec.add_dependency "iknow_cache"
-  spec.add_dependency "iknow_params", "~> 2.2.0"
+  spec.add_dependency "iknow_params", ">= 2.2.0", "< 2.4"
   spec.add_dependency "safe_values"
   spec.add_dependency "keyword_builder"
 
@@ -42,7 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "method_source"
   spec.add_development_dependency "minitest-hooks"
-  spec.add_development_dependency "pg", '~> 0.18' # As of 5.1.4, Rails runtime check excludes pg 1.x, see #31669
+  spec.add_development_dependency "pg"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-expectations"

data/lib/iknow_view_models/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IknowViewModels
-  VERSION = '2.9.0'
+  VERSION = '2.10.1'
 end

data/lib/view_model/callbacks.rb

@@ -11,9 +11,9 @@ module ViewModel::Callbacks
   # callbacks instance with additional instance method access to the view,
   # context and extra context-dependent parameters.
   module CallbackEnvContext
-    def method_missing(method, *args, &block)
+    def method_missing(method, ...)
       if _callbacks.respond_to?(method, true)
-        _callbacks.send(method, *args, &block)
+        _callbacks.send(method, ...)
       else
         super
       end

data/lib/view_model/test_helpers/arvm_builder.rb

@@ -62,8 +62,10 @@ class ViewModel::TestHelpers::ARVMBuilder
     ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS #{name.underscore.pluralize} CASCADE")
     namespace.send(:remove_const, name)
     namespace.send(:remove_const, viewmodel_name) if viewmodel
-    # prevent cached old class from being used to resolve associations
-    ActiveSupport::Dependencies::Reference.clear!
+    if ActiveSupport::VERSION::MAJOR < 7
+      # prevent cached old class from being used to resolve associations
+      ActiveSupport::Dependencies::Reference.clear!
+    end
   end
 
   private

data/lib/view_model/traversal_context.rb

@@ -23,8 +23,8 @@ class ViewModel::TraversalContext
   attr_reader :shared_context
   delegate :access_control, :callbacks, to: :shared_context
 
-  def self.new_child(*args)
-    self.allocate.tap { |c| c.initialize_as_child(*args) }
+  def self.new_child(...)
+    self.allocate.tap { |c| c.initialize_as_child(...) }
   end
 
   def initialize(shared_context: nil, **shared_context_params)

data/lib/view_model.rb

@@ -3,6 +3,7 @@
 # A ViewModel encapsulates a particular aggregation of data calculated via the
 # underlying models and provides a means of serializing it into views.
 require 'jbuilder'
+require 'base64'
 require 'deep_preloader'
 
 class ViewModel
@@ -209,16 +210,16 @@ class ViewModel
       ViewModel::SerializeContext
     end
 
-    def new_serialize_context(*args)
-      serialize_context_class.new(*args)
+    def new_serialize_context(...)
+      serialize_context_class.new(...)
     end
 
     def deserialize_context_class
       ViewModel::DeserializeContext
     end
 
-    def new_deserialize_context(*args)
-      deserialize_context_class.new(*args)
+    def new_deserialize_context(...)
+      deserialize_context_class.new(...)
     end
 
     def accepts_schema_version?(schema_version)

data/test/helpers/arvm_test_models.rb

@@ -6,10 +6,18 @@ require "view_model/active_record/controller"
 
 require "acts_as_manual_list"
 
-db_config_path = File.join(File.dirname(__FILE__), '../config/database.yml')
-db_config = YAML.load(File.open(db_config_path))
-raise "Test database configuration missing" unless db_config["test"]
-ActiveRecord::Base.establish_connection(db_config["test"])
+db_config =
+  if (url = ENV['DATABASE_URL'])
+    url
+  else
+    db_config_path = File.join(File.dirname(__FILE__), '../config/database.yml')
+    yaml = YAML.safe_load(File.open(db_config_path))
+    raise 'Test database configuration missing' unless yaml['test']
+
+    yaml['test']
+  end
+
+ActiveRecord::Base.establish_connection(db_config)
 
 # Remove test tables if any exist
 %w[labels parents children targets poly_ones poly_twos owners

data/test/helpers/controller_test_helpers.rb

@@ -267,7 +267,9 @@ module ControllerTestControllers
     [:ParentController, :ChildController, :LabelController, :TargetController].each do |name|
       Object.send(:remove_const, name)
     end
-    ActiveSupport::Dependencies::Reference.clear!
+    if ActiveSupport::VERSION::MAJOR < 7
+      ActiveSupport::Dependencies::Reference.clear!
+    end
     super
   end
 end

data/test/unit/view_model/active_record/cache_test.rb

@@ -15,16 +15,11 @@ require "view_model/active_record"
 
 DUMMY_RAILS_CACHE = ActiveSupport::Cache::MemoryStore.new
 
-module RailsDummyCache
-  def cache
-    DUMMY_RAILS_CACHE
-  end
+IknowCache.configure! do
+  logger ::ActiveRecord::Base.logger
+  cache DUMMY_RAILS_CACHE
 end
 
-# Ensure we have a dummy Rails, and then prepend our dummy cache
-module Rails; end
-Rails.singleton_class.prepend(RailsDummyCache)
-
 class ViewModel::ActiveRecord
   class CacheTest < ActiveSupport::TestCase
     using ViewModel::Utils::Collections

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.1
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -84,16 +84,22 @@ dependencies:
   name: iknow_params
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: safe_values
   requirement: !ruby/object:Gem::Requirement
@@ -280,16 +286,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -353,11 +359,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".envrc"
+- ".github/workflows/gem-push.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".idea/codeStyleSettings.xml"
-- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -365,7 +371,9 @@ files:
 - Rakefile
 - appveyor.yml
 - gemfiles/rails_5_2.gemfile
-- gemfiles/rails_6_0_beta.gemfile
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_7_0.gemfile
 - iknow_view_models.gemspec
 - lib/iknow_view_models.rb
 - lib/iknow_view_models/railtie.rb
@@ -461,15 +469,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: ViewModels provide a means of encapsulating a collection of related data

data/.circleci/config.yml

@@ -1,119 +0,0 @@
-version: 2.1
-
-executors:
-  ruby-pg:
-    parameters:
-      ruby-version:
-        type: string
-        default: "2.6"
-      pg-version:
-        type: string
-        default: "11"
-      gemfile:
-        type: string
-        default: "Gemfile"
-    environment:
-      PGHOST: 127.0.0.1
-      PGUSER: eikaiwa
-    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 >>
-      - image: circleci/postgres:<< parameters.pg-version >>-alpine
-        environment:
-          POSTGRES_USER: eikaiwa
-          POSTGRES_DB: iknow_view_models
-          POSTGRES_PASSWORD: ""
-
-jobs:
-  test:
-    parameters:
-      ruby-version:
-        type: string
-      pg-version:
-        type: string
-      gemfile:
-        type: string
-    executor:
-      name: ruby-pg
-      ruby-version: << parameters.ruby-version >>
-      pg-version: << parameters.pg-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 && rm Gemfile
-
-      - run:
-          name: Compute a gemfile lock
-          command: bundle lock && cp "${BUNDLE_GEMFILE}.lock" /tmp/gem-lock
-
-      - restore_cache:
-          keys:
-            - iknow_viewmodels-<< parameters.ruby-version >>-{{ checksum "/tmp/gem-lock" }}
-            - iknow_viewmodels-
-
-      - run:
-          name: Bundle Install
-          command: bundle check || bundle install
-
-      - save_cache:
-          key: iknow_viewmodels-<< parameters.ruby-version >>-{{ checksum "/tmp/gem-lock" }}
-          paths:
-            - vendor/bundle
-
-      - run:
-          name: Wait for DB
-          command: dockerize -wait tcp://localhost:5432 -timeout 1m
-
-      - run:
-          name: Run minitest
-          command: bundle exec rake test
-
-      - store_test_results:
-          path: test/reports
-
-  publish:
-    executor: ruby-pg
-    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 iknow_view_models.gemspec
-             gem push iknow_view_models-*.gem
-
-workflows:
-  version: 2.1
-  build:
-    jobs:
-      - test:
-          name: 'ruby 2.6 rails 5.2 pg 11'
-          ruby-version: "2.6"
-          pg-version: "11"
-          gemfile: gemfiles/rails_5_2.gemfile
-      - test:
-          name: 'ruby 2.6 rails 6.0 pg 11'
-          ruby-version: "2.6"
-          pg-version: "11"
-          gemfile: gemfiles/rails_6_0_beta.gemfile
-      - publish:
-          filters:
-            branches:
-              only: master
-            tags:
-              ignore: /.*/

data/.travis.yml

@@ -1,31 +0,0 @@
-dist: trusty
-sudo: false
-language: ruby
-cache: bundler
-
-rvm:
-  - 2.5
-
-gemfile:
-  - gemfiles/rails_5_2.gemfile
-
-addons:
-  postgresql: "10"
-  apt:
-    packages:
-      - postgresql-10
-      - postgresql-client-10
-      - postgresql-server-dev-10
-env:
-  global:
-    - PGPORT=5433
-
-before_install:
-  - gem update --system
-  - gem install bundler
-
-before_script:
-  - psql -c 'CREATE DATABASE iknow_view_models;'
-
-notifications:
-  email: false