wovnrb 0.1.38 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53c910b709838d8e022deb2c867374c83015e637
-  data.tar.gz: ea9f80befdfa384e8d3bbd514b10e13b8c2cdb4c
+  metadata.gz: 4b5e9cdc92a69314068f8137ea70ce474ea9b471
+  data.tar.gz: 470a31b936dbd76a3a1c3a533a37591bc8dbb2d7
 SHA512:
-  metadata.gz: 1e20028655f471bce65364b10d319046725e82ef30b7e86ea7210e8f5eb87517682ed4f799254760e26c9dfbabe338ad825c519946da691e0b39b149e632fe88
-  data.tar.gz: 02d0912575354f915cae2869b03f9869470367f446dddd6928a10e26c8a1480a28f1a7463a6e942770fdcc8de9578fd5615b7a81ad36d3b6a3d3265927c9afc9
+  metadata.gz: 184c301826c51a1ccdd9493ea7ff000b84d24ad29d0a2642af3c07606dbd4431a420e5778218f3351216e418eb94128d2f1868bba90cbc14b96ea8c24fc3bda7
+  data.tar.gz: 64dc9c7978f99cc1e869cc58f004cb34fc899e5b05523e5d5d68dfe908d584c5ecf133235f11ac48d2ce2994695e0ae26af68e35ad5c62cc3fb5b5a3406f2c00

data/lib/wovnrb/lang.rb

@@ -59,7 +59,7 @@ module Wovnrb
       return nil if lang_name.nil?
       return lang_name if LANG[lang_name]
       LANG.each do |k, l|
-        if lang_name.downcase == l[:name].downcase || lang_name.downcase == l[:en].downcase
+        if lang_name.downcase == l[:name].downcase || lang_name.downcase == l[:en].downcase || lang_name.downcase == l[:code].downcase
           return l[:code]
         end
       end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.1.38"
+  VERSION = "0.1.39"
 end

data/test/lib/headers_test.rb

@@ -9,21 +9,72 @@ class HeadersTest < Minitest::Test
     refute_nil(h)
   end
 
-  def test_initialize_env
-    env = get_env
-    #h = Wovnrb::Headers.new(env, {})
-    #assert_equal(''
-  end
+  # def test_initialize_env
+  #   env = get_env
+  #   h = Wovnrb::Headers.new(env, {})
+  #   binding.pry
+  #   #assert_equal(''
+  # end
 
   def test_initialize_with_simple_url
     h = Wovnrb::Headers.new(get_env('url' => 'https://wovn.io'), get_settings)
-    #assert_equal(''
+    assert_equal('wovn.io/', h.url)
+  end
+
+  def test_initialize_with_query_language
+    h = Wovnrb::Headers.new(get_env('url' => 'https://wovn.io/?wovn=en'), get_settings('url_pattern' => 'query'))
+    assert_equal('wovn.io/?', h.url)
+  end
+
+  def test_initialize_with_query_language_without_slash
+    h = Wovnrb::Headers.new(get_env('url' => 'https://wovn.io?wovn=en'), get_settings('url_pattern' => 'query'))
+    assert_equal('wovn.io/?', h.url)
+  end
+
+  def test_initialize_with_path_language
+    h = Wovnrb::Headers.new(get_env('url' => 'https://wovn.io/en'), get_settings)
+    assert_equal('wovn.io/', h.url)
+  end
+
+  def test_initialize_with_domain_language
+    h = Wovnrb::Headers.new(get_env('url' => 'https://en.wovn.io/'), get_settings('url_pattern' => 'subdomain'))
+    assert_equal('wovn.io/', h.url)
+  end
+
+  def test_initialize_with_path_language_with_query
+    h = Wovnrb::Headers.new(get_env('url' => 'https://wovn.io/en/?wovn=zh-CHS'), get_settings)
+    assert_equal('wovn.io/?wovn=zh-CHS', h.url)
+  end
+
+  def test_initialize_with_domain_language_with_query
+    h = Wovnrb::Headers.new(get_env('url' => 'https://en.wovn.io/?wovn=zh-CHS'), get_settings('url_pattern' => 'subdomain'))
+    assert_equal('wovn.io/?wovn=zh-CHS', h.url)
+  end
+
+  def test_initialize_with_path_language_with_query_without_slash
+    h = Wovnrb::Headers.new(get_env('url' => 'https://wovn.io/en?wovn=zh-CHS'), get_settings)
+    assert_equal('wovn.io/?wovn=zh-CHS', h.url)
+  end
+
+  def test_initialize_with_domain_language_with_query_without_slash
+    h = Wovnrb::Headers.new(get_env('url' => 'https://en.wovn.io?wovn=zh-CHS'), get_settings('url_pattern' => 'subdomain'))
+    assert_equal('wovn.io/?wovn=zh-CHS', h.url)
+  end
+
+  def test_get_settings_valid
+    # TODO: check if get_settings is valid (store.rb, valid_settings)
+    # s = Wovnrb::Store.new
+    # settings = get_settings
+    
+    # settings_stub = stub
+    # settings_stub.expects(:has_key).with(:user_token).returns(settings["user_token"])
+    # s.valid_settings?
   end
 
   def get_settings(options={})
     settings = {}
     settings['user_token'] = 'OHYx9'
-    settings['url_pattern_name'] = 'path'
+    settings['url_pattern'] = 'path'
     settings['url_pattern_reg'] = "/(?<lang>[^/.?]+)"
     settings['query'] = []
     settings['backend_host'] = 'localhost'
@@ -31,7 +82,6 @@ class HeadersTest < Minitest::Test
     settings['default_lang'] = 'en'
     settings['supported_langs'] = []
     settings['secret_key'] = ''
-
     return settings.merge(options)
   end
 

data/test/lib/wovnrb_test.rb

@@ -0,0 +1,25 @@
+require 'wovnrb'
+require 'wovnrb/headers'
+require 'minitest/autorun'
+require 'pry'
+
+class WovnrbTest < Minitest::Test
+
+  def test_initialize
+    i = Wovnrb::Interceptor.new(get_app)
+    refute_nil(i)
+  end
+
+  # def test_call(env)
+  # end
+
+  # def test_switch_lang(body, values, url, lang=STORE.settings['default_lang'], headers)
+  # end
+
+  # def test_get_langs(values)
+  # end
+
+  def get_app()
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -245,6 +245,7 @@ files:
 - spec/wovnrb_spec.rb
 - test/lib/headers_test.rb
 - test/lib/lang_test.rb
+- test/lib/wovnrb_test.rb
 - test/test_helper.rb
 - values/values
 - wovnrb.gemspec
@@ -277,4 +278,5 @@ test_files:
 - spec/wovnrb_spec.rb
 - test/lib/headers_test.rb
 - test/lib/lang_test.rb
+- test/lib/wovnrb_test.rb
 - test/test_helper.rb