trailguide 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d240910be69a80a99df782a0fc7dbd903d2c18620497c37eb694212d4cab8b
-  data.tar.gz: bb05693270dcc5514d308bc07be283b68179a4b988adc57f50049313b43e333c
+  metadata.gz: 5adb31d9a97b2a73b6ff57b91d7f3907d408c511821b72fe0f7b1f857873a794
+  data.tar.gz: 3e054cb7abcd176989b6a322f3f9b34e69d2b2b662824a2a84b4e2c3a6c1040a
 SHA512:
-  metadata.gz: 6ef520115f856997441eb71df4c953c6df3af38472e0962d59d070f70523f703c4750d84d4bea48b7c9827d7fa15ef3ab813bf68281b4b38d2ed8d0ddd99fb3a
-  data.tar.gz: 21f3f1e043e9f3896290b389b8819990e06b98a84db975eaf539e39b4a4eece08f7d7473054f10f35be302296f0256520e14a5b0fb02942134797d2a51d92290
+  metadata.gz: eeefcc9c9b4e08bfe433b576ca5da9614e6295ae354a4858811af3fad1660cd5c3acdecd8afeaa61ed17edbff34d7eebc2bd797ae8c421c199096c4402bc8d83
+  data.tar.gz: 92d4106bff4e3ba5db67e4812b02029126ce3fb43790525c1be0a024fa5dae84cd4b44f4a75e361f4f1c605228bf8fb84e9fa371485ef77058bf3310b33042e2

data/lib/trail_guide/experiment.rb

@@ -265,10 +265,11 @@ module TrailGuide
       @algorithm ||= self.class.algorithm.new(self)
     end
 
-    def choose!(metadata: nil, **opts)
+    def choose!(override: nil, metadata: nil, **opts)
       return control if TrailGuide.configuration.disabled
 
-      variant = choose_variant!(metadata: metadata, **opts)
+      variant = choose_variant!(override: override, metadata: metadata, **opts)
+      participant.participating!(variant) unless override.present? && !TrailGuide.configuration.store_override
       run_callbacks(:on_use, variant, metadata)
       variant
     end
@@ -277,7 +278,7 @@ module TrailGuide
       return control if TrailGuide.configuration.disabled
       if override.present?
         variant = variants.find { |var| var == override }
-        return variant unless TrailGuide.configuration.store_override && started?
+        return variant unless TrailGuide.configuration.track_override && started?
       else
         return winner if winner?
         return control if excluded
@@ -289,7 +290,6 @@ module TrailGuide
         variant = algorithm.choose!(metadata: metadata)
       end
 
-      participant.participating!(variant)
       variant.increment_participation!
       run_callbacks(:on_choose, variant, metadata)
       variant

data/lib/trail_guide/helper.rb

@@ -153,7 +153,7 @@ module TrailGuide
       end
 
       def is_filtered_user_agent?
-        return false if TrailGuide.configuration.filtered_user_agents.empty?
+        return false if TrailGuide.configuration.filtered_user_agents.nil? || TrailGuide.configuration.filtered_user_agents.empty?
         return false unless context.respond_to?(:request, true)
         request = context.send(:request)
         return false unless request && request.user_agent
@@ -167,15 +167,13 @@ module TrailGuide
       end
 
       def is_filtered_ip_address?
-        filtered_ips = TrailGuide.configuration.filtered_ip_addresses
-        filtered_ips = filtered_ips.call if filtered_ips.respond_to?(:call)
-        return false if filtered_ips.nil? || filtered_ips.empty?
+        return false if TrailGuide.configuration.filtered_ip_addresses.nil? || TrailGuide.configuration.filtered_ip_addresses.empty?
 
         return false unless context.respond_to?(:request, true)
         request = context.send(:request)
         return false unless request && request.ip
 
-        filtered_ips.each do |ip|
+        TrailGuide.configuration.filtered_ip_addresses.each do |ip|
           return true if ip.class == String && request.ip == ip
           return true if ip.class == Regexp && request.ip =~ ip
           return true if ip.class == Range && ip.first.class == IPAddr && ip.include?(IPAddr.new(request.ip))

data/lib/trail_guide/version.rb

@@ -2,7 +2,7 @@ module TrailGuide
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 6
+    PATCH = 7
     VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 
     class << self

data/lib/trailguide.rb

@@ -18,6 +18,7 @@ module TrailGuide
     config.start_manually = true
     config.reset_manually = true
     config.store_override = false
+    config.track_override = false
     config.override_parameter = :experiment
     config.allow_multiple_experiments = true # false / :control
     config.algorithm = :weighted
@@ -39,6 +40,22 @@ module TrailGuide
         is_filtered_user_agent? ||
         is_filtered_ip_address?
     end
+
+    def filtered_user_agents
+      @filtered_user_agents ||= begin
+        uas = @state[:filtered_user_agents]
+        uas = uas.call if uas.respond_to?(:call)
+        uas
+      end
+    end
+
+    def filtered_ip_addresses
+      @filtered_ip_addresses ||= begin
+        ips = @state[:filtered_ip_addresses]
+        ips = ips.call if ips.respond_to?(:call)
+        ips
+      end
+    end
   end
 
   def self.catalog

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailguide
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails