vanity 2.0.0.beta8 → 2.0.0.beta9

data/test/metric/remote_test.rb

@@ -2,24 +2,24 @@ require "test_helper"
 
 describe "Remote metrics" do
   before do
-    FileUtils.mkpath "tmp/config"
-    File.open "tmp/config/vanity.yml", "w" do |f|
+    File.open "tmp/experiments/metrics/sandbox.rb", "w" do |f|
       f.write <<-RUBY
-        metrics:
-          sandbox: http://api.vanitydash.com/metrics/sandbox
+        metric "Sandbox" do
+          remote "http://api.vanitydash.com/metrics/sandbox"
+        end
       RUBY
     end
-    ::Rails.stubs(:root).returns(Pathname.new(File.expand_path("tmp")))
+
     Dir.chdir "tmp" do
       Vanity.playground.load!
     end
   end
 
-  it "loads from configuration file" do
-    assert Vanity.playground.metrics[:sandbox]
+  it "loads from metrics files" do
+    assert Vanity.playground.metric(:sandbox)
   end
 
-  it "creates remote metric from configuration file" do
+  it "creates remote metric from metric file" do
     stub_request :post, /vanitydash/
     metric(:sandbox).track!
     assert_requested :post, /api\.vanitydash\.com/

data/test/playground_test.rb

@@ -45,33 +45,7 @@ describe Vanity::Playground do
 
   describe "#add_participant_path" do
     it "sets a default add participant path" do
-      assert_equal Vanity.playground.add_participant_path, Vanity::Playground::DEFAULT_ADD_PARTICIPANT_PATH
-    end
-  end
-
-  describe "reconnect!" do
-    it "reconnects with the same configuration" do
-      Vanity.playground.establish_connection "mock:/"
-      Vanity.playground.reconnect!
-      assert_equal Vanity.playground.connection.to_s, "mock:/"
-    end
-  end
-
-  describe "autoconnect" do
-    it "establishes connection by default with connection" do
-      instance = Vanity::Playground.new(:connection=>"mock:/")
-      assert instance.connected?
-    end
-
-    it "establishes connection by default" do
-      Vanity::Playground.any_instance.expects(:establish_connection)
-      Vanity::Playground.new
-    end
-
-    it "can skip connection" do
-      Vanity::Autoconnect.stubs(:playground_should_autoconnect?).returns(false)
-      instance = Vanity::Playground.new(:connection=>"mock:/")
-      assert !instance.connected?
+      assert_equal Vanity.playground.add_participant_path, Vanity::Configuration::DEFAULTS[:add_participant_route]
     end
   end
 

data/test/templates_test.rb

@@ -6,7 +6,7 @@ describe Vanity::Templates do
   end
 
   describe "template" do
-    it "resolves templates from the gem by default" do
+    it "resolves templates from the configured path" 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')
@@ -14,9 +14,10 @@ describe Vanity::Templates do
       assert_equal expected, Vanity::Templates.new.path('foo.html')
     end
 
-    it "resolves templates from the Rails view directory if it exists" do
+    it "resolves templates from a Rails view directory when configured" do
       begin
         custom_view_path = File.expand_path(File.join(Rails.root, 'app', 'views', 'vanity'))
+        Vanity.configuration.templates_path = custom_view_path
 
         expected = File.expand_path(File.join(custom_view_path, 'foo.html'))
 

data/test/test_helper.rb

@@ -21,11 +21,13 @@ require "rails/test_help"
 require "vanity"
 require "timecop"
 require "mocha/mini_test"
+require "fakefs/safe"
 require "webmock/minitest"
 
 # Due to load order differences in Rails boot and test requires we have to
 # manually require these
 
+# TODO wonder if we can load rails only for the rails tests...
 require 'vanity/frameworks/rails'
 Vanity::Rails.load!
 
@@ -42,30 +44,41 @@ module VanityTestHelpers
   # don't use databases you care about. For Redis, we pick database 15
   # (default is 0).
   DATABASE = {
-    "redis"=>"redis://localhost/15",
-    "mongodb"=>"mongodb://localhost/vanity",
-    "active_record"=> { "adapter"=>"active_record", "active_record_adapter"=>"default" },
-    "mock"=>"mock:/"
+    "redis" => "redis://localhost/15",
+    "mongodb" => "mongodb://localhost/vanity",
+    "active_record" =>  { :adapter => "active_record", :active_record_adapter =>"default" },
+    "mock" => "mock:/"
   }[ENV["DB"]] or raise "No support yet for #{ENV["DB"]}"
 
+  TEST_DATA_FILES = Dir[File.expand_path("../data/*",  __FILE__)]
+  VANITY_CONFIGS = TEST_DATA_FILES.each.with_object({}) do |path, hash|
+    hash[File.basename(path)] = File.read(path)
+  end
+
   def setup_after
     FileUtils.mkpath "tmp/experiments/metrics"
-    new_playground
+    vanity_reset
   end
 
   def teardown_after
     Vanity.context = nil
     FileUtils.rm_rf "tmp"
-    Vanity.playground.connection.flushdb if Vanity.playground.connected?
+    Vanity.connection.adapter.flushdb if Vanity.connection.connected?
     WebMock.reset!
   end
 
   # Call this if you need a new playground, e.g. to re-define the same experiment,
   # or reload an experiment (saved by the previous playground).
-  def new_playground
-    Vanity.playground = Vanity::Playground.new(:logger=>$logger, :load_path=>"tmp/experiments")
+  def vanity_reset
+    Vanity.reset!
+    Vanity.configuration.logger = $logger
+    Vanity.configuration.experiments_path = "tmp/experiments"
+
+    Vanity.disconnect!
     ActiveRecord::Base.establish_connection
-    Vanity.playground.establish_connection(DATABASE)
+    Vanity.connect!(DATABASE)
+
+    Vanity.unload!
   end
 
   # Defines the specified metrics (one or more names). Returns metric, or array
@@ -82,7 +95,7 @@ module VanityTestHelpers
   def new_ab_test(name, &block)
     id = name.to_s.downcase.gsub(/\W/, "_").to_sym
     experiment = Vanity::Experiment::AbTest.new(Vanity.playground, id, name)
-    experiment.instance_eval &block
+    experiment.instance_eval(&block)
     experiment.save
     Vanity.playground.experiments[id] = experiment
   end
@@ -97,8 +110,7 @@ module VanityTestHelpers
   end
 
   def not_collecting!
-    Vanity.playground.collecting = false
-    Vanity.playground.stubs(:connection).returns(stub(:flushdb=>nil))
+    Vanity.configuration.collecting = false
   end
 
   def dummy_request

data/test/vanity_test.rb

@@ -0,0 +1,130 @@
+require "test_helper"
+
+describe Vanity do
+  describe "#configuration" do
+    it "returns the same configuration" do
+      assert_same Vanity.configuration, Vanity.configuration
+    end
+
+    it "returns nil if if skipping bang" do
+      Vanity.configuration = nil
+      assert_nil Vanity.configuration(false)
+    end
+  end
+
+  describe "#configure!" do
+    it "returns a configuration" do
+      assert_kind_of Vanity::Configuration, Vanity.configure!
+    end
+
+    it "returns a new configuration" do
+      refute_same Vanity.configure!, Vanity.configure!
+    end
+  end
+
+  describe "#reset!" do
+    it "creates a new configuration" do
+      original_configuration = Vanity.configuration
+      refute_same original_configuration, Vanity.reset!
+    end
+  end
+
+  describe "#configure" do
+    it "configures via a block" do
+      Vanity.configure do |config|
+        config.collecting = false
+      end
+
+      assert !Vanity.configuration.collecting
+    end
+  end
+
+  describe "#context" do
+    it "returns the context" do
+      Vanity.context = Object.new
+      assert_same Vanity.context, Vanity.context
+    end
+  end
+
+  describe "#connection" do
+    it "returns the same connection" do
+      assert_same Vanity.connection, Vanity.connection
+    end
+
+    it "returns nil if if skipping bang" do
+      Vanity.connection = nil
+      assert_nil Vanity.connection(false)
+    end
+  end
+
+  describe "#connect!" do
+    it "returns a connection" do
+      assert_kind_of Vanity::Connection, Vanity.connect!
+    end
+
+    it "returns a new connection" do
+      refute_same Vanity.connect!, Vanity.connect!
+    end
+  end
+
+  describe "#disconnect!" do
+    it "sets the connection to nil" do
+      Vanity.disconnect!
+      assert_nil Vanity.connection(false)
+    end
+
+    it "handles nil connections" do
+      Vanity.connection = nil
+      assert_nil Vanity.disconnect!
+    end
+  end
+
+  describe "#reconnect!" do
+    it "reconnects with the same configuration" do
+      Vanity.disconnect!
+      original_specification = Vanity.connection.specification
+      Vanity.reconnect!
+      assert_equal original_specification, Vanity.connection.specification
+    end
+
+    it "creates a new connection" do
+      original_configuration = Vanity.connection
+      refute_same original_configuration, Vanity.reconnect!
+    end
+  end
+
+   describe "#playground" do
+    it "returns the same playground" do
+      assert_same Vanity.playground, Vanity.playground
+    end
+
+    it "returns nil if if skipping bang" do
+      Vanity.playground = nil
+      assert_nil Vanity.playground(false)
+    end
+  end
+
+  describe "#load!" do
+    it "returns a playground" do
+      assert_kind_of Vanity::Playground, Vanity.load!
+    end
+
+    it "returns a new playground" do
+      refute_same Vanity.load!, Vanity.load!
+    end
+  end
+
+  describe "#unload!" do
+    it "sets the playground to nil" do
+      Vanity.unload!
+      assert_nil Vanity.playground(false)
+    end
+  end
+
+  describe "#reload!" do
+    it "creates a new playground" do
+      original_configuration = Vanity.playground
+      refute_same original_configuration, Vanity.reload!
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta8
+  version: 2.0.0.beta9
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -79,8 +79,6 @@ 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
@@ -118,6 +116,7 @@ files:
 - lib/generators/vanity/views_generator.rb
 - lib/generators/vanity_generator.rb
 - lib/vanity.rb
+- lib/vanity/adapters.rb
 - lib/vanity/adapters/abstract_adapter.rb
 - lib/vanity/adapters/active_record_adapter.rb
 - lib/vanity/adapters/mock_adapter.rb
@@ -126,6 +125,8 @@ files:
 - lib/vanity/autoconnect.rb
 - lib/vanity/commands/list.rb
 - lib/vanity/commands/report.rb
+- lib/vanity/configuration.rb
+- lib/vanity/connection.rb
 - lib/vanity/experiment/ab_test.rb
 - lib/vanity/experiment/alternative.rb
 - lib/vanity/experiment/base.rb
@@ -135,6 +136,8 @@ files:
 - lib/vanity/frameworks/rails.rb
 - lib/vanity/helpers.rb
 - lib/vanity/images/x.gif
+- lib/vanity/locales/vanity.en.yml
+- lib/vanity/locales/vanity.pt-BR.yml
 - lib/vanity/metric/active_record.rb
 - lib/vanity/metric/base.rb
 - lib/vanity/metric/google_analytics.rb
@@ -153,11 +156,19 @@ files:
 - lib/vanity/templates/jquery.min.js
 - lib/vanity/templates/vanity.css
 - lib/vanity/templates/vanity.js
+- lib/vanity/vanity.rb
 - lib/vanity/version.rb
 - test/adapters/redis_adapter_test.rb
 - test/autoconnect_test.rb
 - test/cli_test.rb
 - test/commands/report_test.rb
+- test/configuration_test.rb
+- test/connection_test.rb
+- test/data/redis.yml.url
+- test/data/vanity.yml.activerecord
+- test/data/vanity.yml.mock
+- test/data/vanity.yml.redis
+- test/data/vanity.yml.redis-erb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -197,6 +208,7 @@ files:
 - test/playground_test.rb
 - test/templates_test.rb
 - test/test_helper.rb
+- test/vanity_test.rb
 - test/web/rails/dashboard_test.rb
 - vanity.gemspec
 homepage: http://vanity.labnotes.org
@@ -205,7 +217,7 @@ licenses:
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 2.0.0.beta8
+- Vanity 2.0.0.beta9
 - --main
 - README.rdoc
 - --webcvs
@@ -235,6 +247,13 @@ test_files:
 - test/autoconnect_test.rb
 - test/cli_test.rb
 - test/commands/report_test.rb
+- test/configuration_test.rb
+- test/connection_test.rb
+- test/data/redis.yml.url
+- test/data/vanity.yml.activerecord
+- test/data/vanity.yml.mock
+- test/data/vanity.yml.redis
+- test/data/vanity.yml.redis-erb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -274,5 +293,6 @@ test_files:
 - test/playground_test.rb
 - test/templates_test.rb
 - test/test_helper.rb
+- test/vanity_test.rb
 - test/web/rails/dashboard_test.rb
 has_rdoc: