moses-vanity 1.7.1 → 1.8.0

data/test/experiment/ab_test.rb

@@ -13,7 +13,11 @@ class AbTestController < ActionController::Base
   end
 
   def test_capture
-    render :inline=>"<% ab_test :simple do |value| %><%= value %><% end %>"
+    if Rails.version.to_i == 3
+      render :inline=>"<%= ab_test :simple do |value| %><%= value %><% end %>"
+    else
+      render :inline=>"<% ab_test :simple do |value| %><%= value %><% end %>"
+    end
   end
 
   def track
@@ -230,7 +234,7 @@ class AbTestTest < ActionController::TestCase
   # -- A/B helper methods --
 
   def test_fail_if_no_experiment
-    assert_raise NameError do
+    assert_raise Vanity::NoExperimentError do
       get :test_render
     end
   end
@@ -276,7 +280,7 @@ class AbTestTest < ActionController::TestCase
       metrics :coolness
     end
     responses = Array.new(100) do
-      @controller.send(:cookies).clear
+      @controller.send(:cookies).each{ |cookie| @controller.send(:cookies).delete(cookie.first) }
       get :track
       @response.body
     end

data/test/experiment/base_test.rb

@@ -34,7 +34,7 @@ class ExperimentTest < Test::Unit::TestCase
   # -- Loading experiments --
 
   def test_fails_if_cannot_load_named_experiment
-    assert_raises NameError do
+    assert_raises Vanity::NoExperimentError do
       experiment(:ice_cream_flavor)
     end
   end
@@ -93,7 +93,7 @@ class ExperimentTest < Test::Unit::TestCase
       f.write <<-RUBY
         ab_test "Ice Cream Flavor" do
           metrics :happiness
-          expects(:save)
+          expects(:save).at_least_once
         end
       RUBY
     end
@@ -102,7 +102,7 @@ class ExperimentTest < Test::Unit::TestCase
 
   def test_experiment_has_created_timestamp
     new_ab_test(:ice_cream_flavor) { metrics :happiness }
-    assert_instance_of Time, experiment(:ice_cream_flavor).created_at
+    assert_kind_of Time, experiment(:ice_cream_flavor).created_at
     assert_in_delta experiment(:ice_cream_flavor).created_at.to_i, Time.now.to_i, 1
   end
  

data/test/metric/active_record_test.rb

@@ -7,7 +7,11 @@ class Sky < ActiveRecord::Base
     t.timestamps
   end
 
-  named_scope :high, lambda { { :conditions=>"height >= 4" } }
+  if defined?(Rails::Railtie)
+    scope :high, lambda { { :conditions=>"height >= 4" } }
+  else
+    named_scope :high, lambda { { :conditions=>"height >= 4" } }
+  end
 end
 
 
@@ -207,13 +211,24 @@ context "ActiveRecord Metric" do
   end
 
   test "with after_save" do
-    File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
-      f.write <<-RUBY
-        metric "Sky is limit" do
-          model Sky, :conditions=>["height > 3"]
-          Sky.after_save { |sky| track! if sky.height_changed? && sky.height > 3 }
-        end
-      RUBY
+    if rails3?
+      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
+        f.write <<-RUBY
+          metric "Sky is limit" do
+            model Sky, :conditions=>["height > 3"]
+            Sky.after_save { |sky| track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
+          end
+        RUBY
+      end
+    else
+      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
+        f.write <<-RUBY
+          metric "Sky is limit" do
+            model Sky, :conditions=>["height > 3"]
+            Sky.after_save { |sky| track! if sky.height_changed? && sky.height > 3 }
+          end
+        RUBY
+      end
     end
     Vanity.playground.metrics
     times = 0
@@ -228,12 +243,22 @@ context "ActiveRecord Metric" do
   end
 
   test "do it youself" do
-    File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
-      f.write <<-RUBY
-        metric "Sky is limit" do
-          Sky.after_save { |sky| track! if sky.height_changed? && sky.height > 3 }
-        end
-      RUBY
+    if rails3?
+      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
+        f.write <<-RUBY
+          metric "Sky is limit" do
+            Sky.after_save { |sky| track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
+          end
+        RUBY
+      end
+    else
+      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
+        f.write <<-RUBY
+          metric "Sky is limit" do
+            Sky.after_save { |sky| track! if sky.height_changed? && sky.height > 3 }
+          end
+        RUBY
+      end
     end
     Vanity.playground.metrics
     (1..5).each do |height|
@@ -271,7 +296,12 @@ context "ActiveRecord Metric" do
 
   teardown do
     Sky.delete_all
-    Sky.after_create.clear
-    Sky.after_save.clear
+    if rails3?
+      Sky.reset_callbacks(:create)
+      Sky.reset_callbacks(:save)
+    else
+      Sky.after_create.clear
+      Sky.after_save.clear
+    end
   end
 end

data/test/passenger_test.rb

@@ -1,6 +1,8 @@
 require "test/test_helper"
-require "phusion_passenger/spawn_manager"
 
+#not supported for rails3
+unless defined?(Rails::Railtie)
+require "phusion_passenger/spawn_manager"
 class PassengerTest < Test::Unit::TestCase
   def setup
     super
@@ -39,5 +41,5 @@ class PassengerTest < Test::Unit::TestCase
     @server.stop
     File.unlink "test/myapp/config/vanity.yml"
   end
-
+end
 end

data/test/rails_helper_test.rb

@@ -27,10 +27,12 @@ class RailsHelperTest < ActionView::TestCase
   end
   
   def test_vanity_track_url_for_returns_url_with_identity_and_metrics
-    assert_equal vanity_track_url_for("123", :sugar_high, :controller => "controller", :action => "action"), "/controller/action?_identity=123&amp;_track=sugar_high"
+    self.expects(:url_for).with(:controller => "controller", :action => "action", :_identity => '123', :_track => :sugar_high)
+    vanity_track_url_for("123", :sugar_high, :controller => "controller", :action => "action")
   end
   
   def test_vanity_tracking_image
-    assert_equal vanity_tracking_image("123", :sugar_high, options = {}), image_tag("/vanity/image?_identity=123&amp;_track=sugar_high", :width => "1px", :height => "1px", :alt => "")
+    self.expects(:url_for).with(:controller => :vanity, :action => :image, :_identity => '123', :_track => :sugar_high).returns("/url")
+    assert_equal image_tag("/url", :width => "1px", :height => "1px", :alt => ""), vanity_tracking_image("123", :sugar_high, options = {})
   end
 end

data/test/rails_test.rb

@@ -6,10 +6,15 @@ class UseVanityController < ActionController::Base
   def index
     render :text=>ab_test(:pie_or_cake)
   end
+
+  def js
+    ab_test(:pie_or_cake)
+    render :inline => "<%= vanity_js -%>"
+  end
 end
 
 # Pages accessible to everyone, e.g. sign in, community search.
-class UseVanityTest < ActionController::TestCase
+class UseVanityControllerTest < ActionController::TestCase
   tests UseVanityController
 
   def setup
@@ -26,6 +31,12 @@ class UseVanityTest < ActionController::TestCase
     end
   end
 
+  def test_render_js_for_tests
+    Vanity.playground.use_js!
+    get :js
+    assert_match /script.*e=pie_or_cake.*script/m, @response.body
+  end
+
   def test_chooses_sets_alternatives_for_rails_tests
     experiment(:pie_or_cake).chooses(true)
     get :index
@@ -39,9 +50,11 @@ class UseVanityTest < ActionController::TestCase
 
   def test_vanity_cookie_is_persistent
     get :index
-    assert cookie = @response["Set-Cookie"].find { |c| c[/^vanity_id=/] }
-    assert expires = cookie[/vanity_id=[a-f0-9]{32}; path=\/; expires=(.*)(;|$)/, 1]
-    assert_in_delta Time.parse(expires), Time.now + 1.month, 1.minute
+    cookie = @response["Set-Cookie"].to_s
+    assert_match /vanity_id=[a-f0-9]{32};/, cookie
+    expires = cookie[/expires=(.*)(;|$)/, 1]
+    assert expires
+    assert_in_delta Time.parse(expires), Time.now + 1.month, 1.day
   end
 
   def test_vanity_cookie_default_id
@@ -130,7 +143,7 @@ class UseVanityTest < ActionController::TestCase
   
   def test_cookie_domain_from_rails_configuration
     get :index
-    assert_equal cookies["vanity_id"][:domain], '.foo.bar' if ::Rails.respond_to?(:application)
+    assert_match /domain=.foo.bar/, @response["Set-Cookie"] if ::Rails.respond_to?(:application)
   end
 
   # -- Load path --
@@ -161,100 +174,139 @@ $stdout << Vanity.playground.load_path
 
   # -- Connection configuration --
 
-  def test_default_connection
-    assert_equal "redis://127.0.0.1:6379/0", load_rails(<<-RB)
+  if ENV['DB'] == 'redis'
+    def test_default_connection
+      assert_equal "redis://127.0.0.1:6379/0", load_rails(<<-RB)
 initializer.after_initialize
 $stdout << Vanity.playground.connection
-    RB
-  end
+      RB
+    end
 
-  def test_connection_from_string
-    assert_equal "redis://192.168.1.1:6379/5", load_rails(<<-RB)
+    def test_connection_from_string
+      assert_equal "redis://192.168.1.1:6379/5", load_rails(<<-RB)
 Vanity.playground.establish_connection "redis://192.168.1.1:6379/5"
 initializer.after_initialize
 $stdout << Vanity.playground.connection
-    RB
-  end
+      RB
+    end
 
-  def test_connection_from_yaml
-    FileUtils.mkpath "tmp/config"
-    ENV["RAILS_ENV"] = "production"
-    File.open("tmp/config/vanity.yml", "w") do |io|
-      io.write <<-YML
+    def test_connection_from_yaml
+      FileUtils.mkpath "tmp/config"
+      ENV["RAILS_ENV"] = "production"
+      File.open("tmp/config/vanity.yml", "w") do |io|
+        io.write <<-YML
 production:
   adapter: redis
   host: somehost
   database: 15
-      YML
+        YML
+      end
+      assert_equal "redis://somehost:6379/15", load_rails(<<-RB)
+initializer.after_initialize
+$stdout << Vanity.playground.connection
+      RB
+    ensure
+      File.unlink "tmp/config/vanity.yml"
     end
-    assert_equal "redis://somehost:6379/15", load_rails(<<-RB)
+
+    def test_connection_from_yaml_url
+      FileUtils.mkpath "tmp/config"
+      ENV["RAILS_ENV"] = "production"
+      File.open("tmp/config/vanity.yml", "w") do |io|
+        io.write <<-YML
+production: redis://somehost/15
+        YML
+      end
+      assert_equal "redis://somehost:6379/15", load_rails(<<-RB)
 initializer.after_initialize
 $stdout << Vanity.playground.connection
-    RB
-  ensure
-    File.unlink "tmp/config/vanity.yml"
+      RB
+    ensure
+      File.unlink "tmp/config/vanity.yml"
+    end
+
+    def test_connection_from_yaml_with_erb
+      FileUtils.mkpath "tmp/config"
+      ENV["RAILS_ENV"] = "production"
+      # Pass storage URL through environment like heroku does
+      ENV["REDIS_URL"] = "redis://somehost:6379/15"
+      File.open("tmp/config/vanity.yml", "w") do |io|
+        io.write <<-YML
+production: <%= ENV['REDIS_URL'] %>
+        YML
+      end
+      assert_equal "redis://somehost:6379/15", load_rails(<<-RB)
+initializer.after_initialize
+$stdout << Vanity.playground.connection
+      RB
+    ensure
+      File.unlink "tmp/config/vanity.yml"
+    end
+
+    def test_connection_from_redis_yml
+      FileUtils.mkpath "tmp/config"
+      yml = File.open("tmp/config/redis.yml", "w")
+      yml << "production: internal.local:6379\n"
+      yml.flush
+      assert_equal "redis://internal.local:6379/0", load_rails(<<-RB)
+initializer.after_initialize
+$stdout << Vanity.playground.connection
+      RB
+    ensure
+      File.unlink yml.path
+    end
+  
+
   end
 
-  def test_mongo_connection_from_yaml
-    FileUtils.mkpath "tmp/config"
-    File.open("tmp/config/vanity.yml", "w") do |io|
-      io.write <<-YML
+  if ENV['DB'] == 'mongo'
+    def test_mongo_connection_from_yaml
+      FileUtils.mkpath "tmp/config"
+      File.open("tmp/config/vanity.yml", "w") do |io|
+        io.write <<-YML
 mongodb:
   adapter: mongodb
   host: localhost
   port: 27017
   database: vanity_test
-      YML
-    end
+        YML
+      end
 
-    assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB, "mongodb")
+      assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB, "mongodb")
 initializer.after_initialize
 $stdout << Vanity.playground.connection
-    RB
-  ensure
-    File.unlink "tmp/config/vanity.yml"
-  end
+      RB
+    ensure
+      File.unlink "tmp/config/vanity.yml"
+    end
 
-  def test_mongodb_replica_set_connection
-    FileUtils.mkpath "tmp/config"
-    File.open("tmp/config/vanity.yml", "w") do |io|
-      io.write <<-YML
+    unless ENV['CI'] == 'true'
+      def test_mongodb_replica_set_connection
+        FileUtils.mkpath "tmp/config"
+        File.open("tmp/config/vanity.yml", "w") do |io|
+          io.write <<-YML
 mongodb:
   adapter: mongodb
   hosts:
     - localhost
   port: 27017
   database: vanity_test
-      YML
-    end
+          YML
+        end
 
-    assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB, "mongodb")
+        assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB, "mongodb")
 initializer.after_initialize
 $stdout << Vanity.playground.connection
-    RB
+        RB
 
-    assert_equal "Mongo::ReplSetConnection", load_rails(<<-RB, "mongodb")
+        assert_equal "Mongo::ReplSetConnection", load_rails(<<-RB, "mongodb")
 initializer.after_initialize
 $stdout << Vanity.playground.connection.mongo.class
-    RB
-  ensure
-    File.unlink "tmp/config/vanity.yml"
-  end
-
-  def test_connection_from_yaml_url
-    FileUtils.mkpath "tmp/config"
-    ENV["RAILS_ENV"] = "production"
-    File.open("tmp/config/vanity.yml", "w") do |io|
-      io.write <<-YML
-production: redis://somehost/15
-      YML
+        RB
+      ensure
+        File.unlink "tmp/config/vanity.yml"
+      end
     end
-    assert_equal "redis://somehost:6379/15", load_rails(<<-RB)
-initializer.after_initialize
-$stdout << Vanity.playground.connection
-    RB
-  ensure
-    File.unlink "tmp/config/vanity.yml"
   end
 
   def test_connection_from_yaml_missing
@@ -273,37 +325,6 @@ $stdout << (Vanity.playground.connection rescue $!.message)
     File.unlink "tmp/config/vanity.yml"
   end
 
-  def test_connection_from_yaml_with_erb
-    FileUtils.mkpath "tmp/config"
-    ENV["RAILS_ENV"] = "production"
-    # Pass storage URL through environment like heroku does
-    ENV["REDIS_URL"] = "redis://somehost:6379/15"
-    File.open("tmp/config/vanity.yml", "w") do |io|
-      io.write <<-YML
-production: <%= ENV['REDIS_URL'] %>
-      YML
-    end
-    assert_equal "redis://somehost:6379/15", load_rails(<<-RB)
-initializer.after_initialize
-$stdout << Vanity.playground.connection
-    RB
-  ensure
-    File.unlink "tmp/config/vanity.yml"
-  end
-
-  def test_connection_from_redis_yml
-    FileUtils.mkpath "tmp/config"
-    yml = File.open("tmp/config/redis.yml", "w")
-    yml << "production: internal.local:6379\n"
-    yml.flush
-    assert_equal "redis://internal.local:6379/0", load_rails(<<-RB)
-initializer.after_initialize
-$stdout << Vanity.playground.connection
-    RB
-  ensure
-    File.unlink yml.path
-  end
-  
   def test_collection_from_vanity_yaml
     FileUtils.mkpath "tmp/config"
     File.open("tmp/config/vanity.yml", "w") do |io|
@@ -384,6 +405,8 @@ require "vanity"
 
   def teardown
     super
-    UseVanityController.send(:filter_chain).clear
+    if !rails3?
+      UseVanityController.send(:filter_chain).clear
+    end
   end
 end

data/test/test_helper.rb

@@ -4,21 +4,40 @@ $LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
 ENV["RACK_ENV"] = "test"
 ENV["DB"] ||= "redis"
 
-RAILS_ROOT = File.expand_path("..")
 require "test/unit"
 require "mocha"
 require "action_controller"
 require "action_controller/test_case"
 require "action_view/test_case"
 require "active_record"
-require "initializer"
-Rails.configuration = Rails::Configuration.new
-require "phusion_passenger/events"
+
+begin
+  require "rails"
+rescue LoadError
+end
+
+if defined?(Rails::Railtie)
+  require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+  require "rails/test_help"
+else
+  RAILS_ROOT = File.expand_path("..")
+  require "initializer"
+  Rails.configuration = Rails::Configuration.new
+
+  ActionController::Routing::Routes.draw do |map|
+    map.connect ':controller/:action/:id'
+  end
+  require "phusion_passenger/events"
+end
+
 require "lib/vanity"
 require "timecop"
 require "webmock/test_unit"
-require "ruby-debug"
 
+#Do to load order differences in Rails boot and test requires we have to manually
+#require these
+require 'vanity/frameworks/rails'
+Vanity::Rails.load!
 
 if $VERBOSE
   $logger = Logger.new(STDOUT)
@@ -40,6 +59,9 @@ class Test::Unit::TestCase
     "mock"=>"mock:/"
   }[ENV["DB"]] or raise "No support yet for #{ENV["DB"]}"
 
+  def rails3?
+    defined?(Rails::Railtie)
+  end
 
   def setup
     FileUtils.mkpath "tmp/experiments/metrics"
@@ -102,13 +124,13 @@ class Test::Unit::TestCase
 
 end
 
-ActionController::Routing::Routes.draw do |map|
-  map.connect ':controller/:action/:id'
-end
-
 
+if  ENV["DB"] == "postgres"
+  ActiveRecord::Base.establish_connection :adapter=>"postgresql", :database=>"vanity_test"
+else
+  ActiveRecord::Base.establish_connection :adapter=>"mysql", :database=>"vanity_test"
+end
 ActiveRecord::Base.logger = $logger
-ActiveRecord::Base.establish_connection :adapter=>"mysql", :database=>"vanity_test"
 
 if ENV["DB"] == "mysql" || ENV["DB"] == "postgres"
   require "generators/templates/vanity_migration"

metadata

@@ -2,7 +2,7 @@
 name: moses-vanity
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-06 00:00:00 -06:00
+date: 2012-04-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,8 +49,10 @@ files:
 - .gitignore
 - .rvmrc
 - .travis.yml
+- Appraisals
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -80,6 +82,12 @@ files:
 - doc/metrics.textile
 - doc/rails.textile
 - doc/site.js
+- gemfiles/rails3.gemfile
+- gemfiles/rails3.gemfile.lock
+- gemfiles/rails31.gemfile
+- gemfiles/rails31.gemfile.lock
+- gemfiles/rails32.gemfile
+- gemfiles/rails32.gemfile.lock
 - generators/templates/vanity_migration.rb
 - generators/vanity_generator.rb
 - lib/generators/templates/vanity_migration.rb
@@ -118,6 +126,31 @@ files:
 - lib/vanity/templates/vanity.js
 - lib/vanity/version.rb
 - test/adapters/redis_adapter_test.rb
+- test/dummy/Rakefile
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/log/development.log
+- test/dummy/log/production.log
+- test/dummy/log/server.log
+- test/dummy/public/favicon.ico
+- test/dummy/public/stylesheets/.gitkeep
+- test/dummy/script/rails
 - test/experiment/ab_test.rb
 - test/experiment/base_test.rb
 - test/experiments/age_and_zipcode.rb
@@ -149,7 +182,7 @@ licenses: []
 post_install_message: To get started run vanity --help
 rdoc_options: 
 - --title
-- Vanity 1.7.1
+- Vanity 1.8.0
 - --main
 - README.rdoc
 - --webcvs
@@ -177,6 +210,31 @@ specification_version: 3
 summary: Experience Driven Development framework for Ruby
 test_files: 
 - test/adapters/redis_adapter_test.rb
+- test/dummy/Rakefile
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/log/development.log
+- test/dummy/log/production.log
+- test/dummy/log/server.log
+- test/dummy/public/favicon.ico
+- test/dummy/public/stylesheets/.gitkeep
+- test/dummy/script/rails
 - test/experiment/ab_test.rb
 - test/experiment/base_test.rb
 - test/experiments/age_and_zipcode.rb