wovnrb 0.2.03 → 0.2.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 331efba8ea791590ae759615aa853a4379a8633f
-  data.tar.gz: 95325d00b3d635fa06b2acd30ffde80a17d722ac
+  metadata.gz: 5b14f7b1db39f462612fbfb5437c8b9a57ab0545
+  data.tar.gz: 216b7d095a9ab39fe039ecd7a86cb421f93edbba
 SHA512:
-  metadata.gz: 9aa88813f3efce6b9990c31f2e82d6ec80f0fe445cb15bee1814a5bd82eae9fa825275f236e4b747b03933e7f6e922ce14ec7d9499ac0dec5c0d0efc58f358ba
-  data.tar.gz: 9dfc5c07628474fc96203be53f18bdec97a98c198bf997c2a0bf448d02c6226c5222bda14fdc9974c9cee2cb08181afa93ac72dfe5427302818f227970556a3f
+  metadata.gz: 03c36df5a7edb5fc443124eafdf338d272d009b7c612188512cf24ec272f68538808b4c7dd312fa37822b96cf25200afde4185a6c8c6593d9939f00a1f0e5015
+  data.tar.gz: 79114a464d34be6fb01dd0091bec13f58823d14f61f6308a964cff85cf24d69f43b35838e4bde1ab80eddc49aede2fe984a82a5057276bedce15d98e5d7d4ac8

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 rvm:
   - 2.1.0
 before_install:

data/README.md

@@ -38,8 +38,8 @@ Insert the following into either config/application.rb or config/environments/.
 ...
 
 config.wovnrb = {
-:user_token => '2Wle3',
-:secret_key => 'secret',
+  :user_token => '2Wle3',
+  :secret_key => 'secret',
 }
 
 ...
@@ -55,8 +55,8 @@ Insert the following into either the Application File or config.ru.
 require 'wovnrb'
 
 use Wovnrb::Interceptor, {
-:user_token => '2Wle3',
-:secret_key => 'secret',
+  :user_token => '2Wle3',
+  :secret_key => 'secret',
 }
 
 ...
@@ -100,15 +100,15 @@ parameters  | Translated page's URL           | Notes
 
 ### 2.4. query
 
-Using the query parameter, you can setup query parameters you wish to be ignored within the URL when translating via WOVN.io. There is no default value, in this case, all query parameters are included within the translated page's URL.
+WOVN.io ignores query parameters when searching translated page. If you want to add query parameter to translated page's URL, you should configure "query" parameter. (You need to configure WOVN.io too)
 
 	https://wovn.io/ja/contact?os=mac&keyboard=us
 
-If the defualt_lang is 'en', and the query is set to 'os=mac&keyboard=us', the above URL will be modified into the following URL to search for the page's translation.
+If the defualt_lang is 'en', and the query is set to '', the above URL will be modified into the following URL to search for the page's translation.
 
-	https://wovn.io/contact?os=mac&keyboard=us
+	https://wovn.io/contact
 
-If the default_lang is 'en', and the query is set to 'os=mac', the above URL will be modified into the following URL to search for the page's translation.
+If the default_lang is 'en', and the query is set to 'os', the above URL will be modified into the following URL to search for the page's translation.
 
 	https://wovn.io/contact?os=mac
 

data/lib/wovnrb/headers.rb

@@ -55,6 +55,8 @@ module Wovnrb
         end
         if query_vals.length > 0
           @query = "?#{query_vals.sort.join('&')}"
+        else
+          @query = ''
         end
       else
         @query = ''
@@ -170,6 +172,9 @@ module Wovnrb
         if @env.has_key?('ORIGINAL_FULLPATH')
           @env['ORIGINAL_FULLPATH'] = remove_lang(@env['ORIGINAL_FULLPATH'])
         end
+        if @env.has_key?('HTTP_REFERER')
+          @env["HTTP_REFERER"] = remove_lang(@env["HTTP_REFERER"])
+        end
       end
       @env
     end

data/lib/wovnrb/version.rb

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

data/test/lib/headers_test.rb

@@ -82,7 +82,25 @@ class HeadersTest < Minitest::Test
    assert_equal('wovn.io', h.unmasked_host)
    assert_equal('localhost', env['HTTP_HOST'])
    assert_equal('localhost', env['SERVER_NAME'])
- end
+  end
+
+  def test_initialize_without_query
+    env = Wovnrb.get_env
+    h = Wovnrb::Headers.new(env, Wovnrb.get_settings)
+    assert_equal('wovn.io/dashboard', h.redis_url)
+  end
+
+  def test_initialize_with_query
+    env = Wovnrb.get_env
+    h = Wovnrb::Headers.new(env, Wovnrb.get_settings('query' => ['param']))
+    assert_equal('wovn.io/dashboard?param=val', h.redis_url)
+  end
+
+  def test_initialize_with_not_matching_query
+    env = Wovnrb.get_env
+    h = Wovnrb::Headers.new(env, Wovnrb.get_settings('query' => ['aaa']))
+    assert_equal('wovn.io/dashboard', h.redis_url)
+  end
 
   #########################
   # REQUEST_OUT
@@ -106,6 +124,31 @@ class HeadersTest < Minitest::Test
    assert_equal('wovn.io', env['HTTP_X_FORWARDED_HOST'])
   end
 
+  def test_request_out_http_referer_subdomain
+    h = Wovnrb::Headers.new(
+      Wovnrb.get_env(
+        'SERVER_NAME' => 'ja.wovn.io',
+        'REQUEST_URI' => '/test',
+        'HTTP_REFERER' => 'http://ja.wovn.io/test',
+      ),
+      Wovnrb.get_settings(
+        'url_pattern' => 'subdomain',
+        'url_pattern_reg' => '^(?<lang>[^.]+).',
+      ),
+    )
+    env = h.request_out('ja')
+    assert_equal('http://wovn.io/test', env['HTTP_REFERER'])
+  end
+
+  def test_request_out_http_referer_path
+    h = Wovnrb::Headers.new(
+      Wovnrb.get_env('REQUEST_URI' => '/ja/test', 'HTTP_REFERER' => 'http://wovn.io/ja/test'),
+      Wovnrb.get_settings,
+    )
+    env = h.request_out('ja')
+    assert_equal('http://wovn.io/test', env['HTTP_REFERER'])
+  end
+
   #########################
   # GET SETTINGS
   #########################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.2.03
+  version: 0.2.04
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -350,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Gem for WOVN.io
@@ -374,3 +374,4 @@ test_files:
 - test/lib/wovnrb_test.rb
 - test/services/url_test.rb
 - test/test_helper.rb
+has_rdoc: