wovnrb 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e29488764fb88eeb19e1eff45f80d0ee7bc9e9f
-  data.tar.gz: 7cf695b56bd2808316afb21cca7149a1c671c453
+  metadata.gz: cc6f97af8d6ae409297a399b58c35570e267ca11
+  data.tar.gz: 46437e1724675d82d2618f82a622e75a2641be89
 SHA512:
-  metadata.gz: 669492de84557bbff060615fad054a0895bccc76f66279f5a4fa03d34b7bfa0b3cb837b08cd75004bd9ff1977bd9ab487bd448ecd32d1bc4d81c926d37baa475
-  data.tar.gz: df708dcbd7a1ceb1d346fda5579892af608971199d7e6e70c6966e27a92cd54962fe625c295758aa85f1d1209d7ec6d6a8182537455b729de9fdcd72ed21a12d
+  metadata.gz: 09b1f83b01bd0ea0ea754ce5bc4cc545b19d43c62280f6041bdb725d360cdcd42e4d35adc280e770f852d36c32fb3ffa69a223a9c192b2e48455ecfd92e12669
+  data.tar.gz: 6121d05cd6d8710e5ac8825b926ce4ced7bbf0f1f5238aa8c29661c77a42d6037ef931098301626f74aac5b2082946973029e86d5f632067fc40c8f878ab8c2f

data/lib/wovnrb.rb

@@ -24,7 +24,7 @@ module Wovnrb
       @app = app
       @store = Store.instance
       opts = opts.each_with_object({}){|(k,v),memo| memo[k.to_s]=v}
-      @store.settings(opts)
+      @store.update_settings(opts)
       CacheBase.set_single(@store.settings)
     end
 

data/lib/wovnrb/store.rb

@@ -37,8 +37,6 @@ module Wovnrb
     end
 
     def initialize
-      @settings = Settings.new
-      @config_loaded = false
       reset
     end
 
@@ -89,7 +87,7 @@ module Wovnrb
         valid = false
         errors.push("API URL is not configured.")
       end
-      if !settings.has_key?('default_lang') || settings['default_lang'].length == 0
+      if !settings.has_key?('default_lang') || settings['default_lang'].nil?
         valid = false
         errors.push("Default lang #{settings['default_lang']} is not valid.")
       end
@@ -112,30 +110,33 @@ module Wovnrb
 
     # Returns the settings object, pulling from Rails config the first time this is called
     #
-    # @return [Hash] The settings which are pulled from the config file given by the user and filled in by defaults
-    def settings(*opts)
-      if !opts.first.nil?
-        @settings.merge!(opts.first)
-        @config_loaded = false
+    def settings
+      load_settings unless @config_loaded
+      @settings
+    end
+
+    # Load Rails config.wovnrb
+    #
+    def load_settings
+      if Object.const_defined?('Rails') && Rails.configuration.respond_to?(:wovnrb)
+        @config_loaded = true
+        update_settings(Rails.configuration.wovnrb)
       end
+    end
 
-      if @config_loaded
-        return @settings
+    def update_settings(new_settings)
+      load_settings unless @config_loaded
+      if !new_settings.nil?
+        @settings.merge!(new_settings.stringify_keys)
+        format_settings
       end
+    end
 
-      # get Rails config.wovnrb
-      if Object.const_defined?('Rails') && Rails.configuration.respond_to?(:wovnrb)
-        config_settings = Rails.configuration.wovnrb.stringify_keys
-        if config_settings.has_key?('url_pattern')
-          if config_settings['url_pattern'] == 'query' || config_settings['url_pattern'] == 'subdomain' || config_settings['url_pattern'] == 'path'
-            config_settings['url_pattern'] = config_settings['url_pattern']
-            config_settings.delete('url_pattern')
-          end
-        end
-        @settings.merge!(Rails.configuration.wovnrb.stringify_keys)
+    def format_settings
+      if @settings.has_key?('custom_lang_aliases')
+        stringify_keys! @settings['custom_lang_aliases']
       end
 
-      # fix settings object
       @settings['default_lang'] = Lang.get_code(@settings['default_lang'])
       if !@settings.has_key?('supported_langs')
         @settings['supported_langs'] = [@settings['default_lang']]
@@ -160,16 +161,9 @@ module Wovnrb
         @settings['test_mode'] = true
       end
 
-      if @settings.has_key?('custom_lang_aliases')
-        stringify_keys! @settings['custom_lang_aliases']
-      end
-
       if wovn_dev_mode? && @settings['api_url'] == Store.default_settings['api_url']
         @settings['api_url'] = "#{wovn_protocol}://api.#{wovn_host}/v0/values"
       end
-
-      @config_loaded = true
-      @settings
     end
 
     def wovn_dev_mode?

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 end

data/test/lib/api_data_test.rb

@@ -25,7 +25,7 @@ module Wovnrb
       stub_request(:get, "https://api.wovn.io/v0/values?token=#{token}&url=#{url}").
         to_return(:body => '{"test_body": "a"}')
       store = Wovnrb::Store.instance
-      store.settings('project_token' => token)
+      store.update_settings('project_token' => token)
       api_data = Wovnrb::ApiData.new(url, store)
 
       assert_equal({'test_body' => 'a'}, api_data.get_data)
@@ -37,7 +37,7 @@ module Wovnrb
       stub = stub_request(:get, "https://api.wovn.io/v0/values?token=#{token}&url=#{url}").
         to_return(:body => '{"test_body": "a"}')
       store = Wovnrb::Store.instance
-      store.settings('project_token' => token)
+      store.update_settings('project_token' => token)
       api_data = Wovnrb::ApiData.new(url, store)
 
       assert_equal({'test_body' => 'a'}, api_data.get_data)
@@ -53,13 +53,13 @@ module Wovnrb
       store = Wovnrb::Store.instance
       api_data = Wovnrb::ApiData.new(url, store)
 
-      store.settings('project_token' => token)
+      store.update_settings('project_token' => token)
       assert_equal({'test_body' => 'a'}, api_data.get_data)
 
       token = 'b'
       stub_b = stub_request(:get, "https://api.wovn.io/v0/values?token=#{token}&url=#{url}").
         to_return(:body => '{"test_body": "a"}')
-      store.settings('project_token' => token)
+      store.update_settings('project_token' => token)
       assert_equal({'test_body' => 'a'}, api_data.get_data)
 
       assert_requested(stub_a, :times => 1)
@@ -72,7 +72,7 @@ module Wovnrb
       stub_request(:get, "https://api.wovn.io/v0/values?token=#{token}&url=#{url}").
         to_return(:status => [500, "Internal Server Error"])
       store = Wovnrb::Store.instance
-      store.settings('project_token' => token)
+      store.update_settings('project_token' => token)
       api_data = Wovnrb::ApiData.new(url, store)
       log_mock = Wovnrb::LogMock.mock_log
 

data/test/lib/headers_test.rb

@@ -123,7 +123,7 @@ module Wovnrb
     end
 
     def test_redirect_location_without_custom_lang_code
-      Store.instance.settings['custom_lang_aliases'] = {'ja' => 'staging-ja'}
+      Store.instance.update_settings({'custom_lang_aliases' => {'ja' => 'staging-ja'}})
       h = Wovnrb::Headers.new(
         Wovnrb.get_env('url' => 'http://wovn.io/contact', 'HTTP_X_FORWARDED_HOST' => 'wovn.io'),
         Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'),
@@ -216,7 +216,7 @@ module Wovnrb
     end
 
     def test_request_out_http_referer_subdomain_with_custom_lang_code
-      Store.instance.settings['custom_lang_aliases'] = {'ja' => 'staging-ja'}
+      Store.instance.update_settings({'custom_lang_aliases' => {'ja' => 'staging-ja'}})
       h = Wovnrb::Headers.new(
         Wovnrb.get_env(
           'SERVER_NAME' => 'staging-ja.wovn.io',
@@ -233,7 +233,7 @@ module Wovnrb
     end
 
     def test_out_http_referer_subdomain_with_custom_lang_code
-      Store.instance.settings['custom_lang_aliases'] = {'ja' => 'staging-ja'}
+      Store.instance.update_settings({'custom_lang_aliases' => {'ja' => 'staging-ja'}})
       h = Wovnrb::Headers.new(
         Wovnrb.get_env(
           'SERVER_NAME' => 'staging-ja.wovn.io',
@@ -6217,7 +6217,7 @@ module Wovnrb
     end
 
     def test_remove_lang_subdomain_with_custom_lang_alias
-      Store.instance.settings['custom_lang_aliases'] = {'fr' => 'staging-fr'}
+      Store.instance.update_settings({'custom_lang_aliases' => {'fr' => 'staging-fr'}})
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'subdomain'))
 
       uri_without_scheme = h.remove_lang("staging-fr.wovn.io/", 'fr')

data/test/lib/html_replacers/replacer_base_test.rb

@@ -33,7 +33,7 @@ module Wovnrb
 
     def test_wovn_ignore_class
       store = Store.instance
-      store.settings('ignore_class' => ['base_ignore'])
+      store.update_settings({'ignore_class' => ['base_ignore']})
       replacer = ReplacerBase.new(store)
       dom = Wovnrb.to_dom('<html><body><div class="base_ignore"></div></body></html>')
       actual = replacer.send(:wovn_ignore?, dom.xpath('//div')[0])
@@ -43,7 +43,7 @@ module Wovnrb
 
     def test_wovn_ignore_multiple_classes
       store = Store.instance
-      store.settings('ignore_class' => ['base_ignore', 'base_ignore2'])
+      store.update_settings({'ignore_class' => ['base_ignore', 'base_ignore2']})
       replacer = ReplacerBase.new(store)
       html = <<HTML
 <html>

data/test/lib/html_replacers/script_replacer_test.rb

@@ -5,7 +5,7 @@ module Wovnrb
   class ScriptReplacerTest < WovnMiniTest
     def test_replace
       store = Store.instance
-      store.settings({
+      store.update_settings({
         'user_token' => 'test_token',
         'default_lang' => 'en',
         'url_pattern' => 'domain'
@@ -27,7 +27,7 @@ module Wovnrb
 
     def test_replace_with_wovn_dev_mode_on
       store = Store.instance
-      store.settings({
+      store.update_settings({
         'user_token' => 'test_token',
         'default_lang' => 'en',
         'url_pattern' => 'domain',
@@ -50,7 +50,7 @@ module Wovnrb
 
     def test_with_embed_wovn
       store = Store.instance
-      store.settings({
+      store.update_settings({
         'user_token' => 'test_token',
         'default_lang' => 'en',
         'url_pattern' => 'domain'
@@ -68,7 +68,7 @@ module Wovnrb
 
     def test_with_multiple_embed_wovn
       store = Store.instance
-      store.settings({
+      store.update_settings({
         'user_token' => 'test_token',
         'default_lang' => 'en',
         'url_pattern' => 'domain'
@@ -86,7 +86,7 @@ module Wovnrb
 
     def test_with_embed_wovn_at_body
       store = Store.instance
-      store.settings({
+      store.update_settings({
         'user_token' => 'test_token',
         'default_lang' => 'en',
         'url_pattern' => 'domain'
@@ -104,7 +104,7 @@ module Wovnrb
 
     def test_contains_lang_code_aliases
       store = Store.instance
-      store.settings({
+      store.update_settings({
         'user_token' => 'test_token',
         'default_lang' => 'en',
         'url_pattern' => 'domain',

data/test/lib/lang_test.rb

@@ -573,7 +573,7 @@ module Wovnrb
 
     def test_add_lang_code_with_custom_lang_aliases
       lang = Lang.new('fr')
-      Store.instance.settings['custom_lang_aliases'] = {'fr' => 'staging-fr'}
+      Store.instance.update_settings({'custom_lang_aliases' => {'fr' => 'staging-fr'}})
       h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
       assert_equal("http://staging-fr.wovn.io/topics/50", lang.add_lang_code("/topics/50", 'subdomain', h))
     end

data/test/lib/services/wovn_logger_test.rb

@@ -9,22 +9,21 @@ module Wovnrb
 
     def test_initialize
       log_file_name = 'test_tmp.log'
-      Store.instance.settings({'log_path' => log_file_name})
+      Store.instance.update_settings({'log_path' => log_file_name})
       WovnLogger.instance
       assert(File.exists?(log_file_name))
       File.delete(log_file_name)
     end
 
     def test_initialize_without_path
-      path = Store.instance.settings['log_path']
-      Store.instance.settings({'log_path' => nil})
+      Store.instance.update_settings({'log_path' => nil})
       WovnLogger.instance
-      assert_equal(false, File.exists?(path))
+      assert_equal($stderr, WovnLogger.instance.instance_variable_get(:@logger))
     end
 
-    def test_initialize_wit_invalid_path
+    def test_initialize_with_invalid_path
       log_file_name = 'in/val/id/test_tmp.log'
-      Store.instance.settings({'log_path' => log_file_name})
+      Store.instance.update_settings({'log_path' => log_file_name})
       WovnLogger.instance
       assert_equal(false, File.exists?(log_file_name))
       assert_equal(true, File.exists?('wovn_error.log'))

data/test/lib/store_test.rb

@@ -16,41 +16,41 @@ module Wovnrb
 
     def test_settings_user_token_retro_compatibility
       s = Wovnrb::Store.instance
-      s.settings('user_token' => 'aaaaa')
+      s.update_settings({'user_token' => 'aaaaa'})
       assert_equal('aaaaa', s.settings['project_token'])
       assert(!s.settings.has_key?('user_token'))
     end
 
     def test_settings_project_token_set
       s = Wovnrb::Store.instance
-      s.settings('project_token' => 'bbbbbb')
+      s.update_settings({'project_token' => 'bbbbbb'})
       assert_equal('bbbbbb', s.settings['project_token'])
     end
 
     def test_settings_project_token_set_without_retro_compatibility
       s = Wovnrb::Store.instance
-      s.settings('project_token' => 'bbbbbb', 'user_token' => 'aaaaa')
+      s.update_settings({'project_token' => 'bbbbbb', 'user_token' => 'aaaaa'})
       assert_equal('bbbbbb', s.settings['project_token'])
       assert(!s.settings.has_key?('user_token'))
     end
 
     def test_settings_url_pattern_path
       s = Wovnrb::Store.instance
-      s.settings({'url_pattern' => 'path'})
+      s.update_settings({'url_pattern' => 'path'})
       assert_equal('path', s.settings['url_pattern'])
       assert_equal('/(?<lang>[^/.?]+)', s.settings['url_pattern_reg'])
     end
 
     def test_settings_url_pattern_subdomain
       s = Wovnrb::Store.instance
-      s.settings({'url_pattern' => 'subdomain'})
+      s.update_settings({'url_pattern' => 'subdomain'})
       assert_equal("^(?<lang>[^.]+)\.", s.settings['url_pattern_reg'])
       assert_equal('subdomain', s.settings['url_pattern'])
     end
 
     def test_settings_url_pattern_query
       s = Wovnrb::Store.instance
-      s.settings({'url_pattern' => 'query'})
+      s.update_settings({'url_pattern' => 'query'})
       assert_equal('((\\?.*&)|\\?)wovn=(?<lang>[^&]+)(&|$)', s.settings['url_pattern_reg'])
       assert_equal('query', s.settings['url_pattern'])
     end
@@ -66,7 +66,7 @@ module Wovnrb
 
     def test_settings_ignore_paths
       s = Wovnrb::Store.instance
-      s.settings({'ignore_paths' => ['/api/**']})
+      s.update_settings({'ignore_paths' => ['/api/**']})
       assert_equal(1, s.settings['ignore_globs'].size)
       assert_equal(true, s.settings['ignore_globs'].first.match?('/api/a/b'))
       assert_equal(false, s.settings['ignore_globs'].first.match?('/a/b'))
@@ -74,7 +74,7 @@ module Wovnrb
 
     def test_settings_ignore_paths_multiple
       s = Wovnrb::Store.instance
-      s.settings({'ignore_paths' => ['/api/a/**', '/api/b/**']})
+      s.update_settings({'ignore_paths' => ['/api/a/**', '/api/b/**']})
       assert_equal(2, s.settings['ignore_globs'].size)
       assert_equal(true, s.settings['ignore_globs'].any?{|g| g.match?('/api/a')})
       assert_equal(true, s.settings['ignore_globs'].any?{|g| g.match?('/api/b')})
@@ -83,14 +83,14 @@ module Wovnrb
 
     def test_settings_ignore_paths_empty
       s = Wovnrb::Store.instance
-      s.settings({'ignore_paths' => []})
+      s.update_settings({'ignore_paths' => []})
       assert_equal([], s.settings['ignore_globs'])
     end
 
     def test_settings_invalid_ignore_paths
       mock = LogMock.mock_log
       store = Wovnrb::Store.instance
-      store.settings({'ignore_paths' => 'aaaa'})
+      store.update_settings({'ignore_paths' => 'aaaa'})
 
       assert_equal(false, store.valid_settings?)
       assert_equal(['Project token  is not valid.', 'Ignore Paths aaaa should be Array.'], mock.errors)
@@ -98,8 +98,8 @@ module Wovnrb
 
     def test_settings_ignore_glob_injection
       s = Wovnrb::Store.instance
-      s.settings({'ignore_paths' => nil})
-      s.settings({'ignore_globs' => [1, 2]})
+      s.update_settings({'ignore_paths' => nil})
+      s.update_settings({'ignore_globs' => [1, 2]})
 
       assert_equal([], s.settings['ignore_globs'])
     end
@@ -142,35 +142,35 @@ module Wovnrb
 
     def test_add_custom_lang_aliases_empty
       s = Wovnrb::Store.instance
-      s.settings({'custom_lang_aliases' => {}})
+      s.update_settings({'custom_lang_aliases' => {}})
 
       assert_equal({}, s.settings['custom_lang_aliases'])
     end
 
     def test_add_custom_lang_aliases_single_value
       s = Wovnrb::Store.instance
-      s.settings({'custom_lang_aliases' => {'ja' => 'staging-ja'}})
+      s.update_settings({'custom_lang_aliases' => {'ja' => 'staging-ja'}})
 
       assert_equal({'ja' => 'staging-ja'}, s.settings['custom_lang_aliases'])
     end
 
     def test_add_custom_lang_aliases_multiple_values
       s = Wovnrb::Store.instance
-      s.settings({'custom_lang_aliases' => {'ja' => 'staging-ja', 'en' => 'staging-en'}})
+      s.update_settings({'custom_lang_aliases' => {'ja' => 'staging-ja', 'en' => 'staging-en'}})
 
       assert_equal({'ja' => 'staging-ja', 'en' => 'staging-en'}, s.settings['custom_lang_aliases'])
     end
 
     def test_add_custom_lang_aliases_using_symbols
       s = Wovnrb::Store.instance
-      s.settings({'custom_lang_aliases' => {ja: 'staging-ja', en: 'staging-en'}})
+      s.update_settings({'custom_lang_aliases' => {ja: 'staging-ja', en: 'staging-en'}})
 
       assert_equal({'ja' => 'staging-ja', 'en' => 'staging-en'}, s.settings['custom_lang_aliases'])
     end
 
     def test_wovn_dev_mode_on
       s = Wovnrb::Store.instance
-      s.settings({'wovn_dev_mode' => true})
+      s.update_settings({'wovn_dev_mode' => true})
 
       assert(s.settings['wovn_dev_mode'])
       assert(s.wovn_dev_mode?)
@@ -178,7 +178,7 @@ module Wovnrb
 
     def test_wovn_dev_mode_off_by_default
       s = Wovnrb::Store.instance
-      s.settings({})
+      s.reset
 
       assert(!s.settings['wovn_dev_mode'])
       assert(!s.wovn_dev_mode?)
@@ -186,28 +186,28 @@ module Wovnrb
 
     def test_default_api_url_with_wovn_dev_mode_on
       s = Wovnrb::Store.instance
-      s.settings({'wovn_dev_mode' => true})
+      s.update_settings({'wovn_dev_mode' => true})
 
       assert_equal('http://api.dev-wovn.io:3000/v0/values', s.settings['api_url'])
     end
 
     def test_default_api_url_with_wovn_dev_mode_off
       s = Wovnrb::Store.instance
-      s.settings({'wovn_dev_mode' => false})
+      s.update_settings({'wovn_dev_mode' => false})
 
       assert_equal('https://api.wovn.io/v0/values', s.settings['api_url'])
     end
 
     def test_custom_api_url_not_changed_with_wovn_dev_mode_on
       s = Wovnrb::Store.instance
-      s.settings({'api_url' => 'test-api.io', 'wovn_dev_mode' => true})
+      s.update_settings({'api_url' => 'test-api.io', 'wovn_dev_mode' => true})
 
       assert_equal('test-api.io', s.settings['api_url'])
     end
 
     def test_custom_api_url_not_changed_with_wovn_dev_mode_off
       s = Wovnrb::Store.instance
-      s.settings({'api_url' => 'test-api.io', 'wovn_dev_mode' => false})
+      s.update_settings({'api_url' => 'test-api.io', 'wovn_dev_mode' => false})
 
       assert_equal('test-api.io', s.settings['api_url'])
     end

data/test/test_helper.rb

@@ -42,7 +42,7 @@ module Wovnrb
     attr_accessor :errors
 
     def self.mock_log
-      Store.instance.settings['log_path'] = nil
+      Store.instance.update_settings({'log_path' => nil})
       mock = self.new
       WovnLogger.instance.set_logger(mock)
       mock

data/wovnrb.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   #spec.extensions    = %w[ext/dom/extconf.rb]
   #spec.extensions    = spec.files.grep(%r{/extconf\.rb$})
 
-  spec.add_dependency "nokogumbo", ">= 1.3.0"
+  spec.add_dependency "nokogumbo", ">= 1.4.0", "< 2.0.0"
   spec.add_dependency "nokogiri", "~> 1.8.1"
   spec.add_dependency "activesupport"
   spec.add_dependency "lz4-ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -17,14 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement