fabes 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/fabes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fabes"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alejandro Andres"]
-  s.date = "2012-07-23"
+  s.date = "2012-07-25"
   s.description = "Fabes is an A/B testing system for your ruby projects"
   s.email = "fuzzy.alej@gmail.com"
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/fabes/connection_handling.rb",
     "lib/fabes/experiment.rb",
     "lib/fabes/helper.rb",
+    "lib/fabes/railtie.rb",
     "lib/fabes/utils.rb",
     "test/helper.rb",
     "test/test_abstract_adapter.rb",

data/lib/fabes.rb

@@ -17,15 +17,10 @@ module Fabes
   end
 
   def db
-    @db ||= ConnectionHandling.establish_connection Fabes.configuration.db, Fabes.configuration.adapter
+    @db ||= ConnectionHandling.establish_connection Fabes.configuration.database
   end
 end
 
 Fabes.configure
 
-if defined? Rails
-  ActionController::Base.send :include, Fabes::Helper
-  ActionController::Base.helper Fabes::Helper
-  #TODO: Autoadd route to admin panel
-  #TODO: Railtie???
-end
+require 'fabes/railtie' if defined? Rails

data/lib/fabes/admin/public/application.css

@@ -1,7 +1,8 @@
 body {
-  font: normal 12px auto Verdana, Arial, Helvetica, sans-serif;
-  color: #FDF3E7;
-  background: #3B3738;
+  font-family: 'trebuchet MS', 'Lucida sans', Arial, sans-serif;
+  font-size: 14px;
+  color: #3b3b3b;
+  background-image: url('http://subtlepatterns.com/patterns/fabric_plaid.png');
 }
 
 a {
@@ -18,38 +19,103 @@ h2.span {
   font-size: 16px;
 }
 
+#logo {
+  margin-bottom: 25px;
+}
+
+#logo h1 {
+  font-family: Arial, sans-serif;
+  font-size: 75px;
+  margin: 25px 0 0 0;
+  color: #504f4f;
+  text-shadow: 0px 2px 1px #bbbaba;
+}
+
+#logo span {
+  text-shadow: 0px 1px 1px #bbbaba;
+}
+
 table {
   width: 700px;
   padding: 0px;
   margin: 0px;
+  border: solid 1px #999;
+  *border-collapse: collapse;
+  border-spacing: 0;
+  border-radius: 6px;
+  -moz-border-radius: 6px;
+  -wekit-border-radius: 6px;
+  box-shadow: 0 1px 1px #999;
+  -webkit-box-shadow: 0 1px 1px #999;
+  -moz-box-shadow: 0 1px 1px #999;
 }
 
 th {
-  border-right: 1px solid #A64C2E;
-  border-bottom: 1px solid #A64C2E;
-  border-top: 1px solid #D53500;
-  border-left: 1px solid #D53500;
   letter-spacing: 2px;
   text-transform: uppercase;
   text-align: center;
   font-size: 13px;
   padding: 10px;
-  background: #C63D0F;
   color: #FFFFFF;
+  background-color: #C63D0F;
+  background-image: linear-gradient(top, #c63d0f, #6f1b00);
+  background-image: -webkit-linear-gradient(top, #c63d0f, #6f1b00);
+  background-image: -moz-linear-gradient(top, #c63d0f, #6f1b00);
   text-shadow: 1px 1px 1px black;
+  box-shadow: 0 1px 0 rgba(255, 200, 200, .8) inset;
+  -moz-box-shadow: 0 1px 0 rgba(255, 200, 200, .8) inset;
+  -webkit-box-shadow: 0 1px 0 rgba(255, 200, 200, .8) inset;
+}
+
+th:first-child {
+  background-color: #C63D0F;
+  background-image: linear-gradient(top, #c63d0f, #6f1b00)
+  background-image: -webkit-linear-gradient(top, #c63d0f, #6f1b00);
+  background-image: -moz-linear-gradient(top, #c63d0f, #6f1b00);
+  -moz-border-radius: 6px 0 0 0;
+  -webkit-border-radius: 6px 0 0 0;
+  border-radius: 6px 0 0 0;
+}
+
+th:last-child {
+  -moz-border-radius: 0 6px 0 0;
+  -webkit-border-radius: 0 6px 0 0;
+  border-radius: 0 6px 0 0;
 }
 
 td {
   border-right: 1px solid #C1DAD7;
   border-bottom: 1px solid #C1DAD7;
-  background: #FDF3E7;
   padding: 6px;
   color: #3B3738;
-  font-size: 13px;
+}
+
+td:first-child {
+  font-weight: bold;
+}
+
+tr {
+  background: white;
+}
+
+tr:last-child td:first-child {
+  border-radius: 0 0 0 6px;
+  -moz-border-radius: 0 0 0 6px;
+  -webkit-border-radius: 0 0 0 6px;
+}
+
+tr:last-child td:last-child {
+  border-radius: 0 0 6px 0;
+  -moz-border-radius: 0 0 6px 0;
+  -webkit-border-radius: 0 0 6px 0;
+}
+
+tr:hover {
+  background: #FBF8E9;
 }
 
 #container {
-  margin: 50px auto;
+  margin: 0 auto;
   text-align: center;
   overflow: hidden;
 }

data/lib/fabes/admin/views/index.haml

@@ -4,14 +4,16 @@
     .experiment
       %h2= "Experiment: #{name.capitalize}"
       %table{id: name.first, cellspacing: 0, summary: "Data for experiment '#{name}'"}
-        %tr
-          %th{scope: 'col'} Alternative
-          %th{scope: 'col'} Participants
-          %th{scope: 'col'} Hits
-          %th{scope: 'col'} Weight
-        - experiment.alternatives.each do |alternative|
+        %thead
           %tr
-            %td{title: alternative.id}= alternative.payload
-            %td= alternative.participants
-            %td= alternative.hits
-            %td= alternative.weight
+            %th{scope: 'col'} Alternative
+            %th{scope: 'col'} Participants
+            %th{scope: 'col'} Hits
+            %th{scope: 'col'} Weight
+        %tbody
+          - experiment.alternatives.each do |alternative|
+            %tr
+              %td{title: alternative.id}= alternative.payload
+              %td= alternative.participants
+              %td= alternative.hits
+              %td= alternative.weight

data/lib/fabes/admin/views/layout.haml

@@ -5,7 +5,8 @@
     %link{href: request.env['SCRIPT_NAME'] + '/application.css', media: 'all', rel: 'stylesheet', type: 'text/css'}
   %body
     #container
-      #header
-        .logo
+      #logo
+        %h1 Fabes
+        %span Fabulous A/B Experimentation System
       #content
         =yield

data/lib/fabes/configuration.rb

@@ -1,17 +1,20 @@
 module Fabes
   class Configuration
-    attr_accessor :adapter, :db
+    attr_accessor :database, :factor
 
     def initialize
-      @adapter = 'redis'
-      @db = nil
+      @database = ENV['FABES_DB_URL'] || ENV['REDISTOGO_URL']
+      @factor = 0.1
     end
 
-    def use(db_config)
-      @adapter = db_config[:adapter].to_s
-      @db = db_config[:db] || ENV['FABES_DB_URL'] || ENV['REDISTOGO_URL']
-    rescue => e
-      raise "Bad 'use' config: #{e.message}"
+    def use(options)
+      @database = options[:database] || options [:db]
+    rescue
+      @database = nil
+    end
+
+    def bandit_factor(percentage)
+      @factor = percentage
     end
   end
 end

data/lib/fabes/connection_adapters/abstract_adapter.rb

@@ -1,17 +1,31 @@
 module Fabes
   module ConnectionHandling
+    require 'ostruct'
     extend self
 
-    def establish_connection(db, adapter)
-      #TODO: automagically parse db a la rails
-      #REF: https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_handling.rb
+    def establish_connection(db)
+      database = connection_url_to_hash(db)
+      adapter = database.delete :adapter
       adapter_method = "#{adapter}_connection"
-      send adapter_method, db
-    rescue => e
+      send adapter_method, database
+    rescue
       raise "Could not find #{adapter} adapter!"
     end
 
-    def parse_connection_url(url)
+    #from https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/connection_specification.rb#L65
+    def connection_url_to_hash(url)
+      url ||= ''
+      uri = URI.parse url
+      spec = {
+        host:     uri.host,
+        port:     uri.port,
+        adapter:  uri.scheme,
+        username: uri.user,
+        password: uri.password,
+        database: uri.path.sub(%r{^/}, '')
+      }
+      spec.reject! {|_, value| !value}
+      {adapter: 'redis'}.merge spec
     end
   end
 

data/lib/fabes/connection_adapters/redis_adapter.rb

@@ -2,8 +2,8 @@ module Fabes
   module ConnectionHandling
     def self.redis_connection(db)
       require 'redis'
-      db ||= ::Redis.new
-      ConnectionAdapters::RedisAdapter.new(db)
+      redis = ::Redis.new db
+      ConnectionAdapters::RedisAdapter.new redis
     end
   end
 

data/lib/fabes/experiment.rb

@@ -52,7 +52,7 @@ module Fabes
     private
 
     def exploration?
-      rand() < 0.2 # 20% of times
+      rand() < Fabes.configuration.factor.to_f
     end
 
     def random_alternative

data/lib/fabes/railtie.rb

@@ -0,0 +1,7 @@
+module Fabes
+  class FabesRailtie < ::Rails::Railtie
+    ActionController::Base.send :include, Fabes::Helper
+    ActionController::Base.helper Fabes::Helper
+    #TODO: auto-inject route in rails?
+  end
+end

data/test/test_abstract_adapter.rb

@@ -4,17 +4,15 @@ class TestAbstractAdapter < Test::Unit::TestCase
   context 'establish_connection' do
     should 'raise if no suitable adapter' do
       assert_raise RuntimeError do
-        adapter = 'caca'
-        db = ''
-        Fabes::ConnectionHandling.establish_connection(db, adapter)
+        db = 'http://uno:dos@tres.com:123/'
+        Fabes::ConnectionHandling.establish_connection(db)
       end
     end
 
     should 'work if suitable adapter (redis)' do
-      adapter = 'redis'
-      db = ''
+      db = 'redis://uno:dos@tres.com:123/'
       Fabes::ConnectionHandling.expects :redis_connection
-      Fabes::ConnectionHandling.establish_connection(db, adapter)
+      Fabes::ConnectionHandling.establish_connection(db)
     end
   end
 end

data/test/test_configuration.rb

@@ -2,9 +2,14 @@ require 'helper'
 
 class TestConfiguration < Test::Unit::TestCase
   context 'initialization' do
-    should 'have an adapter' do
+    should 'have a database' do
       configuration = Fabes::Configuration.new
-      assert configuration.respond_to? :adapter
+      assert configuration.respond_to? :database
+    end
+
+    should 'have a factor' do
+      configuration = Fabes::Configuration.new
+      assert configuration.respond_to? :factor
     end
   end
 
@@ -14,20 +19,30 @@ class TestConfiguration < Test::Unit::TestCase
       assert configuration.respond_to? :use
     end
 
-    should 'set the adapter' do
+    should 'have a factor command' do
+      configuration = Fabes::Configuration.new
+      assert configuration.respond_to? :factor
+    end
+
+    should 'set the database' do
+      configuration = Fabes.configure do |c|
+        c.use database: 'redis://user:pwd@host.com:123/'
+      end
+      assert_not_nil configuration.instance_variable_get :@database
+    end
+
+    should 'nilify the db with bad configuration' do
       configuration = Fabes.configure do |c|
-        c.use db: 'abc', adapter: :redis
+        c.use fail: 'redis://user:pwd@host.com:123/'
       end
-      assert_not_nil configuration.instance_variable_get :@adapter
-      assert_equal configuration.instance_variable_get(:@adapter), 'redis'
+      assert_nil configuration.instance_variable_get :@database
     end
 
-    should 'set the db' do
+    should 'set the factor' do
       configuration = Fabes.configure do |c|
-        c.use db: 'abc', adapter: :redis
+        c.bandit_factor 0.25
       end
-      assert_not_nil configuration.instance_variable_get(:@db)
-      assert_equal configuration.instance_variable_get(:@db), 'abc'
+      assert_equal configuration.factor, 0.25
     end
   end
 end

data/test/test_redis_adapter.rb

@@ -15,6 +15,7 @@ class TestRedisAdapter < Test::Unit::TestCase
     setup do
       @db = Redis.new
       @adapter = Fabes::ConnectionAdapters::RedisAdapter.new(@db)
+      Fabes.stubs(:db).returns(@adapter)
       @experiment = Fabes::Experiment.new 'test', 'a', 'b', 'c'
       @adapter.save_experiment(@experiment)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fabes
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -185,6 +185,7 @@ files:
 - lib/fabes/connection_handling.rb
 - lib/fabes/experiment.rb
 - lib/fabes/helper.rb
+- lib/fabes/railtie.rb
 - lib/fabes/utils.rb
 - test/helper.rb
 - test/test_abstract_adapter.rb
@@ -208,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4128537144808349217
+      hash: 3698846090476597919
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: