wovnrb 0.1.35 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 700600d132d315519350a61fd20a57c7e0181050
-  data.tar.gz: 5fc85d3db8886950aa4a9ad139d6e00ee0b1f659
+  metadata.gz: eb6a923f625d953649b1de0242b1f477947d58c7
+  data.tar.gz: 1e75041212f5da667742dde22913779a125b042c
 SHA512:
-  metadata.gz: 2e0cf2c5ccf9f1e73d2d4cd59f13c0655c031f6ef425c7257bce762190bd0cb5a44cb91e314d27fad0101891c9620e8768186967f5b6fa60a063e193036f7c40
-  data.tar.gz: b74aa7c268d8fabba4bb66f069d8f195033f84fad0f41dcda710cacfd63fd94b6af32ecb05453171e8f79dacf3554193bff410937153a8e1f1e819d21c13e059
+  metadata.gz: cae95611865c9f2b5e8aaa856c5644b36e6204bd5a4cdf2ab7063764c25f0739160372b3175cc66249f46f5a3a75f7f790b7a142ee6086bc4bd8d350f490c33d
+  data.tar.gz: 61eea27872c4b496d83a45cafc6edbeb6291f1711deba5798a83baf1bf7bae6852682ad949e5a189f97895e8055a3dd3d31cc12697c1eca5e4d65b9ce90b332c

data/lib/wovnrb.rb

@@ -17,40 +17,30 @@ module Wovnrb
     end
 
     def call(env)
-      #Rails.logger.error("++++++++++++++++++++++++++ENV++++++++++++++++++++++++")
-      #Rails.logger.error(env)
-      #Rails.logger.error("++++++++++++++++++++++++++ENV++++++++++++++++++++++++")
+      unless STORE.valid_settings?
+        return @app.call(env)
+      end
       @env = env
-      STORE.refresh_settings
       headers = Headers.new(env, STORE.settings)
       # 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'])
         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
       status, res_headers, body = @app.call(headers.request_out)
-      #binding.pry if res_headers["Content-Type"] =~ /html/ && !body[0].nil?
 
       if res_headers["Content-Type"] =~ /html/ && !body[0].nil?
-# Can we make this request beforehand?
+
         values = STORE.get_values(headers.redis_url)
         url = {
                 :protocol => headers.protocol, 
                 :host => headers.host, 
                 :pathname => headers.pathname
               }
-        body = switch_lang(body, values, url, lang) unless status.to_s =~ /^1|302/
+        body = switch_lang(body, values, url, lang, headers) unless status.to_s =~ /^1|302/
 
         content_length = 0
         body.each { |b| content_length += b.respond_to?(:bytesize) ? b.bytesize : 0 }
@@ -60,15 +50,12 @@ module Wovnrb
       end
 
       headers.out(res_headers)
-#      res_headers['Content-Length'] = body.each {|b| break b.length.to_s }
-      #binding.pry if res_headers["Content-Type"] =~ /html/ && !body[0].nil?
       [status, res_headers, body]
       #[status, res_headers, d.transform()]
     end
 
 
-    def switch_lang(body, values, url, lang=STORE.settings['default_lang'])
-      def_lang = 'en'
+    def switch_lang(body, values, url, lang=STORE.settings['default_lang'], headers)
       text_index = values['text_vals'] || {}
       src_index = values['img_vals'] || {}
       img_src_prefix = values['img_src_prefix'] || ''
@@ -76,6 +63,7 @@ module Wovnrb
       body.map! do |b|
         d = Nokogiri::HTML5(b)
         d.encoding = "UTF-8"
+        # swap text
         d.xpath('//text()').each do |node|
           node_text = node.content.strip
 # shouldn't need size check, but for now...
@@ -83,6 +71,17 @@ module Wovnrb
             node.content = node.content.gsub(/^(\s*)[\S\s]*(\s*)$/, '\1' + text_index[node_text][lang][0]['data'] + '\2')
           end
         end
+        # swap meta tag values
+        d.xpath('//meta').select{ |t|
+          (t.get_attribute('name') || t.get_attribute('property') || '') =~ /^(description|keywords|og:title|og:description)$/
+        }.each do |node|
+          node_content = node.get_attribute('content').strip
+# shouldn't need size check, but for now...
+          if text_index[node_content] && text_index[node_content][lang] && text_index[node_content][lang].size > 0
+            node.set_attribute('content', node_content.gsub(/^(\s*)[\S\s]*(\s*)$/, '\1' + text_index[node_content][lang][0]['data'] + '\2'))
+          end
+        end
+        # swap img srcs
         d.xpath('//img').each do |node|
           # use regular expressions to support case insensitivity (right?)
           if node.to_html =~ /src=['"][^'"]*['"]/i
@@ -105,41 +104,62 @@ module Wovnrb
             end
           end
         end
-        # INSERTS
-        #insert_node = Nokogiri::XML::Node.new('script', d)
-        #insert_node['type'] = 'text/javascript'
-        #insert_node.content = "window.wovn_backend = function() { return {'currentLang': '#{lang}'}; };"
-        #parent_node = d.at_css('head') || d.at_css('body') || d.at_css('html')
-        #parent_node.add_child(insert_node)
-
-# If dev can't be used on production gem 
+
+        # REMOVE WIDGET
         d.xpath('//script').each do |script_node|
           if script_node['src'] && script_node['src'].include?('//j.wovn.io/')
             script_node.remove
           end
         end
+
+        # PARENT NODE FOR INSERTS
+        parent_node = d.at_css('head') || d.at_css('body') || d.at_css('html')
+
+        # INSERT BACKEND WIDGET
         insert_node = Nokogiri::XML::Node.new('script', d)
         insert_node['src'] = '//j.wovn.io/0'
-        insert_node['data-wovnio'] = "key=#{STORE.settings['user_token']}&backend=true&currentLang=#{lang}&defaultLang=#{STORE.settings['default_lang']}&urlPattern=#{STORE.settings['url_pattern_name']}"
+        insert_node['data-wovnio'] = "key=#{STORE.settings['user_token']}&backend=true&currentLang=#{lang}&defaultLang=#{STORE.settings['default_lang']}&urlPattern=#{STORE.settings['url_pattern']}"
         # do this so that there will be a closing tag (better compatibility with browsers)
         insert_node.content = ' '
-        parent_node = d.at_css('head') || d.at_css('body') || d.at_css('html')
         if parent_node.children.size > 0
           parent_node.children.first.add_previous_sibling(insert_node)
         else
           parent_node.add_child(insert_node)
         end
 
+        
+        # INSERT LANGUAGE METALINKS
+        published_langs = get_langs(values)
+        published_langs.each do |l|
+          insert_node = Nokogiri::XML::Node.new('link', d)
+          insert_node['rel'] = 'alternate'
+          insert_node['hreflang'] = l
+          insert_node['href'] = headers.redirect_location(l)
+          parent_node.add_child(insert_node)
+        end
+
+        # set lang property on HTML tag
+        if d.at_css('html') || d.at_css('HTML')
+          (d.at_css('html') || d.at_css('HTML')).set_attribute('lang', lang)
+        end
+
         output = d.to_html.gsub(/href="([^"]*)"/) {|m| "href=\"#{URI.decode($1)}\""}
-        # RAILS
-        #if Object.const_defined?('ActionView') && ActionView.const_defined?('OutputBuffer')
-        #  output = ActionView::OutputBuffer.new(output)
-        #end
         output
       end
       body
     end
 
+    # this clearly needs to be refactored. I'm thinking maybe a Value service? (STORE.values.get_langs)
+    def get_langs(values)
+      langs = Set.new
+      (values['text_vals'] || {}).merge(values['img_vals'] || {}).each do |key, index|
+        index.each do |l, val|
+            langs.add(l)
+        end
+      end
+      langs
+    end
+
   end
 
 end

data/lib/wovnrb/headers.rb

@@ -1,3 +1,4 @@
+require 'pry'
 module Wovnrb
 
   class Headers
@@ -49,7 +50,6 @@ module Wovnrb
       @query = remove_lang(@query, self.lang)
       @pathname = @pathname.gsub(/\/$/, '')
       @redis_url = "#{@host}#{@pathname}#{@query}"
-      #binding.pry
     end
 
     def lang
@@ -103,7 +103,7 @@ module Wovnrb
         #return remove_lang("#{@env['HTTP_HOST']}#{@env['REQUEST_URI']}", lang)
       else
         location = self.url
-        case STORE.settings['url_pattern_name']
+        case STORE.settings['url_pattern']
         when 'query'
           if location !~ /\?/
             location = "#{location}?wovn=#{lang}"
@@ -121,7 +121,7 @@ module Wovnrb
     end
 
     def request_out(def_lang=STORE.settings['default_lang'])
-      case STORE.settings['url_pattern_name']
+      case STORE.settings['url_pattern']
       when 'query'
         @env['REQUEST_URI'] = remove_lang(@env['REQUEST_URI']) if @env.has_key?('REQUEST_URI')
         @env['QUERY_STRING'] = remove_lang(@env['QUERY_STRING']) if @env.has_key?('QUERY_STRING')
@@ -147,7 +147,7 @@ module Wovnrb
     end
 
     def remove_lang(uri, lang=self.path_lang)
-      case STORE.settings['url_pattern_name']
+      case STORE.settings['url_pattern']
       when 'query'
         return uri.sub(/(^|\?|&)wovn=#{lang}(&|$)/, '\1').gsub(/(\?|&)$/, '')
       when 'subdomain'
@@ -161,7 +161,7 @@ module Wovnrb
 
     def out(headers)
       if headers.has_key?("Location")
-        case STORE.settings['url_pattern_name']
+        case STORE.settings['url_pattern']
         when 'query'
           if headers["Location"] =~ /\?/
             headers["Location"] += "&"

data/lib/wovnrb/store.rb

@@ -11,11 +11,12 @@ module Wovnrb
       @settings = 
         {
           'user_token' => '',
-          # 'url_pattern_name' => 'query'
+          'secret_key' => '',
+          # 'url_pattern' => 'query'
           # 'url_pattern_reg' => "?.*wovn=(?<lang>[^&]+)(&|$)",
-          'url_pattern_name' => 'path',
+          'url_pattern' => 'path',
           'url_pattern_reg' => "/(?<lang>[^/.?]+)",
-          #'url_pattern_name' => 'subdomain',
+          #'url_pattern' => 'subdomain',
           #'url_pattern_reg' => "^(?<lang>[^.]+)\.",
           'query' => [],
           'backend_host' => 'rs1.wovn.io',
@@ -27,19 +28,55 @@ module Wovnrb
       @config_loaded = false
     end
 
+    def valid_settings?
+      if !settings.has_key?('user_token') || settings['user_token'].length < 5 || settings['user_token'].length > 6
+        return false
+      elsif !settings.has_key?('secret_key') || settings['secret_key'].length == 0 #|| settings['secret_key'].length < 5 || settings['secret_key'].length > 6
+        return false
+      elsif !settings.has_key?('url_pattern') || settings['url_pattern'].length == 0
+        return false
+      elsif !settings.has_key?('query') || !settings['query'].kind_of?(Array)
+        return false
+      elsif !settings.has_key?('backend_host') || settings['backend_host'].length == 0
+        return false
+      elsif !settings.has_key?('backend_port') || settings['backend_port'].length == 0
+        return false
+      elsif !settings.has_key?('default_lang') || settings['default_lang'].length == 0
+        return false
+      elsif !settings.has_key?('supported_langs') || !settings['supported_langs'].kind_of?(Array) || settings['supported_langs'].size < 1
+        return false
+      else
+        return true
+      end
+    end
+
     def settings
       if !@config_loaded
+        # get Rails config.wovnrb
         if Object.const_defined?('Rails') && Rails.configuration.respond_to?(:wovnrb)
           config_settings = Rails.configuration.wovnrb.stringify_keys
           if config_settings.has_key?('url_pattern')
             if config_settings['url_pattern'] == 'query' || config_settings['url_pattern'] == 'subdomain' || config_settings['url_pattern'] == 'path'
-              config_settings['url_pattern_name'] = config_settings['url_pattern']
+              config_settings['url_pattern'] = config_settings['url_pattern']
               config_settings.delete('url_pattern')
             end
           end
           @settings.merge!(Rails.configuration.wovnrb.stringify_keys)
         end
-        refresh_settings
+
+        # fix settings object
+        @settings['backend_port'] = @settings['backend_port'].to_s
+        @settings['default_lang'] = Lang.get_code(@settings['default_lang'])
+        if !@settings.has_key?('supported_langs')
+          @settings['supported_langs'] = [@settings['default_lang']]
+        end
+        if @settings['url_pattern'] == 'path'
+          @settings['url_pattern_reg'] = "/(?<lang>[^/.?]+)"
+        elsif @settings['url_pattern'] == 'query'
+          @settings['url_pattern_reg'] = "((\\?.*&)|\\?)wovn=(?<lang>[^&]+)(&|$)"
+        elsif @settings['url_pattern'] == 'subdomain'
+          @settings['url_pattern_reg'] = "^(?<lang>[^.]+)\."
+        end
         @config_loaded = true
       end
       @settings
@@ -68,9 +105,9 @@ module Wovnrb
       if !vals.has_key?('supported_langs')
         @settings['supported_langs'] = [@settings['default_lang']]
       end
-      if @settings['url_pattern_name'] == 'path'
+      if @settings['url_pattern'] == 'path'
         @settings['url_pattern_reg'] = "/(?<lang>[^/.?]+)"
-      elsif @settings['url_pattern_name'] == 'query'
+      elsif @settings['url_pattern'] == 'query'
         @settings['url_pattern_reg'] = "((\\?.*&)|\\?)wovn=(?<lang>[^&]+)(&|$)"
       end
       @settings

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.1.35"
+  VERSION = "0.1.36"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo