active_record_extended 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbcdc3e208ac89fd2d55b8944ad7c0483e57f21a89941a4848beb548b56ce293
-  data.tar.gz: 10465bfe73686aae4fad33a7da0e533ed22401c68da5655654e1538a8bbb34c0
+  metadata.gz: 7f3f7041cc4869183bc20b38f8387bd8f3f216225990a62ec0c4e0fba5f847dd
+  data.tar.gz: c61e5ad1c2fae32a5dbfe8660bb888d85f255f285a2df8b1f02206f51cbd71b7
 SHA512:
-  metadata.gz: 1ed8f4d6fe19c384bbb8add11443cc78b6f23cf4adc1808bdd0a1b6328a2dbeac22d4e0fa8fc6257dde505646d1c3613ed90711bbd36321cbb74231cf621958d
-  data.tar.gz: e139454fc996ad112d70332e39b002ba164d2172100f6b61f2494f090a0a3afe16c0e5e51998ab8f8cb8e839c6b0cb1104d152f821ae65d55bec4c83ec9c990a
+  metadata.gz: c27cf6541f3e11a3beb00263be7c1478e8f4ddb64b0121ed141347ca995252453864bd3cf0992038b7ea2aa1c409f50792800fdf909d8e544edd470af35231fa
+  data.tar.gz: d0426b00cca79e3d0d145fb87fdd05c25611ff5bfde95c8c1845a281786bd4c7e6bfbd866df46cb8ce1ccd45ab5b4bd91aa83e6c21db879721436574f90087cf

data/README.md

@@ -55,8 +55,8 @@ This package is designed align and work with any officially supported Ruby and R
  - Minimum Ruby Version: 2.4.x **(EOL warning!)**
  - Minimum Rails Version: 5.1.x **(EOL warning!)**
  - Minimum Postgres Version: 9.6.x **(EOL warning!)**
- - Latest Ruby supported: 2.7.x
- - Latest Rails supported: 6.1.x
+ - Latest Ruby supported: 3.0.x
+ - Latest Rails supported: 7.0.x
  - Postgres: 9.6-current(13) (probably works with most older versions to a certain point)
 
 ## Installation
@@ -649,12 +649,12 @@ SELECT "people".*
 
 ```ruby
 users               = Person.where(id: 1..5)
-expect_these_users  = Person.where(id: 2..4)
+except_these_users  = Person.where(id: 2..4)
 
-Person.union_except(users, expect_these_users) #=> [#<Person id: 1, ..>, #<Person id: 5,..>]
+Person.union_except(users, except_these_users) #=> [#<Person id: 1, ..>, #<Person id: 5,..>]
 
 # You can also chain union's
-Person.union.except(users, expect_these_users).union(Person.where(id: 20))
+Person.union.except(users, except_these_users).union(Person.where(id: 20))
 ```
 
 Query Output

data/lib/active_record_extended/query_methods/where_chain.rb

@@ -2,6 +2,8 @@
 
 module ActiveRecordExtended
   module WhereChain
+    AR_VERSION_AT_LEAST_6_1 = ActiveRecord.version >= Gem::Version.new('6.1')
+
     # Finds Records that have an array column that contain any a set of values
     # User.where.overlap(tags: [1,2])
     #   # SELECT * FROM users WHERE tags && {1,2}
@@ -106,7 +108,7 @@ module ActiveRecordExtended
     end
 
     def build_where_clause_for(scope, opts, rest)
-      if ActiveRecord::VERSION::MAJOR == 6 && ActiveRecord::VERSION::MINOR == 1
+      if AR_VERSION_AT_LEAST_6_1
         scope.send(:build_where_clause, opts, rest)
       else
         scope.send(:where_clause_factory).build(opts, rest)

data/lib/active_record_extended/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordExtended
-  VERSION = "2.0.3"
+  VERSION = "2.1.0"
 end

data/spec/query_methods/unionize_spec.rb

@@ -91,7 +91,7 @@ RSpec.describe "Active Record Union Methods" do
           User.select(:id, "profile_ls.likes").joins(:profile_l).where("profile_ls.likes < 150")
         )
 
-      expect(query.pluck(:id)).to have_attributes(size: 1).and(eq([user_one_pl.id]))
+      expect(query.pluck(:id)).to have_attributes(size: 1).and(eq([user_one_pl.user.id]))
       expect(query.first.likes).to eq(user_one_pl.likes)
     end
   end

data/spec/query_methods/with_cte_spec.rb

@@ -12,14 +12,14 @@ RSpec.describe "Active Record With CTE Query Methods" do
     context "when using as a standalone query" do
       it "should only return a person with less than 300 likes" do
         query = User.with(profile: ProfileL.where("likes < 300"))
-                    .joins("JOIN profile ON profile.id = users.id")
+                    .joins("JOIN profile ON profile.user_id = users.id")
 
         expect(query).to match_array([user_one])
       end
 
       it "should return anyone with likes greater than or equal to 200" do
         query = User.with(profile: ProfileL.where("likes >= 200"))
-                    .joins("JOIN profile ON profile.id = users.id")
+                    .joins("JOIN profile ON profile.user_id = users.id")
 
         expect(query).to match_array([user_one, user_two])
       end
@@ -39,7 +39,7 @@ RSpec.describe "Active Record With CTE Query Methods" do
       it "should contain a unique list of ordered CTE keys when merging in multiple children" do
         x     = User.with(profile: ProfileL.where("likes < 300"))
         y     = User.with(profile: ProfileL.where("likes > 400"))
-        z     = y.merge(x).joins("JOIN profile ON profile.id = users.id") # Y should reject X's CTE (FIFO)
+        z     = y.merge(x).joins("JOIN profile ON profile.user_id = users.id") # Y should reject X's CTE (FIFO)
         query = User.with(my_profile: z).joins("JOIN my_profile ON my_profile.id = users.id")
 
         expect(query.cte.with_keys).to eq([:profile, :my_profile])

data/spec/support/database_cleaner.rb

@@ -2,7 +2,7 @@
 
 require "database_cleaner"
 
-DatabaseCleaner.strategy = :truncation
+DatabaseCleaner.strategy = :transaction
 
 RSpec.configure do |config|
   config.before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_extended
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - George Protacio-Karaszi
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: ar_outer_joins
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Adds extended functionality to Activerecord Postgres implementation