seo_cache 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7286c3adfbf791c5b7091e4f689e4fbfe69bef35973e01c3f50f4d2fa3c8b9bb
-  data.tar.gz: 4b27b16b60243f1f428ad36aa6e00d9699d1e71afe42100c1e643ed56b06ba4a
+  metadata.gz: 959dca2a3a9df2edb1bf3b7ff01e09a5632fb572624d101acc46a2a773f1de4f
+  data.tar.gz: 176b714c37870807890538accd50b47849c42702e734fb0124841dc6df870296
 SHA512:
-  metadata.gz: 66ab72c0aea1d7029ebd8f39e90b8aa5b36e8d15951b0359824989175e56098d380882fe0e05c8a90e9faa1fbf4b43d2a9acd53ec9aea67aebf3ed87399858d2
-  data.tar.gz: 60121490b30d93c0fcd204f3dcf5c06bf3c9a14aa5e76eb19a9cf9986ff119bfb72b6e6ead3a119f33479334eeb5e8831b99bf68f56c7ad54ad44bfd20741eb8
+  metadata.gz: 433a9a7f97517d4c8e2b1335997c0d7de7c41044a51f8c90e3439ea07e92b4174986233e3ead7a72dd7a117674fc3b2d2cce2eab162776867e4afe5b8dafe3b6
+  data.tar.gz: 93e2d478189c54928bd6adeaa48aca393b96f1a5b5807bd44019880a9808d78e97e633fcdfe4a13bf5379faccbbfa373491a4f372607637e4de2468edb250594

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.1
+
+- Add new option to use locale as first directory for cache path
+
 ## 1.1.0
 
 - Update dependencies

data/lib/seo_cache/middleware.rb

@@ -186,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
 
@@ -213,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.1.0'.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'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seo_cache
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - FloXcoder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-10-29 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.29
+rubygems_version: 3.2.30
 signing_key: 
 specification_version: 4
 summary: Cache dedicated for SEO with Javascript rendering