http_store 0.3.25 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ea5b823d0827eb5eab4f525425f1b40ae92e738ce5051f82a1194ef93109af2
-  data.tar.gz: 96cda715cd019a616638462a049c2f98c40ae25a2fc9c623377e4de1357ff72e
+  metadata.gz: c3d99fb3eccde52a754bdc4a0a83ff650591c297f28dcc9d8eccc0e24ef0c4b0
+  data.tar.gz: f597d1f6ef335f2da23cf95d62c7d8f07b23001d5ef07e46c89d8a8fb8a0564c
 SHA512:
-  metadata.gz: 1309b79c2849852c398ec5213cc3bdf4969f7896410547fd50f6993a10e56ca15df8b5a666dbf9abcb7956834c115f350266221044803fdc9f7535cad02b8980
-  data.tar.gz: 478086a9d32bb0fe9925459d9bf00428aaa6a59dd234fa58ab675c467f98aa57b184c02b58a09a1de35fe8647f64904daf40315f21239f8808f9256467915635
+  metadata.gz: 0f05f4b6a7087861b78e83e76f67eca620f544a0a3677afe177b7b6bb1144701f2570681dbbde9452bcd0331472c5e7cdec2d356662da737bc456a336a77bab6
+  data.tar.gz: 22b94e98bfea7fb0a64e79befe7888e2e9721a79c1b32ac14c82b4a8550facba6727672cc0aeba99c00d187903017c470b14540a1d3f8fdf3a2e619e49ac82da

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    http_store (0.3.25)
+    http_store (0.5.2)
       activerecord (>= 5.0, < 6.1)
       hashie (~> 3.0)
       rails (>= 5, < 7)
@@ -10,110 +10,125 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (6.0.3.3)
+      actionpack (= 6.0.3.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailbox (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+      mail (>= 2.7.1)
+    actionmailer (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (6.0.3.3)
+      actionview (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.3.3)
+      activesupport (= 6.0.3.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.3.3)
+      activesupport (= 6.0.3.3)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activemodel (6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activerecord (6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activestorage (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
-    builder (3.2.3)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    builder (3.2.4)
     byebug (11.0.1)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
     diff-lcs (1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.8.0)
+    erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashie (3.6.0)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.6.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
+    loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mime-types (3.3)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mimemagic (0.3.3)
+    mime-types-data (3.2020.0512)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.14.2)
     netrc (0.11.0)
-    nio4r (2.5.1)
-    nokogiri (1.10.4)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    rack (2.0.7)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (6.0.3.3)
+      actioncable (= 6.0.3.3)
+      actionmailbox (= 6.0.3.3)
+      actionmailer (= 6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actiontext (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 6.0.3.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rake (10.5.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -133,23 +148,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    sprockets (3.7.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    websocket-driver (0.7.1)
+    unf_ext (0.0.7.7)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -162,4 +178,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/db/migrate/3_add_retry_times_field_to_http_log.rb

@@ -0,0 +1,5 @@
+class AddRetryTimesFieldToHttpLog < ActiveRecord::Migration[5.2]
+  def change
+    add_column :http_logs, :retry_times, :integer
+  end
+end

data/lib/http_store.rb

@@ -8,7 +8,7 @@ require 'http_store/engine'
 module HttpStore
   extend ActiveSupport::Autoload
 
-  REQUEST_KEYS  = %w[http_method url data_type headers query_params data other_params force request_valid]
+  REQUEST_KEYS  = %w[http_method url data_type headers query_params data other_params force request_valid retry_times]
   RESPONSE_KEYS = %w[status_code response response_headers response_data response_valid response_code cache_response]
   META_KEYS     = %w[request_digest client_type parent_id requestable_id requestable_type]
   TMP_KEYS      = %w[requestable response_obj]

data/lib/http_store/client.rb

@@ -15,17 +15,19 @@ module HttpStore
       build_request
 
       return unless request_valid?
-
-      # exist request or not force, return
       load_storeable_record and return if use_cache?
 
       execute # send request
-      raise HttpStore::RequestError, 'response_obj is nil' if response_obj.nil?
+      retry! while need_retry? && retry_times.to_i > 0
 
-      build_response
       after_response
-    ensure
-      store_request
+    end
+
+    def retry!
+      @meta.retry_times = retry_times.to_i - 1
+      @meta.force       = true
+
+      execute
     end
 
     HttpStore::ALL_KEYS.each do |meta_key|
@@ -47,6 +49,11 @@ module HttpStore
 
     def execute
       @meta.response_obj = get? ? http_get_execute : http_post_execute
+      raise HttpStore::RequestError, 'response_obj is nil' if response_obj.nil?
+
+      build_response
+    ensure
+      store_request
     end
 
     def http_get_execute

data/lib/http_store/configuration.rb

@@ -9,5 +9,9 @@ module HttpStore
     def store_class
       @store_class || HttpStore::HttpLog
     end
+
+    def store_time
+      @store_time || 31_536_000
+    end
   end
 end

data/lib/http_store/helpers/responseable.rb

@@ -6,6 +6,10 @@ module HttpStore
         status_code >= 200 && status_code < 400
       end
 
+      def need_retry?
+        !response_valid?
+      end
+
       def json_response?
         response_headers_hash['content_type'].to_s =~ /json/
       end

data/lib/http_store/helpers/storable.rb

@@ -1,12 +1,14 @@
 module HttpStore
   module Helpers
     module Storable
-      STRING_LIMIT_SIZE = 30_000
+      STRING_LIMIT_SIZE = 1000
+      TEXT_LIMIT_SIZE   = 10000
 
       def storeable_record
         return unless HttpStore.config.store_enable
 
-        @storeable_record ||= HttpStore.config.store_class.where(request_digest: @meta.request_digest, cache_response: true).order(id: :desc).first
+        expired_time      = Time.current - HttpStore.config.store_time
+        @storeable_record ||= HttpStore.config.store_class.where('created_at > ?', expired_time).where(request_digest: @meta.request_digest, cache_response: true).order(id: :desc).first
       end
 
       def load_storeable_record
@@ -28,15 +30,6 @@ module HttpStore
         @meta.parent_id   = storeable_record.id if use_cache?
         @storeable_record = HttpStore.config.store_class.new(gen_storable_meta)
         @storeable_record.save!
-      rescue ActiveRecord::StatementInvalid
-
-        Rails.logger.info(@storeable_record.response)
-        Rails.logger.info(@storeable_record.response.encoding)
-        Rails.logger.info(@storeable_record.response.first.encoding)
-        Rails.logger.info('xxx' * 2000)
-
-        @storeable_record.response = Digest::SHA1.hexdigest(@storeable_record.response)
-        @storeable_record.save!
       end
 
       def use_cache?
@@ -48,11 +41,11 @@ module HttpStore
           storable_v = storable(v)
 
           begin
-            storable_v = storable_v.to_json[0..STRING_LIMIT_SIZE] if v.is_a?(Hash) || v.is_a?(Array)
+            storable_v = storable_v.to_json[0..TEXT_LIMIT_SIZE] if v.is_a?(Hash) || v.is_a?(Array)
 
             [k, storable_v]
           rescue JSON::GeneratorError
-            [k, storable_v.to_s[0..STRING_LIMIT_SIZE]]
+            [k, storable_v.to_s[0..TEXT_LIMIT_SIZE]]
           end
         end.to_h
       end
@@ -78,7 +71,7 @@ module HttpStore
         raise EncodingError unless str.encoding.name == 'UTF-8'
         raise EncodingError unless str.valid_encoding?
 
-        str.length > STRING_LIMIT_SIZE ? { digest: Digest::SHA1.hexdigest(str), origin: str[0..1000] } : str
+        str.length > STRING_LIMIT_SIZE ? { digest: Digest::SHA1.hexdigest(str), origin: str[0..STRING_LIMIT_SIZE] } : str
       rescue EncodingError
         { digest: Digest::SHA1.hexdigest(str) }
       end

data/lib/http_store/version.rb

@@ -1,3 +1,3 @@
 module HttpStore
-  VERSION = "0.3.25"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_store
 version: !ruby/object:Gem::Version
-  version: 0.3.25
+  version: 0.5.2
 platform: ruby
 authors:
 - black
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -153,6 +153,7 @@ files:
 - bin/setup
 - db/migrate/1_create_http_logs.rb
 - db/migrate/2_add_cache_response_field_to_http_log.rb
+- db/migrate/3_add_retry_times_field_to_http_log.rb
 - http_store.gemspec
 - lib/generators/http_store/initializer_generator.rb
 - lib/http_store.rb
@@ -186,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: store the http request, it based on rest-client