vanity 1.8.3.beta → 1.8.3.beta2

data/.travis.yml

@@ -17,6 +17,7 @@ gemfile:
   - gemfiles/rails3.gemfile
   - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
+  - gemfiles/rails4.gemfile
 before_script:
 - if [[ "`basename $BUNDLE_GEMFILE`" == "Gemfile" ]]; then rvm rubygems 1.8.25; fi # Rubygems 2.0.x fails with Rails 2.3
 - "mysql -e 'create database vanity_test;' >/dev/null"
@@ -52,6 +53,16 @@ matrix:
     - rvm: 2.0.0
       env: DB=mysql
       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=mysql
+      gemfile: gemfiles/rails4.gemfile
   allow_failures:
     - rvm: ruby-head
     - rvm: 2.0.0

data/Appraisals

@@ -15,3 +15,9 @@ appraise "rails32" do
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end
+
+appraise "rails4" do
+  gem "rails", "4.0.0"
+  gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
+  gem "passenger", "~>3.0"
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vanity (1.8.3.beta)
+    vanity (1.8.3.beta2)
       redis (>= 2.1)
       redis-namespace (>= 1.1.0)
 

data/gemfiles/rails3.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: /Users/phill/Development/ruby/vanity
   specs:
-    vanity (1.8.2)
+    vanity (1.8.3.beta2)
       redis (>= 2.1)
       redis-namespace (>= 1.1.0)
 
@@ -103,9 +103,9 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    redis (3.0.5)
-    redis-namespace (1.3.1)
-      redis (~> 3.0.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)

data/gemfiles/rails31.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: /Users/phill/Development/ruby/vanity
   specs:
-    vanity (1.8.2)
+    vanity (1.8.3.beta2)
       redis (>= 2.1)
       redis-namespace (>= 1.1.0)
 
@@ -59,7 +59,6 @@ GEM
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
-    hike (1.2.1)
     i18n (0.6.0)
     integration (0.1.0)
     json (1.6.5)
@@ -109,9 +108,9 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    redis (3.0.5)
-    redis-namespace (1.3.1)
-      redis (~> 3.0.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)

data/gemfiles/rails32.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: /Users/phill/Development/ruby/vanity
   specs:
-    vanity (1.8.2)
+    vanity (1.8.3.beta2)
       redis (>= 2.1)
       redis-namespace (>= 1.1.0)
 
@@ -107,9 +107,9 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    redis (3.0.5)
-    redis-namespace (1.3.1)
-      redis (~> 3.0.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)

data/gemfiles/rails4.gemfile

@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack"
+gem "bson_ext"
+gem "mongo"
+gem "mysql"
+gem "pg"
+gem "backports", :platforms=>:mri_18
+gem "integration"
+gem "rubystats"
+gem "garb"
+gem "SystemTimer", "1.2.3", :platforms=>:mri_18
+gem "appraisal"
+gem "mocha", :require=>false
+gem "shoulda", :require=>false
+gem "timecop", :require=>false
+gem "webmock", :require=>false
+gem "rails", "4.0.0"
+gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
+gem "passenger", "~>3.0"
+
+gemspec :path=>"../"

data/gemfiles/rails4.gemfile.lock

@@ -0,0 +1,154 @@
+GIT
+  remote: git://github.com/zoltankiss/fastthread.git
+  revision: 56e6ce7c1780797a354d5befe9a9a9869bbc7e3e
+  specs:
+    fastthread (1.0.7)
+
+PATH
+  remote: /Users/phill/Development/ruby/vanity
+  specs:
+    vanity (1.8.3.beta2)
+      redis (>= 2.1)
+      redis-namespace (>= 1.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    SystemTimer (1.2.3)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
+    appraisal (0.5.2)
+      bundler
+      rake
+    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)
+    builder (3.1.4)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    daemon_controller (1.1.7)
+    erubis (2.7.0)
+    garb (0.9.1)
+      activesupport (>= 2.2.0)
+      crack (>= 0.1.6)
+    hike (1.2.3)
+    i18n (0.6.5)
+    integration (0.1.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    mime-types (1.25)
+    minitest (4.7.5)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
+    mongo (1.9.2)
+      bson (~> 1.9.2)
+    multi_json (1.8.2)
+    mysql (2.9.1)
+    passenger (3.0.21)
+      daemon_controller (>= 1.0.0)
+      fastthread (>= 1.0.1)
+      rack
+      rake (>= 0.8.1)
+    pg (0.17.0)
+    polyglot (0.3.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    redis (3.0.6)
+    redis-namespace (1.3.2)
+      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)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    timecop (0.6.3)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+    webmock (1.15.2)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  SystemTimer (= 1.2.3)
+  appraisal
+  backports
+  bson_ext
+  fastthread!
+  garb
+  integration
+  mocha
+  mongo
+  mysql
+  passenger (~> 3.0)
+  pg
+  rack
+  rails (= 4.0.0)
+  rubystats
+  shoulda
+  timecop
+  vanity!
+  webmock

data/lib/vanity/adapters/active_record_adapter.rb

@@ -13,6 +13,10 @@ module Vanity
       # Base model, stores connection and defines schema
       class VanityRecord < ActiveRecord::Base
         self.abstract_class = true
+
+        def self.needs_attr_accessible?
+          respond_to?(:attr_accessible) && !defined?(ActionController::StrongParameters)
+        end
       end
 
       # Schema model
@@ -32,7 +36,7 @@ module Vanity
 
       # Metric value
       class VanityMetricValue < VanityRecord
-	       attr_accessible :date, :index, :value if respond_to?(:attr_accessible)
+        attr_accessible :date, :index, :value if needs_attr_accessible?
 
         self.table_name = :vanity_metric_values
         belongs_to :vanity_metric
@@ -42,7 +46,7 @@ module Vanity
       class VanityExperiment < VanityRecord
         self.table_name = :vanity_experiments
         has_many :vanity_conversions, :dependent => :destroy
-        attr_accessible :experiment_id if respond_to?(:attr_accessible)
+        attr_accessible :experiment_id if needs_attr_accessible?
 
         # Finds or creates the experiment
         def self.retrieve(experiment)
@@ -64,7 +68,7 @@ module Vanity
       # Participant model
       class VanityParticipant < VanityRecord
         self.table_name = :vanity_participants
-        attr_accessible :experiment_id, :identity, :seen, :shown, :converted if respond_to?(:attr_accessible)
+        attr_accessible :experiment_id, :identity, :seen, :shown, :converted if needs_attr_accessible?
 
         # Finds the participant by experiment and identity. If
         # create is true then it will create the participant

data/lib/vanity/version.rb

@@ -1,5 +1,5 @@
 module Vanity
-  VERSION = "1.8.3.beta"
+  VERSION = "1.8.3.beta2"
 
   module Version
     version = VERSION.to_s.split(".").map { |i| i.to_i }

data/test/autoconnect_test.rb

@@ -2,9 +2,6 @@ require "test/test_helper"
 
 context ".playground_should_autoconnect?" do
 
-  setup do
-  end
-
   test "returns true by default" do
     autoconnect = Vanity::Autoconnect.playground_should_autoconnect?
     assert autoconnect == true

data/test/dummy/config/application.rb

@@ -46,5 +46,9 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    config.eager_load = (ENV['RAILS_ENV'] || ENV['RACK_ENV']) == "production" if Rails::Application.respond_to?(:eager_load!)
+
+    ActiveSupport::Deprecation.silenced = true if ActiveSupport::Deprecation.respond_to?(:silenced) && ENV['CI']
   end
 end

data/test/dummy/config/routes.rb

@@ -54,5 +54,5 @@ Dummy::Application.routes.draw do
 
   # This is a legacy wild controller route that's not recommended for RESTful applications.
   # Note: This route will make all actions in every controller accessible via GET requests.
-  match ':controller(/:action(/:id(.:format)))'
+  match ':controller(/:action(/:id(.:format)))', :via => [:get]
 end

data/test/experiment/ab_test.rb

@@ -13,7 +13,7 @@ class AbTestController < ActionController::Base
   end
 
   def test_capture
-    if Rails.version.to_i == 3
+    if defined?(Rails::Railtie)
       render :inline=>"<%= ab_test :simple do |value| %><%= value %><% end %>"
     else
       render :inline=>"<% ab_test :simple do |value| %><%= value %><% end %>"

data/test/experiment/base_test.rb

@@ -152,10 +152,11 @@ class ExperimentTest < Test::Unit::TestCase
   def test_complete_updates_completed_at
     new_ab_test(:ice_cream_flavor) { metrics :happiness }
 
-    Timecop.freeze(2008, 9, 1, 12, 0, 0) do
+    time = Time.utc(2008, 9, 1, 12, 0, 0)
+    Timecop.freeze(time) do
       experiment(:ice_cream_flavor).complete!(1)
     end
-    assert_equal Time.local(2008, 9, 1, 12, 0, 0), experiment(:ice_cream_flavor).completed_at
+    assert_equal time, experiment(:ice_cream_flavor).completed_at
   end
 
 end

data/test/metric/base_test.rb

@@ -163,7 +163,7 @@ context "Metric name" do
     end
     assert_equal "Yawns per second", Vanity.playground.metric(:yawns_sec).name
   end
-end  
+end
 
 
 context "Metric description" do
@@ -237,7 +237,7 @@ context "Metric last_update_at" do
     end
     assert_in_delta metric.last_update_at.to_i, (Time.now + 1.day).to_i, 1
   end
-end 
+end
 
 
 context "Metric data" do

data/test/rails_test.rb

@@ -165,7 +165,7 @@ class VanityMailer < ActionMailer::Base
     experiment(:pie_or_cake).chooses(forced_outcome)
 
     if defined?(Rails::Railtie)
-      mail :subject =>ab_test(:pie_or_cake).to_s
+      mail :subject =>ab_test(:pie_or_cake).to_s, :body => ""
     else
       subject ab_test(:pie_or_cake).to_s
       body ""
@@ -442,10 +442,10 @@ $:.unshift File.expand_path("../lib")
 RAILS_ROOT = File.expand_path(".")
       RB
       code = code_setup
-      code += defined?(Rails::Railtie) ? load_rails_3(env) : load_rails_2(env)
+      code += defined?(Rails::Railtie) ? load_rails_3_or_4(env) : load_rails_2(env)
       code += %Q{\nrequire "vanity"\n}
       code += before_initialize
-      code += defined?(Rails::Railtie) ? initialize_rails_3 : initialize_rails_2
+      code += defined?(Rails::Railtie) ? initialize_rails_3_or_4 : initialize_rails_2
       code += after_initialize
       tmp.write code
       tmp.flush
@@ -468,7 +468,7 @@ initializer.check_gem_dependencies
     RB
   end
 
-  def load_rails_3(env)
+  def load_rails_3_or_4(env)
     <<-RB
 ENV['BUNDLE_GEMFILE'] ||= "#{ENV['BUNDLE_GEMFILE']}"
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
@@ -481,6 +481,8 @@ Bundler.require(:default)
 module Foo
   class Application < Rails::Application
     config.active_support.deprecation = :notify
+    config.eager_load = #{env == "production"} if Rails::Application.respond_to?(:eager_load!)
+    ActiveSupport::Deprecation.silenced = true if ActiveSupport::Deprecation.respond_to?(:silenced) && ENV['CI']
   end
 end
     RB
@@ -492,7 +494,7 @@ initializer.after_initialize
     RB
   end
 
-  def initialize_rails_3
+  def initialize_rails_3_or_4
     <<-RB
 Foo::Application.initialize!
     RB

data/test/test_helper.rb

@@ -45,10 +45,7 @@ if $VERBOSE
   $logger.level = Logger::DEBUG
 end
 
-
-class Test::Unit::TestCase
-  include WebMock::API
-
+module VanityTestHelpers
   # We go destructive on the database at the end of each run, so make sure we
   # don't use databases you care about. For Redis, we pick database 15
   # (default is 0).
@@ -64,11 +61,18 @@ class Test::Unit::TestCase
     defined?(Rails::Railtie)
   end
 
-  def setup
+  def setup_after
     FileUtils.mkpath "tmp/experiments/metrics"
     new_playground
   end
 
+  def teardown_after
+    Vanity.context = nil
+    FileUtils.rm_rf "tmp"
+    Vanity.playground.connection.flushdb if Vanity.playground.connected?
+    WebMock.reset!
+  end
+
   # Call this on teardown. It wipes put the playground and any state held in it
   # (mostly experiments), resets vanity ID, and clears database of all experiments.
   def nuke_playground
@@ -116,17 +120,33 @@ class Test::Unit::TestCase
     Vanity.playground.stubs(:connection).returns(stub(:flushdb=>nil))
   end
 
-  def teardown
-    Vanity.context = nil
-    FileUtils.rm_rf "tmp"
-    Vanity.playground.connection.flushdb if Vanity.playground.connected?
-    WebMock.reset!
+  # Defining setup/tear down in a module and including it below doesn't
+  # override the built-in setup/teardown methods, so we alias_method_chain
+  # them to run.
+  def self.included(klass)
+    klass.class_eval {
+      alias :teardown_before :teardown
+      alias :teardown :teardown_after
+
+      alias :setup_before :setup
+      alias :setup :setup_after
+    }
   end
+end
 
+class Test::Unit::TestCase
+  include WebMock::API
+  include VanityTestHelpers
 end
 
+if defined?(ActiveSupport::TestCase)
+  class ActiveSupport::TestCase
+    include WebMock::API
+    include VanityTestHelpers
+  end
+end
 
-if  ENV["DB"] == "postgres"
+if ENV["DB"] == "postgres"
   ActiveRecord::Base.establish_connection :adapter=>"postgresql", :database=>"vanity_test"
 else
   ActiveRecord::Base.establish_connection :adapter=>"mysql", :database=>"vanity_test"
@@ -139,18 +159,7 @@ if ENV["DB"] == "mysql" || ENV["DB"] == "postgres"
   VanityMigration.up
 end
 
-
-class Array
-  # Not in Ruby 1.8.6.
-  unless method_defined?(:shuffle)
-    def shuffle
-      copy = clone
-      Array.new(size) { copy.delete_at(Kernel.rand(copy.size)) }
-    end
-  end
-end
-
-
+# test/spec/mini v3
 # Source: http://gist.github.com/25455
 def context(*args, &block)
   return super unless (name = args.first) && block

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 1.8.3.beta
+  version: 1.8.3.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -94,6 +94,8 @@ files:
 - gemfiles/rails31.gemfile.lock
 - gemfiles/rails32.gemfile
 - gemfiles/rails32.gemfile.lock
+- gemfiles/rails4.gemfile
+- gemfiles/rails4.gemfile.lock
 - generators/templates/vanity_migration.rb
 - generators/vanity_generator.rb
 - lib/generators/templates/vanity_migration.rb
@@ -194,7 +196,7 @@ licenses:
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 1.8.3.beta
+- Vanity 1.8.3.beta2
 - --main
 - README.rdoc
 - --webcvs