gitlab-experiment 0.3.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bb028b4495b7ab210c13769433a8b6ec7b8a3fc459a2c33f0e9bc650cf23916
-  data.tar.gz: '0387ed9d7e722c4ba6bce42aed1b71720b6df23b6687100b02186f57b6f125c9'
+  metadata.gz: 5b1a2f81e8680cffda06d116655200c055dbb74a42a52a7fa8adcb84c720fb01
+  data.tar.gz: 715ea6dd8494457c169ef3147ca2edf2fc6e4c63571801e1f5b22814182ebb56
 SHA512:
-  metadata.gz: d27ae9c243b447d994060bc2250ade8be78351312c01fa591e67441f913fd67f9e2caed1de77caac454b0a6b84702ff865e6a58c796c8e014ba2cf530dd5df9b
-  data.tar.gz: 2a3dcfef0dbfeb7e9e35d3ca56ede0bc7d1feeeafa9774a0f9184eeb89dfe49a49e6fbc93f594332cda1d8c87b374069a0ab1c053ab51183d8fdf47af4769845
+  metadata.gz: 7eec246157542ff0897f9af9f3135272d4d7fea31049443519fb550d5ca9cb3ad2d073ae8594104256d353b8042132f7ae5cba399bb44c38d7d5332154d5b849
+  data.tar.gz: ff4145fbe06fad2de4ef6295f4a0715c71c9ef4165308452d9dacd0c02a0df94d2152d138a6945c583c68d6c5966e1bb1e200fd79a7d9668382ee7c1d68861ea

data/README.md

@@ -1,10 +1,11 @@
-# GitLab Experiment
+GitLab Experiment
+=================
 
 <img alt="experiment" src="/uploads/60990b2dbf4c0406bbf8b7f998de2dea/experiment.png" align="right" width="40%">
 
 Here at GitLab, we run experiments as A/B/n tests and review the data the experiment generates. From that data, we determine the best performing variant and promote it as the new default code path. Or revert back to the control if no variant outperformed it.
 
-This library provides a clean and elegant DSL to define, run, and track your GitLab experiment.
+This library provides a clean and elegant DSL (domain specific language) to define, run, and track your GitLab experiment.
 
 When we discuss the behavior of this gem, we'll use terms like experiment, context, control, candidate, and variant. It's worth defining these terms so they're more understood.
 
@@ -16,6 +17,8 @@ When we discuss the behavior of this gem, we'll use terms like experiment, conte
 
 Candidate and variant are the same concept, but simplify how we speak about experimental paths.<br clear="all">
 
+[[_TOC_]]
+
 ## Installation
 
 Add the gem to your Gemfile and then `bundle install`.
@@ -24,10 +27,10 @@ Add the gem to your Gemfile and then `bundle install`.
 gem 'gitlab-experiment'
 ```
 
-If you're using Rails, you can install the initializer. It provides basic configuration and documentation.
+If you're using Rails, you can install the initializer which provides basic configuration, documentation, and the base experiment class that all your experiments can inherit from.
 
 ```shell
-$ rails generate gitlab_experiment:install
+$ rails generate gitlab:experiment:install
 ```
 
 ## Implementing an experiment
@@ -79,72 +82,84 @@ To this end, we track events that are important by calling the same experiment e
 experiment(:notification_toggle, actor: user).track(:clicked_button)
 ```
 
-<details>
-  <summary>You can also use the more low level class or instance interfaces...</summary>
+### Custom experiments
 
-### Class level interface using `.run`
+You can craft more advanced behaviors by defining custom experiments at a higher level. To do this you can define a class that inherits from `ApplicationExperiment` (or `Gitlab::Experiment`).
 
-```ruby
-exp = Gitlab::Experiment.run(:notification_toggle, actor: user) do |e|
-  # Context may be passed in the block, but must be finalized before calling
-  # run or track.
-  e.context(project: project) # add the project to the context
+Let's say you want to do more advanced segmentation, or provide default behavior for the variants on the experiment we've already outlined above -- that way if the variants aren't defined in the block at the time the experiment is run, these methods will be used. 
 
-  # Define the control and candidate variant.
-  e.use { render_toggle } # control
-  e.try { render_button } # candidate
-end
+You can generate a custom experiment by running:
 
-# Track an event on the experiment we've defined.
-exp.track(:clicked_button)
-```
+```shell
+$ rails generate gitlab:experiment NotificationToggle control candidate
+``` 
+
+This will generate a file in `app/experiments/notification_toggle_experiment.rb`, as well as a test file for you to further expand on.
 
-### Instance level interface
+Here are some examples of what you can introduce once you have a custom experiment defined.
 
 ```ruby
-exp = Gitlab::Experiment.new(:notification_toggle, actor: user)
-# Additional context may be provided to the instance (exp) but must be
-# finalized before calling run or track.
-exp.context(project: project) # add the project id to the context
+class NotificationToggleExperiment < ApplicationExperiment
+  # Segment any account less than 2 weeks old into the candidate, without
+  # asking the variant resolver to decide which variant to provide.
+  segment :account_age, variant: :candidate
+
+  # Define the default control behavior, which can be overridden at
+  # experiment time.
+  def control_behavior
+    render_toggle
+  end
+
+  # Define the default candidate behavior, which can be overridden
+  # at experiment time.
+  def candidate_behavior
+    render_button
+  end
+
+  private
 
-# Define the control and candidate variant.
-exp.use { render_toggle } # control
-exp.try { render_button } # candidate
+  def account_age
+    context.actor && context.actor.created_at < 2.weeks.ago
+  end
+end
 
-# Run the experiment, returning the result.
+# The class will be looked up based on the experiment name provided. 
+exp = experiment(:notification_toggle, actor: user)
+exp # => instance of NotificationToggleExperiment
+
+# Run the experiment -- returning the result.
 exp.run
 
 # Track an event on the experiment we've defined.
 exp.track(:clicked_button)
 ```
 
-</details>
+You can now also do things very similar to the simple examples and override the default variant behaviors defined in the custom experiment -- keeping in mind that this should be carefully considered within the scope of your experiment.
+
+```ruby
+experiment(:notification_toggle, actor: user) do |e|
+  e.use { render_special_toggle } # override default control behavior
+end
+```
 
 <details>
-  <summary>You can define and use custom classes...</summary>
+  <summary>You can also use the lower level class interface...</summary>
 
-### Custom class
+### Using the `.run` approach
 
-```ruby
-class NotificationExperiment < Gitlab::Experiment
-  def initialize(variant_name = nil, **context, &block)
-    super(:notification_toggle, variant_name, **context, &block)
+This is useful if you haven't included the DSL and so don't have access to the `experiment` method, but still want to execute an experiment. This is ultimately what the `experiment` method calls through to, and the method signatures are the same.
 
-    # Define the control and candidate variant.
-    use { render_toggle } # control
-    try { render_button } # candidate
-  end
-end
+```ruby
+exp = Gitlab::Experiment.run(:notification_toggle, actor: user) do |e|
+  # Context may be passed in the block, but must be finalized before calling
+  # run or track.
+  e.context(project: project) # add the project to the context
 
-exp = NotificationExperiment.new(actor: user) do |e|
-  # Context may be provided within the block or to the instance (exp) but must
-  # be finalized before calling run or track.
-  e.context(project: project) # add the project id to the context
+  # Define the control and candidate variant.
+  e.use { render_toggle } # control
+  e.try { render_button } # candidate
 end
 
-# Run the experiment -- returning the result.
-exp.run
-
 # Track an event on the experiment we've defined.
 exp.track(:clicked_button)
 ```
@@ -152,11 +167,11 @@ exp.track(:clicked_button)
 </details>
 
 <details>
-  <summary>You can also specify the variant to use...</summary>
+  <summary>You can also specify the variant to use for segmentation...</summary>
 
 ### Specifying variant
 
-You can hardcode the variant if you want. It's important to know what this might do to your data during rollout, so use this with consideration.
+Generally, defining segmentation rules is a better way to approach routing into specific variants, but it's possible to explicitly specify the variant when running an experiment. It's important to know what this might do to your data during rollout, so use this with careful consideration.
 
 ```ruby
 experiment(:notification_toggle, :no_interface, actor: user) do |e|
@@ -188,6 +203,25 @@ end
 
 </details>
 
+### Segmentation rules
+
+This library comes with the capability to segment contexts into a specific variant, before asking the variant resolver which variant to provide.
+
+Segmentation can be achieved by using a custom experiment class and specifying the segmentation rules at a class level.
+
+```ruby
+class NotificationToggleExperiment < ApplicationExperiment
+  segment(variant: :variant_one) { context.actor.username == 'jejacks0n' }
+  segment(variant: :variant_two) { context.actor.created_at < 2.weeks.ago }
+end
+```
+
+In the previous examples, any user with the username `'jejacks0n'` would always receive the experience defined in "variant_one". As well, any account less than 2 weeks old would get the alternate experience defined in "variant_two".
+
+When an experiment is run, the segmentation rules are executed in the order they're defined. The first segmentation rule to produce a truthy result is the one which gets used to assign the variant. The remaining segmentation rules are skipped.
+
+This means that any user with the name `'jejacks0n'`, regardless of account age, will always be provided the experience as defined in "variant_one". 
+
 ### Return value
 
 By default the return value is a `Gitlab::Experiment` instance. In simple cases you may want only the results of the experiment though. You can call `run` within the block to get the return value of the assigned variant.
@@ -307,7 +341,7 @@ Gitlab::Experiment.configure do |config|
 end
 ```
 
-More examples for configuration are available in the provided [rails initializer](lib/generators/gitlab_experiment/install/templates/initializer.rb).
+More examples for configuration are available in the provided [rails initializer](lib/generators/gitlab/experiment/install/templates/initializer.rb).
 
 ### Client layer / JavaScript
 
@@ -351,4 +385,32 @@ If you only include a user, that user would get the same experience across every
 
 Each of these approaches could be desirable given the objectives of your experiment.
 
-### Make code not war
+## Development
+
+After checking out the repo, run `bundle install` to install dependencies.
+Then, run `bundle exec rake` to run the tests. You can also run `bundle exec pry` for an
+interactive prompt that will allow you to experiment.
+
+## Contributing
+
+Bug reports and merge requests are welcome on GitLab at
+https://gitlab.com/gitlab-org/gitlab-experiment. This project is intended to be a
+safe, welcoming space for collaboration, and contributors are expected to adhere
+to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+## Release Process
+
+Please refer to the [Release Process](docs/release_process.md).
+
+## License
+
+The gem is available as open source under the terms of the
+[MIT License](http://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the `Gitlab::Experiment` project’s codebases, issue trackers,
+chat rooms and mailing lists is expected to follow the
+[code of conduct](CODE_OF_CONDUCT.md).
+
+***Make code not war***

data/lib/generators/gitlab/experiment/USAGE

@@ -0,0 +1,17 @@
+Description:
+    Stubs out a new experiment and its variants. Pass the experiment name,
+    either CamelCased or under_scored, and a list of variants as arguments.
+
+    To create an experiment within a module, specify the experiment name as a
+    path like 'parent_module/experiment_name'.
+
+    This generates an experiment class in app/experiments and invokes feature
+    flag, and test framework generators.
+
+Example:
+    `rails generate gitlab:experiment NullHypothesis control candidate alt_variant`
+
+    NullHypothesis experiment with default variants.
+        Experiment:   app/experiments/null_hypothesis_experiment.rb
+        Feature Flag: config/feature_flags/experiment/null_hypothesis.yaml
+        Test:         test/experiments/null_hypothesis_experiment_test.rb

data/lib/generators/gitlab/experiment/experiment_generator.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+
+module Gitlab
+  module Generators
+    class ExperimentGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('templates/', __dir__)
+      check_class_collision suffix: 'Experiment'
+
+      argument :variants,
+               type: :array,
+               default: %w[control candidate],
+               banner: 'variant variant'
+
+      def create_experiment
+        template 'experiment.rb', File.join('app/experiments', class_path, "#{file_name}_experiment.rb")
+      end
+
+      hook_for :test_framework
+
+      private
+
+      def file_name
+        @_file_name ||= remove_possible_suffix(super)
+      end
+
+      def remove_possible_suffix(name)
+        name.sub(/_?exp[ei]riment$/i, "") # be somewhat forgiving with spelling
+      end
+    end
+  end
+end

data/lib/generators/gitlab/experiment/install/install_generator.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+
+module Gitlab
+  module Generators
+    module Experiment
+      class InstallGenerator < Rails::Generators::Base
+        source_root File.expand_path('templates', __dir__)
+
+        desc 'Installs the Gitlab::Experiment initializer and optional ApplicationExperiment into your application.'
+
+        class_option :skip_initializer,
+                     type: :boolean,
+                     default: false,
+                     desc: 'Skip the initializer with default configuration'
+
+        class_option :skip_baseclass,
+                     type: :boolean,
+                     default: false,
+                     desc: 'Skip the ApplicationExperiment base class'
+
+        def create_initializer
+          return if options[:skip_initializer]
+
+          template 'initializer.rb', 'config/initializers/gitlab_experiment.rb'
+        end
+
+        def create_baseclass
+          return if options[:skip_baseclass]
+
+          template 'application_experiment.rb', 'app/experiments/application_experiment.rb'
+        end
+
+        def display_post_install
+          readme 'POST_INSTALL' if behavior == :invoke
+        end
+      end
+    end
+  end
+end

data/lib/generators/gitlab/experiment/install/templates/POST_INSTALL

@@ -0,0 +1,2 @@
+Gitlab::Experiment has been installed. You may want to adjust the configuration
+that's been provided in the Rails initializer.

data/lib/generators/gitlab/experiment/install/templates/application_experiment.rb.tt

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class ApplicationExperiment < Gitlab::Experiment
+end

data/lib/generators/{gitlab_experiment/install/templates/initializer.rb → gitlab/experiment/install/templates/initializer.rb.tt}

@@ -7,41 +7,41 @@ Gitlab::Experiment.configure do |config|
   # The logger is used to log various details of the experiments.
   config.logger = Logger.new($stdout)
 
-  # The caching layer is expected to respond to fetch, like Rails.cache.
+  # The base class that should be instantiated for basic experiments. It should
+  # be a string, so we can constantize it later.
+  config.base_class = 'ApplicationExperiment'
+
+  # The caching layer is expected to respond to fetch, like Rails.cache for
+  # instance -- or anything that adheres to ActiveSupport::Cache::Store.
   config.cache = nil
 
+  # The domain to use on cookies.
+  #
+  # When not set, it uses the current host. If you want to provide specific
+  # hosts, you use `:all`, or provide an array like
+  # `['www.gitlab.com', '.gitlab.com']`.
+  config.cookie_domain = :all
+
   # Logic this project uses to resolve a variant for a given experiment.
   #
-  # This can return an instance of any object that responds to `name`, or can
-  # return a variant name as a string, in which case the build in variant
-  # class will be used.
+  # Should return a symbol or string that represents the variant that should
+  # be assigned. Blank or nil values will be defaulted to the control.
   #
-  # This block will be executed within the scope of the experiment instance,
-  # so can easily access experiment methods, like getting the name or context.
+  # This block is executed within the scope of the experiment and so can access
+  # experiment methods, like `name`, `context`, and `signature`.
   config.variant_resolver = lambda do |requested_variant|
     # Run the control, unless a variant was requested in code:
-    requested_variant || 'control'
+    requested_variant
 
     # Run the candidate, unless a variant was requested, with a fallback:
     #
-    # requested_variant || variant_names.first || 'control'
-
-    # Using Unleash to determine the variant:
-    #
-    # fallback = Unleash::Variant.new(name: requested_variant || 'control', enabled: true)
-    # Unleash.get_variant(name, context.value, fallback)
-
-    # Using Flipper to determine the variant:
-    #
-    # TODO: provide example.
-    # Variant.new(name: requested_variant || 'control')
+    # requested_variant || variant_names.first || nil
   end
 
   # Tracking behavior can be implemented to link an event to an experiment.
   #
-  # Similar to the variant_resolver, this is called within the scope of the
-  # experiment instance and so can access any methods on the experiment,
-  # such as name and signature.
+  # This block is executed within the scope of the experiment and so can access
+  # experiment methods, like `name`, `context`, and `signature`.
   config.tracking_behavior = lambda do |event, args|
     # An example of using a generic logger to track events:
     config.logger.info "Gitlab::Experiment[#{name}] #{event}: #{args.merge(signature: signature)}"
@@ -58,8 +58,11 @@ Gitlab::Experiment.configure do |config|
   # Called at the end of every experiment run, with the result.
   #
   # You may want to track that you've assigned a variant to a given context,
-  # or push the experiment into the client or publish results elsewhere, like
-  # into redis. Also called within the scope of the experiment instance.
+  # or push the experiment into the client or publish results elsewhere like
+  # into redis.
+  #
+  # This block is executed within the scope of the experiment and so can access
+  # experiment methods, like `name`, `context`, and `signature`.
   config.publishing_behavior = lambda do |result|
     # Track the event using our own configured tracking logic.
     track(:assignment)
@@ -80,6 +83,9 @@ Gitlab::Experiment.configure do |config|
   # Given a specific context hash map, we need to generate a consistent hash
   # key. The logic in here will be used for generating cache keys, and may also
   # be used when determining which variant may be presented.
+  #
+  # This block is executed within the scope of the experiment and so can access
+  # experiment methods, like `name`, `context`, and `signature`.
   config.context_hash_strategy = lambda do |context|
     values = context.values.map { |v| (v.respond_to?(:to_global_id) ? v.to_global_id : v).to_s }
     Digest::MD5.hexdigest((context.keys + values).join('|'))

data/lib/generators/gitlab/experiment/templates/experiment.rb.tt

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+<% if namespaced? -%>
+require_dependency "<%= namespaced_path %>/application_experiment"
+
+<% end -%>
+<% module_namespacing do -%>
+class <%= class_name %>Experiment < ApplicationExperiment
+<% variants.each do |variant| -%>
+  def <%= variant %>_behavior
+  end
+<%= "\n" unless variant == variants.last -%>
+<% end -%>
+end
+<% end -%>

data/lib/generators/rspec/experiment/experiment_generator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'generators/rspec'
+
+module Rspec
+  module Generators
+    class ExperimentGenerator < Rspec::Generators::Base
+      source_root File.expand_path('templates/', __dir__)
+
+      def create_experiment_spec
+        template 'experiment_spec.rb', File.join('spec/experiments', class_path, "#{file_name}_experiment_spec.rb")
+      end
+    end
+  end
+end

data/lib/generators/rspec/experiment/templates/experiment_spec.rb.tt

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+<% module_namespacing do -%>
+RSpec.describe <%= class_name %>Experiment do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
+<% end -%>

data/lib/generators/test_unit/experiment/experiment_generator.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails/generators/test_unit'
+
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class ExperimentGenerator < TestUnit::Generators::Base # :nodoc:
+      source_root File.expand_path('templates/', __dir__)
+
+      check_class_collision suffix: 'Test'
+
+      def create_test_file
+        template 'experiment_test.rb', File.join('test/experiments', class_path, "#{file_name}_experiment_test.rb")
+      end
+    end
+  end
+end

data/lib/generators/test_unit/experiment/templates/experiment_test.rb.tt

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+<% module_namespacing do -%>
+class <%= class_name %>ExperimentTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
+<% end -%>

data/lib/gitlab/experiment.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
 require 'scientist'
+require 'active_support/callbacks'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/string/inflections'
 
 require 'gitlab/experiment/caching'
+require 'gitlab/experiment/callbacks'
 require 'gitlab/experiment/configuration'
 require 'gitlab/experiment/cookies'
 require 'gitlab/experiment/context'
@@ -15,31 +19,48 @@ module Gitlab
   class Experiment
     include Scientist::Experiment
     include Caching
+    include Callbacks
 
     class << self
       def configure
         yield Configuration
       end
 
-      def run(name, variant_name = nil, **context, &block)
+      def run(name = nil, variant_name = nil, **context, &block)
+        raise ArgumentError, 'name is required' if name.nil? && base?
+
         instance = constantize(name).new(name, variant_name, **context, &block)
         return instance unless block_given?
 
         instance.context.frozen? ? instance.run : instance.tap(&:run)
       end
 
-      def constantize(name)
-        name = "#{name}_experiment"
-        klass = name.respond_to?(:classify) ? name.classify.safe_constantize : nil
-        klass || self
+      def experiment_name(name = nil, suffix: true, suffix_word: 'experiment')
+        name = (name.presence || self.name).to_s.underscore.sub(%r{(?<char>[_/]|)#{suffix_word}$}, '')
+        name = "#{name}#{Regexp.last_match(:char) || '_'}#{suffix_word}"
+        suffix ? name : name.sub(/_#{suffix_word}$/, '')
+      end
+
+      def base?
+        self == Gitlab::Experiment || name == Configuration.base_class
+      end
+
+      private
+
+      def constantize(name = nil)
+        return self if name.nil?
+
+        experiment_name(name).classify.safe_constantize || Configuration.base_class.constantize
       end
     end
 
-    def initialize(name, variant_name = nil, **context)
-      @name = name
+    def initialize(name = nil, variant_name = nil, **context)
+      raise ArgumentError, 'name is required' if name.blank? && self.class.base?
+
+      @name = self.class.experiment_name(name, suffix: false)
       @variant_name = variant_name
       @excluded = []
-      @context = Context.new(self, context)
+      @context = Context.new(self, **context)
 
       exclude { !@context.trackable? }
       compare { false }
@@ -48,17 +69,29 @@ module Gitlab
     end
 
     def context(value = nil)
-      return @context if value.nil?
+      return @context if value.blank?
 
       @context.value(value)
       @context
     end
 
     def variant(value = nil)
-      return @variant_name = value unless value.nil?
+      if value.blank? && @variant_name || @resolving_variant
+        return Variant.new(name: (@variant_name || :unresolved).to_s)
+      end
+
+      @variant_name = value unless value.blank?
+      @variant_name ||= :control if excluded?
 
-      result = instance_exec(@variant_name, &Configuration.variant_resolver)
-      result.respond_to?(:name) ? result : Variant.new(name: result.to_s)
+      @resolving_variant = true
+      resolved = :control
+      if (result = cache_variant(@variant_name) { resolve_variant_name }).present?
+        @variant_name = resolved = result.to_sym
+      end
+
+      Variant.new(name: resolved.to_s)
+    ensure
+      @resolving_variant = false
     end
 
     def exclude(&block)
@@ -67,10 +100,14 @@ module Gitlab
 
     def run(variant_name = nil)
       @result ||= begin
-        @variant_name = variant_name unless variant_name.nil?
-        @variant_name ||= :control if excluded?
-
-        super(cache { variant.name })
+        variant_name = variant(variant_name).name
+        run_callbacks(variant_assigned? ? :unsegmented_run : :segmented_run) do
+          if respond_to?((behavior_name = "#{variant_name}_behavior"))
+            behaviors[variant_name] ||= -> { send(behavior_name) } # rubocop:disable GitlabSecurity/PublicSend
+          end
+
+          super(@variant_name = variant_name)
+        end
       end
     end
 
@@ -104,8 +141,12 @@ module Gitlab
       @excluded.any? { |exclude| exclude.call(self) }
     end
 
+    def variant_assigned?
+      !@variant_name.nil?
+    end
+
     def id
-      "#{name}:#{signature[:key]}"
+      "#{name}:#{key_for(context.value)}"
     end
     alias_method :session_id, :id
 
@@ -113,8 +154,16 @@ module Gitlab
       "Experiment;#{id}"
     end
 
+    def key_for(hash)
+      instance_exec(hash, &Configuration.context_hash_strategy)
+    end
+
     protected
 
+    def resolve_variant_name
+      instance_exec(@variant_name, &Configuration.variant_resolver)
+    end
+
     def generate_result(variant_name)
       observation = Scientist::Observation.new(variant_name, self, &behaviors[variant_name])
       Scientist::Result.new(self, [observation], observation)

data/lib/gitlab/experiment/caching.rb

@@ -3,20 +3,26 @@
 module Gitlab
   class Experiment
     module Caching
-      def cache(&block)
-        return yield unless (cache = Configuration.cache)
+      def cache_variant(specified = nil, &block)
+        cache = Configuration.cache
+        return (specified.presence || yield) unless cache
 
         key, migrations = cache_strategy
-        migrated_cache(cache, migrations || [], key) or cache.fetch(key, &block)
+        result = migrated_cache(cache, migrations || [], key) || cache.fetch(key, &block)
+        return result unless specified.present?
+
+        cache.write(cache_key, specified) if result != specified
+        specified
+      end
+
+      def cache_key(key = nil)
+        "#{name}:#{key || context.signature[:key]}"
       end
 
       private
 
       def cache_strategy
-        [
-          "#{name}:#{signature[:key]}",
-          signature[:migration_keys]&.map { |key| "#{name}:#{key}" }
-        ]
+        [cache_key, context.signature[:migration_keys]&.map { |key| cache_key(key) }]
       end
 
       def migrated_cache(cache, migrations, new_key)

data/lib/gitlab/experiment/callbacks.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Gitlab
+  class Experiment
+    module Callbacks
+      extend ActiveSupport::Concern
+      include ActiveSupport::Callbacks
+
+      included do
+        define_callbacks(
+          :unsegmented_run,
+          skip_after_callbacks_if_terminated: true
+        )
+
+        define_callbacks(
+          :segmented_run,
+          skip_after_callbacks_if_terminated: false,
+          terminator: lambda do |target, result_lambda|
+            result_lambda.call
+            target.variant_assigned?
+          end
+        )
+      end
+
+      class_methods do
+        def segment(*filter_list, variant:, **options, &block)
+          filters = filter_list.unshift(block).compact.map do |filter|
+            result_lambda = ActiveSupport::Callbacks::CallTemplate.build(filter, self).make_lambda
+            ->(target) { target.variant(variant) if result_lambda.call(target, nil) }
+          end
+
+          raise ArgumentError, 'no filters provided' if filters.empty?
+
+          set_callback(:segmented_run, :before, *filters, options, &block)
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/experiment/configuration.rb

@@ -15,12 +15,19 @@ module Gitlab
       # The logger is used to log various details of the experiments.
       @logger = Logger.new($stdout)
 
-      # Cache layer. Expected to respond to fetch, like Rails.cache.
+      # The base class that should be instantiated for basic experiments.
+      @base_class = 'Gitlab::Experiment'
+
+      # The caching layer is expected to respond to fetch, like Rails.cache.
       @cache = nil
 
+      # The domain to use on cookies.
+      @cookie_domain = :all
+
       # Logic this project uses to resolve a variant for a given experiment.
+      # If no variant is determined, the control will be used.
       @variant_resolver = lambda do |requested_variant|
-        requested_variant || 'control'
+        requested_variant
       end
 
       # Tracking behavior can be implemented to link an event to an experiment.
@@ -28,23 +35,24 @@ module Gitlab
         Configuration.logger.info "Gitlab::Experiment[#{name}] #{event}: #{args.merge(signature: signature)}"
       end
 
-      # Called at the end of every experiment run, with the results. You may
-      # want to push the experiment into the client or push results elsewhere.
+      # Called at the end of every experiment run, with the result.
       @publishing_behavior = lambda do |_result|
         track(:assignment)
       end
 
       # Algorithm that consistently generates a hash key for a given hash map.
-      @context_hash_strategy = lambda do |context|
-        values = context.values.map { |v| (v.respond_to?(:to_global_id) ? v.to_global_id : v).to_s }
-        Digest::MD5.hexdigest((context.keys + values).join('|'))
+      @context_hash_strategy = lambda do |hash_map|
+        values = hash_map.values.map { |v| (v.respond_to?(:to_global_id) ? v.to_global_id : v).to_s }
+        Digest::MD5.hexdigest(([name] + hash_map.keys + values).join('|'))
       end
 
       class << self
         attr_accessor(
           :name_prefix,
           :logger,
+          :base_class,
           :cache,
+          :cookie_domain,
           :variant_resolver,
           :tracking_behavior,
           :publishing_behavior,

data/lib/gitlab/experiment/context.rb

@@ -39,7 +39,7 @@ module Gitlab
       end
 
       def signature
-        @signature ||= { key: key_for(@value), migration_keys: migration_keys }.compact
+        @signature ||= { key: @experiment.key_for(@value), migration_keys: migration_keys }.compact
       end
 
       private
@@ -60,12 +60,8 @@ module Gitlab
       def migration_keys
         return nil if @migrations[:unmerged].empty? && @migrations[:merged].empty?
 
-        @migrations[:unmerged].map { |m| key_for(m) } +
-          @migrations[:merged].map { |m| key_for(@value.merge(m)) }
-      end
-
-      def key_for(context)
-        Configuration.context_hash_strategy.call(context)
+        @migrations[:unmerged].map { |m| @experiment.key_for(m) } +
+          @migrations[:merged].map { |m| @experiment.key_for(@value.merge(m)) }
       end
     end
   end

data/lib/gitlab/experiment/cookies.rb

@@ -11,7 +11,7 @@ module Gitlab
         return hash if cookie_jar.nil?
 
         resolver = [hash, :actor, cookie_name, cookie_jar.signed[cookie_name]]
-        resolve_cookie(*resolver) or generate_cookie(*resolver)
+        resolve_cookie(*resolver) || generate_cookie(*resolver)
       end
 
       def cookie_jar
@@ -24,7 +24,7 @@ module Gitlab
         return hash.merge(key => cookie) if hash[key].nil?
 
         add_migration(key => cookie)
-        cookie_jar.delete(cookie_name, domain: :all)
+        cookie_jar.delete(cookie_name, domain: domain)
 
         hash
       end
@@ -34,11 +34,15 @@ module Gitlab
 
         cookie ||= SecureRandom.uuid
         cookie_jar.permanent.signed[cookie_name] = {
-          value: cookie, secure: true, domain: :all, httponly: true
+          value: cookie, secure: true, domain: domain, httponly: true
         }
 
         hash.merge(key => cookie)
       end
+
+      def domain
+        Configuration.cookie_domain
+      end
     end
   end
 end

data/lib/gitlab/experiment/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   class Experiment
-    VERSION = '0.3.1'
+    VERSION = '0.4.4'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-experiment
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.4
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: scientist
   requirement: !ruby/object:Gem::Requirement
@@ -39,11 +53,20 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- lib/generators/gitlab_experiment/install/POST_INSTALL
-- lib/generators/gitlab_experiment/install/install_generator.rb
-- lib/generators/gitlab_experiment/install/templates/initializer.rb
+- lib/generators/gitlab/experiment/USAGE
+- lib/generators/gitlab/experiment/experiment_generator.rb
+- lib/generators/gitlab/experiment/install/install_generator.rb
+- lib/generators/gitlab/experiment/install/templates/POST_INSTALL
+- lib/generators/gitlab/experiment/install/templates/application_experiment.rb.tt
+- lib/generators/gitlab/experiment/install/templates/initializer.rb.tt
+- lib/generators/gitlab/experiment/templates/experiment.rb.tt
+- lib/generators/rspec/experiment/experiment_generator.rb
+- lib/generators/rspec/experiment/templates/experiment_spec.rb.tt
+- lib/generators/test_unit/experiment/experiment_generator.rb
+- lib/generators/test_unit/experiment/templates/experiment_test.rb.tt
 - lib/gitlab/experiment.rb
 - lib/gitlab/experiment/caching.rb
+- lib/gitlab/experiment/callbacks.rb
 - lib/gitlab/experiment/configuration.rb
 - lib/gitlab/experiment/context.rb
 - lib/gitlab/experiment/cookies.rb

data/lib/generators/gitlab_experiment/install/install_generator.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails/generators'
-
-module GitlabExperiment
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path(__dir__)
-
-      desc 'Installs the Gitlab Experiment initializer into your application.'
-
-      def copy_initializers
-        copy_file 'templates/initializer.rb', 'config/initializers/gitlab_experiment.rb'
-      end
-
-      def display_post_install
-        readme 'POST_INSTALL' if behavior == :invoke
-      end
-    end
-  end
-end