http_store 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbad1b169cfaefecb2f2c7a96b916d382e109c8ff89c7104340974a9061013f0
-  data.tar.gz: 8957ccdac995dcaacb30b40b0e4cbe3c53b06fcacf92344b741515dd3c8cbbfc
+  metadata.gz: 2bb337e2004a6a150a320fd1a9d3afbe17054860faa48cb31b53f1f266382928
+  data.tar.gz: ca53ded6e7fbf4eaaa341b52a520a4d7b07b94322c87ce8ecf2e4ea4dc8542c4
 SHA512:
-  metadata.gz: 7a52092f8d72dcac74d88662e7cc5ecf361be80526d6ebb8908fd448f28e7f1a6c7107ccdb972bc640f672b3e572d310585c31dfc4219ad36ccc769a28d5c494
-  data.tar.gz: 9a14abb12047c30f3afd11c1218ee068ee4a3de9da46291024f872087aca09303351538d0bdd1b1ca26e45c855cae840adb413cb564326e4a9ad36b8adb213be
+  metadata.gz: fa430ae04cd59ba0aa5f2806815837f1322482019008d4f222830fd73ba51cbb2a9fd1f6f0da5fda10add07f594fbcbe39e3d8cb15aee9a534f80a08b6b6c2e8
+  data.tar.gz: 70d4a2cd9cb8cba4c0e7d331bad2466f2b06d60917ca90ed7e4fa156782400a3d23508b4b7a5e770ad480fbcf03cbbcc78152708eae73060d4da6dcb2a4a8e36

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    http_store (0.3.4)
+    http_store (0.3.5)
       activerecord (>= 5.0, < 6.1)
       hashie (~> 3.0)
       rails (>= 5, < 7)

data/db/migrate/1_create_http_logs.rb

@@ -28,6 +28,7 @@ class CreateHttpLogs < ActiveRecord::Migration[5.2]
       t.string :client_type, comment: '请求类型'
       t.string :requestable_id, comment: '外键 ID'
       t.string :requestable_type, comment: '外键 类型'
+      t.integer :parent_id
 
       t.timestamps
     end

data/lib/http_store/client.rb

@@ -17,7 +17,7 @@ module HttpStore
       return unless request_valid?
 
       # exist request or not force, return
-      return if !force && storeable_record.present?
+      load_storeable_record and return if !force && storeable_record.present?
 
       execute # send request
       raise HttpStore::RequestError, 'response_obj is nil' if response_obj.nil?

data/lib/http_store/helpers/storable.rb

@@ -6,14 +6,29 @@ module HttpStore
       def storeable_record
         return unless HttpStore.config.store_enable
 
-        @storeable_model ||= HttpStore.config.store_class.find_by(request_digest: request_digest, response_valid: true)
+        @storeable_record ||= HttpStore.config.store_class.find_by(request_digest: request_digest, response_valid: true)
+      end
+
+      def load_storeable_record
+        return if storeable_record.nil?
+
+        attrs =
+          storeable_record.attributes.slice(*HttpStore::ALL_KEYS).map do |k, v|
+            [k, v.is_a?(String) ? re_storable(v) : v]
+          end.to_h
+
+        @meta.parent_id = storeable_record.id
+        @meta.reverse_merge! attrs
       end
 
       # you can rewrite this callback, to store the request
       def store_request
         return unless HttpStore.config.store_enable
 
-        HttpStore.config.store_class.new(storable_meta).save
+        @parent_storeable_record = storeable_record
+        @storeable_record        = HttpStore.config.store_class.new(storable_meta)
+        @storeable_record.parent = @parent_storeable_record if @parent_storeable_record.present?
+        save!
       end
 
       def storable_meta
@@ -26,6 +41,10 @@ module HttpStore
         end.to_h
       end
 
+      def re_storable(value)
+
+      end
+
       def storable(value)
         case value
         when Hash

data/lib/http_store/http_log.rb

@@ -1,5 +1,8 @@
 module HttpStore
   class HttpLog < ActiveRecord::Base
     belongs_to :requestable, polymorphic: true, optional: true
+
+    has_many :sons, class_name: 'HttpStore::HttpLog', foreign_key: 'parent_id'
+    belongs_to :parent, class_name: 'HttpStore::HttpLog'
   end
 end

data/lib/http_store/version.rb

@@ -1,3 +1,3 @@
 module HttpStore
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_store
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - black