V0_11 dev

.docker/ruby_versions.txt

@@ -0,0 +1,4 @@
+3.0.6
+3.1.4
+3.2.3
+3.3.0

.docker/scripts/test_all

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+xargs -L 1 ./test_ruby < ruby_versions.txt

.docker/scripts/test_mysql

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cd /src
+bundle update;
+
+RUBY_VERSION=$(ruby -v);
+
+echo "Testing With MySQL and Ruby $RUBY_VERSION";
+export DATABASE_URL="mysql2://test:password@mysql:3306/test"
+bundle exec rake test;

.docker/scripts/test_postgresql

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cd /src
+bundle update;
+
+RUBY_VERSION=$(ruby -v);
+
+echo "Testing With PostgreSQL and Ruby $RUBY_VERSION";
+export DATABASE_URL="postgresql://postgres:password@postgres:5432/test"
+bundle exec rake test;

.docker/scripts/test_ruby

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+rbenv global $1;
+
+../test_postgresql
+../test_mysql
+../test_sqlite

.docker/scripts/test_sqlite

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cd /src
+bundle update;
+
+RUBY_VERSION=$(ruby -v);
+
+echo "Testing With SQLite and Ruby $RUBY_VERSION";
+export DATABASE_URL="sqlite3:test_db"
+bundle exec rake test;

.github/dependabot.yml

@@ -0,0 +1,10 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every weekday
+      interval: "daily"

.github/workflows/ruby.yml

@@ -2,14 +2,26 @@ name: CI
 
 on:
   push:
-    branches: [ 'master', 'release-0-8', 'release-0-9', 'release-0-10' ]
+    branches: [ 'master', 'release-0-8', 'release-0-9', 'release-0-10', 'v0-11-dev' ]
   pull_request:
     branches: ['**']
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     services:
+      mysql:
+        image: mysql
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: test
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
       postgres:
         image: postgres
         env:
@@ -26,43 +38,21 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 2.6
-          - 2.7
+          - '3.3'
+          - '3.2'
+          - '3.1'
           - '3.0'
-          - 3.1
-          - 3.2
         rails:
-          - 7.0.4
-          - 6.1.7
-          - 6.0.6
-          - 5.2.8.1
-          - 5.1.7
+          - '7.1'
+          - '7.0'
+          - '6.1'
         database_url:
-          - postgresql://postgres:password@localhost:5432/test
           - sqlite3:test_db
-        exclude:
-          - ruby: 3.2
-            rails: 6.0.6
-          - ruby: 3.2
-            rails: 5.2.8.1
-          - ruby: 3.2
-            rails: 5.1.7
-          - ruby: 3.1
-            rails: 6.0.6
-          - ruby: 3.1
-            rails: 5.2.8.1
-          - ruby: 3.1
-            rails: 5.1.7
-          - ruby: '3.0'
-            rails: 6.0.6
-          - ruby: '3.0'
-            rails: 5.2.8.1
-          - ruby: '3.0'
-            rails: 5.1.7
-          - ruby: 2.6
-            rails: 7.0.4
-          - database_url: postgresql://postgres:password@localhost:5432/test
-            rails: 5.1.7
+          - postgresql://postgres:password@localhost:5432/test
+          - mysql2://root:[email protected]:3306/test
+#        exclude:
+#          - ruby: '3.1'
+#            rails: '6.0'
     env:
       RAILS_VERSION: ${{ matrix.rails }}
       DATABASE_URL: ${{ matrix.database_url }}
@@ -73,7 +63,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Install dependencies
-        run: bundle install --jobs 4 --retry 3
+          bundler-cache: true
       - name: Run tests
         run: bundle exec rake test

.gitignore

@@ -23,3 +23,4 @@ test_db
 test_db-journal
 .idea
 *.iml
+*.override.yml

Dockerfile

@@ -0,0 +1,36 @@
+FROM buildpack-deps:bullseye
+
+# Install rbenv
+RUN git clone https://github.com/sstephenson/rbenv.git /root/.rbenv
+RUN git clone https://github.com/sstephenson/ruby-build.git /root/.rbenv/plugins/ruby-build
+RUN /root/.rbenv/plugins/ruby-build/install.sh
+ENV PATH /root/.rbenv/bin:/root/.rbenv/shims:$PATH
+RUN echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh # or /etc/profile
+RUN echo 'eval "$(rbenv init -)"' >> .bashrc
+
+# Install supported ruby versions
+RUN echo 'gem: --no-document' >> ~/.gemrc
+
+COPY .docker/ruby_versions.txt /
+RUN xargs -I % sh -c 'rbenv install %; rbenv global %; gem install bundler' < ruby_versions.txt
+RUN rbenv rehash
+
+# COPY just enough to bundle. This allows for most code changes without needing to reinstall all gems
+RUN mkdir src
+COPY Gemfile jsonapi-resources.gemspec Rakefile ./src/
+COPY lib/jsonapi/resources/version.rb ./src/lib/jsonapi/resources/
+# This will run bundle install for each ruby version and leave the global version set as the last one.
+# So we can control the default ruby version with the order in the ruby_versions.txt file, with last being the default
+RUN xargs -I % sh -c 'cd src; rbenv global %; bundle install' < /ruby_versions.txt
+
+# Scripts
+COPY .docker/scripts/* /
+RUN chmod +x /test_*
+
+# COPY in the rest of the project
+COPY lib/ ./src/lib
+COPY locales/ ./src/locales
+COPY test/ ./src/test
+RUN ls -la
+
+CMD ["/test_all"]

Gemfile

@@ -10,6 +10,7 @@ version = ENV['RAILS_VERSION'] || 'default'
 
 platforms :ruby do
   gem 'pg'
+  gem 'mysql2'
 
   if version.start_with?('4.2', '5.0')
     gem 'sqlite3', '~> 1.3.13'
@@ -26,4 +27,4 @@ when 'default'
   gem 'railties', '>= 6.0'
 else
   gem 'railties', "~> #{version}"
-end
+end

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2021 Cerebris Corporation
+Copyright (c) 2014-2023 Cerebris Corporation
 
 MIT License
 

README.md

@@ -46,6 +46,43 @@ gem install jsonapi-resources
 
 **For further usage see the [v0.10 alpha Guide](http://jsonapi-resources.com/v0.10/guide/)**
 
+## Development
+
+There is a docker compose setup that can be used for testing your code against the supported versions of ruby and
+against PostgreSQL, MYSQL, and SQLite databases.
+
+First build the docker image:
+```bash
+docker compose build
+```
+Be sure to rebuild after making code changes. It should be fast after the initial build.
+
+### Running the tests
+
+The default command will run everything (it may take a while):
+```bash
+docker compose run tests
+```
+
+To test just one database against the latest ruby:
+```bash
+docker compose run tests ./test_mysql
+docker compose run tests ./test_postgresql
+docker compose run tests ./test_sqlite
+```
+
+To test a version of ruby against all databases:
+```bash
+docker compose run tests ./test_ruby 2.7.7
+```
+
+The tests by default run against the latest rails version. To override that you can set the RAILS_VERSION environment
+variable:
+
+```bash
+docker compose run -e RAILS_VERSION=6.1.1 tests ./test_postgresql
+```
+
 ## Contributing
 
 1. Submit an issue describing any new features you wish it add or the bug you intend to fix
@@ -73,4 +110,4 @@ and **paste the content into the issue description or attach as a file**:
 
 ## License
 
-Copyright 2014-2021 Cerebris Corporation. MIT License (see LICENSE for details).
+Copyright 2014-2023 Cerebris Corporation. MIT License (see LICENSE for details).

docker-compose.yml

@@ -0,0 +1,49 @@
+version: "3.9"
+
+networks:
+  back:
+
+services:
+  postgres:
+    image: postgres:latest
+    ports:
+      - "5432"
+    networks:
+      back:
+    environment:
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=test
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
+      interval: 2s
+      retries: 15
+
+  mysql:
+    image: mysql:latest
+    command: --default-authentication-plugin=mysql_native_password
+    ports:
+      - 3306
+    networks:
+      - back
+    environment:
+      - MYSQL_DATABASE=test
+      - MYSQL_USER=test
+      - MYSQL_PASSWORD=password
+      - MYSQL_ROOT_PASSWORD=password
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      interval: 2s
+      retries: 15
+
+  tests:
+    image: jr_tests:latest
+    build:
+      context: .
+      dockerfile: Dockerfile
+    networks:
+      - back
+    depends_on:
+      postgres:
+        condition: service_healthy
+      mysql:
+        condition: service_healthy

jsonapi-resources.gemspec

@@ -27,6 +27,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'concurrent-ruby-ext'
   spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'hashie'
+  spec.add_development_dependency 'sorted_set'
+  spec.add_development_dependency 'memory_profiler'
   spec.add_dependency 'activerecord', '>= 5.1'
   spec.add_dependency 'railties', '>= 5.1'
   spec.add_dependency 'concurrent-ruby'

lib/generators/jsonapi/controller_generator.rb

@@ -1,5 +1,7 @@
-module Jsonapi
-  class ControllerGenerator < Rails::Generators::NamedBase
+# frozen_string_literal: true
+
+module JSONAPI
+  class ControllerGenerator < ::Rails::Generators::NamedBase
     source_root File.expand_path('../templates', __FILE__)
 
     def create_resource

lib/generators/jsonapi/resource_generator.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Jsonapi
-  class ResourceGenerator < Rails::Generators::NamedBase
+  class ResourceGenerator < ::Rails::Generators::NamedBase
     source_root File.expand_path('../templates', __FILE__)
 
     def create_resource

lib/jsonapi-resources.rb

@@ -1,15 +1,20 @@
 # frozen_string_literal: true
 
 require 'jsonapi/resources/railtie'
+require 'jsonapi/utils/polymorphic_types_lookup'
 require 'jsonapi/naive_cache'
 require 'jsonapi/compiled_json'
-require 'jsonapi/basic_resource'
-require 'jsonapi/active_relation_resource'
+require 'jsonapi/relation_retrieval'
+require 'jsonapi/active_relation_retrieval'
+require 'jsonapi/active_relation_retrieval_v09'
+require 'jsonapi/active_relation_retrieval_v10'
+require 'jsonapi/resource_common'
 require 'jsonapi/resource'
+require 'jsonapi/simple_resource'
 require 'jsonapi/cached_response_fragment'
 require 'jsonapi/response_document'
 require 'jsonapi/acts_as_resource_controller'
-if Rails::VERSION::MAJOR >= 6
+if ::Rails::VERSION::MAJOR >= 6
   ActiveSupport.on_load(:action_controller_base) do
     require 'jsonapi/resource_controller'
   end
@@ -37,6 +42,7 @@
 require 'jsonapi/link_builder'
 require 'jsonapi/active_relation/adapters/join_left_active_record_adapter'
 require 'jsonapi/active_relation/join_manager'
+require 'jsonapi/active_relation/join_manager_v10'
 require 'jsonapi/resource_identity'
 require 'jsonapi/resource_fragment'
 require 'jsonapi/resource_tree'

lib/jsonapi/active_relation/adapters/join_left_active_record_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JSONAPI
   module ActiveRelation
     module Adapters
@@ -7,7 +9,7 @@ module JoinLeftActiveRecordAdapter
         # example Post.joins(:comments).joins_left(comments: :author) will join the comments table twice,
         # once inner and once left in 5.2, but only as inner in earlier versions.
         def joins_left(*columns)
-          if Rails::VERSION::MAJOR >= 6 || (Rails::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 2)
+          if ::Rails::VERSION::MAJOR >= 6 || (::Rails::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 2)
             left_joins(columns)
           else
             join_dependency = ActiveRecord::Associations::JoinDependency.new(self, columns, [])
@@ -23,4 +25,4 @@ def joins_left(*columns)
       end
     end
   end
-end
+end