vanity 1.9.3 → 2.0.0.beta

data/.gitignore

@@ -1,6 +1,5 @@
 vendor
 log/*
-test/myapp/log/
 test/dummy/db/*.sqlite3
 test/dummy/log/*.log
 test/dummy/tmp/

data/.travis.yml

@@ -5,71 +5,20 @@ services:
   - mongodb
   - redis-server
 rvm:
-- 1.8.7
 - 1.9.3
 - 2.0.0
+- 2.1.0
+- ruby-head
 env:
 - DB=mongodb
 - DB=redis
 - DB=active_record
 gemfile:
-  - Gemfile
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
   - gemfiles/rails4.gemfile
 before_script:
 - 'echo ''gem: --no-ri --no-rdoc'' > ~/.gemrc' # skip installing docs for gems
-- if [[ "`basename $BUNDLE_GEMFILE`" == "Gemfile" ]]; then rvm rubygems 1.8.25; fi # Rubygems 2.0.x fails with Rails 2.3
 matrix:
   exclude:
-    # Rails 2 is not officially supported on Ruby 1.9.3
-    - rvm: 1.9.3
-      env: DB=mongodb
-      gemfile: Gemfile
-    - rvm: 1.9.3
-      env: DB=redis
-      gemfile: Gemfile
-    - rvm: 1.9.3
-      env: DB=active_record
-      gemfile: Gemfile
-    # Rails <= 3.2 is not officially supported on Ruby 2.0.0
-    - rvm: 2.0.0
-      env: DB=mongodb
-      gemfile: Gemfile
-    - rvm: 2.0.0
-      env: DB=redis
-      gemfile: Gemfile
-    - rvm: 2.0.0
-      env: DB=active_record
-      gemfile: Gemfile
-    - rvm: 2.0.0
-      env: DB=mongodb
-      gemfile: gemfiles/rails3.gemfile
-    - rvm: 2.0.0
-      env: DB=redis
-      gemfile: gemfiles/rails3.gemfile
-    - rvm: 2.0.0
-      env: DB=active_record
-      gemfile: gemfiles/rails3.gemfile
-    # Rails >=4 officially supports >= Ruby 1.9.3
-    - rvm: 1.8.7
-      env: DB=mongodb
-      gemfile: gemfiles/rails4.gemfile
-    - rvm: 1.8.7
-      env: DB=redis
-      gemfile: gemfiles/rails4.gemfile
-    - rvm: 1.8.7
-      env: DB=active_record
-      gemfile: gemfiles/rails4.gemfile
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.0.0
-      env: DB=mongodb
-      gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.0.0
-      env: DB=redis
-      gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.0.0
-      env: DB=active_record
-      gemfile: gemfiles/rails31.gemfile

data/Appraisals

@@ -1,22 +1,13 @@
-appraise "rails3" do
-  gem "rails", "3.0.11"
-  gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
-  gem "passenger", "~>3.0"
-end
-
-appraise "rails31" do
-  gem "rails", "3.1.3"
-  gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
-  gem "passenger", "~>3.0"
-end
-
 appraise "rails32" do
+  gem "mocha",  "~> 0.12.8", :require=>false
+  gem "minitest", "~>4.2.0"
   gem "rails", "3.2.1"
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end
 
 appraise "rails4" do
+  gem "mocha",  "~> 1.0", :require=>false
   gem "rails", "4.0.0"
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"

data/CHANGELOG

@@ -1,8 +1,4 @@
-== 1.9.3 (2015-10-04)
-
-Cherry-pick fix for ruby 2.2.
-
-== 1.9.1 (2014-04-20)
+== 1.9.0 (2014-04-20)
 
 Include db:reset in blacklist for autoconnect. (@phillbaker)
 Add grace period to Vanity::Metric updated_at (@stangel)

data/Gemfile

@@ -3,10 +3,6 @@ gemspec
 
 # Frameworks
 gem "rack"
-gem "rails", "~>2.3.8"
-
-# Servers
-gem "passenger", "~>2.0"
 
 # Persistence
 gem "redis", ">= 2.1"
@@ -16,19 +12,13 @@ gem "mongo"
 gem "sqlite3"
 
 # Math libraries
-gem "backports", :platforms => :mri_18
 gem "integration"
 gem "rubystats"
 
 # APIs
 gem "garb"
 
-# Compatibility
-gem "SystemTimer", "1.2.3", :platforms => :mri_18
-
 # Testing
-gem "mocha", :require=>false
-gem "shoulda", :require=>false # Requires test/unit
 gem "timecop", :require=>false
 gem "webmock", :require=>false
 

data/Gemfile.lock

@@ -1,22 +1,12 @@
 PATH
   remote: .
   specs:
-    vanity (1.9.3)
+    vanity (2.0.0.beta)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    SystemTimer (1.2.3)
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
     activesupport (2.3.14)
     addressable (2.2.7)
     albino (1.3.3)
@@ -25,7 +15,6 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    backports (3.3.5)
     bson (1.6.0)
     bson_ext (1.6.0)
       bson (= 1.6.0)
@@ -34,7 +23,6 @@ GEM
     crack (0.3.1)
     directory_watcher (1.4.1)
     fast-stemmer (1.0.0)
-    fastthread (1.0.7)
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
@@ -50,34 +38,16 @@ GEM
     liquid (2.3.0)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    metaclass (0.0.1)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
+    minitest (4.7.5)
     mongo (1.6.0)
       bson (= 1.6.0)
-    passenger (2.2.15)
-      fastthread (>= 1.0.1)
-      rack
-      rake (>= 0.8.1)
     posix-spawn (0.3.6)
     rack (1.1.3)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
-      rake (>= 0.8.3)
     rake (10.1.0)
     redis (3.0.6)
     redis-namespace (1.3.2)
       redis (~> 3.0.4)
     rubystats (0.2.3)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
     sqlite3 (1.3.8)
     syntax (1.0.0)
     thor (0.18.1)
@@ -92,24 +62,19 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  SystemTimer (= 1.2.3)
   appraisal (>= 1.0.0.beta2)
-  backports
   bson_ext
   bundler (>= 1.0.0)
   garb
   integration
   jekyll
-  mocha
+  minitest (>= 4.2)
   mongo
-  passenger (~> 2.0)
   rack
-  rails (~> 2.3.8)
   rake
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  shoulda
   sqlite3
   timecop
   vanity!

data/README.rdoc

@@ -21,15 +21,7 @@ Add to your Gemfile:
 
   gem "vanity"
 
-===== Rails 2.x installation
-
-  Rails::Initializer.run do |config|
-    gem.config "vanity"
-
-    config.after_initialize do
-      require "vanity"
-    end
-  end
+(For support for older versions of Rails and Ruby 1.8, please see the {1.9.x branch}[https://github.com/assaf/vanity/tree/1-9-stable].)
 
 ==== Step 1.2
 
@@ -168,12 +160,9 @@ To set this up simply do the following:
 
 Here's what's tested and known to work:
 
-  Ruby 1.8.7
-    Persistence: Redis, Mongo, ActiveRecord
-    Rails: 2.3, 3, 3.1, 3.2
   Ruby 1.9.3
     Persistence: Redis, Mongo, ActiveRecord
-    Rails: 3, 3.1, 3.2, 4.0
+    Rails: 3.2, 4.0
   Ruby 2.0
     Persistence: Redis, Mongo, ActiveRecord
     Rails: 3.2, 4.0

data/Rakefile

@@ -8,7 +8,7 @@ desc "Test everything"
 task "test:all"=>"test:adapters"
 
 # Ruby versions we're testing with.
-RUBIES = %w{1.8.7 1.9.2 2.0.0}
+RUBIES = %w{1.9.3 2.0.0}
 
 # Use rake test:rubies to run all combination of tests (see test:adapters) using
 # all the versions of Ruby specified in RUBIES. Or to test a specific version of
@@ -64,21 +64,15 @@ task "test:adapters", :adapter do |t, args|
 end
 
 # Run the test suit.
+Rake::TestTask.new(:test) do |task|
+  task.libs << "lib"
+  task.libs << "test"
+  task.pattern = "test/**/*_test.rb"
+  task.verbose = false
+end
 
 task :default=>:test
 desc "Run all tests"
-Rake::TestTask.new do |task|
-  task.test_files = FileList['test/**/*_test.rb']
-  if Rake.application.options.trace
-    #task.warning = true
-    task.verbose = true
-  elsif Rake.application.options.silent
-    task.ruby_opts << "-W0"
-  else
-    task.verbose = true
-  end
-    task.ruby_opts << "-I."
-end
 
 task(:clobber) { rm_rf "tmp" }
 

data/bin/vanity

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# Is there a better way to detect Rails?
 if File.exist?("config/boot.rb") && File.exist?("config/environment.rb")
   require "./config/environment"
 else

data/doc/rails.textile

@@ -20,18 +20,6 @@ Add Vanity to your Gemfile:
 gem "vanity"
 </pre>
 
-<em>Rails 2.x:</em>
-
-<pre>
-Rails::Initializer.run do |config|
-  gem.config "vanity"
-
-  config.after_initialize do
-    require "vanity"
-  end
-end
-</pre>
-
 h3(#config).  Configuring Vanity
 
 h4. Configuring identity

data/gemfiles/rails32.gemfile

@@ -8,15 +8,13 @@ gem "redis-namespace", ">= 1.1.0"
 gem "bson_ext"
 gem "mongo"
 gem "sqlite3"
-gem "backports", :platforms=>:mri_18
 gem "integration"
 gem "rubystats"
 gem "garb"
-gem "SystemTimer", "1.2.3", :platforms=>:mri_18
-gem "mocha", :require=>false
-gem "shoulda", :require=>false
 gem "timecop", :require=>false
 gem "webmock", :require=>false
+gem "mocha", "~> 0.12.8", :require=>false
+gem "minitest", "~>4.2.0"
 gem "rails", "3.2.1"
 gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"

data/gemfiles/rails32.gemfile.lock

@@ -7,13 +7,12 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (1.9.3)
+    vanity (2.0.0.beta)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    SystemTimer (1.2.3)
     actionmailer (3.2.1)
       actionpack (= 3.2.1)
       mail (~> 2.4.0)
@@ -49,7 +48,6 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (3.0.2)
-    backports (3.3.5)
     bson (1.6.0)
     bson_ext (1.6.0)
       bson (= 1.6.0)
@@ -84,9 +82,10 @@ GEM
       treetop (~> 1.4.8)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     mime-types (1.17.2)
-    mocha (0.10.5)
+    minitest (4.2.0)
+    mocha (0.12.10)
       metaclass (~> 0.0.1)
     mongo (1.6.0)
       bson (= 1.6.0)
@@ -127,11 +126,6 @@ GEM
     redis-namespace (1.3.2)
       redis (~> 3.0.4)
     rubystats (0.2.3)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -155,16 +149,15 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  SystemTimer (= 1.2.3)
   appraisal (>= 1.0.0.beta2)
-  backports
   bson_ext
   bundler (>= 1.0.0)
   fastthread!
   garb
   integration
   jekyll
-  mocha
+  minitest (~> 4.2.0)
+  mocha (~> 0.12.8)
   mongo
   passenger (~> 3.0)
   rack
@@ -173,7 +166,6 @@ DEPENDENCIES
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  shoulda
   sqlite3
   timecop
   vanity!

data/gemfiles/rails4.gemfile

@@ -8,15 +8,12 @@ gem "redis-namespace", ">= 1.1.0"
 gem "bson_ext"
 gem "mongo"
 gem "sqlite3"
-gem "backports", :platforms=>:mri_18
 gem "integration"
 gem "rubystats"
 gem "garb"
-gem "SystemTimer", "1.2.3", :platforms=>:mri_18
-gem "mocha", :require=>false
-gem "shoulda", :require=>false
 gem "timecop", :require=>false
 gem "webmock", :require=>false
+gem "mocha", "~> 1.0", :require=>false
 gem "rails", "4.0.0"
 gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"

data/gemfiles/rails4.gemfile.lock

@@ -7,13 +7,12 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (1.9.3)
+    vanity (2.0.0.beta)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    SystemTimer (1.2.3)
     actionmailer (4.0.0)
       actionpack (= 4.0.0)
       mail (~> 2.5.3)
@@ -47,7 +46,6 @@ GEM
       thor (>= 0.14.0)
     arel (4.0.1)
     atomic (1.1.14)
-    backports (3.3.5)
     bson (1.9.2)
     bson_ext (1.9.2)
       bson (~> 1.9.2)
@@ -80,10 +78,10 @@ GEM
       treetop (~> 1.4.8)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     mime-types (1.25)
     minitest (4.7.5)
-    mocha (0.14.0)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
     mongo (1.9.2)
       bson (~> 1.9.2)
@@ -117,12 +115,6 @@ GEM
       redis (~> 3.0.4)
     rubystats (0.2.3)
     safe_yaml (0.9.7)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.4.0)
-      activesupport (>= 3.0.0)
     sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -153,16 +145,15 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  SystemTimer (= 1.2.3)
   appraisal (>= 1.0.0.beta2)
-  backports
   bson_ext
   bundler (>= 1.0.0)
   fastthread!
   garb
   integration
   jekyll
-  mocha
+  minitest (>= 4.2)
+  mocha (~> 1.0)
   mongo
   passenger (~> 3.0)
   rack
@@ -171,7 +162,6 @@ DEPENDENCIES
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  shoulda
   sqlite3
   timecop
   vanity!

data/lib/vanity/adapters/active_record_adapter.rb

@@ -15,7 +15,7 @@ module Vanity
         self.abstract_class = true
 
         def self.needs_attr_accessible?
-          respond_to?(:attr_accessible) && !defined?(ActionController::StrongParameters)
+          respond_to?(:attr_accessible) && (!defined?(ActionController::StrongParameters) || defined?(ProtectedAttributes))
         end
 
         def self.rails_agnostic_find_or_create_by(method, value)
@@ -25,6 +25,14 @@ module Vanity
             send :"find_or_create_by_#{method}", value
           end
         end
+
+        def self.rails_agnostic_find_first(conditions)
+          if respond_to? :where
+            where(conditions).first
+          else
+            find(:first, :conditions => conditions)
+          end
+        end
       end
 
       # Schema model
@@ -36,8 +44,7 @@ module Vanity
       class VanityMetric < VanityRecord
         UPDATED_AT_GRACE_PERIOD = 1.minute
         self.table_name = :vanity_metrics
-        has_many :vanity_metric_values,
-          :class_name => 'Vanity::Adapters::ActiveRecordAdapter::VanityMetricValue'
+        has_many :vanity_metric_values
 
         def self.retrieve(metric)
           rails_agnostic_find_or_create_by(:metric_id, metric.to_s)
@@ -60,15 +67,13 @@ module Vanity
         attr_accessible :date, :index, :value if needs_attr_accessible?
 
         self.table_name = :vanity_metric_values
-        belongs_to :vanity_metric,
-          :class_name => 'Vanity::Adapters::ActiveRecordAdapter::VanityMetric'
+        belongs_to :vanity_metric
       end
 
       # Experiment model
       class VanityExperiment < VanityRecord
         self.table_name = :vanity_experiments
-        has_many :vanity_conversions, :dependent => :destroy,
-          :class_name => 'Vanity::Adapters::ActiveRecordAdapter::VanityConversion'
+        has_many :vanity_conversions, :dependent => :destroy
         attr_accessible :experiment_id if needs_attr_accessible?
 
         # Finds or creates the experiment
@@ -85,8 +90,7 @@ module Vanity
       # Conversion model
       class VanityConversion < VanityRecord
         self.table_name = :vanity_conversions
-        belongs_to :vanity_experiment,
-          :class_name => 'Vanity::Adapters::ActiveRecordAdapter::VanityExperiment'
+        belongs_to :vanity_experiment
       end
 
       # Participant model
@@ -99,7 +103,7 @@ module Vanity
         # passed then this will be passed to create if creating, or will be
         # used to update the found participant.
         def self.retrieve(experiment, identity, create = true, update_with = nil)
-          if record = VanityParticipant.first(:conditions=>{ :experiment_id=>experiment.to_s, :identity=>identity.to_s })
+          if record = VanityParticipant.rails_agnostic_find_first(:experiment_id=>experiment.to_s, :identity=>identity.to_s)
             record.update_attributes(update_with) if update_with
           elsif create
             record = VanityParticipant.create({ :experiment_id=>experiment.to_s, :identity=>identity.to_s }.merge(update_with || {}))

data/lib/vanity/experiment/ab_test.rb

@@ -302,7 +302,7 @@ module Vanity
 
       # Use the result of #score or #bayes_bandit_score to derive a conclusion. Returns an
       # array of claims.
-      def conclusion(score = score())
+      def conclusion(score = score)
         claims = []
         participants = score.alts.inject(0) { |t,alt| t + alt.participants }
         claims << case participants

data/lib/vanity/frameworks/rails.rb

@@ -59,13 +59,10 @@ module Vanity
             elsif symbol && object = send(symbol)
               @vanity_identity = object.id
             elsif response # everyday use
-              #conditional for Rails2 support
-              secure_random = defined?(SecureRandom) ? SecureRandom : ActiveSupport::SecureRandom
-              @vanity_identity = cookies["vanity_id"] || secure_random.hex(16)
+              @vanity_identity = cookies["vanity_id"] || SecureRandom.hex(16)
               cookie = { :value=>@vanity_identity, :expires=>1.month.from_now }
               # Useful if application and admin console are on separate domains.
-              # This only works in Rails 3.x.
-              cookie[:domain] ||= ::Rails.application.config.session_options[:domain] if ::Rails.respond_to?(:application)
+              cookie[:domain] ||= ::Rails.application.config.session_options[:domain]
               cookies["vanity_id"] = cookie
               @vanity_identity
             else # during functional testing
@@ -95,8 +92,7 @@ module Vanity
         else
           class << self
             define_method :vanity_identity do
-              secure_random = defined?(SecureRandom) ? SecureRandom : ActiveSupport::SecureRandom
-              @vanity_identity = @vanity_identity || secure_random.hex(16)
+              @vanity_identity = @vanity_identity || SecureRandom.hex(16)
             end
           end
         end
@@ -104,7 +100,6 @@ module Vanity
       protected :use_vanity_mailer
     end
 
-
     # Vanity needs these filters. They are includes in ActionController and
     # automatically added when you use #use_vanity in your controller.
     module Filters
@@ -221,7 +216,7 @@ module Vanity
       def vanity_js
         return if @_vanity_experiments.nil? || @_vanity_experiments.empty?
         javascript_tag do
-          render :file => Vanity.template("_vanity.js.erb")
+          render :file => Vanity.template("_vanity"), :formats => [:js]
         end
       end
 
@@ -346,7 +341,7 @@ end
 
 
 # Enhance ActionController with use_vanity, filters and helper methods.
-if defined?(ActionController)
+ActiveSupport.on_load(:action_controller) do
   # Include in controller, add view helper methods.
   ActionController::Base.class_eval do
     extend Vanity::Rails::UseVanity
@@ -355,13 +350,12 @@ if defined?(ActionController)
   end
 end
 
-if defined?(ActionMailer)
-  # Include in mailer, add view helper methods.
-  ActionMailer::Base.class_eval do
-    include Vanity::Rails::UseVanityMailer
-    include Vanity::Rails::Filters
-    helper Vanity::Rails::Helpers
-  end
+
+# Include in mailer, add view helper methods.
+ActiveSupport.on_load(:action_mailer) do
+  include Vanity::Rails::UseVanityMailer
+  include Vanity::Rails::Filters
+  helper Vanity::Rails::Helpers
 end
 
 # Reconnect whenever we fork under Passenger.