vanity 1.4.0 → 1.5.0.beta

data/test/myapp/log/production.log

@@ -2724,3 +2724,268 @@ Completed in 5ms (View: 1 | 200 OK [http://:? ]
 Processing MainController#index (for  at 2010-08-06 00:13:59) [GET]
   Parameters: {" "=>nil}
 Completed in 7ms (View: 2 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-03 11:30:25) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-03 11:31:47) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-03 11:32:33) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-03 11:33:37) [GET]
+  Parameters: {" "=>nil}
+Completed in 2ms (View: 0 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-03 11:34:32) [GET]
+  Parameters: {" "=>nil}
+Completed in 2ms (View: 0 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-03 11:36:41) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-03 11:37:23) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-03 12:05:18) [GET]
+  Parameters: {" "=>nil}
+Completed in 4ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-03 12:07:38) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-03 12:08:15) [GET]
+  Parameters: {" "=>nil}
+Completed in 180ms (View: 0 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 15:36:26) [GET]
+  Parameters: {" "=>nil}
+Completed in 281ms (View: 0 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 15:39:12) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 15:45:11) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 15:46:10) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 15:46:52) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 15:50:10) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 15:50:43) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 15:51:12) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 15:51:50) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 16:04:39) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 16:05:17) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 16:07:13) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 16:07:46) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 16:08:15) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 16:08:54) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 16:14:08) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 16:14:44) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 16:15:13) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-22 16:15:52) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-23 22:43:00) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-23 22:43:43) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-23 22:44:15) [GET]
+  Parameters: {" "=>nil}
+Completed in 8ms (View: 3 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-09-23 22:44:58) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-06 20:29:58) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 0 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-06 20:59:06) [GET]
+  Parameters: {" "=>nil}
+Completed in 2ms (View: 0 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-06 21:00:04) [GET]
+  Parameters: {" "=>nil}
+Completed in 2ms (View: 0 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 19:58:19) [GET]
+  Parameters: {" "=>nil}
+Completed in 307ms (View: 0 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 19:58:58) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 19:59:40) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 20:00:11) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 2 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 20:00:52) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:41:13) [GET]
+  Parameters: {" "=>nil}
+Completed in 4ms (View: 2 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:41:47) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:42:16) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:42:56) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:52:58) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:53:32) [GET]
+  Parameters: {" "=>nil}
+Completed in 4ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:54:02) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:54:41) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:55:32) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:56:06) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:56:34) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2010-10-12 22:57:16) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]

data/test/rails_test.rb

@@ -193,6 +193,24 @@ $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")
@@ -206,20 +224,36 @@ $stdout << Vanity.playground.connection
     File.unlink yml.path
   end
 
-  def test_collection_true_in_production
+  def test_collection_true_in_production_by_default
     assert_equal "true", load_rails(<<-RB, "production")
 initializer.after_initialize
 $stdout << Vanity.playground.collecting?
     RB
   end
 
-  def test_collection_false_in_development
+  def test_collection_false_in_production_when_configured
+    assert_equal "false", load_rails(<<-RB, "production")
+Vanity.playground.collecting = false
+initializer.after_initialize
+$stdout << Vanity.playground.collecting?
+    RB
+  end
+
+  def test_collection_false_in_development_by_default
     assert_equal "false", load_rails(<<-RB, "development")
 initializer.after_initialize
 $stdout << Vanity.playground.collecting?
     RB
   end
 
+  def test_collection_true_in_development_when_configured
+    assert_equal "true", load_rails(<<-RB, "development")
+Vanity.playground.collecting = true
+initializer.after_initialize
+$stdout << Vanity.playground.collecting?
+    RB
+  end
+
   def test_collection_false_after_test!
     assert_equal "false", load_rails(<<-RB, "production")
 initializer.after_initialize

data/test/test_helper.rb

@@ -45,8 +45,11 @@ class Test::Unit::TestCase
     # 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).
-    spec = { "redis"=>"redis://localhost/15", "mongodb"=>"mongo://localhost/vanity-test",
-             "mock"=>"mock:/" }[adapter]
+    spec = {
+      "redis"=>"redis://localhost/15",
+      "mongodb"=>"mongodb://localhost/vanity-test",
+      "mock"=>"mock:/"
+    }[adapter]
     raise "No support yet for #{adapter}" unless spec
     Vanity.playground = Vanity::Playground.new(:logger=>$logger, :load_path=>"tmp/experiments")
     Vanity.playground.establish_connection spec
@@ -84,7 +87,7 @@ class Test::Unit::TestCase
     Vanity.playground.collecting = false
     Vanity.playground.stubs(:connection).returns(stub(:flushdb=>nil))
   end
-  
+
   def teardown
     Vanity.context = nil
     FileUtils.rm_rf "tmp"
@@ -101,32 +104,6 @@ end
 
 ActiveRecord::Base.logger = $logger
 ActiveRecord::Base.establish_connection :adapter=>"sqlite3", :database=>File.expand_path("database.sqlite")
-# Call this to define aggregate functions not available in SQlite.
-class ActiveRecord::Base
-  def self.aggregates
-    connection.raw_connection.create_aggregate("minimum", 1) do
-      step do |func, value|
-        func[:minimum] = value.to_i unless func[:minimum] && func[:minimum].to_i < value.to_i
-      end
-      finalize { |func| func.result = func[:minimum] }
-    end
-
-    connection.raw_connection.create_aggregate("maximum", 1) do
-      step do |func, value|
-        func[:maximum] = value.to_i unless func[:maximum] && func[:maximum].to_i > value.to_i
-      end
-      finalize { |func| func.result = func[:maximum] }
-    end
-
-    connection.raw_connection.create_aggregate("average", 1) do
-      step do |func, value|
-        func[:total] = func[:total].to_i + value.to_i
-        func[:count] = func[:count].to_i + 1
-      end
-      finalize { |func| func.result = func[:total].to_i / func[:count].to_i }
-    end
-  end
-end
 
 
 class Array
@@ -134,7 +111,7 @@ class Array
   unless method_defined?(:shuffle)
     def shuffle
       copy = clone
-      Array.new(size) { copy.delete_at(Kernel.rand(copy.size)) } 
+      Array.new(size) { copy.delete_at(Kernel.rand(copy.size)) }
     end
   end
 end
@@ -145,7 +122,7 @@ 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) 
+    def self.test(name, &block)
       define_method("test_#{name.gsub(/\W/,'_')}", &block) if block
     end
     def self.xtest(*args) end

data/vanity.gemspec

@@ -1,6 +1,9 @@
+$: << File.dirname(__FILE__) + "/lib"
+require "vanity/version"
+
 Gem::Specification.new do |spec|
   spec.name           = "vanity"
-  spec.version        = "1.4.0"
+  spec.version        = Vanity::VERSION
   spec.author         = "Assaf Arkin"
   spec.email          = "assaf@labnotes.org"
   spec.homepage       = "http://vanity.labnotes.org"
@@ -8,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.description    = "Mirror, mirror on the wall ..."
   spec.post_install_message = "To get started run vanity --help"
 
-  spec.files          = Dir["{bin,lib,vendor,test}/**/*", "CHANGELOG", "MIT-LICENSE", "README.rdoc", "Rakefile", "Gemfile", "vanity.gemspec"]
+  spec.files          = Dir["{bin,lib,vendor,test}/**/*", "CHANGELOG", "MIT-LICENSE", "README.rdoc", "Rakefile", "Gemfile", "*.gemspec"]
   spec.executable     = "vanity"
 
   spec.has_rdoc         = true

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: vanity
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 31098233
+  prerelease: true
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  - beta
+  version: 1.5.0.beta
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -07:00
+date: 2010-10-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,8 +61,9 @@ extra_rdoc_files:
 files: 
 - bin/vanity
 - lib/vanity/adapters/abstract_adapter.rb
+- lib/vanity/adapters/active_record_adapter.rb
 - lib/vanity/adapters/mock_adapter.rb
-- lib/vanity/adapters/mongo_adapter.rb
+- lib/vanity/adapters/mongodb_adapter.rb
 - lib/vanity/adapters/redis_adapter.rb
 - lib/vanity/backport.rb
 - lib/vanity/commands/list.rb
@@ -86,6 +88,7 @@ files:
 - lib/vanity/templates/jquery.min.js
 - lib/vanity/templates/vanity.css
 - lib/vanity/templates/vanity.js
+- lib/vanity/version.rb
 - lib/vanity.rb
 - test/experiment/ab_test.rb
 - test/experiment/base_test.rb
@@ -131,7 +134,7 @@ licenses: []
 post_install_message: To get started run vanity --help
 rdoc_options: 
 - --title
-- Vanity 1.4.0
+- Vanity 1.5.0.beta
 - --main
 - README.rdoc
 - --webcvs
@@ -152,12 +155,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: