wovnrb 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b7f43ed6f36e66150ace95ea7cb5d43877af2da
-  data.tar.gz: 50cf1be127a79c8a5e0e14dc333639eb03cc160c
+  metadata.gz: 7348fe530bd3a1abe6f31aa1013a8262beca4153
+  data.tar.gz: facf8da674510feed09ef64b53ea50a769f9fb40
 SHA512:
-  metadata.gz: c1370c369c99bc5267af4293e3a87089f4272583924e7168b95e7c30aaa57953061094f99023d680ba6fd306e9df90f886ffac71e69c4e169fd3cbf03686479d
-  data.tar.gz: af6a461b70f53880625a21d067688ce89209bdafa919b9d63ed0a0b32dace23097385a6d178f9bef47d8ba39fed7d296173067bbd285b4e07da491efb41ac48f
+  metadata.gz: 388bf3245e438c050b83f28c5417a7b275a7892318319e048b1c7d3c21e302bbd57b393c650a1134bc85658c2a4216201830554e34404bb8a8005b28cefc247a
+  data.tar.gz: 1b6632a9627cc7ff68fee160e1c91e12389eaec80f606748355751111beed03984c122f0f4f40f8ebfcba5b411e76b285c7de2f2c4f93d4829e2b0cee57d0e47

data/lib/wovnrb/html_replacers/script_replacer.rb

@@ -23,7 +23,7 @@ module Wovnrb
 
       # INSERT BACKEND WIDGET
       insert_node = Nokogiri::XML::Node.new('script', dom)
-      insert_node['src'] = '//j.wovn.io/1'
+      insert_node['src'] = "//j.#{@store.wovn_host}/1"
       insert_node['async'] = true
       version = defined?(VERSION) ? VERSION : ''
       insert_node['data-wovnio'] = "key=#{@store.settings['user_token']}&backend=true&currentLang=#{lang.lang_code}&defaultLang=#{@store.settings['default_lang']}&urlPattern=#{@store.settings['url_pattern']}&langCodeAliases=#{JSON.dump(@store.settings['custom_lang_aliases'])}&version=#{version}"

data/lib/wovnrb/store.rb

@@ -11,6 +11,29 @@ module Wovnrb
   class Store
     include Singleton
 
+    def self.default_settings
+      {
+        'user_token' => '',
+        'log_path' => 'log/wovn_error.log',
+        'ignore_paths' => [],
+        'ignore_globs' => [],
+        'url_pattern' => 'path',
+        'url_pattern_reg' => "/(?<lang>[^/.?]+)",
+        'query' => [],
+        'api_url' => 'https://api.wovn.io/v0/values',
+        'api_timeout_seconds' => 0.5,
+        'default_lang' => 'en',
+        'supported_langs' => ['en'],
+        'test_mode' => false,
+        'test_url' => '',
+        'cache_megabytes' => nil,
+        'ttl_seconds' => nil,
+        'use_proxy' => false,  # use env['HTTP_X_FORWARDED_HOST'] instead of env['HTTP_HOST'] and env['SERVER_NAME'] when this setting is true.
+        'custom_lang_aliases' => {},
+        'wovn_dev_mode' => false
+      }
+    end
+
     def initialize
       @settings = {}
       @config_loaded = false
@@ -21,26 +44,7 @@ module Wovnrb
     #
     # @return [nil]
     def reset
-      @settings =
-        {
-          'user_token' => '',
-          'log_path' => 'log/wovn_error.log',
-          'ignore_paths' => [],
-          'ignore_globs' => [],
-          'url_pattern' => 'path',
-          'url_pattern_reg' => "/(?<lang>[^/.?]+)",
-          'query' => [],
-          'api_url' => 'https://api.wovn.io/v0/values',
-          'api_timeout_seconds' => 0.5,
-          'default_lang' => 'en',
-          'supported_langs' => ['en'],
-          'test_mode' => false,
-          'test_url' => '',
-          'cache_megabytes' => nil,
-          'ttl_seconds' => nil,
-          'use_proxy' => false,  # use env['HTTP_X_FORWARDED_HOST'] instead of env['HTTP_HOST'] and env['SERVER_NAME'] when this setting is true.
-          'custom_lang_aliases' => {}
-        }
+      @settings = Store.default_settings
       # When Store is initialized, the Rails.configuration object is not yet initialized
       @config_loaded = false
     end
@@ -148,10 +152,26 @@ module Wovnrb
         @settings['custom_lang_aliases'].stringify_keys!
       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?
+      @settings['wovn_dev_mode']
+    end
+
+    def wovn_protocol
+      wovn_dev_mode? ? 'http' : 'https'
+    end
+
+    def wovn_host
+      wovn_dev_mode? ? 'dev-wovn.io:3000' : 'wovn.io'
+    end
+
     private
     def cleanSettings
       @settings['ignore_globs'] = []

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.2.16"
+  VERSION = "0.2.17"
 end

data/test/lib/html_replacers/script_replacer_test.rb

@@ -23,6 +23,27 @@ module Wovnrb
       assert_equal('test/test.js', other_script.get_attribute('src'))
     end
 
+    def test_replace_with_wovn_dev_mode_on
+      store = Store.instance
+      store.settings['user_token'] = 'test_token'
+      store.settings['default_lang'] = 'en'
+      store.settings['url_pattern'] = 'domain'
+      store.settings['wovn_dev_mode'] = true
+
+      replacer = ScriptReplacer.new(store)
+      dom = to_head_dom('<script src="test/test.js"></script>')
+      replacer.replace(dom, Lang.new('ja'))
+
+      scripts = dom.xpath('//script')
+      assert_equal(2, scripts.length)
+
+      wovn_script = scripts[0]
+      other_script = scripts[1]
+
+      assert_equal('//j.dev-wovn.io:3000/1', wovn_script.get_attribute('src'))
+      assert_equal('test/test.js', other_script.get_attribute('src'))
+    end
+
     def test_with_embed_wovn
       store = Store.instance
       store.settings['user_token'] = 'test_token'

data/test/lib/store_test.rb

@@ -111,5 +111,49 @@ module Wovnrb
 
       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})
+
+      assert(s.settings['wovn_dev_mode'])
+      assert(s.wovn_dev_mode?)
+    end
+
+    def test_wovn_dev_mode_off_by_default
+      s = Wovnrb::Store.instance
+      s.settings({})
+
+      assert(!s.settings['wovn_dev_mode'])
+      assert(!s.wovn_dev_mode?)
+    end
+
+    def test_default_api_url_with_wovn_dev_mode_on
+      s = Wovnrb::Store.instance
+      s.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})
+
+      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})
+
+      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})
+
+      assert_equal('test-api.io', s.settings['api_url'])
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Jeff Sandford