wovnrb 0.2.07 → 0.2.07.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 475d239f4c2bc99bb2e55c39fddb2b44bde9cb4b
-  data.tar.gz: 4210964a50e17d64df9e5419049d2fa88ef73d9f
+  metadata.gz: b65bd099a98b9832deb8a8ad6c0a76b2442727ec
+  data.tar.gz: 2d65eb16175398584a2bebe3f80732d74d7cc3ec
 SHA512:
-  metadata.gz: 9ebfaa9a32f5da6db1ac44e41b0222f609f6fefa1a900db1ccbe394c9807376be12b036b6b9a0ec53d2f1b2a154e29724c09815c628bf7cb7d22667619e5736f
-  data.tar.gz: 21281afc06d1922f57349a374c7296f83fb7aa09534aa718e8a55a5e498913d9446ef8a03cc2630c43ed7f6bc394b510eeeebd6e52fead0c3ec1f8f71b9154e3
+  metadata.gz: 629628750b2196824f4e2be03e0f299f94989d115fc1042a43adc146f22d627d3dbabc78435f39e25d473cef2c72ac6449766ca2779e51c54082e4b12fa681c4
+  data.tar.gz: fa5f22df24ad7726ab9a056718a0ac037ae95482142de2dc6e834a59d55d369398b584125bcb938b6c3a7d3d09d2ceff839e73f1ec6f68294bf4925ff43c8255

data/lib/wovnrb/headers.rb

@@ -205,7 +205,7 @@ module Wovnrb
 
     def out(headers)
       r = Regexp.new("//" + @host)
-      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"] =~ /\?/

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.2.07"
+  VERSION = "0.2.07.1"
 end

data/test/lib/headers_test.rb

@@ -150,6 +150,60 @@ class HeadersTest < Minitest::Test
     assert_equal('http://wovn.io/test', env['HTTP_REFERER'])
   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
+
   #########################
   # GET SETTINGS
   #########################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.2.07
+  version: 0.2.07.1
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -388,4 +388,3 @@ test_files:
 - test/lib/wovnrb_test.rb
 - test/services/url_test.rb
 - test/test_helper.rb
-has_rdoc: