wovnrb 0.1.69 → 0.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afab139e1be1f8c818b1b106e84fe492a0f89520
-  data.tar.gz: 5484d22f34e056ecd2915e816a6d569270606283
+  metadata.gz: 4776a67c2ad218f974c0f0b4f3c0b832c90a5a09
+  data.tar.gz: cc37e82b4c978abe5ce1ea7ac395a9d185998dca
 SHA512:
-  metadata.gz: 8d4f7a9f1efdac922e1dff2bb87ec5465d60b6e242bf45e90719ed067111be604f470d99a2f5b690f8365b534b04f16408968f5725167a9655d65ae54495a7d0
-  data.tar.gz: 90a7be9c2c2f27d4655273a92d441877f6c4741bed90d65d34a1ddcffbf278b5d75c2795f7a2e6e2230fedb0d58e11846a7c9d56ff95ccfacebd9a63ebb37ae9
+  metadata.gz: 96e887e480911dc72395cd152840e9762dc1ae0037e10c34934c3cd4c2a55dafc39b5da62c4bd8dab77f9e91de1a973df8a562b0dfb0157f113f0492fff3e036
+  data.tar.gz: 41c97ebc38bf12c946f9ad0046fe916b8d37caf217a9ae9981bab406b8d0da768bbf2075a7b07cfc30994c4501cc52006ddae896097b9b3b0d68405df1246225

data/lib/wovnrb/headers.rb

@@ -154,7 +154,7 @@ module Wovnrb
       when 'query'
         return uri.sub(/(^|\?|&)wovn=#{lang}(&|$)/, '\1').gsub(/(\?|&)$/, '')
       when 'subdomain'
-        rp = Regexp.new('(^|(//))' + lang + '\.')
+        rp = Regexp.new('(^|(//))' + lang + '\.', 'i')
         return uri.sub(rp, '\1')
      #when 'path'
       else

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.1.69"
+  VERSION = "0.1.70"
 end

data/test/lib/wovnrb_test.rb

@@ -1,28 +1,56 @@
-#require 'wovnrb'
-#require 'wovnrb/headers'
-#require 'minitest/autorun'
-#require 'pry'
-#require 'mocha/mini_test'
-#
-#class WovnrbTest < Minitest::Test
-#
-#  def test_initialize
-#    i = Wovnrb::Interceptor.new(get_app)
-#    refute_nil(i)
-#  end
-#
-#  # def test_call(env)
-#  # end
-#
-#  # def test_switch_lang(body, values, url, lang=STORE.settings['default_lang'], headers)
-#  # end
-#
-#  # def test_get_langs(values)
-#  # end
-#
-#  def get_app()
-#  end
-#
+require 'wovnrb'
+require 'wovnrb/headers'
+require 'minitest/autorun'
+require 'pry'
+
+class WovnrbTest < Minitest::Test
+
+  def test_initialize
+    i = Wovnrb::Interceptor.new(get_app)
+    refute_nil(i)
+  end
+
+  # def test_call(env)
+  # end
+
+  # def test_switch_lang(body, values, url, lang=STORE.settings['default_lang'], headers)
+  # end
+
+  # def test_get_langs(values)
+  # end
+
+  def get_app()
+  end
+
+   def test_add_lang_code_trad_chinese
+     i = Wovnrb::Interceptor.new(get_app)
+     h = Wovnrb::Headers.new(get_env('url' => 'http://favy.tips'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+     assert_equal("http://zh-cht.favy.tips/topics/31", i.add_lang_code("http://favy.tips/topics/31", 'subdomain', 'zh-cht', h))
+   end
+
+   def test_add_lang_code_trad_chinese_2
+     i = Wovnrb::Interceptor.new(get_app)
+     h = Wovnrb::Headers.new(get_env('url' => 'http://zh-cht.favy.tips'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+     assert_equal("http://zh-cht.favy.tips/topics/31", i.add_lang_code("/topics/31", 'subdomain', 'zh-cht', h))
+   end
+
+   def test_add_lang_code_trad_chinese_lang_in_link_already
+     i = Wovnrb::Interceptor.new(get_app)
+     h = Wovnrb::Headers.new(get_env('url' => 'http://zh-cht.favy.tips'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+     assert_equal("http://zh-cht.favy.tips/topics/31", i.add_lang_code("http://zh-cht.favy.tips/topics/31", 'subdomain', 'zh-cht', h))
+   end
+
+   def test_add_lang_code_no_protocol
+     i = Wovnrb::Interceptor.new(get_app)
+     h = Wovnrb::Headers.new(get_env('url' => 'https://zh-cht.google.com'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+     assert_equal("//zh-cht.google.com", i.add_lang_code("//google.com", 'subdomain', 'zh-cht', h))
+   end
+
+   def test_add_lang_code_no_protocol_2
+     i = Wovnrb::Interceptor.new(get_app)
+     h = Wovnrb::Headers.new(get_env('url' => 'https://zh-cht.favy.tips'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+     assert_equal("//google.com", i.add_lang_code("//google.com", 'subdomain', 'zh-cht', h))
+   end
 #  def test_add_lang_code_nil_href
 #    i = Wovnrb::Interceptor.new(get_app)
 #    assert_equal(nil, i.add_lang_code(nil,'path', 'en', nil))
@@ -157,4 +185,49 @@
 #    headers.expects(:pathname).returns('/hello/tab.html')
 #    assert_equal('/fr/hello/hey/index.html', i.add_lang_code('hey/index.html', 'path', 'fr', headers))
 #  end
-#end
+
+  def get_settings(options={})
+    settings = {}
+    settings['user_token'] = 'OHYx9'
+    settings['url_pattern'] = 'path'
+    settings['url_pattern_reg'] = "/(?<lang>[^/.?]+)"
+    settings['query'] = []
+    settings['backend_host'] = 'localhost'
+    settings['backend_port'] = '6379'
+    settings['default_lang'] = 'en'
+    settings['supported_langs'] = []
+    settings['secret_key'] = ''
+    return settings.merge(options)
+  end
+
+  def get_env(options={})
+    env = {}
+    env['rack.url_scheme'] = 'http'
+    env['HTTP_HOST'] = 'wovn.io'
+    env['REQUEST_URI'] = '/dashboard?param=val&hey=you'
+    env['SERVER_NAME'] = 'wovn.io'
+    env['HTTP_COOKIE'] = "olfsk=olfsk021093478426337242; hblid=KB8AAMzxzu2DSxnB4X7BJ26rBGVeF0yJ; optimizelyEndUserId=oeu1426233718869r0.5398541854228824; __zlcmid=UFeZqrVo6Mv3Yl; wovn_selected_lang=en; optimizelySegments=%7B%7D; optimizelyBuckets=%7B%7D; _equalizer_session=eDFwM3M2QUZJZFhoby9JZlArckcvSUJwNFRINXhUeUxtNnltQXZhV0tqdGhZQjJMZ01URnZTK05ydFVWYmM3U0dtMVN0M0Z0UnNDVG8vdUNDTUtPc21jY0FHREgrZ05CUnBTb0hyUlkvYlBWQVhQR3RZdnhjMWsrRW5rOVp1Z3V3bkgyd3NpSlRZQWU1dlZvNmM1THp6aUZVeE83Y1pWWENRNTBUVFIrV05WeTdDMlFlem1tUzdxaEtndFZBd2dtUjU2ak5EUmJPa3RWWmMyT1pSVWdMTm8zOVZhUWhHdGQ3L1c5bm91RmNSdFRrcC90Tml4N2t3ZWlBaDRya2lLT1I0S0J2TURhUWl6Uk5rOTQ4Y1MwM3VKYnlLMUYraEt5clhRdFd1eGdEWXdZd3pFbWQvdE9vQndhdDVQbXNLcHBURm9CbnZKenU2YnNXRFdqRVl0MVV3bmRyYjhvMDExcGtUVU9tK1lqUGswM3p6M05tbVRnTjE3TUl5cEdpTTZ4a2gray8xK0FvTC9wUDVka1JSeE5GM1prZmRjWDdyVzRhWW5uS2Mxc1BxOEVVTTZFS3N5bTlVN2p5eE5YSjNZWGI2UHd3Vzc0bDM5QjIwL0l5Mm85NmQyWFAwdVQ3ZzJYYk1QOHY2NVJpY2c9LS1KNU96eHVycVJxSDJMbEc4Rm9KVXpBPT0%3D--17e47555d692fb9cde20ef78a09a5eabbf805bb3; mp_a0452663eb7abb7dfa9c94007ebb0090_mixpanel=%7B%22distinct_id%22%3A%20%2253ed9ffa4a65662e37000000%22%2C%22%24initial_referrer%22%3A%20%22http%3A%2F%2Fp.dev-wovn.io%3A8080%2Fhttp%3A%2F%2Fdev-wovn.io%3A3000%22%2C%22%24initial_referring_domain%22%3A%20%22p.dev-wovn.io%3A8080%22%2C%22__mps%22%3A%20%7B%7D%2C%22__mpso%22%3A%20%7B%7D%2C%22__mpa%22%3A%20%7B%7D%2C%22__mpu%22%3A%20%7B%7D%2C%22__mpap%22%3A%20%5B%5D%7D"
+    env['HTTP_ACCEPT_LANGUAGE'] = 'ja,en-US;q=0.8,en;q=0.6'
+    env['QUERY_STRING'] = 'param=val&hey=you'
+    env['ORIGINAL_FULLPATH'] = '/dashboard?param=val&hey=you'
+    #env['HTTP_REFERER'] = 
+    env['REQUEST_PATH'] = '/dashboard'
+    env['PATH_INFO'] = '/dashboard'
+
+    if options['url']
+      url = URI.parse(options['url'])
+      env['rack.url_scheme'] = url.scheme
+      env['HTTP_HOST'] = url.host
+      if (url.scheme == 'http' && url.port != 80) || (url.scheme == 'https' && url.port != 443)
+        env['HTTP_HOST'] += ":#{url.port}"
+      end
+      env['SERVER_NAME'] = url.host
+      env['REQUEST_URI'] = url.request_uri
+      env['ORIGINAL_FULLPATH'] = url.request_uri
+      env['QUERY_STRING'] = url.query
+      env['REQUEST_PATH'] = url.path
+      env['PATH_INFO'] = url.path
+    end
+    return env.merge(options)
+  end
+end

metadata

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