wovnrb 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad74f869ecc0be459d21358a460e978cd01a30f
-  data.tar.gz: db9d85d8c7b8557b9b844852115b3773b76cffaf
+  metadata.gz: 844be0f5a9ee0ac6e995181311d020956f456ed7
+  data.tar.gz: 10fc8b27efd2ea6c5ad091031916cbee54b75d00
 SHA512:
-  metadata.gz: 3895654264d2a0d400a3cc1e1e7531a71164abc3536d8448b07d7a8aae22cbf439d2068e9a5fe00fad8c4c58d7cad98d570501c953087d2b8421ba6ebeb72005
-  data.tar.gz: db48ead4d587534e334449850e5ebbc5dfd35089a4afc0a4c79d4c858cba3e831dad8d5f79b5d6cdd9f0ec9c5d4856c28e96a255f53f36520d532a44d265b964
+  metadata.gz: fbc82de4f3344432c508dc28b43fe727e99c8ac1b30691d90aac8c71e6a696d44dd3f06d5503dd78317ad0b3069b56d5684c7460e490cd76a2bbe1d53e43352f
+  data.tar.gz: 056f1cc3176e6fca9fe867e57d35139eb7605bd3a6bebbecc271cafcf17a50e22d051daa5a2ed38f1f62a7ec70c201127e20b12eca5d225cf44a5ae6438a31eb

data/lib/wovnrb.rb

@@ -28,6 +28,7 @@ module Wovnrb
     end
 
     def call(env)
+      @store.settings.clear_dynamic_settings!
       unless Store.instance.valid_settings?
         return @app.call(env)
       end
@@ -50,11 +51,9 @@ module Wovnrb
 
         request = Rack::Request.new(env)
         unless request.params['wovn_disable'] == true
+          @store.settings.update_dynamic_settings!(request.params)
           unless @store.settings['ignore_globs'].any?{|g| g.match?(headers.pathname)}
-            # If the user defines a token for this request, use it instead of the config token
-            if @store.valid_token?(request.params['wovn_token'])
-              @store.settings['project_token'] = request.params['wovn_token']
-            end
+
             # ApiData creates request for external server, but cannot use async.
             # Because some server not allow multi thread. (env['async.callback'] is not supported at all Server).
             api_data = ApiData.new(headers.redis_url, @store)
@@ -135,4 +134,3 @@ module Wovnrb
     end
   end
 end
-

data/lib/wovnrb/settings.rb

@@ -0,0 +1,37 @@
+module Wovnrb
+  class Settings < Hash
+    def initialize(*args, **kwargs)
+      super(*args, **kwargs)
+      @dynamic_settings = {}
+    end
+
+    def [](key)
+      return @dynamic_settings[key] if @dynamic_settings.key?(key)
+      return ignore_globs if key == 'ignore_globs'
+      super(key)
+    end
+
+    def ignore_globs
+      ignore_paths = self['ignore_paths']
+      return [] unless ignore_paths.kind_of?(Array)
+      ignore_paths.map { |pattern| Glob.new(pattern) }
+    end
+
+    def clear_dynamic_settings!
+      @dynamic_settings.clear
+    end
+
+    def update_dynamic_settings!(params)
+      # If the user defines dynamic settings for this request, use it instead of the config
+      DYNAMIC_KEYS.each do |params_key, setting_key|
+        value = params[params_key]
+        @dynamic_settings[setting_key] = value if value
+      end
+    end
+
+    DYNAMIC_KEYS = {
+      'wovn_token' => 'project_token',
+      'wovn_ignore_paths' => 'ignore_paths',
+    }
+  end
+end

data/lib/wovnrb/store.rb

@@ -4,6 +4,7 @@ require 'cgi'
 require 'singleton'
 require 'wovnrb/services/wovn_logger'
 require 'wovnrb/services/glob'
+require 'wovnrb/settings'
 require 'active_support'
 
 module Wovnrb
@@ -11,7 +12,7 @@ module Wovnrb
     include Singleton
 
     def self.default_settings
-      {
+      Settings.new.merge({
         'project_token' => '',
         'log_path' => 'log/wovn_error.log',
         'ignore_paths' => [],
@@ -30,11 +31,11 @@ module Wovnrb
         'use_proxy' => false,  # use env['HTTP_X_FORWARDED_HOST'] instead of env['HTTP_HOST'] and env['SERVER_NAME'] when this setting is true.
         'custom_lang_aliases' => {},
         'wovn_dev_mode' => false
-      }
+      })
     end
 
     def initialize
-      @settings = {}
+      @settings = Settings.new
       @config_loaded = false
       reset
     end
@@ -127,7 +128,6 @@ module Wovnrb
         end
         @settings.merge!(Rails.configuration.wovnrb.stringify_keys)
       end
-      cleanSettings
 
       # fix settings object
       @settings['default_lang'] = Lang.get_code(@settings['default_lang'])
@@ -154,12 +154,6 @@ module Wovnrb
         @settings['test_mode'] = true
       end
 
-      if @settings['ignore_paths'].kind_of?(Array)
-        @settings['ignore_globs'] = @settings['ignore_paths'].map do |pattern|
-          Glob.new(pattern)
-        end
-      end
-
       if @settings.has_key?('custom_lang_aliases')
         stringify_keys! @settings['custom_lang_aliases']
       end
@@ -185,9 +179,6 @@ module Wovnrb
     end
 
     private
-    def cleanSettings
-      @settings['ignore_globs'] = []
-    end
 
     def stringify_keys!(h)
       h.keys.each do |k|

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/lib/wovnrb_test.rb

@@ -53,17 +53,27 @@ class WovnrbTest < Minitest::Test
 
   def test_request_wovn_token
     settings = Wovnrb.get_settings
-    settings['project_token'] = 'token0'
+    default_token = 'token0'
     request_token = 'token1'
+    settings['project_token'] = default_token
     url = 'wovn.io/dashboard'
     stub = stub_request(:get, "#{settings['api_url']}?token=#{request_token}&url=#{url}").
       to_return(:body => '{"test_body": "a"}')
 
-    i = Wovnrb::Interceptor.new(get_app(:params => {'wovn_token' => request_token}), settings)
+    app = get_app(:params => {'wovn_token' => request_token})
+    i = Wovnrb::Interceptor.new(app, settings)
 
     env = Wovnrb.get_env
     i.call(env)
     assert_requested(stub, :times => 1)
+
+    # check use default a token after use dynamic token
+    stub_default = stub_request(:get, "#{settings['api_url']}?token=#{default_token}&url=#{url}").
+      to_return(:body => '{"test_body": "a"}')
+    app.params.clear
+    env['rack.request.query_hash'] = {}
+    i.call(env)
+    assert_requested(stub_default, :times => 1)
   end
 
   def test_request_invalid_wovn_token
@@ -81,6 +91,20 @@ class WovnrbTest < Minitest::Test
     assert_requested(stub, :times => 1)
   end
 
+  def test_request_wovn_ignore_paths
+    settings = Wovnrb.get_settings
+    url = 'wovn.io/dashboard'
+    stub = stub_request(:get, "#{settings['api_url']}?token=#{settings['project_token']}&url=#{url}").
+      to_return(:body => '{"test_body": "a"}')
+
+    app = get_app(:params => {'wovn_ignore_paths' => ['/dashboard']})
+    i = Wovnrb::Interceptor.new(app, settings)
+
+    env = Wovnrb.get_env
+    i.call(env)
+    assert_requested(stub, :times => 0)
+  end
+
   def test_request_wovn_disable
     settings = Wovnrb.get_settings
     token = settings['project_token']
@@ -335,6 +359,8 @@ HTML
   end
 
   class RackMock
+    attr_accessor :params
+
     def initialize(opts={})
       @params = {}
       if opts.has_key?(:params) && opts[:params].class == Hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -364,6 +364,7 @@ files:
 - lib/wovnrb/services/glob.rb
 - lib/wovnrb/services/url.rb
 - lib/wovnrb/services/wovn_logger.rb
+- lib/wovnrb/settings.rb
 - lib/wovnrb/store.rb
 - lib/wovnrb/text_caches/cache_base.rb
 - lib/wovnrb/text_caches/memory_cache.rb