vanity 2.0.0.beta2 → 2.0.0.beta3

data/Gemfile.lock

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

data/README.rdoc

@@ -6,8 +6,7 @@ Vanity is an A/B testing framework for Rails that is datastore agnostic.
 * All about Vanity: http://vanity.labnotes.org
 * On Github: http://github.com/assaf/vanity
 
-http://farm3.static.flickr.com/2540/4099665871_497f274f68_o.jpg
-
+{<img src="https://raw.githubusercontent.com/assaf/vanity/bugfix/readme/doc/images/sidebar_test.png" alt="Dashbarod" />}[http://github.com/assaf/vanity]
 
 == A/B Testing With Rails
 
@@ -134,7 +133,7 @@ Conversions are created via the <code>track!</code> method. For example:
 
 To view metrics and experiment results with the dashboard in Rails 3 & Rails 4:
 
-  rails generate controller --helper=false Vanity
+  rails generate controller Vanity --helper=false
 
 In <code>config/routes.rb</code>, add:
 

data/gemfiles/rails32.gemfile.lock

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

data/gemfiles/rails4.gemfile.lock

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

data/lib/vanity/adapters/active_record_adapter.rb

@@ -166,12 +166,7 @@ module Vanity
         select = "sum(#{connection.quote_column_name('value')}) AS value, #{connection.quote_column_name('date')}"
         group_by = "#{connection.quote_column_name('date')}"
 
-        values = record.vanity_metric_values.all(
-          :select => select,
-          :conditions => conditions,
-          :order => order,
-          :group => group_by
-        )
+        values = record.vanity_metric_values.select(select).where(conditions).group(group_by)
 
         dates.map do |date|
           value = values.detect{|v| v.date == date }
@@ -223,8 +218,8 @@ module Vanity
       # :conversions.
       def ab_counts(experiment, alternative)
         record = VanityExperiment.retrieve(experiment)
-        participants = VanityParticipant.count(:conditions => {:experiment_id => experiment.to_s, :seen => alternative})
-        converted = VanityParticipant.count(:conditions => {:experiment_id => experiment.to_s, :converted => alternative})
+        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})
 
         {

data/lib/vanity/commands/report.rb

@@ -47,7 +47,7 @@ module Vanity
       locals = struct.new(*locals.values_at(*keys))
       dir, base = File.split(path)
       path = File.join(dir, partialize(base))
-      erb = ERB.new(File.read(path), nil, '<>')
+      erb = ERB.new(File.read("#{path}.erb"), nil, '<>')
       erb.filename = path
       erb.result(locals.instance_eval { binding })
     end

data/lib/vanity/templates/_metric.erb

@@ -1,14 +1,14 @@
 <h3><%=vanity_h metric.name %></h3>
-<%= vanity_simple_format vanity_h(Vanity::Metric.description(metric).to_s), :class=>"description" %>
-<%=
-begin 
-  data = Vanity::Metric.data(metric)
-  min, max = data.map(&:last).minmax
-  js = data.map { |date,value| "['#{date.to_time.httpdate}',#{value}]" }.join(",")
-  vanity_html_safe(%{<div class="chart"></div>
+<%= vanity_simple_format(vanity_h(metric.description), :class=>"description") %>
+<%= vanity_html_safe(%Q{<div class="chart"></div>
     <script type="text/javascript">
-    $(function(){Vanity.metric("#{vanity_h id.to_s}").plot([{label:"#{vanity_h metric.name}", data: [#{js}]}])})
-    </script>})
-rescue Exception=>ex
-  %{<div class="error">#{vanity_h ex.message}</div>}
-end %>
+    $(function() {
+      Vanity.metric("#{vanity_h(id)}")
+        .plot([{
+          label:"#{vanity_h(metric.name)}",
+          data: [#{Vanity::Metric.data(metric).map { |date,value| "['#{date.to_time.httpdate}',#{value}]" }.join(",")}]
+        }])
+    })
+    </script>}
+  )
+%>

data/lib/vanity/version.rb

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

data/test/commands/report_test.rb

@@ -0,0 +1,30 @@
+require "test_helper"
+require "vanity/commands/report"
+
+describe Vanity::Commands do
+  before do
+    metric "Coolness"
+  end
+
+  describe ".report" do
+    describe "given file" do
+      let(:file) { "tmp/config/redis.yml" }
+
+      it "writes to that file" do
+        new_ab_test :foobar do
+          alternatives "foo", "bar"
+          identify { "me" }
+          metrics :coolness
+        end
+        experiment(:foobar).choose
+
+        FileUtils.mkpath "tmp/config"
+        Vanity::Commands.report(file)
+      end
+
+      after do
+        File.unlink(File.open(file, "w"))
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,6 +135,7 @@ files:
 - test/adapters/redis_adapter_test.rb
 - test/autoconnect_test.rb
 - test/cli_test.rb
+- test/commands/report_test.rb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -186,7 +187,7 @@ licenses:
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 2.0.0.beta2
+- Vanity 2.0.0.beta3
 - --main
 - README.rdoc
 - --webcvs
@@ -215,6 +216,7 @@ test_files:
 - test/adapters/redis_adapter_test.rb
 - test/autoconnect_test.rb
 - test/cli_test.rb
+- test/commands/report_test.rb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb