relation_to_struct 1.7.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f11031515a2afe3d55c8cfb98a664eb984079514c727233c74f341be071a825d
-  data.tar.gz: 4b97b2856f8529291ea4db5a97bc95b6b58ce5d4b4fbb3eaba066b54a3b317bf
+  metadata.gz: 6ebd7741a088cfbc209a2013e1c6feac68233029bbdb72d8141ba3f711414c8b
+  data.tar.gz: 668edbe5050f12f20dab89ea891e062a4f8ab7b2e11775dd57162d4a58f94b80
 SHA512:
-  metadata.gz: 48ab91406c6acb33100fc8849b2f7ded38ca7a32b199f090d4bd388219b22a615c89f0853d211fa64b2f9b57ba83cf17de4499dc114f2a70578f449c3f389029
-  data.tar.gz: 9f004fded83df12de47eb94047e0245989f700edd63256af1ee9049b7657126603a0460d49ff54ee1ea67267f4ecfac8b0b7843ee28b8ae33af384ae46b0b53a
+  metadata.gz: d58bc5eab67aa7ea28efed4d48365216dcb50f5c48b40b97056dc664ed64da33643f2e5a057ac4ea4c54c4074f81980ef1fa244ae4c4e1ea4d03346da4481bbd
+  data.tar.gz: 1fdaef138830916143a5731893e274aa0d9a3769821829b848074f39917d1d782804b5c78baf92e5570d396f89463c7e883ed737d6c3a466c2615fd0003b1735

data/.github/workflows/ci.yml

@@ -0,0 +1,64 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test_postgres:
+    strategy:
+      matrix:
+        pg:
+          - 11
+          - 12
+          - 13
+          - 14
+          - 15
+          - 16
+        ruby:
+          - "3.1"
+          - "3.2"
+        gemfile:
+          - rails_6_1
+          - rails_7_0
+          - rails_7_1
+          - rails_7_2
+    name: PostgreSQL ${{ matrix.pg }} - Ruby ${{ matrix.ruby }} - ${{ matrix.gemfile }}
+    runs-on: ubuntu-latest
+    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v3
+      - name: Start the postgres container
+        run: docker compose up -d
+        env:
+          PGVERSION: ${{ matrix.pg }}
+      - name: Setup Ruby using .ruby-version file
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake spec
+        env:
+          DATABASE: postgresql
+  test_sqlite:
+    strategy:
+      matrix:
+        ruby:
+          - "3.1"
+          - "3.2"
+        gemfile:
+          - rails_6_1
+          - rails_7_0
+          - rails_7_1
+          - rails_7_2
+    name: SQLite - Ruby ${{ matrix.ruby }} - ${{ matrix.gemfile }}
+    runs-on: ubuntu-latest
+    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Ruby using .ruby-version file
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake spec
+        env:
+          DATABASE: sqlite

data/.gitignore

@@ -12,5 +12,4 @@
 *.so
 *.o
 *.a
-.ruby-version
 mkmf.log

data/.pryrc

@@ -0,0 +1,21 @@
+require "pry-byebug"
+
+Pry.commands.alias_command 'c', 'continue'
+Pry.commands.alias_command 's', 'step'
+Pry.commands.alias_command 'n', 'next'
+Pry.commands.alias_command 'f', 'finish'
+
+# https://github.com/pry/pry/issues/1275#issuecomment-131969510
+# Prevent issue where text input does not display on screen in container after typing Ctrl-C in a pry repl
+at_exit do
+  exit!(1)
+end
+
+trap('INT') do
+  begin
+    Pry.run_command "continue", :show_output => true, :target => Pry.current
+  rescue
+    exit
+  end
+end
+# End pry Ctrl-C workaround

data/.ruby-version

@@ -0,0 +1 @@
+3.3.2

data/Appraisals

@@ -1,10 +1,5 @@
-%w(5.0 5.1 5.2 6.0 6.1 7.0).each do |version|
+%w(6.1 7.0 7.1 7.2).each do |version|
   appraise "rails-#{version.gsub(/\./, "-")}" do
     gem "rails", "~> #{version}.0"
-    if Gem::Version.new(version) >= Gem::Version.new("6.0.0")
-      gem "sqlite3", "~> 1.4.0"
-    else
-      gem "sqlite3", "~> 1.3.0"
-    end
   end
 end

data/README.md

@@ -1,6 +1,6 @@
 # RelationToStruct
 
-[![Build Status](https://semaphoreci.com/api/v1/jcoleman/relation_to_struct/branches/master/badge.svg)](https://semaphoreci.com/jcoleman/relation_to_struct)
+[![Build Status](https://github.com/jcoleman/relation_to_struct/actions/workflows/ci.yml/badge.svg)](https://github.com/jcoleman/relation_to_struct/actions/workflows/ci.yml?query=branch%3Amaster+)
 
 When one needs to use ActiveRecord to fetch specific values (whether subset columns of a model or arbitrary calculated columns), it's desirable to avoid the overhead of model instances and any associated callbacks.
 
@@ -100,14 +100,15 @@ For this reason, **all methods added to `ActiveRecord::Base` explicitly disable
 ## Contributing
 
 1. Fork it ( https://github.com/jcoleman/relation_to_struct/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Test your changes (`bundle install && bundle exec appraisal install && bundle exec rake`)
-4. Commit your changes (`git commit -am 'Add some feature'`)
-5. Push to the branch (`git push origin my-new-feature`)
-6. Create a new Pull Request
+1. Create your feature branch (`git checkout -b my-new-feature`)
+1. Install gems and spin up a PostgreSQL container (`bin/setup`)
+1. Test your changes (`bundle exec appraisal rake && DATABASE=postgresql bundle exec appraisal rake`)
+1. Commit your changes (`git commit -am 'Add some feature'`)
+1. Push to the branch (`git push origin my-new-feature`)
+1. Create a new Pull Request
 
 ## Releasing
 
 1. Bump version in `lib/relation_to_struct/version.rb` and commit.
-2. Run `rake build` to build the `*.gem` file.
-3. Run `rake release` to publish the gem to Rubygems.
+1. Run `rake build` to build the `*.gem` file.
+1. Run `rake release` to publish the gem to Rubygems. Note: if while releasing the gem you get the error ``Your rubygems.org credentials aren't set. Run `gem push` to set them.`` you can more simply run `gem signin`.

data/bin/setup

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+bundle exec appraisal install
+
+# Do any other automated setup that you need to do here
+
+# Launch a blank postgres image
+docker-compose up -d

data/docker-compose.yml

@@ -0,0 +1,8 @@
+version: "3.3"
+services:
+  db:
+    image: postgres:${PGVERSION:-16}
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_PASSWORD=${PGPASSWORD:-postgres}

data/gemfiles/rails_6_1.gemfile

@@ -3,6 +3,5 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 6.1.0"
-gem "sqlite3", "~> 1.4.0"
 
 gemspec path: "../"

data/gemfiles/rails_7_0.gemfile

@@ -3,6 +3,5 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 7.0.0"
-gem "sqlite3", "~> 1.4.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5_0.gemfile → rails_7_1.gemfile}

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0"
-gem "sqlite3", "~> 1.3.0"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5_1.gemfile → rails_7_2.gemfile}

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
-gem "sqlite3", "~> 1.3.0"
+gem "rails", "~> 7.2.0"
 
 gemspec path: "../"

data/lib/relation_to_struct/active_record_base_extension.rb

@@ -1,9 +1,5 @@
 module RelationToStruct::ActiveRecordBaseExtension
   module ClassMethods
-    def _sanitize_sql_for_relation_to_struct(sql)
-      sanitized_sql = ActiveRecord::VERSION::MAJOR >= 5 ? sanitize_sql(sql) : sanitize_sql(sql, nil)
-    end
-
     delegate(
       :structs_from_sql,
       :pluck_from_sql,
@@ -15,4 +11,4 @@ module RelationToStruct::ActiveRecordBaseExtension
   end
 end
 
-::ActiveRecord::Base.singleton_class.send(:prepend, RelationToStruct::ActiveRecordBaseExtension::ClassMethods)
+::ActiveRecord::Base.singleton_class.prepend(RelationToStruct::ActiveRecordBaseExtension::ClassMethods)

data/lib/relation_to_struct/active_record_connection_adapter_extension.rb

@@ -1,6 +1,6 @@
 module RelationToStruct::ActiveRecordConnectionAdapterExtension
   def structs_from_sql(struct_class, sql, binds=[])
-    sanitized_sql = ActiveRecord::Base._sanitize_sql_for_relation_to_struct(sql)
+    sanitized_sql = ActiveRecord::Base.sanitize_sql(sql)
     result = ActiveRecord::Base.uncached do
       select_all(sanitized_sql, "Structs SQL Load", binds)
     end
@@ -25,7 +25,7 @@ module RelationToStruct::ActiveRecordConnectionAdapterExtension
   end
 
   def pluck_from_sql(sql, binds=[])
-    sanitized_sql = ActiveRecord::Base._sanitize_sql_for_relation_to_struct(sql)
+    sanitized_sql = ActiveRecord::Base.sanitize_sql(sql)
     result = ActiveRecord::Base.uncached do
       select_all(sanitized_sql, "Pluck SQL Load", binds)
     end
@@ -33,7 +33,7 @@ module RelationToStruct::ActiveRecordConnectionAdapterExtension
   end
 
   def value_from_sql(sql, binds=[])
-    sanitized_sql = ActiveRecord::Base._sanitize_sql_for_relation_to_struct(sql)
+    sanitized_sql = ActiveRecord::Base.sanitize_sql(sql)
     result = ActiveRecord::Base.uncached do
       select_all(sanitized_sql, "Value SQL Load", binds)
     end
@@ -51,7 +51,7 @@ module RelationToStruct::ActiveRecordConnectionAdapterExtension
   end
 
   def tuple_from_sql(sql, binds=[])
-    sanitized_sql = ActiveRecord::Base._sanitize_sql_for_relation_to_struct(sql)
+    sanitized_sql = ActiveRecord::Base.sanitize_sql(sql)
     result = ActiveRecord::Base.uncached do
       select_all(sanitized_sql, "Value SQL Load", binds)
     end
@@ -68,7 +68,7 @@ module RelationToStruct::ActiveRecordConnectionAdapterExtension
   end
 
   def run_sql(sql, binds=[])
-    sanitized_sql = ActiveRecord::Base._sanitize_sql_for_relation_to_struct(sql)
+    sanitized_sql = ActiveRecord::Base.sanitize_sql(sql)
     # We don't need to build a result set unnecessarily; using
     # interface this also ensures we're clearing the result set
     # for manually memory managed object (e.g., when using the
@@ -77,4 +77,4 @@ module RelationToStruct::ActiveRecordConnectionAdapterExtension
   end
 end
 
-::ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:prepend, RelationToStruct::ActiveRecordConnectionAdapterExtension)
+::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(RelationToStruct::ActiveRecordConnectionAdapterExtension)

data/lib/relation_to_struct/active_record_relation_extension.rb

@@ -6,12 +6,7 @@ module RelationToStruct::ActiveRecordRelationExtension
 
     # See the definition of #pluck in:
     # activerecord/lib/active_record/relation/calculations.rb
-    result = nil
-    if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR < 2
-      result = klass.connection.select_all(relation.arel, nil, bound_attributes)
-    else
-      result = klass.connection.select_all(relation.arel)
-    end
+    result = klass.connection.select_all(relation.arel)
 
     if result.columns.size != struct_class.members.size
       raise ArgumentError, 'Expected struct fields and columns lengths to be equal'
@@ -35,4 +30,4 @@ module RelationToStruct::ActiveRecordRelationExtension
   end
 end
 
-::ActiveRecord::Relation.send(:prepend, RelationToStruct::ActiveRecordRelationExtension)
+::ActiveRecord::Relation.prepend(RelationToStruct::ActiveRecordRelationExtension)

data/lib/relation_to_struct/version.rb

@@ -1,3 +1,3 @@
 module RelationToStruct
-  VERSION = "1.7.0"
+  VERSION = "1.9.1"
 end

data/lib/relation_to_struct.rb

@@ -2,6 +2,3 @@ require "relation_to_struct/version"
 require "relation_to_struct/active_record_connection_adapter_extension"
 require "relation_to_struct/active_record_base_extension"
 require "relation_to_struct/active_record_relation_extension"
-
-module RelationToStruct
-end

data/relation_to_struct.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "appraisal", ">= 2.1"
+  spec.add_development_dependency "appraisal", ">= 2.5"
   spec.add_development_dependency "bundler", ">= 1.7"
   spec.add_development_dependency "rake", ">= 10.0"
-  spec.add_development_dependency "sqlite3", ">= 1.3"
+  spec.add_development_dependency "sqlite3", "~> 1.4"
   spec.add_development_dependency "rspec", ">= 3.2"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "pg"
 
-  spec.add_dependency "activerecord", ">= 5.0", "< 7.1"
-  spec.add_dependency "activesupport", ">= 5.0", "< 7.1"
+  spec.add_dependency "activerecord", ">= 6.1", "< 7.3"
+  spec.add_dependency "activesupport", ">= 6.1", "< 7.3"
 end

data/spec/active_record_helper/setup.rb

@@ -4,8 +4,8 @@ ActiveRecord::Base.configurations = {
     "host" => 'localhost',
     "database" => 'relation_to_struct_tests',
     "encoding" => 'utf8',
-    "username" => ENV["DATABASE_POSTGRESQL_USERNAME"] || `whoami`.strip,
-    "password" => ENV["DATABASE_POSTGRESQL_PASSWORD"],
+    "username" => ENV["PGUSER"] || 'postgres',
+    "password" => ENV["PGPASSWORD"] || 'postgres',
   },
   "sqlite" => {
     "adapter"  => "sqlite3",
@@ -14,12 +14,7 @@ ActiveRecord::Base.configurations = {
 }
 
 env = ENV['DATABASE'] ||= 'sqlite'
-config =
-  if ActiveRecord::VERSION::MAJOR < 7
-    ActiveRecord::Base.configurations[env]
-  else
-    ActiveRecord::Base.configurations.configs_for(env_name: env).first
-  end
+config = ActiveRecord::Base.configurations.configs_for(env_name: env).first
 
 case env
 when 'postgresql'

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ require 'active_record'
 require 'active_support'
 require 'relation_to_struct'
 require 'active_record_helper/setup'
-require 'pry-byebug'
 
 def active_record_supports_arrays?
   if defined?(@active_record_supports_arrays)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relation_to_struct
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.9.1
 platform: ruby
 authors:
 - James Coleman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,60 +114,64 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.3'
 description: ''
 email:
 - jtc331@gmail.com
-executables: []
+executables:
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
+- ".pryrc"
 - ".rspec"
+- ".ruby-version"
 - Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
-- gemfiles/rails_5_2.gemfile
-- gemfiles/rails_6_0.gemfile
+- bin/setup
+- docker-compose.yml
 - gemfiles/rails_6_1.gemfile
 - gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_2.gemfile
 - lib/relation_to_struct.rb
 - lib/relation_to_struct/active_record_base_extension.rb
 - lib/relation_to_struct/active_record_connection_adapter_extension.rb
@@ -202,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Return struct results from ActiveRecord relation queries

data/gemfiles/rails_5_2.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.2.0"
-gem "sqlite3", "~> 1.3.0"
-
-gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 6.0.0"
-gem "sqlite3", "~> 1.4.0"
-
-gemspec path: "../"