seo_cache 1.1.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 959dca2a3a9df2edb1bf3b7ff01e09a5632fb572624d101acc46a2a773f1de4f
-  data.tar.gz: 176b714c37870807890538accd50b47849c42702e734fb0124841dc6df870296
+  metadata.gz: a025198e97eaad8a73126dbbdefdc559563add982f0cbeae20c56fb9f05a1ef4
+  data.tar.gz: 94a3dabdc94052d6830af5a32e44799485fcba7d5ef63a4e6e90b40f3dd556ce
 SHA512:
-  metadata.gz: 433a9a7f97517d4c8e2b1335997c0d7de7c41044a51f8c90e3439ea07e92b4174986233e3ead7a72dd7a117674fc3b2d2cce2eab162776867e4afe5b8dafe3b6
-  data.tar.gz: 93e2d478189c54928bd6adeaa48aca393b96f1a5b5807bd44019880a9808d78e97e633fcdfe4a13bf5379faccbbfa373491a4f372607637e4de2468edb250594
+  metadata.gz: c3e952a05d489b1f449ee39e343d0732e0c882829e09ec2b5cadfe430f5d34d7a924c89754d4536164d1a3d897203ef1af4a580bae576dfbdd5a516583f5a08b
+  data.tar.gz: c4b4fb074b52e84d88f3f5b2aef39301b84989a4b66c02d19b61f21730f81062bfce934bac21ee067b0ef8d72a700005bd72885ab78cce08a3e927985c8bf25a

data/.travis.yml

@@ -30,12 +30,12 @@ script: bundle exec rake $RAKE_TASK
 
 matrix:
   include:
-    - rvm: 2.7
+    - rvm: 3.0
       gemfile: Gemfile
       env: RAKE_TASK=spec
-    - rvm: 2.6
+    - rvm: 2.7
       gemfile: Gemfile
       env: RAKE_TASK=spec
-    - rvm: 2.5
+    - rvm: 2.6
       gemfile: Gemfile
       env: RAKE_TASK=spec

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.2.2
+
+- Update Ruby version for Travis testing
+
+## 1.2.1
+
+- Update deprecated Selenium options
+
+## 1.2.0
+
+- Do not try to cache invalid requests
+
+## 1.1.2
+
+- Correct populate seo cache method
+
 ## 1.1.1
 
 - Add new option to use locale as first directory for cache path

data/README.md

@@ -58,6 +58,8 @@ require 'seo_cache'
 Rails.application.config.middleware.use SeoCache::Middleware
 ```
 
+Required at least Ruby 2.6.
+
 ## Configuration
 
 Chrome path (**required**) (`disk` or `memory`):

data/lib/seo_cache/middleware.rb

@@ -16,52 +16,39 @@ module SeoCache
     end
 
     def call(env)
-      if prerender_page?(env)
+      @status, @headers, @response = @app.call(env)
+
+      if prerender_page?(env, @status)
         cached_response = before_render(env)
 
         return cached_response.finish if cached_response.present?
 
-        if SeoCache.log_missed_cache
-          env_request = Rack::Request.new(env)
-          SeoCache.log("missed cache : #{env_request.path} (User agent: #{env_request.user_agent})")
-        end
-
         if SeoCache.prerender_service_url.present?
           prerender_response = prerender_service(env)
           if prerender_response
             response = build_response_from_prerender(prerender_response.body)
             after_render(env, prerender_response)
+
             return response.finish
           end
         else
           Thread.new do
             prerender_data = page_render(env)
-            # Extract status from render page or return success (200)
-            status = prerender_data&.scan(/<!--status:(\d+)-->/)&.last&.first || 200
-
-            if SeoCache.log_missed_cache && status.to_s.start_with?('2')
-              env_request = Rack::Request.new(env)
-              SeoCache.log("missed cache : #{env_request.path} (User agent: #{env_request.user_agent})")
-            end
 
-            after_render(env, prerender_data, status)
+            after_render(env, prerender_data, @status)
           end
         end
       elsif prerender_params?(env)
-        env['seo_mode'] = true
-        # Add status to render page because Selenium doesn't return http headers or status...
+        env['seo_mode']           = true
         status, headers, response = @app.call(env)
-        status_code               = "<!--status:#{status}-->"
-        # Cannot add at the top of file, Chrome removes leading comments...
         begin
-          body_code = response.body.sub(/<head( ?)(.*?)>/i, "<head\\1\\2>#{status_code}")
-          return [status, headers, [body_code]]
+          return [status, headers, [response.body]]
         rescue
           return [status, headers, [nil]]
         end
       end
 
-      return @app.call(env)
+      return [@status, @headers, @response]
     end
 
     def prerender_params?(env)
@@ -75,13 +62,15 @@ module SeoCache
       return true if query_params.has_key?(SeoCache.prerender_url_param) || query_params.has_key?(SeoCache.force_cache_url_param)
     end
 
-    def prerender_page?(env)
+    def prerender_page?(env, status)
       user_agent                   = env['HTTP_USER_AGENT']
       buffer_agent                 = env['HTTP_X_BUFFERBOT']
       is_requesting_prerender_page = false
 
       return false unless user_agent
 
+      return false if status.to_i > 299
+
       return false if env['REQUEST_METHOD'] != 'GET'
 
       request      = Rack::Request.new(env)

data/lib/seo_cache/page_render.rb

@@ -33,21 +33,14 @@ module SeoCache
 
       Selenium::WebDriver::Chrome.path = SeoCache.chrome_path if SeoCache.chrome_path
 
-      browser_options = ::Selenium::WebDriver::Chrome::Options.new
-      browser_options.args << 'disable-infobars'
-      browser_options.args << '--headless'
-      browser_options.args << '--no-sandbox'
-      browser_options.args << '--incognito'
-      browser_options.args << '--disable-dev-shm-usage'
-      browser_options.args << '--disable-gpu'
-      browser_options.args << '--disable-web-security'
-      browser_options.args << '--disable-extensions'
-      browser_options.args << '--disable-logging'
-      browser_options.args << '--disable-notifications'
-      browser_options.args << '--disable-sync'
-      browser_options.args << '--window-size=1920x1080'
-      browser_options.args << "--remote-debugging-port=#{SeoCache.chrome_debugging_port}" if SeoCache.chrome_debugging_port
-      @driver = ::Selenium::WebDriver.for(:chrome, options: browser_options)
+      browser_options = %w[headless incognito disable-gpu disable-infobars disable-dev-shm-usage disable-gpu disable-web-security disable-extensions no-sandbox disable-logging disable-notifications disable-sync window-size=1920x1080]
+      browser_options << "remote-debugging-port=#{SeoCache.chrome_debugging_port}" if SeoCache.chrome_debugging_port
+      @driver = ::Selenium::WebDriver.for(
+        :chrome,
+        capabilities: [Selenium::WebDriver::Chrome::Options.new(
+          args: browser_options
+        )]
+      )
     end
   end
 end

data/lib/seo_cache/populate_cache.rb

@@ -35,7 +35,7 @@ module SeoCache
     private
 
     def generate_cache(path, locale_domain = nil)
-      return if @page_caching.cache_exists?(path, nil, locale_domain) && !@force_cache
+      return if @page_caching.cache_exists?(path, locale_domain) && !@force_cache
 
       url = @host + path
       url += path.include?('?') ? '&' : '?'

data/lib/seo_cache/version.rb

@@ -1,3 +1,3 @@
 module SeoCache
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seo_cache
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.2
 platform: ruby
 authors:
 - FloXcoder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.30
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Cache dedicated for SEO with Javascript rendering