wovnrb 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f424f493421fb41f99437d20ecaa569a96d1848
-  data.tar.gz: 77b758db4390186f87962f8a1e1e6773215f749a
+  metadata.gz: f30155825513a841ed260d157839f2d5d9ccc302
+  data.tar.gz: fbd5f149deef651dcf1d400150b7175f9e2a537e
 SHA512:
-  metadata.gz: ad31db23c9b0c731fbec6a7f7a9053442a36216d6f97dc6df92bc76580046f4de7ed739f2ccd9bb3207cc47e6aae00c6da18d1e152541641860ddb098ac45d5e
-  data.tar.gz: 6bcc8d868cad4c7d590d71a209f8e14148b5d493242eee9bddabd639a244647de42cce474ef41164495f2e9c3a2db425e2baf5903e865163ff55b203266b89eb
+  metadata.gz: de46ce6ada35bb48385e91844f6baffbb4fb0f2a170621b530c9ca7a70485c42fb40db09a080707f200cec7b0cf73d66a9e9e7758480434613aa0ea381626e77
+  data.tar.gz: a028a8fe2562dabf36d601a85cbc5db979c50ddb41a3d2d5d443ce3225740f7293d3b3de1344832e72c5eda0f6a62f831742ea1d4c705c62303bd64f4b65dfd5

data/lib/wovnrb/headers.rb

@@ -210,20 +210,20 @@ module Wovnrb
     def out(headers)
       r = Regexp.new("//" + @host)
       lang_code = Store.instance.settings['custom_lang_aliases'][self.lang_code] || self.lang_code
-      if headers.has_key?("Location") && headers["Location"] =~ r
+      if lang_code != @settings['default_lang'] && headers.has_key?("Location") && headers["Location"] =~ r
         case @settings['url_pattern']
         when 'query'
-          if headers["Location"] =~ /\?/
-            headers["Location"] += "&"
+          if headers['Location'] =~ /\?/
+            headers['Location'] += "&"
           else
-            headers["Location"] += "?"
+            headers['Location'] += "?"
           end
           headers['Location'] += "wovn=#{lang_code}"
         when 'subdomain'
-          headers["Location"] = headers["Location"].sub(/\/\/([^.]+)/, '//' + lang_code + '.\1')
+          headers['Location'] = headers["Location"].sub(/\/\/([^.]+)/, '//' + lang_code + '.\1')
        #when 'path'
         else
-          headers["Location"] = headers['Location'].sub(/(\/\/[^\/]+)/, '\1/' + lang_code)
+          headers['Location'] = headers['Location'].sub(/(\/\/[^\/]+)/, '\1/' + lang_code)
         end
       end
       headers

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.2.19"
+  VERSION = "0.2.20"
 end

data/test/lib/headers_test.rb

@@ -245,6 +245,60 @@ module Wovnrb
       assert_equal('http://staging-ja.wovn.io/test', h.out(headers)['Location'])
     end
 
+    def test_out_original_lang_with_subdomain_url_pattern
+      h = Wovnrb::Headers.new(
+        Wovnrb.get_env(
+          'SERVER_NAME' => 'wovn.io',
+          'REQUEST_URI' => '/test',
+          'HTTP_REFERER' => 'http://wovn.io/test',
+        ),
+        Wovnrb.get_settings(
+          'url_pattern' => 'subdomain',
+          'url_pattern_reg' => '^(?<lang>[^.]+).',
+        ),
+      )
+      headers = h.request_out(h.lang_code)
+      assert_equal('http://wovn.io/test', headers['HTTP_REFERER'])
+      headers['Location'] = headers['HTTP_REFERER']
+      assert_equal('http://wovn.io/test', h.out(headers)['Location'])
+    end
+
+    def test_out_original_lang_with_path_url_pattern
+      h = Wovnrb::Headers.new(
+        Wovnrb.get_env(
+          'SERVER_NAME' => 'wovn.io',
+          'REQUEST_URI' => '/test',
+          'HTTP_REFERER' => 'http://wovn.io/test',
+        ),
+        Wovnrb.get_settings(
+          'url_pattern' => 'path',
+          'url_pattern_reg' => '/(?<lang>[^/.?]+)',
+        ),
+      )
+      headers = h.request_out(h.lang_code)
+      assert_equal('http://wovn.io/test', headers['HTTP_REFERER'])
+      headers['Location'] = headers['HTTP_REFERER']
+      assert_equal('http://wovn.io/test', h.out(headers)['Location'])
+    end
+
+    def test_out_original_lang_with_query_url_pattern
+      h = Wovnrb::Headers.new(
+        Wovnrb.get_env(
+          'SERVER_NAME' => 'wovn.io',
+          'REQUEST_URI' => '/test',
+          'HTTP_REFERER' => 'http://wovn.io/test',
+        ),
+        Wovnrb.get_settings(
+          'url_pattern' => 'query',
+          'url_pattern_reg' => '((\\?.*&)|\\?)wovn=(?<lang>[^&]+)(&|$)',
+        ),
+      )
+      headers = h.request_out(h.lang_code)
+      assert_equal('http://wovn.io/test', headers['HTTP_REFERER'])
+      headers['Location'] = headers['HTTP_REFERER']
+      assert_equal('http://wovn.io/test', h.out(headers)['Location'])
+    end
+
     def test_out_with_wovn_target_lang_header_using_subdomain
       h = Wovnrb::Headers.new(
         Wovnrb.get_env(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo