seo_cache 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ee65da1765c3f78ac9f0ede65e7271880378217d20deeed9df1476f524f5c9d
-  data.tar.gz: 473a51c49bab2d40fab978611b13e872185d89cb834d57352b5ca5cb10aa627d
+  metadata.gz: 7286c3adfbf791c5b7091e4f689e4fbfe69bef35973e01c3f50f4d2fa3c8b9bb
+  data.tar.gz: 4b27b16b60243f1f428ad36aa6e00d9699d1e71afe42100c1e643ed56b06ba4a
 SHA512:
-  metadata.gz: f0c783ce23dd0122988c73e44110fd2173033a67bdf77029d3c5ba57943b6abf343ae141d3c69b46ef1575366b05b185fdcaba50c3709a0b4a1ee99c8f34fa13
-  data.tar.gz: 9b056081949ce4207f996748d4750fe37c7128afe88341d81a6c2b0ea04f3024f051eabb6fff4cca68f0e7976c1b476076ecce4548a7a510696a04692dbf241d
+  metadata.gz: 66ab72c0aea1d7029ebd8f39e90b8aa5b36e8d15951b0359824989175e56098d380882fe0e05c8a90e9faa1fbf4b43d2a9acd53ec9aea67aebf3ed87399858d2
+  data.tar.gz: 60121490b30d93c0fcd204f3dcf5c06bf3c9a14aa5e76eb19a9cf9986ff119bfb72b6e6ead3a119f33479334eeb5e8831b99bf68f56c7ad54ad44bfd20741eb8

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.1.0
+
+- Update dependencies
+
+## 1.0.7
+
+- Use new syntax to check if Redis key exists
+
+## 1.0.6
+
+- Logs only missed cache for success response
+
+## 1.0.5
+
+- Use correct path for index page with multiple domain names
+
 ## 1.0.4
 
 - Add option to populate seo cache for multi-domains

data/lib/seo_cache/middleware.rb

@@ -36,9 +36,15 @@ module SeoCache
         else
           Thread.new do
             prerender_data = page_render(env)
-            # Extract status from render page or return 404
-            status = prerender_data&.scan(/<!--status:(\d+)-->/)&.last&.first
-            after_render(env, prerender_data, status || 200)
+            # 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)
           end
         end
       elsif prerender_params?(env)
@@ -94,7 +100,7 @@ module SeoCache
       return false if SeoCache.blacklist_params.present? && SeoCache.blacklist_params.any? { |param| query_params.has_key?(param) }
 
       # if it is a bot and is requesting a resource...don't prerender
-      return false if @extensions_to_ignore.any? { |extension| request.fullpath.include? extension }
+      return false if @extensions_to_ignore.any? { |extension| request.fullpath.include?(extension) }
 
       # if it is a bot and not requesting a resource and is not whitelisted...don't prerender
       return false if SeoCache.whitelist_urls.present? && SeoCache.whitelist_urls.all? { |whitelisted| !Regexp.new(whitelisted).match(request.fullpath) }

data/lib/seo_cache/page_caching.rb

@@ -17,12 +17,12 @@ module SeoCache
       @redis.get(cache_path(path, extension)) if SeoCache.memory_cache? && @redis
     end
 
-    def cache(content, path, extension = nil, gzip = Zlib::BEST_COMPRESSION)
+    def cache(content, path, locale_domain = nil, extension = nil, gzip = Zlib::BEST_COMPRESSION)
       instrument :write_page, path do
         if SeoCache.memory_cache? && @redis
-          write_to_memory(content, cache_path(path, extension))
+          write_to_memory(content, cache_path(path, extension, locale_domain))
         else
-          write_to_disk(content, cache_path(path, extension), gzip)
+          write_to_disk(content, cache_path(path, extension, locale_domain), gzip)
         end
       end
     end
@@ -35,7 +35,7 @@ module SeoCache
 
     def cache_exists?(path)
       if SeoCache.memory_cache? && @redis
-        @redis.exists(cache_path(path))
+        @redis.exists?(cache_path(path))
       else
         File.exist?(cache_path(path))
       end
@@ -51,22 +51,22 @@ module SeoCache
       SeoCache.cache_extension
     end
 
-    def cache_file(path, extension)
+    def cache_file(path, extension, locale_domain)
       name = if path.empty? || path =~ %r{\A/+\z}
                '/index'
              else
                URI::Parser.new.unescape(path.chomp('/'))
              end
 
-      if File.extname(name).empty?
-        name + (extension || default_extension)
-      else
-        name
-      end
+      name = "#{locale_domain}/#{name}" if locale_domain
+
+      name += extension || default_extension if File.extname(name).empty?
+
+      name
     end
 
-    def cache_path(path, extension = nil)
-      File.join(cache_directory, cache_file(path, extension))
+    def cache_path(path, extension = nil, locale_domain = nil)
+      File.join(cache_directory, cache_file(path, extension, locale_domain))
     end
 
     def write_to_memory(content, path)

data/lib/seo_cache/populate_cache.rb

@@ -34,7 +34,7 @@ module SeoCache
 
     private
 
-    def generate_cache(path, locale = nil)
+    def generate_cache(path, locale_domain = nil)
       return if @page_caching.cache_exists?(path) && !@force_cache
 
       url = @host + path
@@ -44,8 +44,7 @@ module SeoCache
       page_source = @page_render.get(url, false)
       return unless page_source
 
-      path_cache_key = locale ? "/#{locale}#{path}" : path
-      @page_caching.cache(page_source, path_cache_key)
+      @page_caching.cache(page_source, path, locale_domain)
     end
   end
 end

data/lib/seo_cache/version.rb

@@ -1,3 +1,3 @@
 module SeoCache
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/seo_cache.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'railties', '>= 5'
   spec.add_dependency 'redis', '~> 4'
   spec.add_dependency 'redis-namespace', '~> 1'
-  spec.add_dependency 'selenium-webdriver', '~> 3'
-  spec.add_dependency 'webdrivers', '~> 4'
+  spec.add_dependency 'selenium-webdriver', '>= 3'
+  spec.add_dependency 'webdrivers', '>= 3'
 
   spec.add_development_dependency 'bundler', '~> 2'
   spec.add_development_dependency 'rake', '~> 13'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seo_cache
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - FloXcoder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -84,30 +84,30 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.29
 signing_key: 
 specification_version: 4
 summary: Cache dedicated for SEO with Javascript rendering