wovnrb 0.1.54 → 0.1.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96cb0661f30c5d9d729ef90a5ba9f95626bbf181
-  data.tar.gz: 1b00e8ad4532cc33c438ae0b1ee4f9918f651f1b
+  metadata.gz: 45354cf98daaf36ab8ae980daffdaf7ffcc35793
+  data.tar.gz: 6501b2e1794d28b18693e60f3ee155ad87bb2168
 SHA512:
-  metadata.gz: 49ab51000689c2ae47c0ec43e24cabeabda3f1328ba0022b0c9bd4cdf72d9ead044da2479346d9f17df6930c87ed3082532933c77692043f2c8317c4aa96c936
-  data.tar.gz: 924a6e1e977c3ac5ed8f6c96437601da5c3dc921e34247f8291bd0a02bd70b835eea77f8d7dba1225354fb9e820c3c277c0a63aaada475224c4a7d98ae8fac79
+  metadata.gz: 2433d0dda3c14751a40a09f04ce8d57b51879ffe4ce81c8f7db364df7b00c4777da320dfc182a1c7b7dbb333acc76c8f08b3a3e3d598941957c877abbbd1e247
+  data.tar.gz: 9292166526e3bcc7c508b69d11755e90f8ac469b11e1f2cf9fc291b92adb9707dfee472d215ac9eae06e2f9e61fac024968fd67d9bf7cb03aa26c6cf8c858d83

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.test_files = FileList['test/*/*.rb']
+  t.test_files = FileList['test/*/*.rb'] | FileList['test/*/*/*.rb']
   t.options = '-p'
 end
 

data/lib/wovnrb.rb

@@ -59,6 +59,7 @@ module Wovnrb
 
 
     def switch_lang(body, values, url, lang=STORE.settings['default_lang'], headers)
+      lang = Lang.get_code(lang)
       text_index = values['text_vals'] || {}
       src_index = values['img_vals'] || {}
       img_src_prefix = values['img_src_prefix'] || ''

data/lib/wovnrb/headers.rb

@@ -63,7 +63,7 @@ module Wovnrb
       if @path_lang.nil?
         rp = Regexp.new(@settings['url_pattern_reg'])
         match = "#{@env['SERVER_NAME']}#{@env['REQUEST_URI']}".match(rp)
-        if match && match[:lang] && Lang::LANG[match[:lang]]
+        if match && match[:lang] && Lang.get_lang(match[:lang])
           @path_lang = match[:lang]
         else
           @path_lang = ''
@@ -75,14 +75,14 @@ module Wovnrb
     def browser_lang
       if @browser_lang.nil?
         match = (@env['HTTP_COOKIE'] || '').match(/wovn_selected_lang\s*=\s*(?<lang>[^;\s]+)/)
-        if match && match[:lang] && Lang::LANG[match[:lang]]
+        if match && match[:lang] && Lang.get_lang(match[:lang])
           @browser_lang = match[:lang]
         else
 # IS THIS RIGHT?
           @browser_lang = ''
           accept_langs = (@env['HTTP_ACCEPT_LANGUAGE'] || '').split(/[,;]/)
           accept_langs.each do |l|
-            if Lang::LANG[l]
+            if Lang.get_lang(l)
               @browser_lang = l
               break
             end
@@ -114,7 +114,7 @@ module Wovnrb
             location = "#{location}&wovn=#{lang}"
           end
         when 'subdomain'
-          location = "#{lang}.#{location}"
+          location = "#{lang.downcase}.#{location}"
        #when 'path'
         else
           location = location.sub(/(\/|$)/, "/#{lang}/");

data/lib/wovnrb/lang.rb

@@ -66,5 +66,10 @@ module Wovnrb
       return nil
     end
 
+    def self.get_lang(lang)
+      lang_code = get_code(lang)
+      return LANG[lang_code]
+    end
+
   end
 end

data/lib/wovnrb/services/url.rb

@@ -0,0 +1,32 @@
+module Wovnrb
+  class URL
+
+    # return the absolute url given the current location and a relative location
+    def self.resolve_absolute_url(curr_location, rel_location)
+    
+    end
+
+    # Set the path lang to 
+    def self.prepend_path(url, dir)
+      # URL = "http://google.com/test"
+      # dir = "new_dir"
+      #return "http://google.com/new_dir/test"
+    end
+
+    #def self.set_query_lang(url, lang, param_name='wovn')
+    #end
+
+    #def self.set_subdomain_lang(url, lang)
+    #end
+
+    #def self.remove_subdomain(url)
+    #end
+
+    #def self.add_subdomain(url, subdomain)
+    #end
+
+    #def self.set_query_param(url, param, value)
+    #end
+
+  end
+end

data/lib/wovnrb/store.rb

@@ -3,6 +3,7 @@ require 'net/http'
 require 'socket'
 require 'cgi'
 require 'Logger' unless defined?(Logger)
+require 'pry'
 
 module Wovnrb
 
@@ -129,6 +130,7 @@ module Wovnrb
       url = url.gsub(/\/$/, '')
       redis_key = 'WOVN:BACKEND:STORAGE:' + url + ':' + settings['user_token']
       cli = Redis.new(host: settings['backend_host'], port: settings['backend_port'])
+
       begin
         vals = cli.get(redis_key) || '{}'
         vals = JSON.parse(vals)
@@ -141,7 +143,7 @@ module Wovnrb
         host = 'j.wovn.io'
         post_data = "{\"user_token\":\"#{settings['user_token']}\", \"url\":\"#{CGI.escape(url)}\"}"
         headers = "Host: #{host}\r\nContent-Type: application/json;charset=UTF-8\r\nContent-Length: #{post_data.bytesize}\r\nConnection: close\r\n\r\n"
-        s = TCPSocket.new(host, 80)
+        s = TCPSocket.new(host, 3000)
         s.puts "POST /pages/cache_backend HTTP/1.1\r\n#{headers}#{post_data}"
         s.close
       end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.1.54"
+  VERSION = "0.1.55"
 end

data/test/lib/lang_test.rb

@@ -20,6 +20,10 @@ class LangTest < Minitest::Test
     assert_equal('ms', Wovnrb::Lang.get_code('ms'))
   end
 
+  def test_get_code_with_capital_letters
+    assert_equal('zh-CHT', Wovnrb::Lang.get_code('zh-cht'))
+  end
+
   def test_get_code_with_valid_english_name
     assert_equal('pt', Wovnrb::Lang.get_code('Portuguese'))
   end

data/test/lib/services/url_test.rb

@@ -0,0 +1,9 @@
+require 'wovnrb/services/url'
+
+class URLTest < Minitest::Test
+
+  def test_prepend_path
+    assert_equal('http://google.com/new_dir/test', Wovnrb::URL.prepend_path('http://google.com/test', 'new_dir'))
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.1.54
+  version: 0.1.55
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -239,12 +239,14 @@ files:
 - lib/wovnrb/headers.rb
 - lib/wovnrb/lang.rb
 - lib/wovnrb/railtie.rb
+- lib/wovnrb/services/url.rb
 - lib/wovnrb/store.rb
 - lib/wovnrb/version.rb
 - spec/spec_helper.rb
 - spec/wovnrb_spec.rb
 - test/lib/headers_test.rb
 - test/lib/lang_test.rb
+- test/lib/services/url_test.rb
 - test/lib/wovnrb_test.rb
 - test/test_helper.rb
 - values/values
@@ -278,5 +280,6 @@ test_files:
 - spec/wovnrb_spec.rb
 - test/lib/headers_test.rb
 - test/lib/lang_test.rb
+- test/lib/services/url_test.rb
 - test/lib/wovnrb_test.rb
 - test/test_helper.rb