gitlab-experiment 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f89a48e8e15030981a25d71cfc86d9f92520e535b90381209861e698d47d646e
-  data.tar.gz: 80c92e4817efd0b9f9c273bd6392548ef03352140c9d8e2cc9ce13cee90fb5b2
+  metadata.gz: ed3c0028563936ce8a3fbdfd1de9d64e499102c4ec71a21946b63c56cc2bebd5
+  data.tar.gz: 43389ef9b7b2a4b3e60b82b5ffefbe3635739cb9fafec21dd5e9d59586f942c2
 SHA512:
-  metadata.gz: 9ff2aa5d59df1dac0d5c6efd5a592e98c5363ad59c209a46b84a722c231b674cdfaa7c9ca53eade02b180d99bce2c13c336fedc92cebd2f0bec1bb59c7b0f82a
-  data.tar.gz: 3e94dd388343cddab5eef06dd3e3bfa756725a690f45f2143ef03d6c56e5b19f4b47d5757fcfbc9cde9ae415f74ec838c764ac59254d385368a2ab76d9d97a7b
+  metadata.gz: 30d0988d199f34eb60e3d56d8e7aec3a00222a5de482410c0294e15ce37a2a9dccbb2fb35b372c90b4425879938bec0d7e5b0ffadf5d842ee31abb0ea673aaeb
+  data.tar.gz: 3665443e1d937b77e12debaf3195423b3fad171b651573e58a328dfb5c1f618eb9a282eedcfde68376ae0e7207837b74ae60e4fda616c046caa329b4cc681e68

data/lib/gitlab/experiment/base_interface.rb

@@ -29,6 +29,7 @@ module Gitlab
 
         def from_param(id)
           %r{/?(?<name>.*):(?<key>.*)$} =~ id
+          name = CGI.unescape(name) if name
           constantize(name).new(name).tap { |e| e.context.key(key) }
         end
       end

data/lib/gitlab/experiment/context.rb

@@ -61,16 +61,18 @@ module Gitlab
       private
 
       def process_migrations(value)
-        add_migration(value.delete(:migrated_from))
-        add_migration(value.delete(:migrated_with), merge: true)
+        add_unmerged_migration(value.delete(:migrated_from))
+        add_merged_migration(value.delete(:migrated_with))
 
         migrate_cookie(value, "#{@experiment.name}_id")
       end
 
-      def add_migration(value, merge: false)
-        return unless value.is_a?(Hash)
+      def add_unmerged_migration(value = {})
+        @migrations[:unmerged] << value if value.is_a?(Hash)
+      end
 
-        @migrations[merge ? :merged : :unmerged] << value
+      def add_merged_migration(value = {})
+        @migrations[:merged] << value if value.is_a?(Hash)
       end
 
       def migration_keys

data/lib/gitlab/experiment/cookies.rb

@@ -23,7 +23,7 @@ module Gitlab
         return hash if cookie.to_s.empty?
         return hash.merge(key => cookie) if hash[key].nil?
 
-        add_migration(key => cookie)
+        add_unmerged_migration(key => cookie)
         cookie_jar.delete(cookie_name, domain: domain)
 
         hash

data/lib/gitlab/experiment/engine.rb

@@ -35,7 +35,10 @@ module Gitlab
         app.config.middleware.use(Middleware, mount_at)
         app.routes.append do
           mount Engine, at: mount_at, as: :experiment_engine
-          direct(:experiment_redirect) { |ex, url:| "#{engine.url_helpers.experiment_url(ex)}?#{url}" }
+          direct(:experiment_redirect) do |ex, options|
+            url = options[:url]
+            "#{engine.url_helpers.experiment_url(ex)}?#{url}"
+          end
         end
       end
     end

data/lib/gitlab/experiment/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   class Experiment
-    VERSION = '0.6.3'
+    VERSION = '0.6.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-experiment
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - GitLab