trailguide 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11efc183928cf8abf01883fa97b5b7ae849ba6574a9f991063e1933db35c49f4
-  data.tar.gz: 7b13f5895c3ce50d03f768e96593eddce2d8309b65fb23331daf4829808b9be2
+  metadata.gz: c626f06613b7702e01f9c19ef77f6f77e022f0c1280cc13205e46a95bc3ff548
+  data.tar.gz: a91f183473695792a9c067d3ca8e59d91177b0bf97bc1ae29d34c976ba177760
 SHA512:
-  metadata.gz: 5ae3908f5b73f3abef1469327cef2a7a3f52651deca6291b1465d9b6b01acba8d55ebe4d3b82b1bb6103fe22c63e72e038055a643b54b08dbb3ef5b890d21675
-  data.tar.gz: bf187c71dfa8a0a2b637d981f7fff746d6091b9d18ff03fcfa44856a461e37e9ad55b8e3083772d4bb8803abfe2540f32d958bde571b8fbc0445b90d15c02a9a
+  metadata.gz: a0952f9bdb7840f6e201f78a0eb46bfcfe296bcfb115db735062923a8ae9e670c194e7c244225471a1484eaa4649a80f0612061fa4c1c81e7fa0c4824e89ddb3
+  data.tar.gz: 5432d3d30169caa958a344f99d732f389cd1ed23c052a41a0f86a6ef1b39ad2fac7e337dc81d586875d190d3ef9f2236d3abf81268f8ee3714458582409a86b7

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

@@ -23,6 +23,11 @@ module TrailGuide
         redirect_to :back rescue redirect_to trail_guide_admin.experiments_path
       end
 
+      def resume
+        experiment.resume!
+        redirect_to :back rescue redirect_to trail_guide_admin.experiments_path
+      end
+
       def restart
         experiment.reset! && experiment.start!
         redirect_to :back rescue redirect_to trail_guide_admin.experiments_path

data/app/views/trail_guide/admin/experiments/_experiment.html.erb

@@ -10,13 +10,15 @@
         </h3>
       </div>
       <div class="col-sm-12 col-md-6 col-lg-4 text-right">
-        <% if experiment.started? %>
+        <% if experiment.running? %>
           <%= link_to "stop", trail_guide_admin.stop_experiment_path(experiment.experiment_name), class: 'btn btn-sm btn-warning', method: :put %>
           <%= link_to "restart", trail_guide_admin.restart_experiment_path(experiment.experiment_name), class: 'btn btn-sm btn-danger',method: :put %>
+        <% elsif experiment.started? %>
+          <%= link_to "resume", trail_guide_admin.resume_experiment_path(experiment.experiment_name), class: 'btn btn-sm btn-primary',method: :put %>
         <% else %>
           <%= link_to "start", trail_guide_admin.start_experiment_path(experiment.experiment_name), class: 'btn btn-sm btn-success',method: :put %>
         <% end %>
-        <%= link_to "reset", trail_guide_admin.reset_experiment_path(experiment.experiment_name), class: 'btn btn-sm btn-danger',method: :put %>
+        <%= link_to "reset", trail_guide_admin.reset_experiment_path(experiment.experiment_name), class: 'btn btn-sm btn-outline-danger',method: :put %>
       </div>
     </div>
 

data/config/routes.rb

@@ -19,6 +19,7 @@ if defined?(TrailGuide::Admin::Engine)
         match :start,   via: [:put, :post, :get]
         match :stop,    via: [:put, :post, :get]
         match :reset,   via: [:put, :post, :get]
+        match :resume,  via: [:put, :post, :get]
         match :restart, via: [:put, :post, :get]
         match :winner,  via: [:put, :post, :get], path: 'winner/:variant'
       end

data/lib/trail_guide/experiment.rb

@@ -56,26 +56,50 @@ module TrailGuide
       end
 
       def stop!
-        return false unless started?
-        stopped = TrailGuide.redis.hdel(storage_key, 'started_at')
+        return false unless running?
+        stopped = TrailGuide.redis.hset(storage_key, 'stopped_at', Time.now.to_i)
         run_callbacks(:on_stop)
         stopped
       end
 
+      def resume!
+        return false unless started? && stopped?
+        restarted = TrailGuide.redis.hdel(storage_key, 'stopped_at')
+        run_callbacks(:on_resume)
+        restarted
+      end
+
       def started_at
         started = TrailGuide.redis.hget(storage_key, 'started_at')
         return Time.at(started.to_i) if started
       end
 
+      def stopped_at
+        stopped = TrailGuide.redis.hget(storage_key, 'stopped_at')
+        return Time.at(stopped.to_i) if stopped
+      end
+
       def started?
         !!started_at
       end
 
+      def stopped?
+        !!stopped_at
+      end
+
+      def running?
+        started? && !stopped?
+      end
+
       def declare_winner!(variant)
         variant = variant.name if variant.is_a?(Variant)
         TrailGuide.redis.hset(storage_key, 'winner', variant.to_s.underscore)
       end
 
+      def clear_winner!
+        TrailGuide.redis.hdel(storage_key, 'winner')
+      end
+
       def winner
         winner = TrailGuide.redis.hget(storage_key, 'winner')
         return variants.find { |var| var == winner } if winner
@@ -133,9 +157,9 @@ module TrailGuide
 
     attr_reader :participant
     delegate :configuration, :experiment_name, :variants, :control, :funnels,
-      :storage_key, :started?, :started_at, :start!, :resettable?, :winner?,
-      :winner, :allow_multiple_conversions?, :allow_multiple_goals?, :callbacks,
-      to: :class
+      :storage_key, :running?, :started?, :started_at, :start!, :resettable?,
+      :winner?, :winner, :allow_multiple_conversions?, :allow_multiple_goals?,
+      :callbacks, to: :class
 
     def initialize(participant)
       @participant = participant
@@ -158,12 +182,13 @@ module TrailGuide
       return control if TrailGuide.configuration.disabled
       if override.present?
         variant = variants.find { |var| var == override }
-        return variant unless configuration.track_override && started?
+        return variant unless configuration.track_override && running?
       else
         return winner if winner?
         return control if excluded
         return control if !started? && configuration.start_manually
         start! unless started?
+        return control unless running?
         return variants.find { |var| var == participant[storage_key] } if participating?
         return control unless TrailGuide.configuration.allow_multiple_experiments == true || !participant.participating_in_active_experiments?(TrailGuide.configuration.allow_multiple_experiments == false) 
 

data/lib/trail_guide/experiment_config.rb

@@ -23,6 +23,7 @@ module TrailGuide
           on_convert:  [TrailGuide.configuration.on_experiment_convert].flatten.compact,
           on_start:    [TrailGuide.configuration.on_experiment_start].flatten.compact,
           on_stop:     [TrailGuide.configuration.on_experiment_stop].flatten.compact,
+          on_resume:   [TrailGuide.configuration.on_experiment_resume].flatten.compact,
           on_reset:    [TrailGuide.configuration.on_experiment_reset].flatten.compact,
           on_delete:   [TrailGuide.configuration.on_experiment_delete].flatten.compact,
         }
@@ -121,6 +122,10 @@ module TrailGuide
       callbacks[:on_stop] << (meth || block)
     end
 
+    def on_resume(meth=nil, &block)
+      callbacks[:on_resume] << (meth || block)
+    end
+
     def on_reset(meth=nil, &block)
       callbacks[:on_reset] << (meth || block)
     end

data/lib/trail_guide/participant.rb

@@ -30,6 +30,7 @@ module TrailGuide
     end
 
     def participating?(experiment, include_control=true)
+      return false unless experiment.started?
       return false unless adapter.key?(experiment.storage_key)
       varname = adapter[experiment.storage_key]
       variant = experiment.variants.find { |var| var == varname }
@@ -41,6 +42,7 @@ module TrailGuide
     end
 
     def converted?(experiment, checkpoint=nil)
+      return false unless experiment.started?
       if experiment.funnels.empty?
         raise InvalidGoalError, "You provided the checkpoint `#{checkpoint}` but the experiment `#{experiment.experiment_name}` does not have any goals defined." unless checkpoint.nil?
         storage_key = "#{experiment.storage_key}:converted"
@@ -92,7 +94,7 @@ module TrailGuide
       return false if adapter.keys.empty?
       adapter.keys.map { |key| key.to_s.split(":").first.to_sym }.uniq.map do |key|
         experiment = TrailGuide.catalog.find(key)
-        next unless experiment && experiment.started? && participating?(experiment, include_control)
+        next unless experiment && experiment.running? && participating?(experiment, include_control)
         [ experiment.experiment_name, adapter[experiment.storage_key] ]
       end.compact.to_h
     end
@@ -103,7 +105,7 @@ module TrailGuide
       adapter.keys.any? do |key|
         experiment_name = key.to_s.split(":").first.to_sym
         experiment = TrailGuide.catalog.find(experiment_name)
-        experiment && experiment.started? && participating?(experiment, include_control)
+        experiment && experiment.running? && participating?(experiment, include_control)
       end
     end
   end

data/lib/trail_guide/version.rb

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

data/lib/trailguide.rb

@@ -33,6 +33,7 @@ module TrailGuide
 
     config.on_experiment_start = nil   # -> (experiment) { ... }
     config.on_experiment_stop = nil    # -> (experiment) { ... }
+    config.on_experiment_resume = nil  # -> (experiment) { ... }
     config.on_experiment_reset = nil   # -> (experiment) { ... }
     config.on_experiment_delete = nil  # -> (experiment) { ... }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailguide
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Mark Rebec