fixed loadpaths and tests

lib/modesty.rb

@@ -18,8 +18,9 @@ module Modesty
 require 'modesty/metric.rb'
 require 'modesty/experiment.rb'
 require 'modesty/load.rb'
-$:.shift
 
 if defined? Rails
   require 'modesty/frameworks/rails'
 end
+
+$:.shift

lib/modesty/frameworks/rails.rb

@@ -1,5 +1,5 @@
 Modesty.root = File.join(Rails.root, 'modesty')
-Modesty.config_path = File.join(Rails.root, 'config/modesty.yml')
+Modesty.config_path = File.join(Rails.root, 'config', 'modesty.yml')
 Modesty.environment = Rails.env
 
 Rails.configuration.after_initialize do

spec/experiment_spec.rb

@@ -1,8 +1,9 @@
 require 'modesty'
 
 describe Modesty::Experiment, "creating an experiment" do
-  before :all do
-    Modesty.metrics = {}
+  before :each do
+    Modesty.metrics.clear
+    Modesty.experiments.clear
     Modesty.new_metric :foo do |m|
       m.description "Foo"
       m.submetric :bar do |m|
@@ -13,31 +14,31 @@
     Modesty.new_metric :baz do |m|
       m.description "Baz"
     end
-  end
 
-  it "can create an experiment with a block" do
-    e = Modesty.new_experiment(:creation_page) do |m|
+    @e = Modesty.new_experiment(:creation_page) do |m|
       m.description "Three versions of the creation page"
       m.alternatives :heavyweight, :lightweight
       m.metrics :foo/:bar, :baz
     end 
 
+    @f = Modesty.new_experiment :ab_test do |e|
+      e.description "only two groups"
+      e.metrics :baz
+    end
+  end
+
+  it "can create an experiment with a block" do
     Modesty.experiments.should include :creation_page
-    Modesty.experiments[:creation_page].should == e
+    Modesty.experiments[:creation_page].should == @e
 
-    e.metrics.should include Modesty.metrics[:foo/:bar]
-    e.metrics.should include Modesty.metrics[:baz]
-    e.alternatives.should == [:control, :heavyweight, :lightweight]
-    e.description.should == "Three versions of the creation page"
+    @e.metrics.should include Modesty.metrics[:foo/:bar]
+    @e.metrics.should include Modesty.metrics[:baz]
+    @e.alternatives.should == [:control, :heavyweight, :lightweight]
+    @e.description.should == "Three versions of the creation page"
   end
 
   it "uses [:control, :experiment] as the default experiment groups" do
-    e = Modesty.new_experiment :ab_test do |e|
-      e.description "only two groups"
-      e.metrics :baz
-    end
-
-    e.alternatives.should == [:control, :experiment]
+    @f.alternatives.should == [:control, :experiment]
   end
 
   it "auto-creates metrics" do

spec/load_spec.rb

@@ -4,7 +4,8 @@
   before :all do
     Modesty.root = File.join(
       Modesty::TEST,
-      'myapp'
+      'myapp',
+      'modesty'
     )
     Modesty.environment = 'test'
     Modesty.load_config!
@@ -15,7 +16,7 @@
       File.expand_path(
         File.join(
           File.dirname(__FILE__),
-          "../test/myapp/experiments/metrics"
+          "../test/myapp/modesty/metrics"
         )
       )
   end
@@ -33,7 +34,7 @@
     )
 
     Modesty.environment = 'test'
-    Modesty.metrics = {}
+    Modesty.metrics.clear
   end
 
   it "can load metrics" do
@@ -63,15 +64,15 @@
 
   after :all do
     Modesty.root = nil
-    Modesty.metrics = {}
   end
 end
 
 describe "Loading experiments" do
   before :all do
     Modesty.environment = 'test'
+    Modesty.metrics.clear
+    Modesty.experiments.clear
     Modesty.load_all_metrics!
-    Modesty.experiments = {}
   end
 
   it "can load experiments" do
@@ -83,9 +84,4 @@
   it "actually loads experiments" do
     Modesty.experiments.should include :cookbook
   end
-
-  after :all do
-    Modesty.metrics = {}
-    Modesty.experiments = {}
-  end
 end

spec/rails_spec.rb

@@ -1,14 +1,8 @@
-require 'modesty'
-
 describe "bootstrap" do
   before :all do
-    Modesty.root = File.join(
-      Modesty::TEST,
-      'myapp'
-    )
-    Modesty.metrics = {}
-    Modesty.experiments = {}
-    Modesty.load!
+    Modesty.data.flushdb
+    Modesty.metrics.clear
+    Modesty.experiments.clear
 
     unless defined? Rails
       class Rails
@@ -32,10 +26,8 @@ def self.after_initialize
         end
       end
     end
-  end
 
-  it "can bootstrap" do
-    lambda { require 'modesty/frameworks/rails.rb' }.should_not raise_error
+    require 'modesty/frameworks/rails'
   end
 
   it "bootstraps Redis" do

test/myapp/config/modesty.yml

@@ -6,4 +6,4 @@ test:
 
   paths:
     experiments: experiments
-    metrics: experiments/metrics
+    metrics: metrics