seo_cache 1.0.5 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36c446ef0dc5b6781157d81939f519c60e024ef6b4b0a9709b23f71cf2a96684
-  data.tar.gz: 73f5a4fe10538b1292e8482d82f7411da4380ded38bcb13ba3b1565a3267576e
+  metadata.gz: 959dca2a3a9df2edb1bf3b7ff01e09a5632fb572624d101acc46a2a773f1de4f
+  data.tar.gz: 176b714c37870807890538accd50b47849c42702e734fb0124841dc6df870296
 SHA512:
-  metadata.gz: 7e4f9582ca1e55fabd778adedec0cef4f715ea8fa78e3be1fc85a3982f2e4c8a48dfa8954154208735d5a7daf02c7f8da682c8b5f96d008bf5f8a829706d2f77
-  data.tar.gz: 2c6c965ec2cb3621f10e91f8cc75bad2d032825dfebe629cf0a023a74382b3676550f9060c68deb110b21429381e5e4127938c2b5aa2da839925436e7ec32ccc
+  metadata.gz: 433a9a7f97517d4c8e2b1335997c0d7de7c41044a51f8c90e3439ea07e92b4174986233e3ead7a72dd7a117674fc3b2d2cce2eab162776867e4afe5b8dafe3b6
+  data.tar.gz: 93e2d478189c54928bd6adeaa48aca393b96f1a5b5807bd44019880a9808d78e97e633fcdfe4a13bf5379faccbbfa373491a4f372607637e4de2468edb250594

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.1.1
+
+- Add new option to use locale as first directory for cache path
+
+## 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

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) }
@@ -180,7 +186,9 @@ module SeoCache
       # return nil unless @options[:before_render]
       # cached_render = @options[:before_render].call(env)
 
-      cached_render = @page_caching.get(Rack::Request.new(env).path)
+      env_request = Rack::Request.new(env)
+
+      cached_render = @page_caching.get(env_request.path, get_locale(env_request.params, env_request.host))
 
       return nil unless cached_render
 
@@ -207,12 +215,21 @@ module SeoCache
     def after_render(env, response, status = 200)
       return unless response && SeoCache.cache_only_status.include?(status.to_i)
 
+      env_request = Rack::Request.new(env)
+
       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
 
-      @page_caching.cache(response, Rack::Request.new(env).path)
+      @page_caching.cache(response, env_request.path, get_locale(env_request.params, env_request.host))
+    end
+
+    def get_locale(params, host)
+      if SeoCache.locale_as_first_directory
+        SeoCache.locale_method ? SeoCache.locale_method.call(params, host) : I18n.locale
+      else
+        nil
+      end
     end
   end
 end

data/lib/seo_cache/page_caching.rb

@@ -13,31 +13,31 @@ module SeoCache
       @redis = Redis::Namespace.new(SeoCache.redis_namespace, redis: Redis.new(host: uri.host, port: uri.port, password: uri.password, connect_timeout: 1, timeout: 1), warnings: false)
     end
 
-    def get(path, extension = nil)
-      @redis.get(cache_path(path, extension)) if SeoCache.memory_cache? && @redis
+    def get(path, locale_domain = nil, extension = nil)
+      @redis.get(cache_path(path, locale_domain, extension)) if SeoCache.memory_cache? && @redis
     end
 
     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, locale_domain))
+          write_to_memory(content, cache_path(path, locale_domain, extension))
         else
-          write_to_disk(content, cache_path(path, extension, locale_domain), gzip)
+          write_to_disk(content, cache_path(path, locale_domain, extension), gzip)
         end
       end
     end
 
-    def expire(path)
+    def expire(path, locale_domain = nil, extension = nil)
       instrument :expire_page, path do
-        delete(cache_path(path))
+        delete(cache_path(path, locale_domain, extension))
       end
     end
 
-    def cache_exists?(path)
+    def cache_exists?(path, locale_domain = nil, extension = nil)
       if SeoCache.memory_cache? && @redis
-        @redis.exists(cache_path(path))
+        @redis.exists?(cache_path(path, locale_domain, extension))
       else
-        File.exist?(cache_path(path))
+        File.exist?(cache_path(path, locale_domain, extension))
       end
     end
 
@@ -51,7 +51,7 @@ module SeoCache
       SeoCache.cache_extension
     end
 
-    def cache_file(path, extension, locale_domain)
+    def cache_file(path, locale_domain, extension)
       name = if path.empty? || path =~ %r{\A/+\z}
                '/index'
              else
@@ -65,8 +65,8 @@ module SeoCache
       name
     end
 
-    def cache_path(path, extension = nil, locale_domain = nil)
-      File.join(cache_directory, cache_file(path, extension, locale_domain))
+    def cache_path(path, locale_domain = nil, extension = nil)
+      File.join(cache_directory, cache_file(path, locale_domain, extension))
     end
 
     def write_to_memory(content, path)

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) && !@force_cache
+      return if @page_caching.cache_exists?(path, nil, locale_domain) && !@force_cache
 
       url = @host + path
       url += path.include?('?') ? '&' : '?'

data/lib/seo_cache/version.rb

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

data/lib/seo_cache.rb

@@ -22,6 +22,12 @@ module SeoCache
   mattr_accessor :cache_path
   self.cache_path = ''
 
+  mattr_accessor :locale_as_first_directory
+  self.locale_as_first_directory = false
+
+  mattr_accessor :locale_method
+  self.locale_method = nil
+
   mattr_accessor :cache_extension
   self.cache_extension = '.html'
 

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.5
+  version: 1.1.1
 platform: ruby
 authors:
 - FloXcoder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-10-29 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.30
 signing_key: 
 specification_version: 4
 summary: Cache dedicated for SEO with Javascript rendering