wovnrb 0.2.04 → 0.2.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b14f7b1db39f462612fbfb5437c8b9a57ab0545
-  data.tar.gz: 216b7d095a9ab39fe039ecd7a86cb421f93edbba
+  metadata.gz: 7f44db81ea6171f81032cd739b569bbb251ea71d
+  data.tar.gz: 0904bb2bfb09ccc05f6ffdecbdaa0a3de9405b53
 SHA512:
-  metadata.gz: 03c36df5a7edb5fc443124eafdf338d272d009b7c612188512cf24ec272f68538808b4c7dd312fa37822b96cf25200afde4185a6c8c6593d9939f00a1f0e5015
-  data.tar.gz: 79114a464d34be6fb01dd0091bec13f58823d14f61f6308a964cff85cf24d69f43b35838e4bde1ab80eddc49aede2fe984a82a5057276bedce15d98e5d7d4ac8
+  metadata.gz: 7781e8dc905ae4c07b7467d59d00c85c4085af2df65d6759355ab0dafdfa863b6c902f92871e02a5435464a4c5011dc70a8c6d214a88584a77d479197881b67e
+  data.tar.gz: 2201ca3f501a761c41a7ac1c2afd4b572183b06051f5ef3e17cf7e3a69a7c3a17d13a5bfe06d818a508405a82f0221ad94080826f63feb2b413e7c8d66f1cbdb

data/lib/wovnrb/headers.rb

@@ -179,7 +179,18 @@ module Wovnrb
       @env
     end
 
+    # Remove language code from the URI.
+    #
+    # @param uri  [String] original URI
+    # @param lang [String] language code
+    # @return     [String] removed URI
     def remove_lang(uri, lang=self.path_lang)
+
+      # Do nothing if lang is empty.
+      if lang.nil? || lang.empty?
+        return uri
+      end
+
       case @settings['url_pattern']
       when 'query'
         return uri.sub(/(^|\?|&)wovn=#{lang}(&|$)/, '\1').gsub(/(\?|&)$/, '')

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.2.04"
+  VERSION = "0.2.05"
 end

data/test/lib/headers_test.rb

@@ -1,5 +1,6 @@
 require 'test_helper'
 require 'wovnrb/headers'
+require 'wovnrb/lang'
 require 'minitest/autorun'
 require 'pry'
 
@@ -5911,4 +5912,109 @@ class HeadersTest < Minitest::Test
     h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io:1234/zh-cht'), Wovnrb.get_settings)
     assert_equal('zh-CHT', h.path_lang)
   end
+
+  def test_remove_lang_path
+    h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings)
+
+    keys = Wovnrb::Lang::LANG.keys
+    assert_equal(28, keys.size)
+
+    for key in keys
+      uri_without_scheme = h.remove_lang("wovn.io/#{key}", key)
+      assert_equal('wovn.io/', uri_without_scheme)
+
+      uri_with_scheme = h.remove_lang("https://wovn.io/#{key}/", key)
+      assert_equal('https://wovn.io/', uri_with_scheme)
+    end
+  end
+
+  def test_remove_lang_path_with_nil_lang
+    h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings)
+
+    uri_without_scheme = h.remove_lang('wovn.io', nil)
+    assert_equal('wovn.io', uri_without_scheme)
+
+    uri_with_scheme = h.remove_lang('https://wovn.io/', nil)
+    assert_equal('https://wovn.io/', uri_with_scheme)
+  end
+
+  def test_remove_lang_path_with_empty_lang
+    h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings)
+
+    uri_without_scheme = h.remove_lang('wovn.io', '')
+    assert_equal('wovn.io', uri_without_scheme)
+
+    uri_with_scheme = h.remove_lang('https://wovn.io/', '')
+    assert_equal('https://wovn.io/', uri_with_scheme)
+  end
+
+  def test_remove_lang_query
+    h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'query'))
+
+    keys = Wovnrb::Lang::LANG.keys
+    assert_equal(28, keys.size)
+
+    for key in keys
+      uri_without_scheme = h.remove_lang("wovn.io/?wovn=#{key}", key)
+      assert_equal('wovn.io/', uri_without_scheme)
+
+      uri_with_scheme = h.remove_lang("https://wovn.io?wovn=#{key}", key)
+      assert_equal('https://wovn.io', uri_with_scheme)
+    end
+  end
+
+  def test_remove_lang_query_with_nil_lang
+    h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'query'))
+
+    uri_without_scheme = h.remove_lang('wovn.io', nil)
+    assert_equal('wovn.io', uri_without_scheme)
+
+    uri_with_scheme = h.remove_lang('https://wovn.io/', nil)
+    assert_equal('https://wovn.io/', uri_with_scheme)
+  end
+
+  def test_remove_lang_query_with_empty_lang
+    h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'query'))
+
+    uri_without_scheme = h.remove_lang('wovn.io', '')
+    assert_equal('wovn.io', uri_without_scheme)
+
+    uri_with_scheme = h.remove_lang('https://wovn.io/', '')
+    assert_equal('https://wovn.io/', uri_with_scheme)
+  end
+
+  def test_remove_lang_subdomain
+    h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'subdomain'))
+
+    keys = Wovnrb::Lang::LANG.keys
+    assert_equal(28, keys.size)
+
+    for key in keys
+      uri_without_scheme = h.remove_lang("#{key.downcase}.wovn.io/", key)
+      assert_equal('wovn.io/', uri_without_scheme)
+
+      uri_with_scheme = h.remove_lang("https://#{key.downcase}.wovn.io", key)
+      assert_equal('https://wovn.io', uri_with_scheme)
+    end
+  end
+
+  def test_remove_lang_subdomain_with_nil_lang
+    h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'subdomain'))
+
+    uri_without_scheme = h.remove_lang('wovn.io', nil)
+    assert_equal('wovn.io', uri_without_scheme)
+
+    uri_with_scheme = h.remove_lang('https://wovn.io/', nil)
+    assert_equal('https://wovn.io/', uri_with_scheme)
+  end
+
+  def test_remove_lang_subdomain_with_empty_lang
+    h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'subdomain'))
+
+    uri_without_scheme = h.remove_lang('wovn.io', '')
+    assert_equal('wovn.io', uri_without_scheme)
+
+    uri_with_scheme = h.remove_lang('https://wovn.io/', '')
+    assert_equal('https://wovn.io/', uri_with_scheme)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.2.04
+  version: 0.2.05
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo