in_time_scope 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f46c50d90f896b920a86f45ea49329a9629843c4c7550e065f22c4b20df35149
-  data.tar.gz: 6c927de51e73ba689314a7caaf5f419a23af0f61f35b80c09f1c5d4cfa63273d
+  metadata.gz: f92f298fce80365dc81befd347745a346ebc80dd457d7a1647c4156ffc2a6f4a
+  data.tar.gz: eff899e963184dd3bb00ec69a733e6c0a8932e5437e8667ca74b626a31a1a99a
 SHA512:
-  metadata.gz: 4d861b025f3f455367ef485e40df6f98d83e55b1fd3c3b5fdf2cc6f57bbae2dd3dec94586bb1265b76859a83a3bd0c782a523315cf5188e3ccf9f62a8dcb6b2f
-  data.tar.gz: f712f1b0e82dfa596c1d805ef5f7ddd715bc39eb1fffee564df6eb98a68582f21d1f9822f7980471d91c70823e86c1e693599adcb2d77eb96c909059e7d90576
+  metadata.gz: 3e02bc23c847d583d9ad88e7f2d80b63b82d7bb2c2e03375d8967e352a91dc88b4b384a740514a3ff868a79bc6eae606e1f1881dd7e6b15c18f2420c346f54f7
+  data.tar.gz: 16840ab3e4231d2aba4403501e5fedf532629395ef3ffe0b615d0401d6df15ce7245ef2aba1c91a71cb8b2a3958e93304d87dad8929e6a21de6f210300cfe881

data/.rubocop.yml

@@ -39,5 +39,9 @@ Layout/LineLength:
 Style/Documentation:
   Enabled: false
 
+Style/OneClassPerFile:
+  Exclude:
+    - "spec/support/create_test_database.rb"
+
 Gemspec/DevelopmentDependencies:
   EnforcedStyle: gemspec

data/lib/in_time_scope/class_methods.rb

@@ -191,6 +191,12 @@ module InTimeScope
     # This scope efficiently finds the latest record per foreign key,
     # suitable for use with has_one associations and includes.
     #
+    # @note When multiple records share the same timestamp for a given foreign key,
+    #   all of them will be returned. This is safe for +has_one+ associations
+    #   (ActiveRecord picks one), but callers using this as a standalone scope
+    #   should be aware that the result may contain multiple records per foreign key
+    #   in the case of timestamp ties.
+    #
     # @param suffix [String] The suffix for method names
     # @param column [Symbol] The timestamp column name
     # @return [void]
@@ -212,6 +218,23 @@ module InTimeScope
                                       .where(p2[column].gt(arel_table[column]))
                                       .where(p2[:id].not_eq(arel_table[:id]))
 
+        # Propagate simple equality conditions from the current scope into the NOT EXISTS
+        # subquery. This ensures that chained scopes like `.approved.latest_in_time(:user_id)`
+        # only consider approved records when searching for "a newer record exists",
+        # preventing a newer rejected record from shadowing the latest approved one.
+        where_values_hash.each do |col, val|
+          next if col.to_s == column.to_s      # time column already handled above
+          next if col.to_s == foreign_key.to_s # foreign key already handled above
+
+          subquery = if val.nil?
+                       subquery.where(p2[col].eq(nil))
+                     elsif val.is_a?(Array)
+                       subquery.where(p2[col].in(val))
+                     else
+                       subquery.where(p2[col].eq(val))
+                     end
+        end
+
         not_exists = Arel::Nodes::Not.new(Arel::Nodes::Exists.new(subquery.ast))
 
         where(column => ..time).where(not_exists)
@@ -223,6 +246,12 @@ module InTimeScope
     # This scope efficiently finds the earliest record per foreign key,
     # suitable for use with has_one associations and includes.
     #
+    # @note When multiple records share the same timestamp for a given foreign key,
+    #   all of them will be returned. This is safe for +has_one+ associations
+    #   (ActiveRecord picks one), but callers using this as a standalone scope
+    #   should be aware that the result may contain multiple records per foreign key
+    #   in the case of timestamp ties.
+    #
     # @param suffix [String] The suffix for method names
     # @param column [Symbol] The timestamp column name
     # @return [void]
@@ -244,6 +273,21 @@ module InTimeScope
                                       .where(p2[column].lt(arel_table[column]))
                                       .where(p2[:id].not_eq(arel_table[:id]))
 
+        # Propagate simple equality conditions from the current scope into the NOT EXISTS
+        # subquery (same reasoning as define_latest_one_scope).
+        where_values_hash.each do |col, val|
+          next if col.to_s == column.to_s
+          next if col.to_s == foreign_key.to_s
+
+          subquery = if val.nil?
+                       subquery.where(p2[col].eq(nil))
+                     elsif val.is_a?(Array)
+                       subquery.where(p2[col].in(val))
+                     else
+                       subquery.where(p2[col].eq(val))
+                     end
+        end
+
         not_exists = Arel::Nodes::Not.new(Arel::Nodes::Exists.new(subquery.ast))
 
         where(column => ..time).where(not_exists)

data/lib/in_time_scope/version.rb

@@ -2,5 +2,5 @@
 
 module InTimeScope
   # The current version of the InTimeScope gem
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: in_time_scope
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - kyohah
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement