wovnrb 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b52fa4c2f9eb449a733283bbe12420dcf4f60dd606ade7f919ffa43274659d4
-  data.tar.gz: e5b4113a7e9e09aa352efc2a53cbafa26930f3aca5f4ade9e2fe0b46e7754686
+  metadata.gz: ceba766ab6d122f9c54e48ab267ada742f7efabb4fc19e1f9c0a7f5e5ba47983
+  data.tar.gz: dfde93503c625a1bed27cd4b65b44a5cff3adff0d883a0f0824546eb02bd111f
 SHA512:
-  metadata.gz: 9010845d1a66b75de3093a5446571081598092183db5c02b8299492bc09319ab9372782467c694c2c86f62d4dd21238c31770267871542c819c87748ac4f4c20
-  data.tar.gz: 712d54ef68e854dec1017ef57bb147924fcbc4ecdb456af2d797aeb497a8d469045c35b9e5dd41d6dda0c74c6659f32c7560c236c0b1a3c4c1baa9961c479df9
+  metadata.gz: b0af38a90017f6e69f344fa9304c5c79dcf242796d57de31b44900534263673e94910109535783272ba7ad8ebfac399389ca20894d8f1a0e50d6ecd99e921b1b
+  data.tar.gz: adfce2cdbb1b99aeeb2612d68eda7e115018186d1cea1d602dd16754532326288610cf1c5db8f1b77a44c044b2a52d35e398135f7a07cef9c19a836c627bb74e

data/.circleci/config.yml

@@ -1,18 +1,29 @@
-version: 2
+version: 2.1
+
+orbs:
+  # https://github.com/CircleCI-Public/ruby-orb
+  ruby: circleci/ruby@1.1
 
 jobs:
-  build:
+  test:
+    parameters:
+      ruby-version:
+        type: string
     docker:
-      - image: circleci/ruby:2.3-jessie
+      - image: cimg/ruby:<< parameters.ruby-version >>
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - bundler-
       - run: bundle install --path vendor/bundle --jobs=4
-      - save_cache:
-          key: bundler-{{ checksum "Gemfile.lock" }}
-          paths:
-            - vendor/bundle
       - run: bundle exec rubocop
       - run: bundle exec rake test
+
+# https://circleci.com/blog/circleci-matrix-jobs/
+workflows:
+  build_and_test:
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              # https://github.com/CircleCI-Public/cimg-ruby
+              # only supports the last three ruby versions
+              ruby-version: ["2.5", "2.6", "2.7"]

data/.rubocop_todo.yml

@@ -6,17 +6,8 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLinesAroundAccessModifier:
-  Exclude:
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLinesAroundMethodBody:
-  Exclude:
-    - 'test/lib/text_caches/memory_cache_test.rb'
+Gemspec/RequiredRubyVersion:
+  Enabled: false
 
 # Offense count: 11
 # Cop supports --auto-correct.
@@ -25,13 +16,9 @@ Layout/ExtraSpacing:
   Exclude:
     - 'lib/wovnrb/lang.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/FirstHashElementIndentation:
+Style/HashEachMethods:
   Exclude:
-    - 'lib/wovnrb/text_caches/cache_base.rb'
+    - 'lib/wovnrb/store.rb'
 
 # Offense count: 4
 # Cop supports --auto-correct.
@@ -42,13 +29,6 @@ Layout/HeredocIndentation:
     - 'test/lib/lang_test.rb'
     - 'test/lib/wovnrb_test.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
-
 # Offense count: 3
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
@@ -70,13 +50,6 @@ Lint/ImplicitStringConcatenation:
   Exclude:
     - 'test/lib/lang_test.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
-Lint/UnusedMethodArgument:
-  Exclude:
-    - 'lib/wovnrb/text_caches/cache_base.rb'
-
 # Offense count: 5
 Lint/UselessAssignment:
   Exclude:
@@ -116,12 +89,13 @@ Metrics/MethodLength:
 # Offense count: 12
 Metrics/PerceivedComplexity:
   Max: 22
+  Exclude:
+    - 'lib/wovnrb/headers.rb'
 
 # Offense count: 3
 Naming/AccessorMethodName:
   Exclude:
     - 'lib/wovnrb/services/wovn_logger.rb'
-    - 'lib/wovnrb/text_caches/cache_base.rb'
 
 # Offense count: 120
 # Configuration parameters: .
@@ -153,12 +127,6 @@ Style/ClassCheck:
   Exclude:
     - 'lib/wovnrb/store.rb'
 
-# Offense count: 6
-Style/ClassVars:
-  Exclude:
-    - 'lib/wovnrb/text_caches/cache_base.rb'
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: Keywords.
@@ -183,8 +151,6 @@ Style/Documentation:
     - 'lib/wovnrb/services/wovn_logger.rb'
     - 'lib/wovnrb/settings.rb'
     - 'lib/wovnrb/store.rb'
-    - 'lib/wovnrb/text_caches/cache_base.rb'
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
 
 # Offense count: 2
 Style/DoubleNegation:
@@ -224,7 +190,6 @@ Style/IfUnlessModifier:
     - 'Rakefile'
     - 'lib/wovnrb/helpers/nokogumbo_helper.rb'
     - 'lib/wovnrb/store.rb'
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -241,7 +206,6 @@ Style/NegatedIf:
 Style/PreferredHashMethods:
   Exclude:
     - 'lib/wovnrb/store.rb'
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -297,7 +261,7 @@ Style/ZeroLengthPredicate:
 # Offense count: 1436
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
+Layout/LineLength:
   Max: 1424
 
 Style/FrozenStringLiteralComment:
@@ -310,6 +274,7 @@ Style/SafeNavigation:
   Enabled: false
 
 AllCops:
+  NewCops: enable
   Exclude:
     - 'docker/**/*'
-    - 'vendor/**/*'
+    - 'vendor/**/*'

data/Gemfile

@@ -1,7 +1,2 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in wovn.gemspec
-if RUBY_VERSION < '2.2.2'
-  gem 'activesupport', '< 5.0.0'
-end
 gemspec

data/docker/docker-compose.yml

@@ -9,3 +9,8 @@ services:
       - 4000:4000
     volumes:
       - ../:/usr/src/app/wovnrb
+    networks:
+      - backend-network
+networks:
+  backend-network:
+    name: 'backend-network'

data/docker/rails/TestSite/app/controllers/custom_response_controller.rb

@@ -0,0 +1,16 @@
+class CustomResponseController < ApplicationController
+  skip_before_action :verify_authenticity_token2
+
+  def make_response
+    response_args_json = params[:response]
+    raise ActionController::BadRequest unless response_args_json
+
+    (response_args_json[:headers] || {}).each do |name, value|
+      response.headers[name] = value
+    end
+
+    render inline: response_args_json[:body],
+           status: response_args_json[:status],
+           content_type: response_args_json[:content_type]
+  end
+end

data/docker/rails/TestSite/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
   get "/redirecting_page" => "redirects#show"
+  get "/custom_response/*all" => "custom_response#make_response"
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
 end

data/docker/rails/TestSite/yarn.lock

@@ -2592,9 +2592,9 @@ dns-equal@^1.0.0:
   integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
+  integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -5863,9 +5863,9 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
     uniq "^1.0.1"
 
 postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
-  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
+  version "7.0.36"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
+  integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -7581,9 +7581,9 @@ wrappy@1:
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
     async-limiter "~1.0.0"
 

data/lib/wovnrb.rb

@@ -9,7 +9,6 @@ require 'nokogumbo'
 require 'active_support'
 require 'json'
 require 'wovnrb/helpers/nokogumbo_helper'
-require 'wovnrb/text_caches/cache_base'
 require 'wovnrb/railtie' if defined?(Rails)
 require 'wovnrb/version'
 
@@ -18,9 +17,8 @@ module Wovnrb
     def initialize(app, opts = {})
       @app = app
       @store = Store.instance
-      opts = opts.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v }
+      opts = opts.transform_keys(&:to_s)
       @store.update_settings(opts)
-      CacheBase.set_single(@store.settings)
     end
 
     def call(env)

data/lib/wovnrb/api_translator.rb

@@ -109,7 +109,7 @@ module Wovnrb
     end
 
     def api_uri
-      Addressable::URI.parse(@store.settings['api_url'] + '/v0/')
+      Addressable::URI.parse("#{@store.settings['api_url']}/v0/")
     end
 
     def api_timeout

data/lib/wovnrb/headers.rb

@@ -1,17 +1,10 @@
 module Wovnrb
   class Headers
-    attr_reader :unmasked_url
-    attr_reader :url
-    attr_reader :protocol
-    attr_reader :unmasked_host
-    attr_reader :host
-    attr_reader :unmasked_pathname
-    attr_reader :pathname
-    attr_reader :pathname_with_trailing_slash_if_present
+    attr_reader :unmasked_url, :url, :protocol, :unmasked_host, :host, :unmasked_pathname, :pathname, :pathname_with_trailing_slash_if_present
 
     # Generates new instance of Wovnrb::Headers.
     # Its parameters are set by parsing env variable.
-    #
+
     def initialize(env, settings)
       request = Rack::Request.new(env)
 
@@ -42,21 +35,21 @@ module Wovnrb
       @pathname, @query = @env['REQUEST_URI'].split('?')
       @pathname = settings['url_pattern'] == 'path' ? remove_lang(@pathname, lang_code) : @pathname
       @query ||= ''
-      @url = "#{@host}#{@pathname}#{(!@query.empty? ? '?' : '') + remove_lang(@query, lang_code)}"
-      if !settings['query'].empty?
+      @url = "#{@host}#{@pathname}#{(@query.empty? ? '' : '?') + remove_lang(@query, lang_code)}"
+      if settings['query'].empty?
+        @query = ''
+      else
         query_vals = []
         settings['query'].each do |qv|
           rx = Regexp.new("(^|&)(?<query_val>#{qv}[^&]+)(&|$)")
           m = @query.match(rx)
           query_vals.push(m[:query_val]) if m && m[:query_val]
         end
-        @query = if !query_vals.empty?
-                   "?#{query_vals.sort.join('&')}"
-                 else
+        @query = if query_vals.empty?
                    ''
+                 else
+                   "?#{query_vals.sort.join('&')}"
                  end
-      else
-        @query = ''
       end
       @query = remove_lang(@query, lang_code)
       @pathname_with_trailing_slash_if_present = @pathname
@@ -115,11 +108,11 @@ module Wovnrb
         case @settings['url_pattern']
         when 'query'
           lang_param_name = @settings['lang_param_name']
-          if location !~ /\?/
-            location = "#{location}?#{lang_param_name}=#{lang_code}"
-          else @env['REQUEST_URI'] !~ /(\?|&)#{lang_param_name}=/
-               location = "#{location}&#{lang_param_name}=#{lang_code}"
-          end
+          location = if location =~ /\?/
+                       "#{location}&#{lang_param_name}=#{lang_code}"
+                     else
+                       "#{location}?#{lang_param_name}=#{lang_code}"
+                     end
         when 'subdomain'
           location = "#{lang_code.downcase}.#{location}"
         # when 'path'
@@ -173,7 +166,7 @@ module Wovnrb
         lang_param_name = @settings['lang_param_name']
         uri.sub(/(^|\?|&)#{lang_param_name}=#{lang_code}(&|$)/, '\1').gsub(/(\?|&)$/, '')
       when 'subdomain'
-        rp = Regexp.new('(^|(//))' + lang_code + '\.', 'i')
+        rp = Regexp.new("(^|(//))#{lang_code}\\.", 'i')
         uri.sub(rp, '\1')
       # when 'path'
       else
@@ -182,24 +175,22 @@ module Wovnrb
     end
 
     def out(headers)
-      r = Regexp.new('//' + @host)
+      r = Regexp.new("//#{@host}")
       lang_code = Store.instance.settings['custom_lang_aliases'][self.lang_code] || self.lang_code
-      if lang_code != @settings['default_lang'] && headers.key?('Location') && headers['Location'] =~ r
-        unless @settings['ignore_globs'].ignore?(headers['Location'])
-          case @settings['url_pattern']
-          when 'query'
-            headers['Location'] += if headers['Location'] =~ /\?/
-                                     '&'
-                                   else
-                                     '?'
-                                   end
-            headers['Location'] += "#{@settings['lang_param_name']}=#{lang_code}"
-          when 'subdomain'
-            headers['Location'] = headers['Location'].sub(/\/\/([^.]+)/, '//' + lang_code + '.\1')
-          # when 'path'
-          else
-            headers['Location'] = headers['Location'].sub(/(\/\/[^\/]+)/, '\1/' + lang_code)
-          end
+      if lang_code != @settings['default_lang'] && headers.key?('Location') && headers['Location'] =~ r && !@settings['ignore_globs'].ignore?(headers['Location'])
+        case @settings['url_pattern']
+        when 'query'
+          headers['Location'] += if headers['Location'] =~ /\?/
+                                   '&'
+                                 else
+                                   '?'
+                                 end
+          headers['Location'] += "#{@settings['lang_param_name']}=#{lang_code}"
+        when 'subdomain'
+          headers['Location'] = headers['Location'].sub(/\/\/([^.]+)/, "//#{lang_code}.\\1")
+        # when 'path'
+        else
+          headers['Location'] = headers['Location'].sub(/(\/\/[^\/]+)/, "\\1/#{lang_code}")
         end
       end
       headers

data/lib/wovnrb/helpers/nokogumbo_helper.rb

@@ -2,15 +2,13 @@ module Wovnrb
   module Helpers
     module NokogumboHelper
       def parse_html(html_string, encoding = 'UTF-8')
-        dom = if html_string.strip[0..999] =~ /<html/i
-                d = Nokogiri::HTML5(html_string)
-                d.encoding = encoding
-                d
-              else
-                parse_fragment(html_string, encoding)
-              end
-
-        dom
+        if html_string.strip[0..999] =~ /<html/i
+          d = Nokogiri::HTML5(html_string)
+          d.encoding = encoding
+          d
+        else
+          parse_fragment(html_string, encoding)
+        end
       end
 
       # https://www.rubydoc.info/gems/nokogumbo/Nokogiri/HTML5#fragment-class_method

data/lib/wovnrb/lang.rb

@@ -146,46 +146,47 @@ module Wovnrb
         if uri.host.downcase === headers.host.downcase
           case pattern
           when 'subdomain'
-            sub_d = href.match(/\/\/([^\.]*)\./)[1]
+            sub_d = href.match(/\/\/([^.]*)\./)[1]
             sub_code = Lang.get_code(sub_d)
             new_href = if sub_code && sub_code.casecmp(code_to_add).zero?
                          href.sub(Regexp.new(code_to_add, 'i'), code_to_add.downcase)
                        else
-                         href.sub(/(\/\/)([^\.]*)/, '\1' + code_to_add.downcase + '.' + '\2')
+                         href.sub(/(\/\/)([^.]*)/, "\\1#{code_to_add.downcase}.\\2")
                        end
           when 'query'
             new_href = add_query_lang_code(href, code_to_add, lang_param_name)
           else # path
-            new_href = href.sub(/([^\.]*\.[^\/]*)(\/|$)/, '\1/' + code_to_add + '/')
+            new_href = href.sub(/([^.]*\.[^\/]*)(\/|$)/, "\\1/#{code_to_add}/")
           end
         end
       elsif href
         case pattern
         when 'subdomain'
-          lang_url = headers.protocol + '://' + code_to_add.downcase + '.' + headers.host
-          current_dir = headers.pathname.sub(/[^\/]*\.[^\.]{2,6}$/, '')
-          new_href = if href =~ /^\.\..*$/
+          lang_url = "#{headers.protocol}://#{code_to_add.downcase}.#{headers.host}"
+          current_dir = headers.pathname.sub(/[^\/]*\.[^.]{2,6}$/, '')
+          new_href = case href
+                     when /^\.\..*$/
                        # ../path
-                       lang_url + '/' + href.gsub(/^\.\.\//, '')
-                     elsif href =~ /^\..*$/
+                       "#{lang_url}/#{href.gsub(/^\.\.\//, '')}"
+                     when /^\..*$/
                        # ./path
-                       lang_url + current_dir + '/' + href.gsub(/^\.\//, '')
-                     elsif href =~ /^\/.*$/
+                       "#{lang_url}#{current_dir}/#{href.gsub(/^\.\//, '')}"
+                     when /^\/.*$/
                        # /path
                        lang_url + href
                      else
                        # path
-                       lang_url + current_dir + '/' + href
+                       "#{lang_url}#{current_dir}/#{href}"
                      end
         when 'query'
           new_href = add_query_lang_code(href, code_to_add, lang_param_name)
         else # path
           if href =~ /^\//
-            new_href = '/' + code_to_add + href
+            new_href = "/#{code_to_add}#{href}"
           else
-            current_dir = headers.pathname.sub(/[^\/]*\.[^\.]{2,6}$/, '')
+            current_dir = headers.pathname.sub(/[^\/]*\.[^.]{2,6}$/, '')
             current_dir = '/' if current_dir == ''
-            new_href = '/' + code_to_add + current_dir + href
+            new_href = "/#{code_to_add}#{current_dir}#{href}"
           end
         end
       end

data/lib/wovnrb/railtie.rb

@@ -1,7 +1,9 @@
 module Wovnrb
   class Railtie < Rails::Railtie
     initializer 'wovnrb.configure_rails_initialization' do |app|
-      app.middleware.insert_before(0, Wovnrb::Interceptor) if Rails.configuration.wovnrb[:install_middleware]
+      install_middleware = Rails.configuration.wovnrb.fetch(:install_middleware, true)
+
+      app.middleware.insert_before(0, Wovnrb::Interceptor) if install_middleware
     end
   end
 end

data/lib/wovnrb/services/html_converter.rb

@@ -41,7 +41,7 @@ module Wovnrb
 
       @dom.traverse { |node| transform_node(node, marker) }
 
-      insert_snippet(true)
+      insert_snippet(adds_backend_error_mark: true)
       insert_hreflang_tags
       inject_lang_html_tag
 
@@ -79,7 +79,7 @@ module Wovnrb
       return unless classes.present?
 
       ignored_classes = @store.settings['ignore_class']
-      should_be_ignored = (ignored_classes & classes.split(' ')).present?
+      should_be_ignored = (ignored_classes & classes.split).present?
 
       put_replace_marker(node, marker) if should_be_ignored
     end
@@ -147,10 +147,10 @@ module Wovnrb
     end
 
     def widget_urls
-      [@store.settings['api_url'] + '/widget', 'j.wovn.io', 'j.dev-wovn.io:3000']
+      ["#{@store.settings['api_url']}/widget", 'j.wovn.io', 'j.dev-wovn.io:3000']
     end
 
-    def insert_snippet(adds_backend_error_mark = true)
+    def insert_snippet(adds_backend_error_mark: true)
       parent_node = @dom.at_css('head') || @dom.at_css('body') || @dom.at_css('html')
       return unless parent_node
 
@@ -162,10 +162,10 @@ module Wovnrb
       # do this so that there will be a closing tag (better compatibility with browsers)
       insert_node.content = ''
 
-      if !parent_node.children.empty?
-        parent_node.children.first.add_previous_sibling(insert_node)
-      else
+      if parent_node.children.empty?
         parent_node.add_child(insert_node)
+      else
+        parent_node.children.first.add_previous_sibling(insert_node)
       end
     end
 

data/lib/wovnrb/store.rb

@@ -141,19 +141,16 @@ module Wovnrb
       end
       @settings.delete('user_token')
 
-      if @settings['url_pattern'] == 'path'
+      case @settings['url_pattern']
+      when 'path'
         @settings['url_pattern_reg'] = "/(?<lang>[^/.?]+)"
-      elsif @settings['url_pattern'] == 'query'
+      when 'query'
         @settings['url_pattern_reg'] = "((\\?.*&)|\\?)#{@settings['lang_param_name']}=(?<lang>[^&]+)(&|$)"
-      elsif @settings['url_pattern'] == 'subdomain'
+      when 'subdomain'
         @settings['url_pattern_reg'] = "^(?<lang>[^.]+)\."
       end
 
-      @settings['test_mode'] = if @settings['test_mode'] != true || @settings['test_mode'] != 'on'
-                                 false
-                               else
-                                 true
-                               end
+      @settings['test_mode'] = !(@settings['test_mode'] != true || @settings['test_mode'] != 'on')
 
       if @settings['wovn_dev_mode']
         if @settings['api_url'] == self.class.default_settings['api_url']

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = '3.0.1'.freeze
+  VERSION = '3.0.3'.freeze
 end

data/test/lib/api_translator_test.rb

@@ -85,11 +85,10 @@ module Wovnrb
                           compress(stub_response_json)
                         end
         response_headers = { 'Content-Encoding' => response[:encoding] || 'gzip' }
-        stub = stub_request(:post, api_url)
-               .with(body: compressed_data, headers: headers)
-               .to_return(status: response[:status_code] || 200, body: stub_response, headers: response_headers)
+        stub_request(:post, api_url)
+          .with(body: compressed_data, headers: headers)
+          .to_return(status: response[:status_code] || 200, body: stub_response, headers: response_headers)
 
-        stub
       end
     end
 

data/test/lib/lang_test.rb

@@ -21,9 +21,10 @@ module Wovnrb
 
     def test_iso_639_1_normalization
       Wovnrb::Lang::LANG.each do |_, l|
-        if l[:code] == 'zh-CHS'
+        case l[:code]
+        when 'zh-CHS'
           assert_equal('zh-Hans',  Lang.iso_639_1_normalization('zh-CHS'))
-        elsif l[:code] == 'zh-CHT'
+        when 'zh-CHT'
           assert_equal('zh-Hant',  Lang.iso_639_1_normalization('zh-CHT'))
         else
           assert_equal(l[:code], Lang.iso_639_1_normalization(l[:code]))
@@ -89,7 +90,7 @@ module Wovnrb
       assert_equal('http://zh-cht.wovn.io/topics/31', lang.add_lang_code('http://wovn.io/topics/31', 'subdomain', h))
     end
 
-    def test_add_lang_code_trad_chinese_2
+    def test_add_lang_code_trad_chinese2
       lang = Lang.new('zh-cht')
       h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://zh-cht.wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
       assert_equal('http://zh-cht.wovn.io/topics/31', lang.add_lang_code('/topics/31', 'subdomain', h))
@@ -107,7 +108,7 @@ module Wovnrb
       assert_equal('//zh-cht.google.com', lang.add_lang_code('//google.com', 'subdomain', h))
     end
 
-    def test_add_lang_code_no_protocol_2
+    def test_add_lang_code_no_protocol2
       lang = Lang.new('zh-cht')
       h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'https://zh-cht.wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
       assert_equal('//google.com', lang.add_lang_code('//google.com', 'subdomain', h))
@@ -311,138 +312,6 @@ module Wovnrb
       assert_equal('/fr/index.html', lang.add_lang_code('index.html', 'path', headers))
     end
 
-    def generate_body(param = '')
-      body = case param
-             when 'ignore_parent'
-               "<html><body><h1>Mr. Belvedere Fan Club</h1>
-                     <div wovn-ignore><p>Hello</p></div>
-                   </body></html>"
-             when 'ignore_everything'
-               "<html><body wovn-ignore><h1>Mr. Belvedere Fan Club</h1>
-                     <div><p>Hello</p></div>
-                   </body></html>"
-             when 'ignore_parent_translated_in_japanese'
-               "<html lang=\"ja\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;langCodeAliases={}&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.ignore-page.com/\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://ignore-page.com/\"></head><body><h1><!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>
-                     <div wovn-ignore=\"\"><p>Hello</p></div>
-                   </body></html>
-       "
-             when 'translated_in_japanese'
-               "<html lang=\"ja\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;langCodeAliases={}&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://page.com/\"></head><body><h1><!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>
-                     <div><p><!--wovn-src:Hello-->こんにちは</p></div>
-                   </body></html>
-       "
-             when 'ignore_everything_translated'
-               "<html lang=\"ja\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;langCodeAliases={}&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.ignore-page.com/\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://ignore-page.com/\"></head><body wovn-ignore=\"\"><h1>Mr. Belvedere Fan Club</h1>
-                     <div><p>Hello</p></div>
-                   </body></html>
-       "
-             when 'empty'
-               '<html><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore><p>Hello</p></div></body></html>'
-             when 'empty_single_quote'
-               "<html><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore=''><p>Hello</p></div></body></html>"
-             when 'empty_double_quote'
-               '<html><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore=''><p>Hello</p></div></body></html>'
-             when 'value_single_quote'
-               "<html><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore='value'><p>Hello</p></div></body></html>"
-             when 'value_double_quote'
-               '<html><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore="value"><p>Hello</p></div></body></html>'
-             when 'empty_translated'
-               "<html lang=\"ja\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;langCodeAliases={}&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.ignore-page.com/\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://ignore-page.com/\"></head><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore=\"\"><p>Hello</p></div></body></html>\n"
-             when 'empty_single_quote_translated'
-               "<html lang=\"ja\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;langCodeAliases={}&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.ignore-page.com/\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://ignore-page.com/\"></head><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore=\"\"><p>Hello</p></div></body></html>\n"
-             when 'empty_double_quote_translated'
-               "<html lang=\"ja\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;langCodeAliases={}&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.ignore-page.com/\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://ignore-page.com/\"></head><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore=\"\"><p>Hello</p></div></body></html>\n"
-             when 'value_single_quote_translated'
-               "<html lang=\"ja\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;langCodeAliases={}&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.ignore-page.com/\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://ignore-page.com/\"></head><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore=\"value\"><p>Hello</p></div></body></html>\n"
-             when 'value_double_quote_translated'
-               "<html lang=\"ja\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;langCodeAliases={}&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.ignore-page.com/\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://ignore-page.com/\"></head><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore=\"value\"><p>Hello</p></div></body></html>\n"
-             when 'meta_img_alt_tags_translated'
-               "<html lang=\"ja\"><head><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;langCodeAliases={}&amp;version=#{Wovnrb::VERSION}\"> </script><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><meta name=\"description\" content=\"こんにちは\">\n<meta name=\"title\" content=\"こんにちは\">\n<meta property=\"og:title\" content=\"こんにちは\">\n<meta property=\"og:description\" content=\"こんにちは\">\n<meta property=\"twitter:title\" content=\"こんにちは\">\n<meta property=\"twitter:description\" content=\"こんにちは\"><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://page.com/\"></head>\n<body><h1><!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>\n<div><p><!--wovn-src:Hello-->こんにちは</p></div>\n<!--wovn-src:Hello--><img src=\"http://example.com/photo.png\" alt=\"こんにちは\">\n</body></html>\n"
-             when  'meta_img_alt_tags'
-               "<html><head><meta name =\"description\" content=\"Hello\">\n<meta name=\"title\" content=\"Hello\">\n<meta property=\"og:title\" content=\"Hello\">\n<meta property=\"og:description\" content=\"Hello\">\n<meta property=\"twitter:title\" content=\"Hello\">\n<meta property=\"twitter:description\" content=\"Hello\"></head>
-       <body><h1>Mr. Belvedere Fan Club</h1>
-       <div><p>Hello</p></div>
-       <img src=\"http://example.com/photo.png\" alt=\"Hello\">
-       </body></html>"
-             when  'a_href_javascript'
-               "<html><body><h1>Mr. Belvedere Fan Club</h1>
-                     <div><p><a href=\"javascript:void(0)\">Hello</a></p></div>
-                   </body></html>"
-             when  'a_href_javascript_translated'
-               "<html lang=\"ja\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;langCodeAliases={}&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://page.com/\"></head><body><h1><!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>
-                     <div><p><a href=\"javascript:void(0)\"><!--wovn-src:Hello-->こんにちは</a></p></div>
-                   </body></html>
-       "
-             when 'unified_values'
-               <<-HTML
-        <html><body>
-          <div>
-            a <span>b</span> c
-          </div>
-          <div>
-            a<span>b</span>
-          </div>
-          <div>
-            <span> b </span>c
-          </div>
-</body></html>
-               HTML
-
-             when 'unified_values_ja'
-               <<-HTML
-<html lang=\"ja\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;langCodeAliases={}&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"en\" href=\"http://page.com/\"></head><body>
-          <div><!--wovn-src:
-            a -->\u3042<span><!--wovn-src:b-->\u3044</span><!--wovn-src: c
-          -->\u3046</div>
-          <div><!--wovn-src:
-            a-->\u200B<span><!--wovn-src:b-->\u3044</span><!--wovn-src:-->\u3046
-          </div>
-          <div>
-            <!--wovn-src:-->\u3042<span><!--wovn-src: b -->\u3044</span><!--wovn-src:c
-          -->\u200B</div>
-
-</body></html>
-               HTML
-
-             else # "" case
-               "<html><body><h1>Mr. Belvedere Fan Club</h1>
-                       <div><p>Hello</p></div>
-                     </body></html>"
-             end
-
-      body
-    end
-
-    def generate_dom(param = '')
-      Wovnrb.to_dom(generate_body(param))
-    end
-
-    def generate_values
-      values = {}
-      values['text_vals'] = {
-        'Hello' => { 'ja' => [{ 'data' => 'こんにちは' }] },
-        'Mr. Belvedere Fan Club' => { 'ja' => [{ 'data' => 'ベルベデアさんファンクラブ' }] }
-      }
-      values
-    end
-
-    def generate_unified_values
-      {
-        'html_text_vals' => {
-          'a<span>b</span>c' =>
-                { 'ja' =>
-                      [{ 'data' => 'あ<span>い</span>う' }] },
-          'a<span>b</span>' =>
-                { 'ja' =>
-                      [{ 'data' => '<span>い</span>う' }] },
-          '<span>b</span>c' =>
-                { 'ja' =>
-                      [{ 'data' => 'あ<span>い</span>' }] }
-
-        }
-      }
-    end
-
     def test_get_code_from_custom_lang
       store = Store.instance
       store.settings['custom_lang_aliases'] = { 'ja' => 'staging-ja' }

data/test/lib/services/html_converter_test.rb

@@ -25,10 +25,10 @@ module Wovnrb
 
     def test_build_api_compatible_html_not_fail_for_big_content
       long_string = 'a' * 60_000
-      converter = prepare_html_converter('<html><body><p>' + long_string + '</p></body></html>', supported_langs: %w[en vi])
+      converter = prepare_html_converter("<html><body><p>#{long_string}</p></body></html>", supported_langs: %w[en vi])
       converted_html, = converter.build_api_compatible_html
 
-      expected_html = "<html lang=\"en\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=123456&amp;backend=true&amp;currentLang=en&amp;defaultLang=en&amp;urlPattern=query&amp;langCodeAliases={}&amp;langParamName=wovn&amp;version=WOVN.rb_#{VERSION}\" data-wovnio-type=\"fallback_snippet\"></script><link rel=\"alternate\" hreflang=\"en\" href=\"http://my-site.com/\"><link rel=\"alternate\" hreflang=\"vi\" href=\"http://my-site.com/?wovn=vi\"></head><body><p>" + long_string + '</p></body></html>'
+      expected_html = "<html lang=\"en\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=123456&amp;backend=true&amp;currentLang=en&amp;defaultLang=en&amp;urlPattern=query&amp;langCodeAliases={}&amp;langParamName=wovn&amp;version=WOVN.rb_#{VERSION}\" data-wovnio-type=\"fallback_snippet\"></script><link rel=\"alternate\" hreflang=\"en\" href=\"http://my-site.com/\"><link rel=\"alternate\" hreflang=\"vi\" href=\"http://my-site.com/?wovn=vi\"></head><body><p>#{long_string}</p></body></html>"
       assert_equal(expected_html, converted_html)
     end
 

data/test/lib/wovnrb_test.rb

@@ -24,7 +24,7 @@ class WovnrbTest < Minitest::Test
       '</body></html>'
     ].join
 
-    assert_switch_lang('en', 'ja', body, expected_body, true)
+    assert_switch_lang('en', 'ja', body, expected_body, api_expected: true)
   end
 
   def test_switch_lang_with_input_tags
@@ -52,14 +52,14 @@ class WovnrbTest < Minitest::Test
       '</body></html>'
     ].join
 
-    assert_switch_lang('en', 'ja', body, expected_body, true)
+    assert_switch_lang('en', 'ja', body, expected_body, api_expected: true)
   end
 
   def test_switch_lang_of_html_fragment_with_japanese_translations
     bodies = ['<span>Hello</span>'].join
     expected_bodies = ['<span><!--wovn-src:Hello-->こんにちは</span>'].join
 
-    assert_switch_lang('en', 'ja', bodies, expected_bodies, true)
+    assert_switch_lang('en', 'ja', bodies, expected_bodies, api_expected: true)
   end
 
   def test_switch_lang_splitted_body
@@ -68,7 +68,7 @@ class WovnrbTest < Minitest::Test
               '</body></html>'].join
     expected_bodies = ["<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=123456&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=subdomain&amp;langCodeAliases={}&amp;version=WOVN.rb_#{Wovnrb::VERSION}\" data-wovnio-type=\"fallback_snippet\"></script><link rel=\"alternate\" hreflang=\"en\" href=\"http://page.com/\"></head><body><h1>Mr. Belvedere Fan Club</h1><div><p>Hello</p></div></body></html>"].join
 
-    assert_switch_lang('en', 'ja', bodies, expected_bodies, true)
+    assert_switch_lang('en', 'ja', bodies, expected_bodies, api_expected: true)
   end
 
   def test_switch_lang_of_html_fragment_in_splitted_body
@@ -76,7 +76,7 @@ class WovnrbTest < Minitest::Test
             '<option value="2">2</option></select>'].join
     expected_body = ['<select name="test"><option value="1">1</option><option value="2">2</option></select>'].join
 
-    assert_switch_lang('en', 'ja', body, expected_body, true)
+    assert_switch_lang('en', 'ja', body, expected_body, api_expected: true)
   end
 
   def test_switch_lang_missing_values
@@ -88,7 +88,7 @@ class WovnrbTest < Minitest::Test
               </body></html>
 "
 
-    assert_switch_lang('en', 'ja', body, expected_body, true)
+    assert_switch_lang('en', 'ja', body, expected_body, api_expected: true)
   end
 
   def test_switch_lang_on_fragment_with_translate_fragment_false
@@ -96,7 +96,7 @@ class WovnrbTest < Minitest::Test
                 <div><p>Hello</p></div>"
 
     Wovnrb::Store.instance.settings['translate_fragment'] = false
-    assert_switch_lang('en', 'ja', body, body, false)
+    assert_switch_lang('en', 'ja', body, body, api_expected: false)
   end
 
   def test_switch_lang_on_fragment_with_translate_fragment_true
@@ -106,7 +106,7 @@ class WovnrbTest < Minitest::Test
                 <div><p><!--wovn-src:Hello-->こんにちは</p></div>"
 
     Wovnrb::Store.instance.settings['translate_fragment'] = true
-    assert_switch_lang('en', 'ja', body, expected_body, true)
+    assert_switch_lang('en', 'ja', body, expected_body, api_expected: true)
   end
 
   def test_switch_lang_ignores_amp
@@ -120,7 +120,7 @@ class WovnrbTest < Minitest::Test
 </html>
 HTML
 
-    assert_switch_lang('en', 'ja', body, body, false)
+    assert_switch_lang('en', 'ja', body, body, api_expected: false)
   end
 
   def test_switch_lang_ignores_amp_defined_with_symbol_attribute
@@ -133,7 +133,7 @@ HTML
 </html>
 HTML
 
-    assert_switch_lang('en', 'ja', body, body, false)
+    assert_switch_lang('en', 'ja', body, body, api_expected: false)
   end
 
   def test_call_without_path_ignored_should_change_environment
@@ -249,7 +249,7 @@ HTML
     assert_equal(unaffected_env != app_mock.env, affected)
   end
 
-  def assert_switch_lang(original_lang, target_lang, body, expected_body, api_expected = true)
+  def assert_switch_lang(original_lang, target_lang, body, expected_body, api_expected: true)
     subdomain = target_lang == original_lang ? '' : "#{target_lang}."
     interceptor = Wovnrb::Interceptor.new(get_app)
 
@@ -303,7 +303,7 @@ HTML
 
     def initialize(opts = {})
       @params = {}
-      if opts.key?(:params) && opts[:params].class == Hash
+      if opts.key?(:params) && opts[:params].instance_of?(Hash)
         opts[:params].each do |key, val|
           @params[key] = val
         end

data/wovnrb.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Ruby gem for WOVN backend on Rack.'
   spec.homepage      = 'https://wovn.io'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.5'
 
   files = `git ls-files -z`.split("\x0")
   files.delete('BEFORE_PUSHING')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Wovn Technologies, Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -405,7 +405,6 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - PULL_REQUEST_TEMPLATE
@@ -428,6 +427,7 @@ files:
 - docker/rails/TestSite/app/channels/application_cable/connection.rb
 - docker/rails/TestSite/app/controllers/application_controller.rb
 - docker/rails/TestSite/app/controllers/concerns/.keep
+- docker/rails/TestSite/app/controllers/custom_response_controller.rb
 - docker/rails/TestSite/app/controllers/pages_controller.rb
 - docker/rails/TestSite/app/controllers/redirects_controller.rb
 - docker/rails/TestSite/app/helpers/application_helper.rb
@@ -527,8 +527,6 @@ files:
 - lib/wovnrb/services/wovn_logger.rb
 - lib/wovnrb/settings.rb
 - lib/wovnrb/store.rb
-- lib/wovnrb/text_caches/cache_base.rb
-- lib/wovnrb/text_caches/memory_cache.rb
 - lib/wovnrb/version.rb
 - makefile
 - test/fixtures/html/test.html
@@ -541,8 +539,6 @@ files:
 - test/lib/services/html_replace_marker_test.rb
 - test/lib/services/wovn_logger_test.rb
 - test/lib/store_test.rb
-- test/lib/text_caches/cache_base_test.rb
-- test/lib/text_caches/memory_cache_test.rb
 - test/lib/wovnrb_test.rb
 - test/test_helper.rb
 - wovnrb.gemspec
@@ -550,7 +546,7 @@ homepage: https://wovn.io
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -558,15 +554,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Gem for WOVN.io
 test_files:
@@ -580,7 +576,5 @@ test_files:
 - test/lib/services/html_replace_marker_test.rb
 - test/lib/services/wovn_logger_test.rb
 - test/lib/store_test.rb
-- test/lib/text_caches/cache_base_test.rb
-- test/lib/text_caches/memory_cache_test.rb
 - test/lib/wovnrb_test.rb
 - test/test_helper.rb

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  # Supported versions are
-  # > Ruby version:2.2 or later
-  # https://wovn.io/support/ruby-library/
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - 2.2.9
-  # There is no support for 2.1 officially, but test for now.
-  - 2.1.10
-before_install:
-  - gem update bundler --no-document

data/lib/wovnrb/text_caches/cache_base.rb

@@ -1,53 +0,0 @@
-require 'active_support/inflector'
-
-module Wovnrb
-  class CacheBase
-    @@strategy_map = {
-        memory: :memory_cache
-    }
-
-    @@default_base_config = {
-      strategy: :memory
-    }
-
-    @@singleton_cache = nil
-    def self.get_single
-      raise 'cache is not initialized' unless @@singleton_cache
-
-      @@singleton_cache
-    end
-
-    def self.set_single(config)
-      @@singleton_cache = build(config)
-    end
-
-    def self.reset_cache
-      @@singleton_cache = nil
-    end
-
-    def self.build(config)
-      @config = @@default_base_config.merge config
-
-      strategy = @@strategy_map[@config[:strategy]]
-      raise "Invalid strategy: #{strategy}" unless strategy
-
-      strategy_sym = strategy.to_sym
-      begin
-        require "wovnrb/text_caches/#{strategy_sym}"
-      rescue LoadError => e
-        raise "Could not find #{strategy_sym} (#{e})"
-      end
-
-      strategy_class = Wovnrb.const_get(ActiveSupport::Inflector.camelize(strategy_sym))
-      strategy_class.new(config)
-    end
-
-    def put(key, value)
-      raise NotImplementedError.new('put is not defined')
-    end
-
-    def get(key)
-      raise NotImplementedError.new('put is not defined')
-    end
-  end
-end

data/lib/wovnrb/text_caches/memory_cache.rb

@@ -1,51 +0,0 @@
-require 'active_support/cache'
-require 'lz4-ruby'
-
-module Wovnrb
-  class MemoryCache < CacheBase
-    @@default_memory_cache_config = {
-      cache_megabytes: 200,
-      ttl_seconds: 300
-    }
-
-    def initialize(config)
-      @config = merge_setting(@@default_memory_cache_config, config)
-      cache_size = @config[:cache_megabytes].to_f
-      ttl = @config[:ttl_seconds].to_i
-      @cache_store = ActiveSupport::Cache::MemoryStore.new(expires_in: ttl.seconds, size: cache_size.megabytes)
-    end
-
-    def put(key, value)
-      @cache_store.write(key, compress(value))
-    end
-
-    def get(key)
-      stored_value =@cache_store.fetch(key)
-      decompress(stored_value) if stored_value
-    end
-
-    def options
-      @cache_store.options.clone
-    end
-
-    private
-    def merge_setting(original_config, merging_config)
-      config = original_config.clone
-      config.keys.each do |key|
-        key_string = key.to_s
-        if merging_config.has_key?(key_string) && merging_config[key_string].present?
-          config[key] = merging_config[key_string]
-        end
-      end
-      config
-    end
-
-    def compress(value)
-      LZ4.compress(value)
-    end
-
-    def decompress(value)
-      LZ4.decompress(value, value.bytesize, 'UTF-8')
-    end
-  end
-end

data/test/lib/text_caches/cache_base_test.rb

@@ -1,31 +0,0 @@
-require 'wovnrb/text_caches/cache_base'
-require 'minitest/autorun'
-
-class CacheBaseTest < Minitest::Test
-  def setup
-    Wovnrb::CacheBase.reset_cache
-  end
-
-  def test_build
-    cache = Wovnrb::CacheBase.build({})
-    assert_equal('Wovnrb::MemoryCache', cache.class.name)
-  end
-
-  def test_build_with_invalid_strategy
-    assert_raises RuntimeError do
-      Wovnrb::CacheBase.build(strategy: :invalid)
-    end
-  end
-
-  def test_set_and_get_single
-    Wovnrb::CacheBase.set_single({})
-    cache = Wovnrb::CacheBase.get_single
-    assert_equal('Wovnrb::MemoryCache', cache.class.name)
-  end
-
-  def test_get_single_without_set
-    assert_raises RuntimeError do
-      Wovnrb::CacheBase.get_single
-    end
-  end
-end

data/test/lib/text_caches/memory_cache_test.rb

@@ -1,91 +0,0 @@
-require 'wovnrb/text_caches/cache_base'
-require 'wovnrb/text_caches/memory_cache'
-require 'minitest/autorun'
-require 'timecop'
-
-class MemoryCacheTest < Minitest::Test
-  def test_initialize
-    memory = Wovnrb::MemoryCache.new(
-      'cache_megabytes' => 1,
-      'ttl_seconds' => 1
-    )
-    option = memory.options
-    assert_equal(1.megabytes, option[:size])
-    assert_equal(1.megabytes, option[:size])
-    assert_equal(1.seconds, option[:expires_in])
-  end
-
-  def test_initialize_without_cache_megabytes
-    memory = Wovnrb::MemoryCache.new(
-      'ttl_seconds' => 1
-    )
-    option = memory.options
-    assert_equal(200.megabytes, option[:size])
-    assert_equal(1.seconds, option[:expires_in])
-  end
-
-  def test_initialize_without_ttl
-    memory = Wovnrb::MemoryCache.new(
-      'cache_megabytes' => 1
-    )
-    option = memory.options
-    assert_equal(1.megabytes, option[:size])
-    assert_equal(300.seconds, option[:expires_in])
-  end
-
-  def test_initialize_with_no_config
-    memory = Wovnrb::MemoryCache.new({})
-    option = memory.options
-    assert_equal(200.megabytes, option[:size])
-    assert_equal(300.seconds, option[:expires_in])
-  end
-
-  def test_put_without_cache
-    memory = Wovnrb::MemoryCache.new({})
-    memory.put('a', 'b')
-    assert_equal('b', memory.get('a'))
-  end
-
-  def test_put_with_cache
-    memory = Wovnrb::MemoryCache.new({})
-    memory.put('a', 'b')
-    memory.put('a', 'b2')
-    assert_equal('b2', memory.get('a'))
-  end
-
-  def test_get_with_cache
-    memory = Wovnrb::MemoryCache.new({})
-    memory.put('a', 'b')
-    assert_equal('b', memory.get('a'))
-  end
-
-  def test_get_without_cache
-    memory = Wovnrb::MemoryCache.new({})
-    assert_nil(memory.get('a'))
-
-  end
-
-  def test_get_with_timeout
-    memory = Wovnrb::MemoryCache.new({})
-    memory.put('a', 'b')
-    Timecop.travel(1.day.since)
-    assert_nil(memory.get('a'))
-  end
-
-  def test_get_with_over_memory
-    # ActiveSupport::Cache::MemoryStore has 240 bytes overhead per instance
-    memory = Wovnrb::MemoryCache.new(
-      'cache_megabytes' => 400.0 / 1000 / 1000
-    )
-    memory.put('a', 'c')
-    memory.put('b', 'd')
-    assert_nil(memory.get('a'))
-    assert_equal('d', memory.get('b'))
-  end
-
-  def test_get_with_utf8
-    memory = Wovnrb::MemoryCache.new({})
-    memory.put('http://www.example.com', 'あいうえお')
-    assert_equal('あいうえお', memory.get('http://www.example.com'))
-  end
-end