vanity 2.0.0.beta3 → 2.0.0.beta4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vanity (2.0.0.beta3)
+    vanity (2.0.0.beta4)
 
 GEM
   remote: https://rubygems.org/

data/bin/vanity

@@ -16,7 +16,6 @@ opts = OptionParser.new("", 24, "  ") do |opts|
   opts.banner << "Commands:\n"
   opts.banner << "  list    List all experiments and metrics\n"
   opts.banner << "  report  Report on all running experiments/metrics\n"
-  opts.banner << "  upgrade Upgrade your database when deploying new release\n"
 
   opts.separator ""
   opts.separator "Reporting options:"
@@ -29,13 +28,9 @@ opts = OptionParser.new("", 24, "  ") do |opts|
   opts.on "--load_path PATH", "Path to experiments directory (default: #{playground.load_path})" do |path|
     playground.load_path = path
   end
-  opts.on "-d", "--database url", "Database connection URL (e.g. redis:/localhost:6379)" do |conn|
+  opts.on "-d", "--database url", "Database connection URL (e.g. redis://localhost:6379)" do |conn|
     playground.establish_connection conn
   end
-  opts.on "--redis HOST:PORT:DB", "DEPRECATED: Redis server host (default: localhost:6379)" do |redis|
-    host, port, db = redis.split(":")
-    playground.establish_connection "redis:/#{host}:#{port}/#{db}"
-  end
   opts.on_tail "-h", "--help", "Show this message" do
     puts opts.to_s.gsub(/^.*DEPRECATED.*$/s, '')
     exit
@@ -60,9 +55,6 @@ ARGV.each do |cmd|
   when "list"
     require "vanity/commands/list"
     Vanity::Commands.list
-  when "upgrade"
-    require "vanity/commands/upgrade"
-    Vanity::Commands.upgrade
   else puts "No such command: #{cmd}"
   end
 end

data/doc/_layouts/page.html

@@ -15,7 +15,7 @@
     </div>
     <div id="links">
       <a href="http://github.com/assaf/vanity">Source code</a> |
-      <a href="http://groups.google.com/group/vanity-talk" title="vanity-talk google group">Google Group</a> |
+      <a href="http://stackoverflow.com/questions/tagged/vanity" title="stackoverflow vanity tag">StackOverflow Tag</a> |
       <a href="http://rdoc.info/gems/vanity">API reference</a>
     </div>
     <div id="sidebar">

data/doc/contributing.textile

@@ -15,7 +15,7 @@ By all means.
 
 h3(#contributing).  How To Contribute
 
-Pick on an "open issue":http://github.com/assaf/vanity/issues, "experimental feature":experimental.html, suggestion from the "Google Group":http://groups.google.com/group/vanity-talk, or whatever you feel like contributing.
+Pick on an "open issue":http://github.com/assaf/vanity/issues, "experimental feature":experimental.html, or whatever you feel like contributing.
 
 To contribute new code/changes:
 # "Fork the project":http://github.com/assaf/vanity
@@ -68,7 +68,7 @@ h3(#doc). Documentation
 
 Documentation is written in "Textile":http://redcloth.org/textile/writing-paragraph-text/, and converted to HTML using "Jekyll":http://jekyllrb.com/.
 
-API reference is "RDoc":http://rdoc.sourceforge.net/doc/index.html, converted to HTML using "Yardoc":http://yardoc.org/. 
+API reference is "RDoc":http://rdoc.sourceforge.net/doc/index.html, converted to HTML using "Yardoc":http://yardoc.org/.
 
 To build and view documentation:
 

data/doc/index.textile

@@ -21,7 +21,7 @@ Also:
 * "Experiment Driven Development(Introduction to EDD and Vanity)":http://blog.labnotes.org/2009/11/19/vanity-experiment-driven-development-for-rails/
 * "Get the code(Official Github repository)":http://github.com/assaf/vanity
 * "API reference":api/index.html
-* "Join vanity-talk list":http://groups.google.com/group/vanity-talk
+* "Ask questions on StackOverflow":http://stackoverflow.com/questions/tagged/vanity
 * "Contributing to Vanity":contributing.html
 
 h3(#intro). Introduction & setup

data/gemfiles/rails32.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0.beta3)
+    vanity (2.0.0.beta4)
 
 GEM
   remote: https://rubygems.org/

data/gemfiles/rails4.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0.beta3)
+    vanity (2.0.0.beta4)
 
 GEM
   remote: https://rubygems.org/

data/lib/vanity/adapters/active_record_adapter.rb

@@ -25,14 +25,6 @@ module Vanity
             send :"find_or_create_by_#{method}", value
           end
         end
-
-        def self.rails_agnostic_find_first(conditions)
-          if respond_to? :where
-            where(conditions).first
-          else
-            find(:first, :conditions => conditions)
-          end
-        end
       end
 
       # Schema model
@@ -103,7 +95,7 @@ module Vanity
         # passed then this will be passed to create if creating, or will be
         # used to update the found participant.
         def self.retrieve(experiment, identity, create = true, update_with = nil)
-          if record = VanityParticipant.rails_agnostic_find_first(:experiment_id=>experiment.to_s, :identity=>identity.to_s)
+          if record = VanityParticipant.where(:experiment_id=>experiment.to_s, :identity=>identity.to_s).first
             record.update_attributes(update_with) if update_with
           elsif create
             record = VanityParticipant.create({ :experiment_id=>experiment.to_s, :identity=>identity.to_s }.merge(update_with || {}))
@@ -220,7 +212,7 @@ module Vanity
         record = VanityExperiment.retrieve(experiment)
         participants = VanityParticipant.where(:experiment_id => experiment.to_s, :seen => alternative).count
         converted = VanityParticipant.where(:experiment_id => experiment.to_s, :converted => alternative).count
-        conversions = record.vanity_conversions.sum(:conversions, :conditions => {:alternative => alternative})
+        conversions = record.vanity_conversions.where(:alternative => alternative).sum(:conversions)
 
         {
           :participants => participants,

data/lib/vanity/metric/active_record.rb

@@ -39,15 +39,19 @@ module Vanity
         class_or_scope = class_or_scope.constantize if class_or_scope.is_a?(String)
         options = options || {}
         conditions = options.delete(:conditions)
-        @ar_scoped = conditions ? class_or_scope.scoped(:conditions=>conditions) : class_or_scope
+
+        @ar_scoped = conditions ? class_or_scope.where(conditions) : class_or_scope
         @ar_aggregate = AGGREGATES.find { |key| options.has_key?(key) }
         @ar_column = options.delete(@ar_aggregate)
         fail "Cannot use multiple aggregates in a single metric" if AGGREGATES.find { |key| options.has_key?(key) }
+
         @ar_timestamp = options.delete(:timestamp) || :created_at
         @ar_timestamp, @ar_timestamp_table = @ar_timestamp.to_s.split('.').reverse
         @ar_timestamp_table ||= @ar_scoped.table_name
+
         fail "Unrecognized options: #{options.keys * ", "}" unless options.empty?
-        @ar_scoped.after_create self
+
+        @ar_scoped.after_create(self)
         extend ActiveRecord
       end
     end
@@ -65,9 +69,16 @@ module Vanity
         sdate = sdate + difference
         edate = edate + difference
 
-        query = { :conditions=> { @ar_timestamp_table => { @ar_timestamp => (sdate.to_time...(edate + 1).to_time) } },
-                  :group=>"date(#{@ar_scoped.quoted_table_name}.#{@ar_scoped.connection.quote_column_name @ar_timestamp})" }
-        grouped = @ar_column ? @ar_scoped.send(@ar_aggregate, @ar_column, query) : @ar_scoped.count(query)
+        grouped = @ar_scoped
+            .where(@ar_timestamp_table => { @ar_timestamp => (sdate.to_time...(edate + 1).to_time) })
+            .group("date(#{@ar_scoped.quoted_table_name}.#{@ar_scoped.connection.quote_column_name(@ar_timestamp)})")
+
+        if @ar_column
+          grouped = grouped.send(@ar_aggregate, @ar_column)
+        else
+          grouped = grouped.count
+        end
+
         grouped = Hash[grouped.map {|k,v| [k.to_date, v] }]
         (sdate..edate).inject([]) { |ordered, date| ordered << (grouped[date] || 0) }
       end
@@ -79,6 +90,7 @@ module Vanity
       end
 
       def last_update_at
+        # SELECT created_at FROM "skies" ORDER BY created_at DESC LIMIT 1
         record = @ar_scoped.find(:first, :order=>"#@ar_timestamp DESC", :limit=>1, :select=>@ar_timestamp)
         record && record.send(@ar_timestamp)
       end

data/lib/vanity/version.rb

@@ -1,5 +1,5 @@
 module Vanity
-  VERSION = "2.0.0.beta3"
+  VERSION = "2.0.0.beta4"
 
   module Version
     version = VERSION.to_s.split(".").map { |i| i.to_i }

data/test/cli_test.rb

@@ -37,10 +37,10 @@ describe "bin/vanity" do
   end
 
   it "responds to unknown commands" do
-    require "vanity/commands/upgrade"
-    Vanity::Commands.expects(:upgrade)
-    ARGV.clear
-    ARGV << 'upgrade'
-    load "bin/vanity"
+    assert_output("No such command: upgrade\n") do
+      ARGV.clear
+      ARGV << 'upgrade'
+      load "bin/vanity"
+    end
   end
 end

data/test/dummy/config/initializers/secret_token.rb

@@ -5,3 +5,4 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 Dummy::Application.config.secret_token = '33ccbc9a29f3b02e87c08904505b1c9a3a1e97dd01f02e598e65ee9e7b96fff2ca4a6d0dd7c4a8d3682d8c64f84d372661e141264e70697dc576c722c72d80d0'
+Dummy::Application.config.secret_key_base = 'secret' if Dummy::Application.config.respond_to?(:secret_key_base=)

data/test/metric/active_record_test.rb

@@ -1,23 +1,22 @@
 require "test_helper"
 
 class Sky < ActiveRecord::Base
-  if connected?
-    connection.drop_table :skies if table_exists?
-    connection.create_table :skies do |t|
+  scope :high, lambda { where("height >= 4") }
+end
+
+if ENV["DB"] == "active_record"
+
+describe Vanity::Metric::ActiveRecord do
+
+  before do
+    Sky.connection.create_table(:skies) do |t|
       t.integer :height
       t.timestamps
     end
   end
 
-  scope :high, lambda { { :conditions=>"height >= 4" } }
-end
-
-if ActiveRecord::Base.connected?
-
-describe "ActiveRecord Metric" do
-
   after do
-    Sky.delete_all
+    Sky.connection.drop_table(:skies) if Sky.connection.table_exists?(Sky.table_name)
     Sky.reset_callbacks(:create)
     Sky.reset_callbacks(:save)
   end
@@ -236,7 +235,7 @@ describe "ActiveRecord Metric" do
     assert_equal 2, times
   end
 
-  it "do it youself" do
+  it "do it yourself" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do

data/test/playground_test.rb

@@ -49,13 +49,15 @@ describe Vanity::Playground do
     end
   end
 
-  describe "autoconnect" do
-    it "reconnects with existing connection" do
+  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?

data/test/test_helper.rb

@@ -70,7 +70,7 @@ module VanityTestHelpers
   # or reload an experiment (saved by the previous playground).
   def new_playground
     Vanity.playground = Vanity::Playground.new(:logger=>$logger, :load_path=>"tmp/experiments")
-    Vanity.playground.establish_connection(DATABASE)
+    Vanity.playground.establish_connection(DATABASE) unless Vanity.playground.connected?
   end
 
   # Defines the specified metrics (one or more names). Returns metric, or array
@@ -107,7 +107,7 @@ module VanityTestHelpers
   end
 
   def dummy_request
-    defined?(ActionDispatch) ? ActionDispatch::TestRequest.new() : ActionController::TestRequest.new()
+    ActionDispatch::TestRequest.new()
   end
 
   # Defining setup/tear down in a module and including it below doesn't

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.0.0.beta4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,6 @@ files:
 - lib/vanity/backport.rb
 - lib/vanity/commands/list.rb
 - lib/vanity/commands/report.rb
-- lib/vanity/commands/upgrade.rb
 - lib/vanity/experiment/ab_test.rb
 - lib/vanity/experiment/alternative.rb
 - lib/vanity/experiment/base.rb
@@ -163,11 +162,6 @@ files:
 - test/dummy/script/rails
 - test/experiment/ab_test.rb
 - test/experiment/base_test.rb
-- test/experiments/age_and_zipcode.rb
-- test/experiments/metrics/cheers.rb
-- 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
@@ -187,7 +181,7 @@ licenses:
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 2.0.0.beta3
+- Vanity 2.0.0.beta4
 - --main
 - README.rdoc
 - --webcvs
@@ -244,11 +238,6 @@ test_files:
 - test/dummy/script/rails
 - test/experiment/ab_test.rb
 - test/experiment/base_test.rb
-- test/experiments/age_and_zipcode.rb
-- test/experiments/metrics/cheers.rb
-- 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

data/lib/vanity/commands/upgrade.rb

@@ -1,34 +0,0 @@
-module Vanity
-  module Commands
-    class << self
-      # Upgrade to newer version of Vanity (this usually means doing magic in
-      # the database)
-      def upgrade
-        if Vanity.playground.connection.respond_to?(:redis)
-          redis = Vanity.playground.connection.redis
-          # Upgrade metrics from 1.3 to 1.4
-          keys = redis.keys("metrics:*")
-          if keys.empty?
-            puts "No metrics to upgrade"
-          else
-            puts "Updating #{keys.map { |name| name.split(":")[1] }.uniq.length} metrics"
-            keys.each do |key|
-              key << ":value:0" if key[/\d{4}-\d{2}-\d{2}$/] 
-              redis.renamenx key, "vanity:#{key}"
-            end
-          end
-          # Upgrade experiments from 1.3 to 1.4
-          keys = redis.keys("vanity:1:*")
-          if keys.empty?
-            puts "No experiments to upgrade"
-          else
-            puts "Updating #{keys.map { |name| name.split(":")[2] }.uniq.length} experiments"
-            keys.each do |key|
-              redis.renamenx key, key.gsub(":1:", ":experiments:")
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/test/experiments/age_and_zipcode.rb

@@ -1,19 +0,0 @@
-ab_test "Age and Zipcode" do
-  description <<-TEXT
-Testing new registration form that asks for age and zipcode. Option A presents
-the existing form, and option B adds age and zipcode fields.
-   
-We know option B will convert less, but higher quality leads. If we lose less
-than 20% conversions, we're going to switch to option B.
-  TEXT
-  metrics :signups
-
-  complete_if do
-    alternatives.all? { |alt| alt.participants > 100 }
-  end
-  outcome_is do
-    one_field = alternative(false)
-    three_fields = alternative(true)
-    three_fields.conversion_rate >= 0.8 * one_field.conversion_rate ? three_fields : one_field
-  end
-end

data/test/experiments/metrics/cheers.rb

@@ -1,3 +0,0 @@
-metric "Cheers" do
-  description "They love us, don't they?"
-end

data/test/experiments/metrics/signups.rb

@@ -1,2 +0,0 @@
-metric "Signups" do
-end

data/test/experiments/metrics/yawns.rb

@@ -1,3 +0,0 @@
-metric "Yawns" do
-  description "How many yawns/sec can our video-sharing micro-blogging social network elicit?"
-end

data/test/experiments/null_abc.rb

@@ -1,5 +0,0 @@
-ab_test "Null/ABC" do
-  description "Testing three alternatives"
-  alternatives nil, :red, :green, :blue
-  metrics :signups
-end