wovnrb 0.1.09 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aabb45b4cf3175416891b706d4426e365555953
-  data.tar.gz: 4182a8a1dc83097b0e37bbe0e8f0738ef5ba6ae5
+  metadata.gz: 7ca7bed74be6d6a61a8f5c8107ccee865fdf304e
+  data.tar.gz: f5ec357ab1ae89337b630a0c4d2675fe092823af
 SHA512:
-  metadata.gz: 99173d1bfd0a4e217e8b6850c23b6344136e672ef5e1536fd9581d23dc79f83de8b0396b2102ea1a0993a4ccf14582d0425b9b5caf790842515ed06729803e73
-  data.tar.gz: 82933f61765c502a4abac8be6b353681d7e25acd0f8f7790ad759ac6ff110bd4d2027e30159bfe1f43d8a422764438890a89f532fdbcf62fe9d4d2b8b22018dd
+  metadata.gz: 88d93aca8aa15ad285dd48e348d8106493b224609869ef875b1afb465f514a6fbddde8327afc0c69c97460fb7394d35770075f050d1814f35eaa3eb70765206e
+  data.tar.gz: d945655709b5d2759041185b7273cc91a257e29cce0ed44e5c31e103c25f16024df7e17389e28f836568de92eb7b88eec3696a425fdacff708622b851037ac0a

data/lib/wovnrb.rb

@@ -1,6 +1,5 @@
 require 'wovnrb/store'
-require 'wovnrb/headers'
-require 'wovnrb/lang'
+require 'wovnrb/headers' require 'wovnrb/lang'
 #require 'dom'
 require 'json'
 
@@ -19,14 +18,19 @@ module Wovnrb
       @env = env
       STORE.refresh_settings
       headers = Headers.new(env, STORE.settings)
-      if ((headers.path_lang != '' && !STORE.settings['supported_langs'].include?(headers.path_lang)) || headers.path_lang == STORE.settings['default_lang'])
+      # redirect if the path is set to the default language (for SEO purposes)
+      if (headers.path_lang == STORE.settings['default_lang'])
         redirect_headers = headers.redirect(STORE.settings['default_lang'])
-        redirect_headers['set-cookie'] = "wovn_selected_lang=#{STORE.settings['default_lang']};"
-        return [307, redirect_headers, ['']]
-      elsif headers.path_lang == '' && (headers.browser_lang != STORE.settings['default_lang'] && STORE.settings['supported_langs'].include?(headers.browser_lang))
-        redirect_headers = headers.redirect(headers.browser_lang)
         return [307, redirect_headers, ['']]
       end
+      #if ((headers.path_lang != '' && !STORE.settings['supported_langs'].include?(headers.path_lang)) || headers.path_lang == STORE.settings['default_lang'])
+      #  redirect_headers = headers.redirect(STORE.settings['default_lang'])
+      #  redirect_headers['set-cookie'] = "wovn_selected_lang=#{STORE.settings['default_lang']};"
+      #  return [307, redirect_headers, ['']]
+      #elsif headers.path_lang == '' && (headers.browser_lang != STORE.settings['default_lang'] && STORE.settings['supported_langs'].include?(headers.browser_lang))
+      #  redirect_headers = headers.redirect(headers.browser_lang)
+      #  return [307, redirect_headers, ['']]
+      #end
       lang = headers.lang
 
       # pass to application

data/lib/wovnrb/store.rb

@@ -64,7 +64,7 @@ module Wovnrb
       if @settings['url_pattern_name'] == 'path'
         @settings['url_pattern_reg'] = "/(?<lang>[^/.?]+)"
       elsif @settings['url_pattern_name'] == 'query'
-        @settings['url_pattern_reg'] = '((\?.*&)|\?)wovn=(?<lang>[^&]+)(&|$)'
+        @settings['url_pattern_reg'] = "((\?.*&)|\?)wovn=(?<lang>[^&]+)(&|$)"
       end
       @settings
     end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.1.09"
+  VERSION = "0.1.10"
 end

metadata

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