seo_cache 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc2b67ef1141988885f2fa971876755aebfb7d4cc37f1f82a55e86109398ab5
-  data.tar.gz: e568e095d73c6340fa8b1194b8ba081e32568fd51d104e8d00bbe532b2adc8cf
+  metadata.gz: 5883ffe627a24434fdd9b39a474af010cc0ac22d14c8a9a42d02038bcf06d2f9
+  data.tar.gz: 01e2ee94da4a8706a78379d8e59918359e021b8e89d942050a2909fdfcb218e4
 SHA512:
-  metadata.gz: 8de06af3f3df04dff44f3764f0b3df2cd1b618dbded85357fc1e50a5f40dae38c20e8ea6dfda605752b55717e270a95386281e6734316d87458747fdd4f74085
-  data.tar.gz: c8e11178a53dc627d92f02dc2c4ecfdb6f4640e8341b95ad6c995cfb51cd973206ce35caf4bfaf22555c7999abc4c795ccd8be88380ced061bf592bc0a459ed0
+  metadata.gz: 4ec66862f2ea5b0e9963c92c6841a3a7bdb927f48e6e1b1008cb5adba391251a1b70b0e2231a0ef79f9d33de1f392701e5d9f14162f9c739b91c939bc37d2e35
+  data.tar.gz: ba0760d5213a9df4f7da470e87eb395aca8508cb33d674c2708a8e224ba45a46ea9211617c683f2bf476ba1a95be138e4053016fa7f3a7e9f32e461f96099afb

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 
 Documentation:
   Enabled: false
@@ -10,26 +10,32 @@ LineLength:
 Bundler/OrderedGems:
   Enabled: false
 
-Layout/AlignHash:
+Layout/CaseIndentation:
   Enabled: false
 
-Layout/AlignParameters:
+Layout/CommentIndentation:
   Enabled: false
 
-Layout/CaseIndentation:
+Layout/EmptyLinesAroundClassBody:
   Enabled: false
 
-Layout/EmptyLinesAroundClassBody:
+Layout/EmptyLinesAroundModuleBody:
   Enabled: false
 
 Layout/ExtraSpacing:
   Enabled: false
   AllowForAlignment: true
 
-Layout/IndentFirstHashElement:
+Layout/FirstArgumentIndentation:
+  Enabled: false
+
+Layout/FirstArrayElementIndentation:
+  Enabled: false
+
+Layout/FirstHashElementIndentation:
   Enabled: false
 
-Layout/IndentFirstArgument:
+Layout/HashAlignment:
   Enabled: false
 
 Layout/LeadingCommentSpace:
@@ -47,6 +53,9 @@ Layout/MultilineMethodCallIndentation:
 Layout/MultilineOperationIndentation:
   Enabled: false
 
+Layout/ParameterAlignment:
+  Enabled: false
+
 Layout/SpaceAroundOperators:
   Enabled: false
 
@@ -80,18 +89,52 @@ Metrics/MethodLength:
   CountComments: false  # count full line comments?
   Max: 120
 
+Metrics/ModuleLength:
+  CountComments: false  # count full line comments?
+  Max: 350
+
 Metrics/ParameterLists:
   Max: 7
 
 Metrics/PerceivedComplexity:
   Enabled: false
 
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
+
+Rails/DynamicFindBy:
+  Enabled: false
+
+Rails/FindBy:
+  Enabled: false
+
+Rails/HasAndBelongsToMany:
+  Enabled: false
+
+Rails/HelperInstanceVariable:
+  Enabled: false
+
 Rails/OutputSafety:
   Enabled: false
 
+Rails/UnknownEnv:
+  Enabled: false
+
+Rails/Validation:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Max: 20
+
+RSpec/MultipleExpectations:
+  Max: 10
+
 Style/AsciiComments:
   Enabled: false
 
+Style/ClassAndModuleChildren:
+  Enabled: false
+
 Style/ColonMethodCall:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.12.0
+
+- Force driver to quit after page rendering (except for populate cache, quit only after rendered all pages)
+- Add option to wait for page loading (in case of asynchronous components, like React Router)
+
 ## 0.11.0
 
 - Update for Rails 6

data/README.md

@@ -181,6 +181,9 @@ end
 
 You can add the `force_cache: true` option to `SeoCache::PopulateCache` for overwrite cache data.
 
+If you want to only execute only through a rake task, you can comment the line which include the middleware. keep all options configured and remove only the middleware. Thus all pages will be cached and SeoCache not called for pages not in cache.
+It's useful if you have a script which generates all website pages (based on sitemap for instance) and you run script every day.
+
 ## Server
 
 If you use disk caching, add to your Nginx configuration:

data/lib/seo_cache/middleware.rb

@@ -34,7 +34,7 @@ module SeoCache
           Thread.new do
             prerender_data = page_render(env)
             # Extract status from render page
-            status = prerender_data.scan(/<!--status:(\d+)-->/).last&.first
+            status = prerender_data&.scan(/<!--status:(\d+)-->/)&.last&.first
             after_render(env, prerender_data, status || 200)
           end
         end

data/lib/seo_cache/page_render.rb

@@ -6,14 +6,16 @@ module SeoCache
       init_driver
     end
 
-    def get(url)
+    def get(url, quit_after_render = true)
       @driver.get(url)
 
+      sleep SeoCache.wait_time_for_page_loading if SeoCache.wait_time_for_page_loading
+
       return @driver.page_source
     rescue StandardError => error
       SeoCache.log_error(error.message)
-    # ensure
-    #   @driver&.quit
+    ensure
+      @driver&.quit if quit_after_render
     end
 
     def close_connection
@@ -25,7 +27,7 @@ module SeoCache
     def init_driver
       # Selenium::WebDriver.logger.level = :info
 
-      Webdrivers.cache_time = 86_400
+      Webdrivers.cache_time            = 86_400 * 10 # Chromedriver will be cached for 10 days (except if it detects a new version of Chrome)
 
       Selenium::WebDriver::Chrome.path = SeoCache.chrome_path if SeoCache.chrome_path
 

data/lib/seo_cache/populate_cache.rb

@@ -18,7 +18,7 @@ module SeoCache
       @paths.each do |path|
         next if @page_caching.cache_exists?(path) && !@force_cache
 
-        page_source = @page_render.get(@host + path)
+        page_source = @page_render.get(@host + path, true)
         @page_caching.cache(page_source, path)
       end
 

data/lib/seo_cache/version.rb

@@ -1,3 +1,3 @@
 module SeoCache
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/lib/seo_cache.rb

@@ -5,7 +5,7 @@ require 'net/http'
 require 'redis'
 require 'redis-namespace'
 require 'selenium/webdriver'
-require 'webdrivers'
+require 'webdrivers/chromedriver'
 
 require 'seo_cache/logger'
 require 'seo_cache/version'
@@ -59,6 +59,10 @@ module SeoCache
   mattr_accessor :force_cache_url_param
   self.force_cache_url_param = '_seo_cache_'
 
+  # Time to wait to wait before page rendering (for asynchronous called), in seconds
+  mattr_accessor :wait_time_for_page_loading
+  self.wait_time_for_page_loading = nil
+
   mattr_accessor :cache_only_status
   self.cache_only_status = [200]
 

data/seo_cache.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'webdrivers', '~> 4'
 
   spec.add_development_dependency 'bundler', '~> 1'
-  spec.add_development_dependency 'rake', '~> 12'
+  spec.add_development_dependency 'rake', '~> 13'
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'webmock', '~> 3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seo_cache
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - FloXcoder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-18 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement