vanity 2.2.10 → 3.0.0

data/gemfiles/{rails5.gemfile → rails52.gemfile}

@@ -3,14 +3,14 @@
 source "https://rubygems.org"
 
 gem "rack"
-gem "redis", ">= 2.1"
+gem "redis", ">= 3.2.1"
 gem "redis-namespace", ">= 1.1.0"
 gem "mongo", "~> 2.1"
 gem "integration", "<= 0.1.0"
 gem "rubystats", ">= 0.2.5"
 gem "garb", "< 0.9.2", :require => false
 gem "mocha", "~> 1.0", :require => false
-gem "rails", "5.0.0"
+gem "rails", "~>5.2.0"
 gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
 gem "passenger", "~>3.0"
 

data/gemfiles/rails52.gemfile.lock

@@ -0,0 +1,270 @@
+GIT
+  remote: git://github.com/zoltankiss/fastthread.git
+  revision: cefbca3009b9c68df5e473d840462ebcc7fa1504
+  specs:
+    fastthread (1.0.7)
+
+PATH
+  remote: ..
+  specs:
+    vanity (3.0.0)
+      i18n
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    RedCloth (4.3.2)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
+      globalid (>= 0.3.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    blankslate (2.1.2.4)
+    bson (4.3.0)
+    builder (3.2.3)
+    classifier-reborn (2.2.0)
+      fast-stemmer (~> 1.0)
+    coderay (1.1.2)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.11.1)
+    colorator (0.1)
+    concurrent-ruby (1.0.5)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    crass (1.0.4)
+    daemon_controller (1.2.0)
+    erubi (1.7.1)
+    execjs (2.7.0)
+    fakefs (0.18.0)
+    faraday (0.15.2)
+      multipart-post (>= 1.2, < 3)
+    fast-stemmer (1.0.2)
+    ffi (1.9.25)
+    garb (0.9.1)
+      activesupport (>= 2.2.0)
+      crack (>= 0.1.6)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    hashdiff (0.3.7)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    integration (0.1.0)
+    jekyll (2.5.3)
+      classifier-reborn (~> 2.0)
+      colorator (~> 0.1)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.1.1)
+      coffee-script (~> 2.2)
+      coffee-script-source (~> 1.11.1)
+    jekyll-gist (1.5.0)
+      octokit (~> 4.2)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.5.2)
+      sass (~> 3.4)
+    jekyll-watch (1.5.1)
+      listen (~> 3.0)
+    kramdown (1.17.0)
+    liquid (2.6.3)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    mercenary (0.3.6)
+    metaclass (0.0.4)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    mocha (1.6.0)
+      metaclass (~> 0.0.1)
+    mongo (2.6.1)
+      bson (>= 4.3.0, < 5.0.0)
+    multipart-post (2.0.0)
+    nio4r (2.3.1)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
+    octokit (4.9.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    passenger (3.0.21)
+      daemon_controller (>= 1.0.0)
+      fastthread (>= 1.0.1)
+      rack
+      rake (>= 0.8.1)
+    posix-spawn (0.3.13)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.2)
+    pygments.rb (0.6.3)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.2.0)
+    rack (2.0.5)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    redcarpet (3.4.0)
+    redis (4.0.1)
+    redis-namespace (1.6.0)
+      redis (>= 3.0.4)
+    ruby_dep (1.5.0)
+    rubystats (0.3.0)
+    safe_yaml (1.0.4)
+    sass (3.5.7)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    toml (0.1.2)
+      parslet (~> 1.5.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    webmock (3.4.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    yajl-ruby (1.2.3)
+    yard (0.9.15)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  activerecord-jdbc-adapter
+  appraisal (~> 2.0.0)
+  bundler (>= 1.8.0)
+  fakefs
+  fastthread!
+  garb (< 0.9.2)
+  integration (<= 0.1.0)
+  jdbc-sqlite3
+  jekyll (~> 2.5.3)
+  minitest (>= 4.2)
+  mocha (~> 1.0)
+  mongo (~> 2.1)
+  passenger (~> 3.0)
+  pry
+  rack
+  rails (~> 5.2.0)
+  rake
+  redis (>= 3.2.1)
+  redis-namespace (>= 1.1.0)
+  rubystats (>= 0.2.5)
+  sqlite3 (~> 1.3.10)
+  timecop
+  vanity!
+  webmock
+  yard
+
+BUNDLED WITH
+   1.16.2

data/lib/generators/templates/{add_participants_unique_index_migration.rb → add_participants_unique_index_migration.rb.erb}

@@ -1,6 +1,6 @@
 require "vanity/adapters/active_record_adapter"
 
-class AddParticipansUniqueIndexMigration < ActiveRecord::Migration
+class AddParticipantsUniqueIndexMigration < ActiveRecord::Migration<%= migration_version %>
   # Helper methods to ensure we're connecting to the right database, see
   # https://github.com/assaf/vanity/issues/295.
 

data/lib/generators/templates/{add_unique_indexes_migration.rb → add_unique_indexes_migration.rb.erb}

@@ -1,6 +1,6 @@
 require "vanity/adapters/active_record_adapter"
 
-class AddVanityUniqueIndexes < ActiveRecord::Migration
+class AddVanityUniqueIndexes < ActiveRecord::Migration<%= migration_version %>
   # Helper methods to ensure we're connecting to the right database, see
   # https://github.com/assaf/vanity/issues/295.
 

data/lib/generators/templates/{vanity_migration.rb → vanity_migration.rb.erb}

@@ -1,6 +1,6 @@
 require "vanity/adapters/active_record_adapter"
 
-class VanityMigration < ActiveRecord::Migration
+class VanityMigration < ActiveRecord::Migration<%= migration_version %>
   # Helper methods to ensure we're connecting to the right database, see
   # https://github.com/assaf/vanity/issues/295.
 

data/lib/generators/vanity/migration_generator.rb

@@ -0,0 +1,34 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'rails/generators/active_record'
+
+class VanityGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+  source_root File.expand_path('../../templates', __FILE__)
+
+  def self.next_migration_number(path)
+    ::ActiveRecord::Generators::Base.next_migration_number(path)
+  end
+
+  def create_migration_file
+    migration_template "vanity_migration.rb.erb", destination("vanity_migration.rb"), :migration_version=>migration_version
+    migration_template "add_unique_indexes_migration.rb.erb", destination("add_vanity_unique_indexes.rb"), :migration_version=>migration_version
+    migration_template "add_participants_unique_index_migration.rb.erb", destination("add_participants_unique_index_migration.rb"), :migration_version=>migration_version
+  end
+
+  private
+
+  def destination(name)
+    File.join(Rails.root, 'db', 'migrate', name)
+  end
+
+  def versioned?
+    ActiveRecord::VERSION::MAJOR >= 5
+  end
+
+  def migration_version
+    if versioned?
+      "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+    end
+  end
+end

data/lib/vanity/adapters/redis_adapter.rb

@@ -41,11 +41,7 @@ module Vanity
 
       def disconnect!
         if redis
-          begin
-            redis.client.disconnect
-          rescue Exception => e
-            Vanity.logger.warn("Error while disconnecting from redis: #{e.message}")
-          end
+          redis.disconnect!
         end
         @redis = nil
       end
@@ -72,7 +68,7 @@ module Vanity
       # -- Metrics --
 
       def get_metric_last_update_at(metric)
-        last_update_at = @metrics["#{metric}:last_update_at"]
+        last_update_at = @metrics.get("#{metric}:last_update_at")
         last_update_at && Time.at(last_update_at.to_i)
       end
 
@@ -81,7 +77,7 @@ module Vanity
           values.each_with_index do |v,i|
             @metrics.incrby "#{metric}:#{timestamp.to_date}:value:#{i}", v
           end
-          @metrics["#{metric}:last_update_at"] = Time.now.to_i
+          @metrics.set("#{metric}:last_update_at", Time.now.to_i)
         end
       end
 
@@ -98,7 +94,7 @@ module Vanity
       # -- Experiments --
 
       def experiment_persisted?(experiment)
-        !!@experiments["#{experiment}:created_at"]
+        !!@experiments.get("#{experiment}:created_at")
       end
 
       def set_experiment_created_at(experiment, time)
@@ -108,7 +104,7 @@ module Vanity
       end
 
       def get_experiment_created_at(experiment)
-        created_at = @experiments["#{experiment}:created_at"]
+        created_at = @experiments.get("#{experiment}:created_at")
         created_at && Time.at(created_at.to_i)
       end
 
@@ -117,7 +113,7 @@ module Vanity
       end
 
       def get_experiment_completed_at(experiment)
-        completed_at = @experiments["#{experiment}:completed_at"]
+        completed_at = @experiments.get("#{experiment}:completed_at")
         completed_at && Time.at(completed_at.to_i)
       end
 
@@ -134,7 +130,7 @@ module Vanity
       end
 
       def is_experiment_enabled?(experiment)
-        value = @experiments["#{experiment}:enabled"]
+        value = @experiments.get("#{experiment}:enabled")
         if Vanity.configuration.experiments_start_enabled
           value != 'false'
         else
@@ -146,19 +142,19 @@ module Vanity
         {
           :participants => @experiments.scard("#{experiment}:alts:#{alternative}:participants").to_i,
                 :converted    => @experiments.scard("#{experiment}:alts:#{alternative}:converted").to_i,
-          :conversions  => @experiments["#{experiment}:alts:#{alternative}:conversions"].to_i
+          :conversions  => @experiments.get("#{experiment}:alts:#{alternative}:conversions").to_i
         }
       end
 
       def ab_show(experiment, identity, alternative)
         call_redis_with_failover do
-          @experiments["#{experiment}:participant:#{identity}:show"] = alternative
+          @experiments.set("#{experiment}:participant:#{identity}:show", alternative)
         end
       end
 
       def ab_showing(experiment, identity)
         call_redis_with_failover do
-          alternative = @experiments["#{experiment}:participant:#{identity}:show"]
+          alternative = @experiments.get("#{experiment}:participant:#{identity}:show")
           alternative && alternative.to_i
         end
       end
@@ -212,7 +208,7 @@ module Vanity
       end
 
       def ab_get_outcome(experiment)
-        alternative = @experiments["#{experiment}:outcome"]
+        alternative = @experiments.get("#{experiment}:outcome")
         alternative && alternative.to_i
       end
 
@@ -221,9 +217,13 @@ module Vanity
       end
 
       def destroy_experiment(experiment)
-        @experiments.del "#{experiment}:outcome", "#{experiment}:created_at", "#{experiment}:completed_at"
-        alternatives = @experiments.keys("#{experiment}:alts:*")
-        @experiments.del(*alternatives) unless alternatives.empty?
+        cursor = nil
+
+        while cursor != "0" do
+          cursor, keys = @experiments.scan(cursor || "0", match: "#{experiment}:*")
+
+          @experiments.del(*keys) unless keys.empty?
+        end
       end
 
       protected