vanity 3.0.2 → 4.0.1

data/gemfiles/rails52.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (3.0.2)
+    vanity (4.0.1)
       i18n
 
 GEM
@@ -65,6 +65,7 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (9.0.0)
+    ast (2.4.2)
     blankslate (2.1.2.4)
     bson (4.3.0)
     bson (4.3.0-java)
@@ -82,7 +83,6 @@ GEM
     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)
@@ -162,11 +162,12 @@ GEM
       racc (~> 1.4)
     octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.21.0)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    passenger (3.0.21)
-      daemon_controller (>= 1.0.0)
-      fastthread (>= 1.0.1)
+    passenger (6.0.12)
       rack
       rake (>= 0.8.1)
     posix-spawn (0.3.13)
@@ -183,7 +184,7 @@ GEM
       yajl-ruby (~> 1.2.0)
     racc (1.6.0)
     racc (1.6.0-java)
-    rack (2.0.5)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.0)
@@ -210,7 +211,8 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -218,6 +220,25 @@ GEM
     redis (4.0.1)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rubocop (1.25.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.2)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.13.2)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (2.8.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
     ruby_dep (1.5.0)
     rubystats (0.3.0)
     safe_yaml (1.0.4)
@@ -247,6 +268,7 @@ GEM
       parslet (~> 1.5.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    unicode-display_width (2.1.0)
     webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -277,13 +299,16 @@ DEPENDENCIES
   minitest (>= 4.2)
   mocha (~> 1.0)
   mongo (~> 2.1)
-  passenger (~> 3.0)
+  passenger
   pry
   rack
   rails (~> 5.2.0)
   rake
   redis (>= 3.2.1)
   redis-namespace (>= 1.1.0)
+  rubocop
+  rubocop-performance
+  rubocop-rspec
   rubystats (>= 0.2.5)
   sqlite3 (~> 1.3.10)
   timecop
@@ -292,4 +317,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/gemfiles/rails60.gemfile

@@ -3,26 +3,29 @@
 source "https://rubygems.org"
 
 gem "rack"
+gem "mongo", "~> 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.2.0"
 gem "fastthread", platforms: :mri_20, git: "https://github.com/zoltankiss/fastthread.git"
-gem "passenger", "~>3.0"
+gem "passenger"
 
 group :development do
   gem "rake"
   gem "RedCloth"
   gem "yard"
+  gem "rubocop"
+  gem "rubocop-performance"
+  gem "rubocop-rspec"
 end
 
 platforms :ruby do
-  gem "sqlite3", "~> 1.3.10"
   gem "jekyll", "~> 2.5.3"
+  gem "sqlite3", "~> 1.3.10"
 end
 
 platforms :jruby do

data/gemfiles/rails60.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (3.0.2)
+    vanity (4.0.1)
       i18n
 
 GEM
@@ -65,6 +65,7 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (9.0.0)
+    ast (2.4.2)
     blankslate (2.1.2.4)
     bson (4.3.0)
     bson (4.3.0-java)
@@ -82,7 +83,6 @@ GEM
     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)
@@ -160,11 +160,12 @@ GEM
       racc (~> 1.4)
     octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.21.0)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    passenger (3.0.21)
-      daemon_controller (>= 1.0.0)
-      fastthread (>= 1.0.1)
+    passenger (6.0.12)
       rack
       rake (>= 0.8.1)
     posix-spawn (0.3.13)
@@ -181,7 +182,7 @@ GEM
       yajl-ruby (~> 1.2.0)
     racc (1.6.0)
     racc (1.6.0-java)
-    rack (2.0.5)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.0)
@@ -208,7 +209,8 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -216,6 +218,25 @@ GEM
     redis (4.0.1)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rubocop (1.25.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.2)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.13.2)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (2.8.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
     ruby_dep (1.5.0)
     rubystats (0.3.0)
     safe_yaml (1.0.4)
@@ -245,6 +266,7 @@ GEM
       parslet (~> 1.5.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    unicode-display_width (2.1.0)
     webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -275,13 +297,16 @@ DEPENDENCIES
   minitest (>= 4.2)
   mocha (~> 1.0)
   mongo (~> 2.1)
-  passenger (~> 3.0)
+  passenger
   pry
   rack
   rails (~> 5.2.0)
   rake
   redis (>= 3.2.1)
   redis-namespace (>= 1.1.0)
+  rubocop
+  rubocop-performance
+  rubocop-rspec
   rubystats (>= 0.2.5)
   sqlite3 (~> 1.3.10)
   timecop
@@ -290,4 +315,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/gemfiles/rails61.gemfile

@@ -3,26 +3,29 @@
 source "https://rubygems.org"
 
 gem "rack"
+gem "mongo", "~> 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.2.0"
 gem "fastthread", platforms: :mri_20, git: "https://github.com/zoltankiss/fastthread.git"
-gem "passenger", "~>3.0"
+gem "passenger"
 
 group :development do
   gem "rake"
   gem "RedCloth"
   gem "yard"
+  gem "rubocop"
+  gem "rubocop-performance"
+  gem "rubocop-rspec"
 end
 
 platforms :ruby do
-  gem "sqlite3", "~> 1.3.10"
   gem "jekyll", "~> 2.5.3"
+  gem "sqlite3", "~> 1.3.10"
 end
 
 platforms :jruby do

data/gemfiles/rails61.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (3.0.2)
+    vanity (4.0.1)
       i18n
 
 GEM
@@ -65,6 +65,7 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (9.0.0)
+    ast (2.4.2)
     blankslate (2.1.2.4)
     bson (4.3.0)
     bson (4.3.0-java)
@@ -82,7 +83,6 @@ GEM
     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)
@@ -160,11 +160,12 @@ GEM
       racc (~> 1.4)
     octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.21.0)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    passenger (3.0.21)
-      daemon_controller (>= 1.0.0)
-      fastthread (>= 1.0.1)
+    passenger (6.0.12)
       rack
       rake (>= 0.8.1)
     posix-spawn (0.3.13)
@@ -181,7 +182,7 @@ GEM
       yajl-ruby (~> 1.2.0)
     racc (1.6.0)
     racc (1.6.0-java)
-    rack (2.0.5)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.0)
@@ -208,7 +209,8 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -216,6 +218,25 @@ GEM
     redis (4.0.1)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rubocop (1.25.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.2)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.13.2)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (2.8.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
     ruby_dep (1.5.0)
     rubystats (0.3.0)
     safe_yaml (1.0.4)
@@ -245,6 +266,7 @@ GEM
       parslet (~> 1.5.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    unicode-display_width (2.1.0)
     webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -275,13 +297,16 @@ DEPENDENCIES
   minitest (>= 4.2)
   mocha (~> 1.0)
   mongo (~> 2.1)
-  passenger (~> 3.0)
+  passenger
   pry
   rack
   rails (~> 5.2.0)
   rake
   redis (>= 3.2.1)
   redis-namespace (>= 1.1.0)
+  rubocop
+  rubocop-performance
+  rubocop-rspec
   rubystats (>= 0.2.5)
   sqlite3 (~> 1.3.10)
   timecop
@@ -290,4 +315,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/lib/generators/vanity/migration_generator.rb

@@ -4,16 +4,16 @@ require 'rails/generators/active_record'
 
 class VanityGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
-  source_root File.expand_path('../../templates', __FILE__)
+  source_root File.expand_path('../templates', __dir__)
 
   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
+    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
@@ -27,8 +27,6 @@ class VanityGenerator < Rails::Generators::Base
   end
 
   def migration_version
-    if versioned?
-      "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
-    end
+    "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]" if versioned?
   end
 end

data/lib/vanity/adapters/abstract_adapter.rb

@@ -21,100 +21,98 @@ module Vanity
       def flushdb
       end
 
-
       # -- Metrics --
 
       # Return when metric was last updated.
-      def get_metric_last_update_at(metric)
-        fail "Not implemented"
+      def get_metric_last_update_at(_metric)
+        raise "Not implemented"
       end
 
       # Track metric data.
-      def metric_track(metric, timestamp, identity, values)
-        fail "Not implemented"
+      def metric_track(_metric, _timestamp, _identity, _values)
+        raise "Not implemented"
       end
 
       # Returns all the metric values between from and to time instances
       # (inclusive). Returns pairs of date and total count for that date.
-      def metric_values(metric, from, to)
-        fail "Not implemented"
+      def metric_values(_metric, _from, _to)
+        raise "Not implemented"
       end
 
       # Deletes all information about this metric.
-      def destroy_metric(metric)
-        fail "Not implemented"
+      def destroy_metric(_metric)
+        raise "Not implemented"
       end
 
-
       # -- Experiments --
 
-      def experiment_persisted?(experiment)
-        fail "Not implemented"
+      def experiment_persisted?(_experiment)
+        raise "Not implemented"
       end
 
       # Store when experiment was created (do not write over existing value).
-      def set_experiment_created_at(experiment, time)
-        fail "Not implemented"
+      def set_experiment_created_at(_experiment, _time)
+        raise "Not implemented"
       end
 
       # Return when experiment was created.
-      def get_experiment_created_at(experiment)
-        fail "Not implemented"
+      def get_experiment_created_at(_experiment)
+        raise "Not implemented"
       end
 
       # Returns true if experiment completed.
-      def is_experiment_completed?(experiment)
-        fail "Not implemented"
+      def is_experiment_completed?(_experiment) # rubocop:todo Naming/PredicateName
+        raise "Not implemented"
       end
 
       # Store whether an experiment is enabled or not
-      def set_experiment_enabled(experiment, enabled)
-        fail "Not implemented"
+      def set_experiment_enabled(_experiment, _enabled)
+        raise "Not implemented"
       end
 
       # Returns true if experiment is enabled, the default (Vanity.configuration.experiments_start_enabled) is true.
       # (*except for mock_adapter, where default is true for testing)
-      def is_experiment_enabled?(experiment)
-        fail "Not implemented"
+      def is_experiment_enabled?(_experiment) # rubocop:todo Naming/PredicateName
+        raise "Not implemented"
       end
 
       # Returns counts for given A/B experiment and alternative (by index).
       # Returns hash with values for the keys :participants, :converted and
       # :conversions.
-      def ab_counts(experiment, alternative)
-        fail "Not implemented"
+      def ab_counts(_experiment, _alternative)
+        raise "Not implemented"
       end
 
       # Pick particular alternative (by index) to show to this particular
       # participant (by identity).
-      def ab_show(experiment, identity, alternative)
-        fail "Not implemented"
+      def ab_show(_experiment, _identity, _alternative)
+        raise "Not implemented"
       end
 
       # Indicates which alternative to show to this participant. See #ab_show.
-      def ab_showing(experiment, identity)
-        fail "Not implemented"
+      def ab_showing(_experiment, _identity)
+        raise "Not implemented"
       end
 
       # Cancels previously set association between identity and alternative. See
       # #ab_show.
-      def ab_not_showing(experiment, identity)
-        fail "Not implemented"
+      def ab_not_showing(_experiment, _identity)
+        raise "Not implemented"
       end
 
       # Records a participant in this experiment for the given alternative.
-      def ab_add_participant(experiment, alternative, identity)
-        fail "Not implemented"
+      def ab_add_participant(_experiment, _alternative, _identity)
+        raise "Not implemented"
       end
 
       # Determines if a participant already has seen this alternative in this experiment.
-      def ab_seen(experiment, identity, assignment)
-        fail "Not implemented"
+      def ab_seen(_experiment, _identity, _assignment)
+        raise "Not implemented"
       end
 
       # Determines what alternative a participant has already been given, if any
-      def ab_assigned(experiment, identity)
-        fail "Not implemented"
+      def ab_assigned(_experiment, _identity)
+        raise "Not implemented"
       end
 
       # Records a conversion in this experiment for the given alternative.
@@ -122,31 +120,31 @@ module Vanity
       # true, add particpant if not already recorded for this experiment. If
       # implicit is false (default), only add conversion is participant
       # previously recorded as participating in this experiment.
-      def ab_add_conversion(experiment, alternative, identity, count = 1, implicit = false)
-        fail "Not implemented"
+      def ab_add_conversion(_experiment, _alternative, _identity, _count = 1, _implicit = false)
+        raise "Not implemented"
       end
 
       # Returns the outcome of this expriment (if set), the index of a
       # particular alternative.
-      def ab_get_outcome(experiment)
-        fail "Not implemented"
+      def ab_get_outcome(_experiment)
+        raise "Not implemented"
       end
 
       # Sets the outcome of this experiment to a particular alternative.
-      def ab_set_outcome(experiment, alternative = 0)
-        fail "Not implemented"
+      def ab_set_outcome(_experiment, _alternative = 0)
+        raise "Not implemented"
       end
 
       # Deletes all information about this experiment.
-      def destroy_experiment(experiment)
-        fail "Not implemented"
+      def destroy_experiment(_experiment)
+        raise "Not implemented"
       end
 
       private
 
       def with_ab_seen_deprecation(experiment, identity, alternative)
         if alternative.respond_to?(:id)
-          Vanity.configuration.logger.warn(%q{Deprecated: #ab_seen should be passed the alternative id, not an Alternative instance})
+          Vanity.configuration.logger.warn('Deprecated: #ab_seen should be passed the alternative id, not an Alternative instance')
           yield experiment, identity, alternative.id
         else
           yield experiment, identity, alternative