http_store 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc0c7e35bf11a61949db7691bb74a8256947e0e6c27ea7b26dbffe41db50d547
-  data.tar.gz: 85c15402f5309d4134beb54558334bf91a0f2068b9d67bc2f62fd2468d54ded1
+  metadata.gz: 13a85e318867138cd3a9179f389281b76f045a3f227bb62be21e293c383d3d09
+  data.tar.gz: 9377610891824c3013c519fd28a7377063b4b3eb89376bb7535a5e8ab9cb5dd0
 SHA512:
-  metadata.gz: babd6761df2ca0da813c5c2a08b7b684480fbc6c65f53d48587db8eaae5f7c2f5d1a9412f4871607d3e72ae216f65122f601f012691d635524f291d88926853f
-  data.tar.gz: d717a172a03c4c959f6b3ea285eed5361c7c54d15c6ab8ec31ca852e6e4513b66e6c2987a2e3d5ac33fb5c3f5288128e03138f6b288734c451eed502617ec9b9
+  metadata.gz: 9cc6c6fb3481294ef589d2bfe2505edc3c14e3aff164ea7db755d704c0287a68919baf48cf11e6f11b940d37d915c7762f2584e549a7ebe5579a05f2c06f1230
+  data.tar.gz: 3ef74302c890bf5b32dcabab68c925e49fa44f27ca0fd77b42c05237b7b357236cf3db4e830413cb47257fc2da37fae608fe831ea808305658f002d79a176e86

data/Gemfile.lock

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

data/lib/http_store/client.rb

@@ -17,7 +17,7 @@ module HttpStore
       return unless request_valid?
 
       # exist request or not force, return
-      load_storeable_record and return if !force && storeable_record.present?
+      load_storeable_record and return if use_cache?
 
       execute # send request
       raise HttpStore::RequestError, 'response_obj is nil' if response_obj.nil?
@@ -65,10 +65,6 @@ module HttpStore
       e.response
       # :nocov:
     end
-
-    def json_safe_parse(str)
-      JSON.parse(str) rescue str
-    end
   end
 end
 

data/lib/http_store/helpers/storable.rb

@@ -6,7 +6,7 @@ module HttpStore
       def storeable_record
         return unless HttpStore.config.store_enable
 
-        @storeable_record ||= HttpStore.config.store_class.find_by(request_digest: request_digest, response_valid: true)
+        @storeable_record ||= HttpStore.config.store_class.find_by(request_digest: @meta.request_digest, response_valid: true)
       end
 
       def load_storeable_record
@@ -14,21 +14,24 @@ module HttpStore
 
         attrs =
           storeable_record.attributes.slice(*HttpStore::ALL_KEYS).map do |k, v|
-            [k, v.is_a?(String) ? re_storable(v) : v]
+            [k, v.is_a?(String) ? json_safe_parse(v) : v]
           end.to_h
 
-        @meta.parent_id = storeable_record.id
         @meta.reverse_merge! attrs
+        @meta.parent_id = storeable_record.id
       end
 
       # you can rewrite this callback, to store the request
       def store_request
         return unless HttpStore.config.store_enable
 
-        @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!
+        @meta.parent_id = storeable_record.id if use_cache?
+        @storeable_record = HttpStore.config.store_class.new(storable_meta)
+        @storeable_record.save!
+      end
+
+      def use_cache?
+        @use_cache ||= !@meta.force && storeable_record.present?
       end
 
       def storable_meta
@@ -41,10 +44,6 @@ module HttpStore
         end.to_h
       end
 
-      def re_storable(value)
-
-      end
-
       def storable(value)
         case value
         when Hash
@@ -62,6 +61,10 @@ module HttpStore
       def storable_string(str)
         str.length > STRING_LIMIT_SIZE ? { digest: Digest::SHA1.hexdigest(str), origin: str[0..1000] } : str
       end
+
+      def json_safe_parse(str)
+        JSON.parse(str) rescue str
+      end
     end
   end
 end

data/lib/http_store/middleware/request_log.rb

@@ -31,7 +31,8 @@ module HttpStore
           http_method:  request.request_method,
           data:         request.params,
           headers:      request.headers.select { |k, _v| k.start_with? 'HTTP_' }.to_h,
-          query_params: request.query_parameters
+          query_params: request.query_parameters,
+          force:        true,
         }
       end
 

data/lib/http_store/version.rb

@@ -1,3 +1,3 @@
 module HttpStore
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/lib/http_store.rb

@@ -10,7 +10,7 @@ module HttpStore
 
   REQUEST_KEYS  = %w[http_method url data_type headers query_params data other_params force request_valid]
   RESPONSE_KEYS = %w[status_code response response_headers response_data response_valid]
-  META_KEYS     = %w[request_digest client_type requestable_id requestable_type]
+  META_KEYS     = %w[request_digest client_type parent_id requestable_id requestable_type]
   TMP_KEYS      = %w[requestable response_obj]
 
   DIGEST_KEYS = %w[http_method url data_type data other_params requestable_id requestable_type]

metadata

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