wovnrb 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb6a923f625d953649b1de0242b1f477947d58c7
-  data.tar.gz: 1e75041212f5da667742dde22913779a125b042c
+  metadata.gz: 48267e3d6147c0fa23c27a54e53895a0830e61a6
+  data.tar.gz: 47c15e957323c220e9348c0736247f3a2f67215d
 SHA512:
-  metadata.gz: cae95611865c9f2b5e8aaa856c5644b36e6204bd5a4cdf2ab7063764c25f0739160372b3175cc66249f46f5a3a75f7f790b7a142ee6086bc4bd8d350f490c33d
-  data.tar.gz: 61eea27872c4b496d83a45cafc6edbeb6291f1711deba5798a83baf1bf7bae6852682ad949e5a189f97895e8055a3dd3d31cc12697c1eca5e4d65b9ce90b332c
+  metadata.gz: 211018b6b73db62671b34a2d31b2455479f9af9652d56351291674def10ef63be24299df32049800708c26b03ef1fa3be3df79d345e0d3c029ad1eb14bb868ab
+  data.tar.gz: 71947f8e26a230990bb6cd2b1035d89ce6b029deb811dba1431498877fb8cad18f20967fae34f9a5fc770aadd7ac8fbd8e010f9ce767ce2e3dde60fb20bb88a7

data/lib/wovnrb.rb

@@ -22,12 +22,15 @@ module Wovnrb
       end
       @env = env
       headers = Headers.new(env, STORE.settings)
+      if STORE.settings.test_mode && STORE.settings.test_url != headers.url
+        return @app.call(env)
+      end
       # 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
-      lang = headers.lang
+      lang = headers.lang_code
 
       # pass to application
       status, res_headers, body = @app.call(headers.request_out)

data/lib/wovnrb/headers.rb

@@ -1,4 +1,3 @@
-require 'pry'
 module Wovnrb
 
   class Headers
@@ -13,6 +12,7 @@ module Wovnrb
 
     def initialize(env, settings)
       @env = env
+      @settings = settings
       @protocol = @env['rack.url_scheme']
       @unmasked_host = @env['HTTP_HOST']
       unless @env.has_key?('REQUEST_URI')
@@ -27,11 +27,11 @@ module Wovnrb
       @unmasked_pathname = @env['REQUEST_URI'].split('?')[0]
       @unmasked_pathname += '/' unless @unmasked_pathname =~ /\/$/ || @unmasked_pathname =~ /\/[^\/.]+\.[^\/.]+$/
       @unmasked_url = "#{@protocol}://#{@unmasked_host}#{@unmasked_pathname}"
-      @host = remove_lang(@env['HTTP_HOST'], self.lang)
+      @host = settings['url_pattern'] == 'subdomain' ? remove_lang(@env['HTTP_HOST'], self.lang_code) : @env['HTTP_HOST']
       @pathname, @query = @env['REQUEST_URI'].split('?')
-      @pathname = remove_lang(@pathname, self.lang)
+      @pathname = settings['url_pattern'] == 'path' ? remove_lang(@pathname, self.lang_code) : @pathname
       @query = @query || ''
-      @url = "#{@host}#{@pathname}#{(@query.length > 0 ? '?' : '') + remove_lang(@query, self.lang)}"
+      @url = "#{@host}#{@pathname}#{(@query.length > 0 ? '?' : '') + remove_lang(@query, self.lang_code)}"
       if settings['query'].length > 0
         query_vals = []
         settings['query'].each do |qv|
@@ -47,18 +47,21 @@ module Wovnrb
       else
         @query = ''
       end
-      @query = remove_lang(@query, self.lang)
+      @query = remove_lang(@query, self.lang_code)
       @pathname = @pathname.gsub(/\/$/, '')
       @redis_url = "#{@host}#{@pathname}#{@query}"
     end
 
-    def lang
-      (self.path_lang && self.path_lang.length > 0) ? self.path_lang : STORE.settings['default_lang']
+    # Get the language code of the current request
+    #
+    # @return [String] The lang code of the current page
+    def lang_code
+      (self.path_lang && self.path_lang.length > 0) ? self.path_lang : @settings['default_lang']
     end
 
     def path_lang
       if @path_lang.nil?
-        rp = Regexp.new(STORE.settings['url_pattern_reg'])
+        rp = Regexp.new(@settings['url_pattern_reg'])
         match = "#{@env['SERVER_NAME']}#{@env['REQUEST_URI']}".match(rp)
         if match && match[:lang] && Lang::LANG[match[:lang]]
           @path_lang = match[:lang]
@@ -97,13 +100,13 @@ module Wovnrb
     end
 
     def redirect_location(lang)
-      if lang == STORE.settings['default_lang']
+      if lang == @settings['default_lang']
 # IS THIS RIGHT??
         return "#{self.protocol}://#{self.url}"
         #return remove_lang("#{@env['HTTP_HOST']}#{@env['REQUEST_URI']}", lang)
       else
         location = self.url
-        case STORE.settings['url_pattern']
+        case @settings['url_pattern']
         when 'query'
           if location !~ /\?/
             location = "#{location}?wovn=#{lang}"
@@ -120,8 +123,8 @@ module Wovnrb
       end
     end
 
-    def request_out(def_lang=STORE.settings['default_lang'])
-      case STORE.settings['url_pattern']
+    def request_out(def_lang=@settings['default_lang'])
+      case @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 +150,7 @@ module Wovnrb
     end
 
     def remove_lang(uri, lang=self.path_lang)
-      case STORE.settings['url_pattern']
+      case @settings['url_pattern']
       when 'query'
         return uri.sub(/(^|\?|&)wovn=#{lang}(&|$)/, '\1').gsub(/(\?|&)$/, '')
       when 'subdomain'
@@ -161,19 +164,19 @@ module Wovnrb
 
     def out(headers)
       if headers.has_key?("Location")
-        case STORE.settings['url_pattern']
+        case @settings['url_pattern']
         when 'query'
           if headers["Location"] =~ /\?/
             headers["Location"] += "&"
           else
             headers["Location"] += "?"
           end
-          headers['Location'] += "wovn=#{self.lang}"
+          headers['Location'] += "wovn=#{self.lang_code}"
         when 'subdomain'
-          headers["Location"] = headers["Location"].sub(/\/\/([^.]+)/, '//' + self.lang + '.\1')
+          headers["Location"] = headers["Location"].sub(/\/\/([^.]+)/, '//' + self.lang_code + '.\1')
        #when 'path'
         else
-          headers["Location"] = headers['Location'].sub(/(\/\/[^\/]+)/, '\1/' + self.lang)
+          headers["Location"] = headers['Location'].sub(/(\/\/[^\/]+)/, '\1/' + self.lang_code)
         end
       end
       headers

data/lib/wovnrb/store.rb

@@ -1,12 +1,12 @@
 require 'redis'
 require 'net/http'
+require 'Logger'
 
 module Wovnrb
 
   class Store
     attr_reader :settings
 
-
     def initialize
       @settings = 
         {
@@ -23,33 +23,64 @@ module Wovnrb
           'backend_port' => '6379',
           'default_lang' => 'en',
           'supported_langs' => ['en'],
+          'test_mode' => false,
+          'test_url' => '',
         }
       # When Store is initialized, the Rails.configuration object is not yet initialized
       @config_loaded = false
     end
 
+    # Returns true or false based on whether the settings are valid or not, logs any invalid settings to ../error.log
+    #
+    # @return [Boolean] Returns true if the settings are valid, and false if they are not
     def valid_settings?
+      valid = true
+      errors = [];
       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
+        valid = false
+        errors.push("User token #{settings['user_token']} is not valid.");
+      end
+      if !settings.has_key?('secret_key') || settings['secret_key'].length == 0 #|| settings['secret_key'].length < 5 || settings['secret_key'].length > 6
+        valid = false
+        errors.push("Secret key #{settings['secret_key']} is not valid.");
+      end
+      if !settings.has_key?('url_pattern') || settings['url_pattern'].length == 0
+        valid = false
+        errors.push("Url pattern #{settings['url_pattern']} is not valid.");
+      end
+      if !settings.has_key?('query') || !settings['query'].kind_of?(Array)
+        valid = false
+        errors.push("query config #{settings['query']} is not valid.");
+      end
+      if !settings.has_key?('backend_host') || settings['backend_host'].length == 0
+        valid = false
+        errors.push("Backend host is not configured.");
+      end
+      if !settings.has_key?('backend_port') || settings['backend_port'].length == 0
+        valid = false
+        errors.push("Backend port is not configured.");
+      end
+      if !settings.has_key?('default_lang') || settings['default_lang'].length == 0
+        valid = false
+        errors.push("Default lang #{settings['default_lang']} is not valid.");
       end
+      if !settings.has_key?('supported_langs') || !settings['supported_langs'].kind_of?(Array) || settings['supported_langs'].size < 1
+        valid = false
+        errors.push("Supported langs configuration is not valid.");
+      end
+      # log errors
+      if errors.length > 0
+        logger = Logger.new('../error.log')
+        errors.each do |e|
+          logger.error(e)
+        end
+      end
+      return valid
     end
 
+    # Returns the settings object, pulling from Rails config the first time this is called
+    #
+    # @return [Hash] The settings which are pulled from the config file given by the user and filled in by defaults
     def settings
       if !@config_loaded
         # get Rails config.wovnrb
@@ -77,70 +108,37 @@ module Wovnrb
         elsif @settings['url_pattern'] == 'subdomain'
           @settings['url_pattern_reg'] = "^(?<lang>[^.]+)\."
         end
-        @config_loaded = true
-      end
-      @settings
-    end
+        if @settings['test_mode'] != true || @settings['test_mode'] != 'on'
+          @settings['test_mode'] = false
+        else
+          @settings['test_mode'] = true
+        end
 
-    def refresh_settings
-# add timer so this only accesses redis once every 5 minutes etc
-      user_token = @settings['user_token']
-      #user_token = 'lYWQ9'
-      redis_key = 'WOVN:BACKEND:SETTING::' + user_token
-      cli = Redis.new(host: @settings['backend_host'], port: @settings['backend_port'])
-      begin
-        vals = cli.hgetall(redis_key) || {}
-      rescue
-        vals = {}
-      end
-      if vals.has_key?('query')
-        vals['query'] = JSON.parse(vals['query'])
-      end
-      if vals.has_key?('supported_langs')
-        vals['supported_langs'] = JSON.parse(vals['supported_langs'])
-      end
-      @settings.merge!(vals)
-      @settings['backend_port'] = @settings['backend_port'].to_s
-      @settings['default_lang'] = Lang.get_code(@settings['default_lang'])
-      if !vals.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>[^&]+)(&|$)"
+        @config_loaded = true
       end
       @settings
     end
 
+    # Get the values for the passed in url
+    #
+    # @param url [String] The url to get the values for
+    # @return [Hash] The values Hash for the passed in url
     def get_values(url)
-      #url = 'http://wovn.io'
-      user_token = @settings['user_token']
-      #user_token = 'lYWQ9'
-      redis_key = 'WOVN:BACKEND:STORAGE:' + url.gsub(/\/$/, '') + ':' + user_token
-      vals = request_values(redis_key)
-      if vals.empty?
-        uri = URI.parse('http://api.wovn.io/v0/page/add')
-        Net::HTTP.post_form(uri, :user_token => user_token, :secret_key => @settings['secret_key'], :url => url)
-      end
-      vals
-      #f = File.open('./values/values', 'r')
-      #return JSON.parse(f.read)
-      #f.close
-    end
-
-    def request_values(key)
-    Rails.logger.info("*******************************************************")
-    Rails.logger.info(key)
-      cli = Redis.new(host: @settings['backend_host'], port: @settings['backend_port'])
-    Rails.logger.info(@settings['backend_host'])
-    Rails.logger.info(@settings['backend_port'])
+      redis_key = 'WOVN:BACKEND:STORAGE:' + url.gsub(/\/$/, '') + ':' + settings['user_token']
+      cli = Redis.new(host: settings['backend_host'], port: settings['backend_port'])
       begin
-        vals = cli.get(key) || '{}'
-        vals = JSON.parse(vals)
+        vals = cli.get(redis_key) || '{}'
       rescue
+        logger = Logger.new('../error.log')
+        logger.error("Redis GET request failed with the following parameters:\nhost: #{settings['backend_host']}\nport: #{settings['backend_port']}\nkey: #{redis_key}")
         vals = {}
       end
+      # handle this on the widget
+      #if vals.empty?
+      #  uri = URI.parse('http://api.wovn.io/v0/page/add')
+      #  Net::HTTP.post_form(uri, :user_token => user_token, :secret_key => @settings['secret_key'], :url => url)
+      #end
+      JSON.parse(vals)
     end
 
   end

data/lib/wovnrb/version.rb

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

data/test/lib/{test_headers.rb → headers_test.rb}

@@ -1,50 +1,24 @@
-require 'wovnrb'
+require 'wovnrb/headers'
 require 'minitest/autorun'
 require 'pry'
 
-class TestHeaders < Minitest::Test
+class HeadersTest < Minitest::Test
 
   def test_initialize
     h = Wovnrb::Headers.new(get_env, get_settings)
     refute_nil(h)
   end
 
-  def test_initialize_with_simple_url
-    h = Wovnrb::Headers.new(get_env('url' => 'https://wovn.io'), get_settings)
+  def test_initialize_env
+    env = get_env
+    h = Wovnrb::Headers.new(env, {})
+    binding.pry
     #assert_equal(''
   end
 
-  def test_keys_exist
-    Wovnrb::Lang::LANG.each do |k, l|
-      assert(l.has_key?(:name))
-      assert(l.has_key?(:code))
-      assert(l.has_key?(:en))
-      assert_equal(k, l[:code])
-    end
-  end
-
-  def test_get_code_with_valid_code
-    assert_equal('ms', Wovnrb::Lang.get_code('ms'))
-  end
-
-  def test_get_code_with_valid_english_name
-    assert_equal('pt', Wovnrb::Lang.get_code('Portuguese'))
-  end
-
-  def test_get_code_with_valid_native_name
-    assert_equal('hi', Wovnrb::Lang.get_code('हिन्दी'))
-  end
-
-  def test_get_code_with_invalid_name
-    assert_equal(nil, Wovnrb::Lang.get_code('WOVN4LYFE'))
-  end
-
-  def test_get_code_with_empty_string
-    assert_equal(nil, Wovnrb::Lang.get_code(''))
-  end
-
-  def test_get_code_with_nil
-    assert_equal(nil, Wovnrb::Lang.get_code(nil))
+  def test_initialize_with_simple_url
+    h = Wovnrb::Headers.new(get_env('url' => 'https://wovn.io'), get_settings)
+    #assert_equal(''
   end
 
   def get_settings(options={})

data/test/lib/{test_lang.rb → lang_test.rb}

@@ -1,9 +1,7 @@
-require 'wovnrb'
-#require 'test/unit'
-#require 'test/unit/notify'
+require 'wovnrb/lang'
 require 'minitest/autorun'
 
-class TestLang < Minitest::Test
+class LangTest < Minitest::Test
 
   def test_langs_exist
     refute_nil(Wovnrb::Lang::LANG)

data/test/test_helper.rb

@@ -0,0 +1 @@
+puts "HEYO"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -243,8 +243,9 @@ files:
 - lib/wovnrb/version.rb
 - spec/spec_helper.rb
 - spec/wovnrb_spec.rb
-- test/lib/test_headers.rb
-- test/lib/test_lang.rb
+- test/lib/headers_test.rb
+- test/lib/lang_test.rb
+- test/test_helper.rb
 - values/values
 - wovnrb.gemspec
 homepage: ''
@@ -274,5 +275,6 @@ summary: Gem for WOVN.io
 test_files:
 - spec/spec_helper.rb
 - spec/wovnrb_spec.rb
-- test/lib/test_headers.rb
-- test/lib/test_lang.rb
+- test/lib/headers_test.rb
+- test/lib/lang_test.rb
+- test/test_helper.rb