vanity 1.8.4 → 1.9.0.beta

data/gemfiles/rails32.gemfile.lock

@@ -5,15 +5,14 @@ GIT
     fastthread (1.0.7)
 
 PATH
-  remote: /Users/phill/Development/ruby/vanity
+  remote: ..
   specs:
-    vanity (1.8.4)
-      redis (>= 2.1)
-      redis-namespace (>= 1.1.0)
+    vanity (1.8.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    RedCloth (4.2.9)
     SystemTimer (1.2.3)
     actionmailer (3.2.1)
       actionpack (= 3.2.1)
@@ -43,30 +42,48 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.7)
-    appraisal (0.4.1)
+    albino (1.3.3)
+      posix-spawn (>= 0.3.6)
+    appraisal (1.0.0.beta2)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (3.0.2)
     backports (3.3.5)
     bson (1.6.0)
     bson_ext (1.6.0)
       bson (= 1.6.0)
     builder (3.0.0)
+    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.7.0)
+    fast-stemmer (1.0.0)
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
     hike (1.2.1)
     i18n (0.6.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)
     journey (1.0.3)
     json (1.6.5)
+    kramdown (0.13.5)
+    liquid (2.3.0)
     mail (2.4.1)
       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)
@@ -80,8 +97,8 @@ GEM
       fastthread (>= 1.0.1)
       rack
       rake (>= 0.8.1)
-    pg (0.13.2)
     polyglot (0.3.3)
+    posix-spawn (0.3.6)
     rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
@@ -107,9 +124,9 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    redis (3.2.0)
-    redis-namespace (1.5.1)
-      redis (~> 3.0, >= 3.0.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)
@@ -120,6 +137,8 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.8)
+    syntax (1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
     timecop (0.3.5)
@@ -130,27 +149,34 @@ GEM
     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
+  appraisal (>= 1.0.0.beta2)
   backports
   bson_ext
   fastthread!
   garb
   integration
+  jekyll
   mocha
   mongo
   mysql
   passenger (~> 3.0)
-  pg
   rack
   rails (= 3.2.1)
+  rake
+  redis (>= 2.1)
+  redis-namespace (>= 1.1.0)
   rubystats
   shoulda
+  sqlite3
   timecop
   vanity!
   webmock
+  yard

data/gemfiles/rails4.gemfile

@@ -3,16 +3,17 @@
 source "https://rubygems.org"
 
 gem "rack"
+gem "redis", ">= 2.1"
+gem "redis-namespace", ">= 1.1.0"
 gem "bson_ext"
 gem "mongo"
 gem "mysql"
-gem "pg"
+gem "sqlite3"
 gem "backports", :platforms=>:mri_18
 gem "integration"
 gem "rubystats"
 gem "garb"
 gem "SystemTimer", "1.2.3", :platforms=>:mri_18
-gem "appraisal"
 gem "mocha", :require=>false
 gem "shoulda", :require=>false
 gem "timecop", :require=>false
@@ -21,4 +22,12 @@ gem "rails", "4.0.0"
 gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"
 
-gemspec :path=>"../"
+group :development do
+  gem "appraisal", ">= 1.0.0.beta2"
+  gem "jekyll"
+  gem "rake"
+  gem "RedCloth"
+  gem "yard"
+end
+
+gemspec :path=>".././"

data/gemfiles/rails4.gemfile.lock

@@ -5,15 +5,14 @@ GIT
     fastthread (1.0.7)
 
 PATH
-  remote: /Users/phill/Development/ruby/vanity
+  remote: ..
   specs:
-    vanity (1.8.4)
-      redis (>= 2.1)
-      redis-namespace (>= 1.1.0)
+    vanity (1.8.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    RedCloth (4.2.9)
     SystemTimer (1.2.3)
     actionmailer (4.0.0)
       actionpack (= 4.0.0)
@@ -40,9 +39,12 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     addressable (2.3.5)
-    appraisal (0.5.2)
+    albino (1.3.3)
+      posix-spawn (>= 0.3.6)
+    appraisal (1.0.0.beta2)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (4.0.1)
     atomic (1.1.14)
     backports (3.3.5)
@@ -50,19 +52,34 @@ GEM
     bson_ext (1.9.2)
       bson (~> 1.9.2)
     builder (3.1.4)
+    classifier (1.3.3)
+      fast-stemmer (>= 1.0.0)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
     daemon_controller (1.1.7)
+    directory_watcher (1.4.1)
     erubis (2.7.0)
+    fast-stemmer (1.0.0)
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
     hike (1.2.3)
     i18n (0.6.5)
     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)
+    kramdown (0.13.5)
+    liquid (2.3.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
     metaclass (0.0.1)
     mime-types (1.25)
     minitest (4.7.5)
@@ -77,8 +94,8 @@ GEM
       fastthread (>= 1.0.1)
       rack
       rake (>= 0.8.1)
-    pg (0.17.0)
     polyglot (0.3.3)
+    posix-spawn (0.3.6)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -96,9 +113,9 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
-    redis (3.2.0)
-    redis-namespace (1.5.1)
-      redis (~> 3.0, >= 3.0.4)
+    redis (3.0.6)
+    redis-namespace (1.3.2)
+      redis (~> 3.0.4)
     rubystats (0.2.3)
     safe_yaml (0.9.7)
     shoulda (3.5.0)
@@ -116,6 +133,8 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
+    sqlite3 (1.3.8)
+    syntax (1.0.0)
     thor (0.18.1)
     thread_safe (0.1.3)
       atomic
@@ -128,27 +147,34 @@ GEM
     webmock (1.15.2)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
+    yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  RedCloth
   SystemTimer (= 1.2.3)
-  appraisal
+  appraisal (>= 1.0.0.beta2)
   backports
   bson_ext
   fastthread!
   garb
   integration
+  jekyll
   mocha
   mongo
   mysql
   passenger (~> 3.0)
-  pg
   rack
   rails (= 4.0.0)
+  rake
+  redis (>= 2.1)
+  redis-namespace (>= 1.1.0)
   rubystats
   shoulda
+  sqlite3
   timecop
   vanity!
   webmock
+  yard

data/lib/vanity/adapters/abstract_adapter.rb

@@ -66,6 +66,10 @@ module Vanity
 
       # -- Experiments --
 
+      def experiment_persisted?(experiment)
+        fail "Not implemented"
+      end
+
       # Store when experiment was created (do not write over existing value).
       def set_experiment_created_at(experiment, time)
         fail "Not implemented"

data/lib/vanity/adapters/active_record_adapter.rb

@@ -27,8 +27,7 @@ module Vanity
       # Metric model
       class VanityMetric < VanityRecord
         self.table_name = :vanity_metrics
-        has_many :vanity_metric_values,
-          :class_name => 'Vanity::Adapters::ActiveRecordAdapter::VanityMetricValue'
+        has_many :vanity_metric_values
 
         def self.retrieve(metric)
           find_or_create_by_metric_id(metric.to_s)
@@ -40,15 +39,13 @@ module Vanity
         attr_accessible :date, :index, :value if needs_attr_accessible?
 
         self.table_name = :vanity_metric_values
-        belongs_to :vanity_metric,
-          :class_name => 'Vanity::Adapters::ActiveRecordAdapter::VanityMetric'
+        belongs_to :vanity_metric
       end
 
       # Experiment model
       class VanityExperiment < VanityRecord
         self.table_name = :vanity_experiments
-        has_many :vanity_conversions, :dependent => :destroy,
-          :class_name => 'Vanity::Adapters::ActiveRecordAdapter::VanityConversion'
+        has_many :vanity_conversions, :dependent => :destroy
         attr_accessible :experiment_id if needs_attr_accessible?
 
         # Finds or creates the experiment
@@ -65,8 +62,7 @@ module Vanity
       # Conversion model
       class VanityConversion < VanityRecord
         self.table_name = :vanity_conversions
-        belongs_to :vanity_experiment,
-          :class_name => 'Vanity::Adapters::ActiveRecordAdapter::VanityExperiment'
+        belongs_to :vanity_experiment
       end
 
       # Participant model
@@ -90,6 +86,8 @@ module Vanity
       end
 
       def initialize(options)
+
+
         @options = options.inject({}) { |h,kv| h[kv.first.to_s] = kv.last ; h }
         if @options["active_record_adapter"] && (@options["active_record_adapter"] != "default")
           @options["adapter"] = @options["active_record_adapter"]
@@ -115,6 +113,9 @@ module Vanity
         end
       end
 
+
+      # -- Metrics --
+
       def get_metric_last_update_at(metric)
         record = VanityMetric.find_by_metric_id(metric.to_s)
         record && record.updated_at
@@ -158,6 +159,13 @@ module Vanity
         record && record.destroy
       end
 
+
+      # -- Experiments --
+
+      def experiment_persisted?(experiment)
+        VanityExperiment.find_by_experiment_id(experiment.to_s).present?
+      end
+
       # Store when experiment was created (do not write over existing value).
       def set_experiment_created_at(experiment, time)
         record = VanityExperiment.find_by_experiment_id(experiment.to_s) ||
@@ -226,8 +234,8 @@ module Vanity
 
       # Determines if a participant already has seen this alternative in this experiment.
       def ab_seen(experiment, identity, alternative)
-      	participant = VanityParticipant.retrieve(experiment, identity, false)
-      	participant && participant.seen == alternative.id
+        participant = VanityParticipant.retrieve(experiment, identity, false)
+        participant && participant.seen == alternative.id
       end
 
       # Returns the participant's seen alternative in this experiment, if it exists

data/lib/vanity/adapters/mock_adapter.rb

@@ -44,7 +44,7 @@ module Vanity
 
 
       # -- Metrics --
-      
+
       def get_metric_last_update_at(metric)
         @metrics[metric] && @metrics[metric][:last_update_at]
       end
@@ -66,10 +66,14 @@ module Vanity
       def destroy_metric(metric)
         @metrics.delete metric
       end
-      
+
 
       # -- Experiments --
-     
+
+      def experiment_persisted?(experiment)
+        !!@experiments[experiment]
+      end
+
       def set_experiment_created_at(experiment, time)
         @experiments[experiment] ||= {}
         @experiments[experiment][:created_at] ||= time
@@ -133,7 +137,7 @@ module Vanity
         if implicit
           alt[:participants] << identity
         else
-          participating = alt[:participants].include?(identity) 
+    participating = alt[:participants].include?(identity)
         end
         alt[:converted] << identity if implicit || participating
         alt[:conversions] += count

data/lib/vanity/adapters/mongodb_adapter.rb

@@ -73,10 +73,10 @@ module Vanity
         @experiments.drop
         @participants.drop
       end
-      
+
 
       # -- Metrics --
-      
+
       def get_metric_last_update_at(metric)
         record = @metrics.find_one(:_id=>metric)
         record && record["last_update_at"]
@@ -99,12 +99,16 @@ module Vanity
       def destroy_metric(metric)
         @metrics.remove :_id=>metric
       end
-      
+
 
       # -- Experiments --
-     
+
+      def experiment_persisted?(experiment)
+        !!@experiments.find_one({ :_id=>experiment })
+      end
+
       def set_experiment_created_at(experiment, time)
-        @experiments.insert :_id=>experiment, :created_at=>time
+        @experiments.insert(:_id=>experiment, :created_at=>time)
       end
 
       def get_experiment_created_at(experiment)
@@ -152,8 +156,8 @@ module Vanity
 
       # Determines if a participant already has seen this alternative in this experiment.
       def ab_seen(experiment, identity, alternative)
-	participant = @participants.find_one({ :experiment=>experiment, :identity=>identity }, { :fields=>[:seen] })
-	participant && participant["seen"].first == alternative.id
+        participant = @participants.find_one({ :experiment=>experiment, :identity=>identity }, { :fields=>[:seen] })
+        participant && participant["seen"].first == alternative.id
       end
 
       # Returns the participant's seen alternative in this experiment, if it exists