vanity 1.9.3 → 2.0.0.beta

data/test/metric/remote_test.rb

@@ -1,8 +1,7 @@
-require "test/test_helper"
+require "test_helper"
 
-
-context "Remote metrics" do
-  setup do
+describe "Remote metrics" do
+  before do
     FileUtils.mkpath "tmp/config"
     File.open "tmp/config/vanity.yml", "w" do |f|
       f.write <<-RUBY
@@ -16,11 +15,11 @@ context "Remote metrics" do
     end
   end
 
-  test "load from configuration file" do
+  it "loads from configuration file" do
     assert Vanity.playground.metrics[:sandbox]
   end
 
-  test "create remote metric from configuration file" do
+  it "creates remote metric from configuration file" do
     stub_request :post, /vanitydash/
     metric(:sandbox).track!
     assert_requested :post, /api\.vanitydash\.com/
@@ -28,46 +27,46 @@ context "Remote metrics" do
 end
 
 
-context "Remote send" do
-  setup do
+describe "Remote send" do
+  before do
     @metric = Vanity::Metric.new(Vanity.playground, :sandbox)
     @metric.remote "http://api.vanitydash.com/metrics/sandbox"
     Vanity.playground.metrics[:sandbox] = @metric
     stub_request :post, /vanitydash/
   end
 
-  test "remote send in sequence" do
+  it "remote send in sequence" do
     Vanity.playground.track! :sandbox
     Vanity.playground.track! :sandbox
     assert_requested(:post, "http://api.vanitydash.com/metrics/sandbox", :times=>2)
   end
 
-  test "remote sends url-encoded data" do
+  it "remote sends url-encoded data" do
     Vanity.playground.track! :sandbox, 12
     assert_requested(:post, /api/) { |request| request.headers["Content-Type"] == "application/x-www-form-urlencoded" }
   end
 
-  test "remote sends metric identifier" do
+  it "remote sends metric identifier" do
     Vanity.playground.track! :sandbox, 12
     assert_requested(:post, /api/) { |request| Rack::Utils.parse_query(request.body)["metric"] == "sandbox" }
   end
 
-  test "remote sends RFC 2616 compliant time stamp" do
+  it "remote sends RFC 2616 compliant time stamp" do
     Vanity.playground.track! :sandbox, 12
     assert_requested(:post, /api/) { |request| Time.httpdate(Rack::Utils.parse_query(request.body)["timestamp"]) }
   end
 
-  test "remote sends array of values" do
+  it "remote sends array of values" do
     Vanity.playground.track! :sandbox, [1,2,3]
     assert_requested(:post, /api/) { |request| Rack::Utils.parse_query(request.body)["values[]"] == %w{1 2 3} }
   end
 
-  test "remote sends default of 1" do
+  it "remote sends default of 1" do
     Vanity.playground.track! :sandbox
     assert_requested(:post, /api/) { |request| Rack::Utils.parse_query(request.body)["values[]"] == "1" }
   end
 
-  test "remote sends current identity" do
+  it "remote sends current identity" do
     Vanity.context = Object.new
     class << Vanity.context
       def vanity_identity
@@ -78,13 +77,13 @@ context "Remote send" do
     assert_requested(:post, /api/) { |request| Rack::Utils.parse_query(request.body)["identity"] == "xkcd" }
   end
 
-  test "remote sends with additional query parameters" do
+  it "remote sends with additional query parameters" do
     @metric.remote "http://api.vanitydash.com/metrics/sandbox?ask=receive"
     Vanity.playground.track! :sandbox, 12
     assert_requested(:post, /api/) { |request| Rack::Utils.parse_query(request.body)["ask"] == "receive" }
   end
 
-  test "remote send handles standard error" do
+  it "remote send handles standard error" do
     stub_request(:post, /api/).to_raise(StandardError)
     Vanity.playground.track! :sandbox
     stub_request(:post, /api/)
@@ -92,7 +91,7 @@ context "Remote send" do
     assert_requested(:post, /api/, :times=>2)
   end
 
-  test "remote send handles timeout error" do
+  it "remote send handles timeout error" do
     stub_request(:post, /api/).to_timeout
     Vanity.playground.track! :sandbox
     stub_request(:post, /api/)
@@ -100,7 +99,7 @@ context "Remote send" do
     assert_requested(:post, /api/, :times=>2)
   end
 
-  test "remote does not send when metrics disabled" do
+  it "remote does not send when metrics disabled" do
     not_collecting!
     Vanity.playground.track! :sandbox
     Vanity.playground.track! :sandbox

data/test/playground_test.rb

@@ -1,4 +1,4 @@
-require "test/test_helper"
+require "test_helper"
 
 class PlaygroundTest < Test::Unit::TestCase
 

data/test/test_helper.rb

@@ -1,12 +1,11 @@
-GC.disable
 $LOAD_PATH.delete_if { |path| path[/gems\/vanity-\d/] }
 $LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
 ENV["RACK_ENV"] = "test"
 ENV["DB"] ||= "redis"
 
-require "test/unit"
+require "minitest/unit"
+require "minitest/spec"
 require "tmpdir"
-require "mocha"
 require "action_controller"
 require "action_controller/test_case"
 require "action_view/test_case"
@@ -17,27 +16,22 @@ begin
 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"
-  require "actionmailer"
-  Rails.configuration = Rails::Configuration.new
-
-  ActionController::Routing::Routes.draw do |map|
-    map.connect ':controller/:action/:id'
-  end
-  require "phusion_passenger/events"
-end
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails/test_help"
 
-require "lib/vanity"
+require "vanity"
 require "timecop"
+
+if defined?(Mocha::VERSION) && Mocha::VERSION < "0.13.0"
+  require "mocha"
+else
+  require "mocha/mini_test"
+end
 require "webmock/test_unit"
 
-#Do to load order differences in Rails boot and test requires we have to manually
-#require these
+# Due to load order differences in Rails boot and test requires we have to
+# manually require these
+
 require 'vanity/frameworks/rails'
 Vanity::Rails.load!
 
@@ -60,10 +54,6 @@ module VanityTestHelpers
     "mock"=>"mock:/"
   }[ENV["DB"]] or raise "No support yet for #{ENV["DB"]}"
 
-  def rails3?
-    defined?(Rails::Railtie)
-  end
-
   def setup_after
     FileUtils.mkpath "tmp/experiments/metrics"
     new_playground
@@ -139,11 +129,20 @@ class Test::Unit::TestCase
   include VanityTestHelpers
 end
 
-if defined?(ActiveSupport::TestCase)
-  class ActiveSupport::TestCase
+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
     self.use_instantiated_fixtures = false if respond_to?(:use_instantiated_fixtures)
     self.use_transactional_fixtures = false if respond_to?(:use_transactional_fixtures)
   end
@@ -175,20 +174,3 @@ if ENV["DB"] == "active_record"
   VanityMigration.up
   ActiveRecord::Base.connection_pool.disconnect!
 end
-
-# test/spec/mini v3
-# Source: http://gist.github.com/25455
-def context(*args, &block)
-  return super unless (name = args.first) && block
-  parent = Class === self ? self : (defined?(ActiveSupport::TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase)
-  klass = Class.new(parent) do
-    def self.test(name, &block)
-      define_method("test_#{name.gsub(/\W/,'_')}", &block) if block
-    end
-    def self.xtest(*args) end
-    def self.setup(&block) define_method(:setup) { super() ; instance_eval &block } end
-    def self.teardown(&block) define_method(:teardown) { super() ; instance_eval &block } end
-  end
-  parent.const_set name.split(/\W+/).map(&:capitalize).join, klass
-  klass.class_eval &block
-end

data/test/{rails_dashboard_test.rb → web/rails/dashboard_test.rb}

@@ -1,4 +1,4 @@
-require "test/test_helper"
+require "test_helper"
 
 class VanityController < ActionController::Base
   include Vanity::Rails::Dashboard
@@ -8,6 +8,7 @@ class RailsDashboardTest < ActionController::TestCase
   tests VanityController
 
   def setup
+    super
     Vanity.playground.collecting = true
     metric :sugar_high
     new_ab_test :food do

data/vanity.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
   spec.rdoc_options     = "--title", "Vanity #{spec.version}", "--main", "README.rdoc",
                           "--webcvs", "http://github.com/assaf/#{spec.name}"
 
-  spec.required_ruby_version = ">= 1.8.7"
+  spec.required_ruby_version = ">= 1.9.3"
 
-  spec.add_development_dependency "bundler", ">= 1.0.0"
+  spec.add_development_dependency "bundler",  ">= 1.0.0"
+  spec.add_development_dependency "minitest", ">= 4.2"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 1.9.3
-  prerelease: 
+  version: 2.0.0.beta
+  prerelease: 6
 platform: ruby
 authors:
 - Assaf Arkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !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 ...
 email: assaf@labnotes.org
 executables:
@@ -72,16 +88,10 @@ 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
 - gemfiles/rails4.gemfile
 - gemfiles/rails4.gemfile.lock
-- generators/templates/vanity_migration.rb
-- generators/vanity_generator.rb
 - lib/generators/templates/vanity_migration.rb
 - lib/generators/vanity_generator.rb
 - lib/vanity.rb
@@ -157,23 +167,18 @@ files:
 - test/experiments/metrics/signups.rb
 - test/experiments/metrics/yawns.rb
 - test/experiments/null_abc.rb
+- test/frameworks/rails/action_controller_test.rb
+- test/frameworks/rails/action_mailer_test.rb
+- test/frameworks/rails/action_view_test.rb
+- test/frameworks/rails/rails_test.rb
 - test/helper_test.rb
 - test/metric/active_record_test.rb
 - test/metric/base_test.rb
 - test/metric/google_analytics_test.rb
 - test/metric/remote_test.rb
-- test/myapp/app/controllers/application_controller.rb
-- test/myapp/app/controllers/main_controller.rb
-- test/myapp/config/boot.rb
-- test/myapp/config/environment.rb
-- test/myapp/config/environments/production.rb
-- test/myapp/config/routes.rb
-- test/passenger_test.rb
 - test/playground_test.rb
-- test/rails_dashboard_test.rb
-- test/rails_helper_test.rb
-- test/rails_test.rb
 - test/test_helper.rb
+- test/web/rails/dashboard_test.rb
 - vanity.gemspec
 homepage: http://vanity.labnotes.org
 licenses:
@@ -181,7 +186,7 @@ licenses:
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 1.9.3
+- Vanity 2.0.0.beta
 - --main
 - README.rdoc
 - --webcvs
@@ -193,13 +198,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -242,21 +247,16 @@ test_files:
 - test/experiments/metrics/signups.rb
 - test/experiments/metrics/yawns.rb
 - test/experiments/null_abc.rb
+- test/frameworks/rails/action_controller_test.rb
+- test/frameworks/rails/action_mailer_test.rb
+- test/frameworks/rails/action_view_test.rb
+- test/frameworks/rails/rails_test.rb
 - test/helper_test.rb
 - test/metric/active_record_test.rb
 - test/metric/base_test.rb
 - test/metric/google_analytics_test.rb
 - test/metric/remote_test.rb
-- test/myapp/app/controllers/application_controller.rb
-- test/myapp/app/controllers/main_controller.rb
-- test/myapp/config/boot.rb
-- test/myapp/config/environment.rb
-- test/myapp/config/environments/production.rb
-- test/myapp/config/routes.rb
-- test/passenger_test.rb
 - test/playground_test.rb
-- test/rails_dashboard_test.rb
-- test/rails_helper_test.rb
-- test/rails_test.rb
 - test/test_helper.rb
+- test/web/rails/dashboard_test.rb
 has_rdoc: 

data/gemfiles/rails3.gemfile

@@ -1,32 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack"
-gem "redis", ">= 2.1"
-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 "rails", "3.0.11"
-gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
-gem "passenger", "~>3.0"
-
-group :development do
-  gem "appraisal", ">= 1.0.0.beta2"
-  gem "jekyll"
-  gem "rake"
-  gem "RedCloth"
-  gem "yard"
-end
-
-gemspec :path=>".././"

data/gemfiles/rails3.gemfile.lock

@@ -1,172 +0,0 @@
-GIT
-  remote: git://github.com/zoltankiss/fastthread.git
-  revision: 56e6ce7c1780797a354d5befe9a9a9869bbc7e3e
-  specs:
-    fastthread (1.0.7)
-
-PATH
-  remote: ..
-  specs:
-    vanity (1.9.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    SystemTimer (1.2.3)
-    abstract (1.0.0)
-    actionmailer (3.0.11)
-      actionpack (= 3.0.11)
-      mail (~> 2.2.19)
-    actionpack (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.11)
-      activesupport (= 3.0.11)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-    activesupport (3.0.11)
-    addressable (2.2.7)
-    albino (1.3.3)
-      posix-spawn (>= 0.3.6)
-    appraisal (1.0.0.beta2)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (2.0.10)
-    backports (3.3.5)
-    bson (1.6.0)
-    bson_ext (1.6.0)
-      bson (= 1.6.0)
-    builder (2.1.2)
-    classifier (1.3.3)
-      fast-stemmer (>= 1.0.0)
-    crack (0.3.1)
-    daemon_controller (1.0.0)
-    directory_watcher (1.4.1)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    fast-stemmer (1.0.0)
-    garb (0.9.1)
-      activesupport (>= 2.2.0)
-      crack (>= 0.1.6)
-    i18n (0.5.0)
-    integration (0.1.0)
-    jekyll (0.11.2)
-      albino (~> 1.3)
-      classifier (~> 1.3)
-      directory_watcher (~> 1.1)
-      kramdown (~> 0.13)
-      liquid (~> 2.3)
-      maruku (~> 0.5)
-    json (1.6.5)
-    kramdown (0.13.5)
-    liquid (2.3.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
-    metaclass (0.0.1)
-    mime-types (1.17.2)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    mongo (1.6.0)
-      bson (= 1.6.0)
-    passenger (3.0.11)
-      daemon_controller (>= 0.2.5)
-      fastthread (>= 1.0.1)
-      rack
-      rake (>= 0.8.1)
-    polyglot (0.3.3)
-    posix-spawn (0.3.6)
-    rack (1.2.5)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.11)
-      actionmailer (= 3.0.11)
-      actionpack (= 3.0.11)
-      activerecord (= 3.0.11)
-      activeresource (= 3.0.11)
-      activesupport (= 3.0.11)
-      bundler (~> 1.0)
-      railties (= 3.0.11)
-    railties (3.0.11)
-      actionpack (= 3.0.11)
-      activesupport (= 3.0.11)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    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.14.6)
-    timecop (0.3.5)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    webmock (1.8.0)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    yard (0.7.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  SystemTimer (= 1.2.3)
-  appraisal (>= 1.0.0.beta2)
-  backports
-  bson_ext
-  bundler (>= 1.0.0)
-  fastthread!
-  garb
-  integration
-  jekyll
-  mocha
-  mongo
-  passenger (~> 3.0)
-  rack
-  rails (= 3.0.11)
-  rake
-  redis (>= 2.1)
-  redis-namespace (>= 1.1.0)
-  rubystats
-  shoulda
-  sqlite3
-  timecop
-  vanity!
-  webmock
-  yard

data/gemfiles/rails31.gemfile

@@ -1,32 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack"
-gem "redis", ">= 2.1"
-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 "rails", "3.1.3"
-gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
-gem "passenger", "~>3.0"
-
-group :development do
-  gem "appraisal", ">= 1.0.0.beta2"
-  gem "jekyll"
-  gem "rake"
-  gem "RedCloth"
-  gem "yard"
-end
-
-gemspec :path=>".././"