vanity 2.0.0.beta4 → 2.0.0.beta5

data/test/playground_test.rb

@@ -99,6 +99,19 @@ describe Vanity::Playground do
     end
   end
 
+  describe "#experiments" do
+    it "saves experiments exactly once" do
+      File.open "tmp/experiments/foobar.rb", "w" do |f|
+        f.write <<-RUBY
+          ab_test :foobar do
+          end
+        RUBY
+      end
+      Vanity::Experiment::AbTest.any_instance.expects(:save).once
+      Vanity.playground.experiments
+    end
+  end
+
   describe "participant_info" do
     it "returns participant's experiments" do
       assert_equal [], Vanity.playground.participant_info("abcdef")

data/test/templates_test.rb

@@ -0,0 +1,28 @@
+require "test_helper"
+
+describe Vanity::Templates do
+  describe "template" do
+    it "resolves templates from the gem by default" do
+      custom_view_path = File.expand_path(File.join(Rails.root, 'app', 'views', 'vanity'))
+      gem_view_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'vanity', 'templates'))
+      expected = File.join(gem_view_path, 'foo.html')
+
+      assert_equal expected, Vanity::Templates.new.path('foo.html')
+    end
+
+    it "resolves templates from the Rails view directory if it exists" do
+      begin
+        custom_view_path = File.expand_path(File.join(Rails.root, 'app', 'views', 'vanity'))
+
+        expected = File.expand_path(File.join(custom_view_path, 'foo.html'))
+
+        FileUtils.mkpath(custom_view_path)
+        File.open(expected, "w")
+
+        assert_equal expected, Vanity::Templates.new.path('foo.html')
+      ensure
+        FileUtils.rm_rf(custom_view_path)
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -3,8 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
 ENV["RACK_ENV"] = "test"
 ENV["DB"] ||= "redis"
 
-require "minitest/unit"
-require "minitest/spec"
+require "minitest/autorun"
 require "tmpdir"
 require "action_controller"
 require "action_controller/test_case"
@@ -27,7 +26,7 @@ if defined?(Mocha::VERSION) && Mocha::VERSION < "0.13.0"
 else
   require "mocha/mini_test"
 end
-require "webmock/test_unit"
+require "webmock/minitest"
 
 # Due to load order differences in Rails boot and test requires we have to
 # manually require these
@@ -124,40 +123,39 @@ module VanityTestHelpers
   end
 end
 
-class Test::Unit::TestCase
-  include WebMock::API
-  include VanityTestHelpers
+if defined?(Test)
+  class Test::Unit::TestCase
+    include VanityTestHelpers
+  end
 end
 
 class MiniTest::Spec
-  include WebMock::API
   include VanityTestHelpers
 end
 
 if defined?(MiniTest::Unit::TestCase)
   class MiniTest::Unit::TestCase
-    include WebMock::API
     include VanityTestHelpers
   end
 end
 
 if defined?(ActiveSupport::TestCase)
   class ActiveSupport::TestCase
+    include VanityTestHelpers
+
     self.use_instantiated_fixtures = false if respond_to?(:use_instantiated_fixtures)
     self.use_transactional_fixtures = false if respond_to?(:use_transactional_fixtures)
   end
 end
 
 if defined?(ActionController::TestCase)
-  module ActionController
-    class TestCase
-      alias :setup_controller_request_and_response_without_vanity :setup_controller_request_and_response
-      # Sets Vanity.context to the current controller, so you can do things like:
-      #   experiment(:simple).chooses(:green)
-      def setup_controller_request_and_response
-        setup_controller_request_and_response_without_vanity
-        Vanity.context = @controller
-      end
+  class ActionController::TestCase
+    alias :setup_controller_request_and_response_without_vanity :setup_controller_request_and_response
+    # Sets Vanity.context to the current controller, so you can do things like:
+    #   experiment(:simple).chooses(:green)
+    def setup_controller_request_and_response
+      setup_controller_request_and_response_without_vanity
+      Vanity.context = @controller
     end
   end
 end

data/test/web/rails/dashboard_test.rb

@@ -16,6 +16,13 @@ class RailsDashboardTest < ActionController::TestCase
       metrics :sugar_high
       identify { '1' }
     end
+
+    metric :liquidity
+    new_ab_test :drink do
+      alternatives :tea, :coffee
+      metrics :liquidity
+      identify { '1' }
+    end
   end
 
   # --  Test dashboard --
@@ -51,15 +58,23 @@ class RailsDashboardTest < ActionController::TestCase
   # --  Actions used in non-admin actions, e.g. in JS --
 
   def test_add_participant
-    xhr :post, :add_participant, :e => "food", :a => 0
+    xhr :post, :add_participant, :v => 'food=0'
+    assert_response :success
+    assert @response.body.blank?
+    assert_equal 1, experiment(:food).alternatives.map(&:participants).sum
+  end
+
+  def test_add_participant_multiple_experiments
+    xhr :post, :add_participant, :v => 'food=0,drink=1'
     assert_response :success
     assert @response.body.blank?
     assert_equal 1, experiment(:food).alternatives.map(&:participants).sum
+    assert_equal 1, experiment(:drink).alternatives.map(&:participants).sum
   end
 
   def test_add_participant_with_invalid_request
-    @request.user_agent = "Googlebot/2.1 ( http://www.google.com/bot.html)"
-    xhr :post, :add_participant, :e => "food", :a => 0
+    @request.user_agent = 'Googlebot/2.1 ( http://www.google.com/bot.html)'
+    xhr :post, :add_participant, :v => 'food=0'
     assert_equal 0, experiment(:food).alternatives.map(&:participants).sum
   end
 
@@ -69,6 +84,12 @@ class RailsDashboardTest < ActionController::TestCase
     assert @response.body.blank?
   end
 
+  def test_add_participant_not_fail_for_unknown_experiment
+    xhr :post, :add_participant, :e => 'unknown=0'
+    assert_response :not_found
+    assert @response.body.blank?
+  end
+
   # --  Test administrator actions --
 
   def test_participant_renders_experiment_for_id
@@ -99,7 +120,7 @@ class RailsDashboardTest < ActionController::TestCase
   def test_complete_with_confirmation_completes
     xhr :post, :complete, :e => "food", :a => 0, :confirmed => 'true'
     assert_response :success
-    assert !Vanity.playground.experiment('food').active?
+    assert !Vanity.playground.experiment(:food).active?
   end
 
   def test_chooses

data/vanity.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 1.9.3"
 
+  spec.add_runtime_dependency "i18n"
+
   spec.add_development_dependency "bundler",  ">= 1.0.0"
   spec.add_development_dependency "minitest", ">= 4.2"
 end

metadata

@@ -1,46 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta4
-  prerelease: 6
+  version: 2.0.0.beta5
 platform: ruby
 authors:
 - Assaf Arkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.2'
 description: Mirror, mirror on the wall ...
@@ -63,6 +72,8 @@ files:
 - README.rdoc
 - Rakefile
 - bin/vanity
+- config/locales/vanity.en.yml
+- config/locales/vanity.pt-BR.yml
 - doc/_config.yml
 - doc/_layouts/_header.html
 - doc/_layouts/page.html
@@ -92,7 +103,12 @@ files:
 - gemfiles/rails32.gemfile.lock
 - gemfiles/rails4.gemfile
 - gemfiles/rails4.gemfile.lock
+- gemfiles/rails41.gemfile
+- gemfiles/rails41.gemfile.lock
+- gemfiles/rails42.gemfile
+- gemfiles/rails42.gemfile.lock
 - lib/generators/templates/vanity_migration.rb
+- lib/generators/vanity/views_generator.rb
 - lib/generators/vanity_generator.rb
 - lib/vanity.rb
 - lib/vanity/adapters/abstract_adapter.rb
@@ -118,6 +134,7 @@ files:
 - lib/vanity/metric/google_analytics.rb
 - lib/vanity/metric/remote.rb
 - lib/vanity/playground.rb
+- lib/vanity/templates.rb
 - lib/vanity/templates/_ab_test.erb
 - lib/vanity/templates/_experiment.erb
 - lib/vanity/templates/_experiments.erb
@@ -172,16 +189,18 @@ files:
 - test/metric/google_analytics_test.rb
 - test/metric/remote_test.rb
 - test/playground_test.rb
+- test/templates_test.rb
 - test/test_helper.rb
 - test/web/rails/dashboard_test.rb
 - vanity.gemspec
 homepage: http://vanity.labnotes.org
 licenses:
 - MIT
+metadata: {}
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 2.0.0.beta4
+- Vanity 2.0.0.beta5
 - --main
 - README.rdoc
 - --webcvs
@@ -189,22 +208,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Experience Driven Development framework for Ruby
 test_files:
 - test/adapters/redis_adapter_test.rb
@@ -248,6 +265,7 @@ test_files:
 - test/metric/google_analytics_test.rb
 - test/metric/remote_test.rb
 - test/playground_test.rb
+- test/templates_test.rb
 - test/test_helper.rb
 - test/web/rails/dashboard_test.rb
 has_rdoc: