iron_trail 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f67019754098a19e12ca5bf753f081e219f6586e3624ef1baf6369e70a9e0d72
-  data.tar.gz: e8acc199e3135380e404662bf6a4e5622efe18a4c78fac2d9f70a24f02ee0e7a
+  metadata.gz: 205a181e1b361753b39576a57dbee4503b62573314c52d91044acbdcd60c26b0
+  data.tar.gz: 41f13486979881ee2e23b5247f949c23bddca34f27d3aa5bbaf348f32e9a1673
 SHA512:
-  metadata.gz: 925b5f28134a23ab70b10880fbfb40a7b3f7d431d287f5f5b000cdf7c11f07ca743932a11320a59e6c3fd5f1dda874e305f1d6d2457a8b451f23605433bec7b1
-  data.tar.gz: 6c074aadae308632cabbd37edb01f6c77607c4dabcac80cfbcf505a4793aace2b4a96a2976cba9a03dc2de40023f5bba948e517694508411a8d4bb9fab5426d5
+  metadata.gz: df308cd9a427c4069178c7304c9b823070db8474d9556a45c9d4a1eb5d0c3edfef70a3d250cc564648c96ce44e57576fdb78e2b3fe30a9ce4682f6824b56497f
+  data.tar.gz: 448ffb8f0440aa63a927b0e41925fd63a48ed1b2b50b68c7f2b205569c3e2de250cbc9f44ca5297bf06c3b8d9d53517796d16afe966fff589779f31c959c4189

data/lib/iron_trail/change_model_concern.rb

@@ -24,14 +24,20 @@ module IronTrail
       private
 
       def _where_object_changes(ary_index, args)
+        ary_index = Integer(ary_index)
         scope = all
 
         args.each do |col_name, value|
-          scope.where!(
-            ::Arel::Nodes::SqlLiteral.new("rec_delta->#{connection.quote col_name}->>#{Integer(ary_index)}").eq(
-              ::Arel::Nodes::BindParam.new(value)
+          col_delta = "rec_delta->#{connection.quote(col_name)}"
+          node = if value == nil
+            ::Arel::Nodes::SqlLiteral.new("#{col_delta}->#{ary_index} = 'null'::jsonb")
+          else
+            ::Arel::Nodes::SqlLiteral.new("#{col_delta}->>#{ary_index}").eq(
+              ::Arel::Nodes::BindParam.new(value.to_s)
             )
-          )
+          end
+
+          scope.where!(node)
         end
 
         scope

data/lib/iron_trail/current.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module IronTrail
+  class Current < ActiveSupport::CurrentAttributes
+    attribute :metadata
+
+    def self.store_metadata(key, value)
+      self.metadata ||= {}
+      self.metadata[key] = value
+    end
+
+    def self.merge_metadata(keys, merge_hash)
+      self.metadata ||= {}
+      base = self.metadata
+      keys.each do |key|
+        if base.key?(key)
+          base = base[key]
+        else
+          h = {}
+          base[key] = h
+          base = h
+        end
+      end
+      base.merge!(merge_hash)
+    end
+  end
+end

data/lib/iron_trail/query_transformer.rb

@@ -18,7 +18,7 @@ module IronTrail
 
     def create_query_transformer_proc
       proc do |query, adapter|
-        current_metadata = IronTrail.current_metadata
+        current_metadata = IronTrail::Current.metadata
         next query unless adapter.write_query?(query) && (current_metadata.is_a?(Hash) && !current_metadata.empty?)
 
         metadata = JSON.dump(current_metadata)

data/lib/iron_trail/version.rb

@@ -1,5 +1,5 @@
 # frozen_literal_string: true
 
 module IronTrail
-  VERSION = '0.1.2'
+  VERSION = '0.1.4'
 end

data/lib/iron_trail.rb

@@ -3,14 +3,13 @@
 require 'singleton'
 require 'json'
 require 'forwardable'
-require 'request_store'
 
 require 'iron_trail/version'
 require 'iron_trail/config'
 require 'iron_trail/db_functions'
 require 'iron_trail/migration'
 
-require 'iron_trail/metadata_store'
+require 'iron_trail/current'
 require 'iron_trail/query_transformer'
 
 require 'iron_trail/association'
@@ -73,16 +72,9 @@ module IronTrail
       @query_transformer.setup_active_record
     end
 
-    def store_instance
-      @store_instance ||= MetadataStore.new
-    end
-
-    def_delegators :store_instance,
+    def_delegators ::IronTrail::Current,
                    :store_metadata,
-                   :merge_metadata,
-                   :current_metadata
-
-
+                   :merge_metadata
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: iron_trail
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - André Diego Piske
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -23,20 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
-- !ruby/object:Gem::Dependency
-  name: request_store
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -136,9 +122,9 @@ files:
 - lib/iron_trail/change_model_concern.rb
 - lib/iron_trail/collection_proxy_mixin.rb
 - lib/iron_trail/config.rb
+- lib/iron_trail/current.rb
 - lib/iron_trail/db_functions.rb
 - lib/iron_trail/irontrail_log_row_function.sql
-- lib/iron_trail/metadata_store.rb
 - lib/iron_trail/migration.rb
 - lib/iron_trail/model.rb
 - lib/iron_trail/query_transformer.rb

data/lib/iron_trail/metadata_store.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module IronTrail
-  class MetadataStore
-    def store_metadata(key, value)
-      RequestStore.store[:irontrail_metadata] ||= {}
-      RequestStore.store[:irontrail_metadata][key] = value
-    end
-
-    def merge_metadata(keys, merge_hash)
-      RequestStore.store[:irontrail_metadata] ||= {}
-      base = RequestStore.store[:irontrail_metadata]
-      keys.each do |key|
-        if base.key?(key)
-          base = base[key]
-        else
-          h = {}
-          base[key] = h
-          base = h
-        end
-      end
-      base.merge!(merge_hash)
-    end
-
-    def current_metadata
-      RequestStore.store[:irontrail_metadata]
-    end
-  end
-end