trailguide 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec80228061f031c01c0eb4d6dbef24d52ca205ccf2e6137ebe3a18886b095258
-  data.tar.gz: 6fa47e1dd04511cbb35d39a737589a34658fcc9d1f0dde64298908a9ca539f27
+  metadata.gz: 7dadd0f6c7091b171c4e9034e9e4b31b9c7300121f6ef8b75fc577dc5913cf28
+  data.tar.gz: 1f84fdce8ea0d73bb189732fcb5099d1e3e41e48a0fa286d7e68854cb8d038f8
 SHA512:
-  metadata.gz: ca6d1439e8632ec16946dcfc50e5201f24714a568a2b99c234d0ed666db6a6149724aeea7190be7669fe06dc232619cce6ead9211f175c1a518d2b6458dff7d4
-  data.tar.gz: 7ab9d62c95a8c3b0a63fd1b09f0b51bea8d021b98a6797acff0658fbe8a718d5b8665458df8b92b31e89c2e606788d1aa677e96a1ce21dfeb2516e780e8bfacb
+  metadata.gz: d53f939b8c3773cbb08f0d8d36cdec3ead6d7aa0f904d6cc7f31339bab41f388ff0ad2ae48c054429c9152dc42e049a0e6ed98bdef085f28d780bc02e0d112ed
+  data.tar.gz: 8a18ec65a94353dfbe557c07295bb698a5486cdfd0c2071a5ba2a5adc51fea0c3e0b671b2a5d0d108808c814c2846850d6a0d5d839f2576d64d0a8135fd47f9d

data/lib/trail_guide/adapters/participants/anonymous.rb

@@ -6,8 +6,8 @@ module TrailGuide
 
         class << self
           alias_method :configure, :new
-          def new(context, &block)
-            configure(&block).new(context)
+          def new(_context, &block)
+            configure(&block).new(_context)
           end
         end
 
@@ -18,15 +18,14 @@ module TrailGuide
         end
 
         # instance method, creates a new adapter and passes through config
-        def new(context)
-          Adapter.new(context, configuration)
+        def new(_context)
+          Adapter.new(configuration)
         end
 
         class Adapter
-          attr_reader :context, :config
+          attr_reader :config
 
-          def initialize(context, config)
-            @context = context
+          def initialize(config)
             @config = config
           end
 

data/lib/trail_guide/adapters/participants/redis.rb

@@ -27,10 +27,9 @@ module TrailGuide
         end
 
         class Adapter
-          attr_reader :context, :config, :storage_key
+          attr_reader :config, :storage_key
 
           def initialize(context, config, key: nil)
-            @context = context
             @config = config
 
             if key

data/lib/trail_guide/experiments/participant.rb

@@ -9,7 +9,7 @@ module TrailGuide
       end
 
       def participating?
-        @participating ||= variant.present?#participant.participating?(experiment)
+        @participating ||= variant.present?
       end
 
       def converted?(checkpoint=nil)

data/lib/trail_guide/helper.rb

@@ -1,9 +1,48 @@
 module TrailGuide
   module Helper
     def trailguide(metric=nil, **opts, &block)
-      proxy = HelperProxy.new(self)
-      return proxy if metric.nil?
-      proxy.choose!(metric, **opts, &block)
+      @trailguide_proxy ||= HelperProxy.new(self)
+      return @trailguide_proxy if metric.nil?
+      @trailguide_proxy.choose!(metric, **opts, &block)
+    end
+
+    def trailguide_participant
+      @trailguide_participant ||= TrailGuide::Participant.new(self)
+    end
+
+    def trailguide_excluded_request?
+      @trailguide_excluded_request ||= instance_exec(self, &TrailGuide.configuration.request_filter)
+    end
+
+    def is_preview?
+      return false unless respond_to?(:request, true)
+      headers = request.try(:headers)
+      headers && headers['x-purpose'] == 'preview'
+    end
+
+    def is_filtered_user_agent?
+      return false if TrailGuide.configuration.filtered_user_agents.nil? || TrailGuide.configuration.filtered_user_agents.empty?
+      return false unless respond_to?(:request, true) && request.user_agent
+
+      TrailGuide.configuration.filtered_user_agents do |ua|
+        return true if ua.class == String && request.user_agent == ua
+        return true if ua.class == Regexp && request.user_agent =~ ua
+      end
+
+      return false
+    end
+
+    def is_filtered_ip_address?
+      return false if TrailGuide.configuration.filtered_ip_addresses.nil? || TrailGuide.configuration.filtered_ip_addresses.empty?
+      return false unless respond_to?(:request, true) && request.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))
+      end
+
+      return false
     end
 
     class HelperProxy
@@ -35,7 +74,7 @@ module TrailGuide
       end
 
       def participant
-        @participant ||= TrailGuide::Participant.new(context)
+        @participant ||= context.send(:trailguide_participant)
       end
 
       def context_type
@@ -143,43 +182,7 @@ module TrailGuide
 
       def exclude_visitor?
         return false if experiment.configuration.skip_request_filter?
-        instance_exec(context, &TrailGuide.configuration.request_filter)
-      end
-
-      def is_preview?
-        return false unless context.respond_to?(:request, true)
-        headers = context.send(:request).try(:headers)
-        headers && headers['x-purpose'] == 'preview'
-      end
-
-      def is_filtered_user_agent?
-        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
-
-        TrailGuide.configuration.filtered_user_agents do |ua|
-          return true if ua.class == String && request.user_agent == ua
-          return true if ua.class == Regexp && request.user_agent =~ ua
-        end
-
-        return false
-      end
-
-      def is_filtered_ip_address?
-        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
-
-        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))
-        end
-
-        return false
+        context.send(:trailguide_excluded_request?)
       end
     end
   end

data/lib/trail_guide/participant.rb

@@ -1,55 +1,53 @@
 module TrailGuide
   class Participant
-    attr_reader :context, :variants
+    attr_reader :adapter
     delegate :key?, :keys, :[], :[]=, :delete, :destroy!, :to_h, to: :adapter
 
     def initialize(context, adapter: nil)
-      @context = context
-      @adapter = adapter.new(context) unless adapter.nil?
-      @variants = {}
+      @adapter = adapter.present? ? adapter.new(context) : configured_adapter.new(context)
       #cleanup_inactive_experiments!
     end
 
-    def adapter
-      @adapter ||= begin
-        config_adapter = TrailGuide.configuration.adapter
-        case config_adapter
-        when :cookie
-          config_adapter = TrailGuide::Adapters::Participants::Cookie
-        when :session
-          config_adapter = TrailGuide::Adapters::Participants::Session
-        when :redis
-          config_adapter = TrailGuide::Adapters::Participants::Redis
-        when :anonymous
-          config_adapter = TrailGuide::Adapters::Participants::Anonymous
-        when :multi
-          config_adapter = TrailGuide::Adapters::Participants::Multi
-        else
-          config_adapter = config_adapter.constantize if config_adapter.is_a?(String)
-        end
-        config_adapter.new(context)
-      rescue => e
-        [TrailGuide.configuration.on_adapter_failover].flatten.compact.each do |callback|
-          callback.call(config_adapter, e)
-        end
-        TrailGuide::Adapters::Participants::Anonymous.new(context)
+    def configured_adapter
+      config_adapter = TrailGuide.configuration.adapter
+      case config_adapter
+      when :cookie
+        config_adapter = TrailGuide::Adapters::Participants::Cookie
+      when :session
+        config_adapter = TrailGuide::Adapters::Participants::Session
+      when :redis
+        config_adapter = TrailGuide::Adapters::Participants::Redis
+      when :anonymous
+        config_adapter = TrailGuide::Adapters::Participants::Anonymous
+      when :multi
+        config_adapter = TrailGuide::Adapters::Participants::Multi
+      else
+        config_adapter = config_adapter.constantize if config_adapter.is_a?(String)
+      end
+      config_adapter
+    rescue => e
+      [TrailGuide.configuration.on_adapter_failover].flatten.compact.each do |callback|
+        callback.call(config_adapter, e)
       end
+      TrailGuide::Adapters::Participants::Anonymous
     end
 
-    def participating?(experiment, include_control=true)
-      return variants[experiment.storage_key] if variants.key?(experiment.storage_key)
-      return false unless experiment.started?
-      return false unless adapter.key?(experiment.storage_key)
+    def variant(experiment)
+      return nil unless experiment.started?
+      return nil unless adapter.key?(experiment.storage_key)
       varname = adapter[experiment.storage_key]
       variant = experiment.variants.find { |var| var == varname }
-      return false if !include_control && variant.control?
-      return false unless variant && adapter.key?(variant.storage_key)
+      return nil unless variant && adapter.key?(variant.storage_key)
 
       chosen_at = Time.at(adapter[variant.storage_key].to_i)
-      if chosen_at >= experiment.started_at
-        variants[experiment.storage_key] = variant
-        return variant
-      end
+      return variant if chosen_at >= experiment.started_at
+    end
+
+    def participating?(experiment, include_control=true)
+      var = variant(experiment)
+      return false if var.nil?
+      return false if !include_control && var.control?
+      return true
     end
 
     def converted?(experiment, checkpoint=nil)
@@ -79,10 +77,6 @@ module TrailGuide
       end
     end
 
-    def variant(experiment)
-      participating?(experiment) || nil
-    end
-
     def participating!(variant)
       adapter[variant.experiment.storage_key] = variant.name
       adapter[variant.storage_key] = Time.now.to_i

data/lib/trail_guide/version.rb

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

metadata

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