wovnrb 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fb36534c436a191a760359ec8eed7972616d09b
-  data.tar.gz: a53f3c30df5503b55b85efde0def6899e145f2a6
+  metadata.gz: 31142a2c019c93131fd423b8019e803dc7729193
+  data.tar.gz: 1753cc34aaedf94b5d7bb3bc21a70a792cb8e1c8
 SHA512:
-  metadata.gz: 97a24180cd6237673f95b406f07c1928ac7cc7032adfa7e3c45396b1ee0ae023feeb7e78c85a35e9ecb3ac619ef3d4ac10998dad3b90424f7b042dff5f7b2410
-  data.tar.gz: f37153ea07b8cfb5326849423fb3400afd575c6e63b0a3c8af1b65191d59d4d3aaebc6c90d9e47b9d8fe4aec8ef3902b7bd3b3bce4792002c49fbfef227d03bd
+  metadata.gz: 34165658b41c519a54d8efae36bba7a45b3c242b03d76ac2b82666d97e77ff2006f138b51db3313a7916dd8fa1339ff522645bed7beee7acc253e5d82d45a04e
+  data.tar.gz: 39145d2508fbbff2281332a63e68b93359f55671f054d9c85af858bb765bba1fdb2e1bdeff57c46f469c22f724bbb89fd30b60df5fd12787a9e68e35d89878a8

data/lib/wovnrb/lang.rb

@@ -106,7 +106,7 @@ module Wovnrb
                 new_href = href.sub(/(\/\/)([^\.]*)/, '\1' + code_to_add.downcase + '.' + '\2')
               end
             when 'query'
-              new_href = href =~ /\?/ ? href + '&wovn=' + code_to_add : href + '?wovn=' + code_to_add
+              new_href = add_query_lang_code(href, code_to_add)
             else # path
               new_href = href.sub(/([^\.]*\.[^\/]*)(\/|$)/, '\1/' + code_to_add + '/')
           end
@@ -130,7 +130,7 @@ module Wovnrb
               new_href = lang_url + current_dir + '/' + href
             end
           when 'query'
-            new_href = href =~ /\?/ ? href + '&wovn=' + code_to_add : href + '?wovn=' + code_to_add
+            new_href = add_query_lang_code(href, code_to_add)
           else # path
             if href =~ /^\//
               new_href = '/' + code_to_add + href
@@ -201,5 +201,11 @@ module Wovnrb
       end
       langs
     end
+
+    def add_query_lang_code(href, lang_code)
+      query_separator = href =~ /\?/ ? '&' : '?'
+
+      href.sub(/(#|$)/, "#{query_separator}wovn=#{lang_code}\\1")
+    end
   end
 end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.2.25"
+  VERSION = "0.2.26"
 end

data/test/lib/lang_test.rb

@@ -238,6 +238,12 @@ module Wovnrb
       assert_equal('http://google.com?hey=yo&wovn=fr', lang.add_lang_code('http://google.com?hey=yo', 'query', headers))
     end
 
+    def test_add_lang_code_absolute_query_with_hash
+      lang = Lang.new('fr')
+      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
+      assert_equal('http://google.com?wovn=fr#test', lang.add_lang_code('http://google.com#test', 'query', headers))
+    end
+
     def test_add_lang_code_absolute_path_no_pathname
       lang = Lang.new('fr')
       headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
@@ -286,6 +292,12 @@ module Wovnrb
       assert_equal('/index.html?hey=yo&wovn=fr', lang.add_lang_code('/index.html?hey=yo', 'query', headers))
     end
 
+    def test_add_lang_code_relative_query_with_hash
+      lang = Lang.new('fr')
+      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com/'), Wovnrb.get_settings)
+      assert_equal('/index.html?hey=yo&wovn=fr', lang.add_lang_code('/index.html?hey=yo', 'query', headers))
+    end
+
     def test_add_lang_code_relative_path_with_leading_slash
       lang = Lang.new('fr')
       headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com/'), Wovnrb.get_settings)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo