trailguide 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6ac0fab202185a9755998f242b35db29fedb2ea544c5061517e2b0a6c38b870
-  data.tar.gz: a589a4ca3dd13adf8653c07d582d104280313977598dc62cbeb76559d3682122
+  metadata.gz: c099d61bcdf95cc843e70c0f6d29181e98a0b406223c9da34f58c5acbc512275
+  data.tar.gz: 86d169432b3f218fd174b52b0b1bb8e16134dbfbac3e4d8b16064f5b077e1926
 SHA512:
-  metadata.gz: 789156dc2f71f2d20e4e24f5b7423b53f30145a494d0ed8b0ff7ec2e99e229803d21ca3e91022531bfda682583a38de285702f610bed7b63e097eac804c9f515
-  data.tar.gz: 126dafd03f04e469d6de1ae3f1b1639d791368261bd05e36b55170a9a92b63cd0fe3433ce4e76759ef5fe167f71b0745a93fa77cd44816c9a4f725eb9f798552
+  metadata.gz: c6ded8b6d09c96fa94238274675b4450163cd71d83a6c8275d590a2dede66435b5e89aacf95afc91d78f1a04a26dae4763a78c432455b9d9de3e015433760458
+  data.tar.gz: 1819ff2788259221bdd5e4942df7d3b5f99320b3dc2319602fd5174b3922bcf72248e65fc715e685590e3aa4676c704fb3e8f99256e7457c3316660925daf341

data/app/controllers/trail_guide/admin/application_controller.rb

@@ -17,6 +17,13 @@ module TrailGuide
       end
       helper_method :preview_url
 
+      def subtitle(context=self)
+        subtitle = TrailGuide::Admin.configuration.subtitle
+        subtitle = context.instance_exec(&subtitle) if subtitle.respond_to?(:call)
+        subtitle
+      end
+      helper_method :subtitle
+
       def experiment_peekable?(experiment)
         return false unless TrailGuide::Admin.configuration.peek_parameter
         return false unless experiment.started? && !experiment.stopped? && !experiment.winner?
@@ -100,17 +107,16 @@ module TrailGuide
       end
       helper_method :experiment_color
 
-      def time_zone
-        zone = TrailGuide::Admin.configuration.time_zone || ActiveSupport::TimeZone['UTC']
-        zone = zone.call if zone.respond_to?(:call)
-        zone = ActiveSupport::TimeZone[zone] unless zone.is_a?(ActiveSupport::TimeZone)
-        zone
-      end
-
       def format_time(time, format=TrailGuide::Admin.configuration.date_format)
-        ActiveSupport::TimeWithZone.new(time.utc, time_zone).strftime(format)
+        ActiveSupport::TimeWithZone.new(time.utc, TrailGuide::Admin.configuration.time_zone).strftime(format)
       end
       helper_method :format_time
+
+      if TrailGuide::Admin.configuration.experiment_user.present?
+        def trailguide_user
+          send TrailGuide::Admin.configuration.experiment_user.to_sym
+        end
+      end
     end
   end
 end

data/app/views/layouts/trail_guide/admin/_header.html.erb

@@ -123,7 +123,7 @@
       <span class="fas fa-calculator"></span>
     </button>
   </div>
-  <span class="navbar-brand d-none d-md-inline-block"><small class="text-muted"><%= TrailGuide::Admin.configuration.subtitle %></small></span>
+  <span class="navbar-brand d-none d-md-inline-block"><%= raw subtitle(self) %></span>
 </nav>
 
 <%= render partial: 'layouts/trail_guide/admin/calculator' %>

data/config/initializers/admin.rb

@@ -7,7 +7,20 @@ TrailGuide::Admin.configure do |config|
 
   # display subtitle for admin UI
   #
-  config.subtitle = 'Experiments and A/B Tests'
+  # can be a string or a block, and may contain raw html.
+  #
+  # if a block is given, it will be executed within the view context, so you can use
+  # all available helpers, route helpers, etc.
+  #
+  config.subtitle = '<small class="text-muted">Experiments and A/B Tests</small>'
+
+  # specify a custom method to call when looking for a trailguide user/participant
+  # within the admin UI.
+  #
+  # this can be useful if you have separate admin and application user models, and
+  # allows you to specify the application user who will be enrolled on behalf of the
+  # admin user within the admin UI, to more easily facilitate enrollment and testing
+  config.experiment_user = nil
 
   # request parameter can be used to "peek" at results even before an
   # experiment's target_sample_size has been hit if one is configured

data/lib/trail_guide/admin/config.rb

@@ -0,0 +1,21 @@
+module TrailGuide
+  module Admin
+    class Config < Canfig::Config
+      DEFAULT_KEYS = [
+        :title, :subtitle, :experiment_user, :peek_parameter, :date_format, :time_zone
+      ].freeze
+
+      def initialize(*args, **opts, &block)
+        args = args.concat(DEFAULT_KEYS)
+        super(*args, **opts, &block)
+      end
+
+      def time_zone
+        self[:time_zone] ||= 'UTC'
+        self[:time_zone] = self[:time_zone].call if self[:time_zone].respond_to?(:call)
+        self[:time_zone] = ActiveSupport::TimeZone[self[:time_zone]] unless self[:time_zone].is_a?(ActiveSupport::TimeZone)
+        self[:time_zone]
+      end
+    end
+  end
+end

data/lib/trail_guide/admin.rb

@@ -1,7 +1,16 @@
+require "trail_guide/admin/config"
 require "trail_guide/admin/engine"
 
 module TrailGuide
   module Admin
-    include Canfig::Module
+    class << self
+      def configuration
+        @configuration ||= Admin::Config.new
+      end
+
+      def configure(*args, &block)
+        configuration.configure(*args, &block)
+      end
+    end
   end
 end

data/lib/trail_guide/helper/experiment_proxy.rb

@@ -115,7 +115,7 @@ module TrailGuide
         end
       rescue NoExperimentsError => e
         unless TrailGuide.configuration.ignore_orphaned_groups?
-          trace = e.backtrace.find { |t| !t.match?(Regexp.new(__FILE__)) }
+          trace = e.backtrace.find { |t| !t.match?(Regexp.new(File.dirname(__FILE__))) }
             .to_s.split(Rails.root.to_s).last
             .split(':').first(2).join(':')
           TrailGuide.catalog.orphaned(key, trace)

data/lib/trail_guide/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailguide
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -248,6 +248,7 @@ files:
 - lib/trail_guide/adapters/variants.rb
 - lib/trail_guide/adapters/variants/redis.rb
 - lib/trail_guide/admin.rb
+- lib/trail_guide/admin/config.rb
 - lib/trail_guide/admin/engine.rb
 - lib/trail_guide/algorithms.rb
 - lib/trail_guide/algorithms/algorithm.rb