sapling 0.2.2 → 0.3.0

data/README.md

@@ -44,10 +44,16 @@ Server-side Usage
 
 To check if a feature is enabled for a user in rails controllers or views: use
   
-    feature_active?(:space_chat [, :user => the current user])
+    sapling.active?(:space_chat [, :user => the current user])
+    
   
   *Note*: sapling will automatically populate the user argument by calling `current_user`
   
+To get the css classes the javascript adds to the HTML element for a feature:
+
+    sapling.css_class(:space_chat)
+    sapling.css_toggle_class(:space_chat)    
+  
 To enable a feature for a specific user, in the rails console:
   
     Sapling::ActiveRecord.new.activate_user(:space_chat, space_admin)
@@ -67,6 +73,23 @@ To disable a feature activated for anyone but individually-activated users, in t
 *Note*: Individually-activated users are always activated, regardless of the percentage setting.  A deactivated user
 may still have access to a feature if they fall within an active percentage.
 
+Custom Feature-Active Tests
+---------------------------
+
+You can optionally inject your own code for testing if a feature is active. In rails, just added methods of the following form to your ApplicationController:
+
+    # Example: override feature-active? for feature :new_homepage                                                         
+    # options:                                                                                                        
+    #   :feature => object of type Sapling::Feature
+    #       (current settings for the feature from the database)
+    #   :user => user to test for feature-active                                                                                                             
+    # return true if the feature is active.
+    def new_homepage_active?(options={})                                                                            
+      # your test here
+    end                                                                                                             
+
+*Note* If you are using Sapling manually, when you create a Sapling instance, you can pass in an any object which responds to "current_user" and implements zero or more of your feature-active overrides.
+
 Client-side Usage
 -----------------
 
@@ -100,11 +123,11 @@ CSS:
 
 ERB:
 
-    <div class="<%= feature_class(:chat) %> enabled">
+    <div class="<%= sapling.css_class(:chat) %> enabled">
       REJOICE - SPIFF CHAT ENABLED FOR YOU
     </div>
 
-    <div class="<%= feature_class(:chat) %> disabled">
+    <div class="<%= sapling.css_class(:chat) %> disabled">
       DESPAIR - SPIFF CHAT NOT ENABLED FOR YOU
     </div>
     
@@ -116,5 +139,4 @@ TODO
 
 * Rails 3 compatibility
 * Remove mootools dependency
-* CSS generator
 * Database migration generator

data/changelog.md

@@ -0,0 +1,10 @@
+API changes in 0.3.0
+====================
+
+When using Sapling in rails, there are some api changes:
+
+  old: feature_active?(feature_name)
+  new: sapling.active?(feature_name,options={})
+
+  old: feature_class(feature_name)
+  new: sapling.css_class(feature_name)

data/lib/sapling.rb

@@ -1,11 +1,11 @@
 require "sapling/version"
 require "sapling/util"
 require "sapling/base"
+require "sapling/feature"
 require "sapling/memory"
-require "sapling/model"
+require "sapling/active_record_model"
 require "sapling/active_record"
 require "sapling/generators/javascript_generator"
-require "sapling/generators/css_generator"
 
 module Sapling
   # Your code goes here...

data/lib/sapling/active_record.rb

@@ -2,71 +2,58 @@ module Sapling
   class ActiveRecord < Base
 
     def table_name
-      Model.table_name
+      ActiveRecordModel.table_name
     end
 
-    private
-    def query_conditions(feature,normalized_options={})
-      ret=[
-        "#{'feature = ? AND ' if feature} ((user_id IS NOT NULL AND user_id = ?) OR (percentage IS NOT NULL AND ? < percentage)) "
-      ]
-      ret<<feature.to_s if feature
-      ret+=[
-        normalized_options[:user_id],
-        Util::modded_context_id(normalized_options)
-      ]
-      ret
-    end
-    public
-
-    module ClientAPI
-      # see Sapling::API::Client
-      def active?(feature, options={})
-        options = Util.normalized_options options
-        v = Model.count(:conditions => query_conditions(feature,options))
-        v > 0
-      end
-
-      def features
-        features = Model.find :all, :select => "feature", :group => "feature", :order => "feature"
-        features.map {|record| record.feature.to_sym}
+    # returns hash of all features
+    #   keys are feature names (symbols)
+    #   values are:
+    #     :percentage => nil or 0-100
+    #     :user_ids => [] or array of user_ids (integers)
+    def features
+      @features ||= ActiveRecordModel.find(:all).inject({}) do |ret,feature|
+        name = feature.feature.to_sym
+        ret[name]||=Feature.new(name)
+        ret[name].percentage ||= feature.percentage
+        ret[name].users[feature.user_id]=true if feature.user_id
+        ret
       end
+    end
 
-      # returns a list of features enabled for a user
-      # see Sapling::API::Client
-      def active_features(options={})
-        options = Util.normalized_options options
-        features = Model.find :all, :conditions => query_conditions(nil,options)
-        features.map {|record| record.feature.to_sym}.uniq
-      end
+    def reload
+      @features=nil
+      true
     end
-    include ClientAPI
 
     module AdminAPI
 
       def activate_user(feature, user)
-        Model.transaction do
+        ActiveRecordModel.transaction do
           deactivate_user(feature, user)
-          Model.create(:feature => feature.to_s, :user_id => user.id)
+          ActiveRecordModel.create(:feature => feature.to_s, :user_id => user.id)
         end
+        reload
       end
 
       def deactivate_user(feature, user)
-        Model.delete_all ["feature = ? AND percentage IS NULL and user_id = ?",feature.to_s,user.id]
+        ActiveRecordModel.delete_all ["feature = ? AND percentage IS NULL and user_id = ?",feature.to_s,user.id]
+        reload
       end
 
       def activate_percentage(feature, percentage)
         raise "invalid percentage #{percentage.inspect}" unless percentage.kind_of?(Integer) && percentage>=0 && percentage<=100
-        Model.transaction do
+        ActiveRecordModel.transaction do
           deactivate_percentage(feature)
-          Model.create(:feature => feature.to_s, :percentage => percentage)
+          ActiveRecordModel.create(:feature => feature.to_s, :percentage => percentage)
         end
+        reload
       end
 
       def deactivate_percentage(feature)
-        Model.delete_all ["feature = ? AND percentage IS NOT NULL AND user_id IS NULL",
+        ActiveRecordModel.delete_all ["feature = ? AND percentage IS NOT NULL AND user_id IS NULL",
           feature.to_s
         ]
+        reload
       end
     end
 

data/lib/sapling/active_record_model.rb

@@ -0,0 +1,9 @@
+require "active_record"
+class Sapling::ActiveRecordModel < ::ActiveRecord::Base
+  set_table_name "sapling_settings"
+
+  #structure:
+  # feature varchar(255),
+  # percentage integer, -- 0 to 100 or NULL
+  # user_id integer -- user's ID or NULL
+end

data/lib/sapling/base.rb

@@ -1,4 +1,65 @@
 module Sapling
   class Base
+    attr_accessor :controller
+
+    def initialize(controller=nil)
+      @controller = controller
+    end
+
+    def features; @features||={}; end
+
+    private
+    def active_internal(feature_name,options)
+      feature_method = "#{feature_name}_active?".to_sym
+      if controller && controller.respond_to?(feature_method)
+        # use override
+        controller.send(feature_method,options.merge(:feature => features[feature_name]))
+      else
+        (f=features[feature_name]) && f.active?(options)
+      end
+    end
+
+    # override feature test example for feature :new_homepage
+    # options:
+    #   feature is of type Feature
+    #   :user
+    # returns true if the feature is enabled
+    # def new_homepage_active?(options={})
+    #  # your test here
+    # end
+    public
+
+    # see Sapling::API::Client
+    def active?(feature, options={})
+      options = Util.normalized_options options, controller
+      active_internal(feature,options)
+    end
+
+    # returns a list of features enabled for a user
+    # see Sapling::API::Client
+    def active_features(options={})
+      options = Util.normalized_options options, controller
+      ret={}
+      features.each {|feature_name,feature| ret[feature_name]=feature if active_internal(feature_name,options)}
+      ret
+    end
+
+    def js_generator
+      @js_generator ||= JavascriptGenerator.new
+    end
+
+    def css_class_prefix
+      "sapling_feature"
+    end
+
+    # Use these classes on the container elements of your features
+    def css_class(feature)
+      "#{css_class_prefix}_#{feature.to_s}"
+    end
+
+    # Put these on the html element to turn on/off features
+    def css_toggle_class(feature, on)
+      "#{css_class(feature)}_#{on ? 'on' : 'off'}"
+    end
   end
 end

data/lib/sapling/feature.rb

@@ -0,0 +1,58 @@
+module Sapling
+  class Feature
+    attr_accessor :name,:users,:percentage
+
+    protected
+    def normalize_users
+      return unless users.kind_of?(Array)
+      users = @users
+      @users = {}
+      users.each {|user_id| @users[user_id]=true}
+    end
+    public
+
+    # options
+    #   :users => array or hash
+    #       users can be an array of user-ids or hash of user_ids mapped to true
+    #   :percentage =>
+    def initialize(name=nil,options={})
+      @name = name
+      @users = options[:users] || {}
+      normalize_users
+      self.percentage = options[:percentage]
+    end
+
+    # the Feature reports its name with "to_s"
+    def to_s; name.to_s; end
+
+    # see Sapling::API::Client
+    def active?(options={})
+      options = Util.normalized_options(options)
+      individually_active?(options[:user]) || percentage_active?(options)
+    end
+
+    def percentage_active?(options={})
+      percentage && (Util.modded_context_id(options)) < percentage
+    end
+
+    def individually_active?(user)
+      user && users[user.id]
+    end
+
+    def activate_user(user)
+      users[user.id]=true
+    end
+
+    def deactivate_user(user)
+      users.delete(user.id)
+    end
+
+    def activate_percentage(percentage)
+      @percentage=percentage
+    end
+
+    def deactivate_percentage
+      @percentage=0
+    end
+  end
+end

data/lib/sapling/generators/javascript_generator.rb

@@ -7,39 +7,26 @@ class Sapling::JavascriptGenerator
     @sapling=sapling
   end
 
-  def prefix
-    "sapling_feature"
-  end
-    
-  # Use these classes on the container elements of your features
-  def css_container_class(feature)
-    "#{prefix}_#{feature.to_s}"
-  end
-
-  # Put these on the html element to turn on/off features
-  def css_toggle_class(feature, on)
-    "#{css_container_class(feature)}_#{on ? 'on' : 'off'}"
-  end
-
-
   # see Sapling::API::Client for options
-  
   def mootools_for_feature(feature, on)
-    "html.removeClass('" + css_toggle_class(feature,!on) + "');html.addClass('" + css_toggle_class(feature,on) + "');"
+    "html.removeClass('" + sapling.css_toggle_class(feature,!on) + "');html.addClass('" + sapling.css_toggle_class(feature,on) + "');"
   end
-  
+
+  # options
+  # options is passed directly into sapling.active_features
+  #   One useful option is to override the user:
+  #     :user => user
   def generate(options={})
-    features = Set.new @sapling.features
-    active_features = Set.new @sapling.active_features options
+    features = sapling.features.keys
+    active_features = sapling.active_features(options).keys
     inactive_features = features - active_features
 
-    
     <<-END
 (function() {
   if (window.MooTools) {
     html = $$('html')[0];
     #{inactive_features.map{|f| mootools_for_feature(f,false) }.join}
-    #{active_features.map{|f| mootools_for_feature(f,true) }.join}    
+    #{active_features.map{|f| mootools_for_feature(f,true) }.join}
   }
 })();
 END

data/lib/sapling/memory.rb

@@ -1,69 +1,9 @@
 module Sapling
   class Memory < Base
 
-    class Feature
-      attr_accessor :users,:percentage
-
-      def initialize
-        @users={}
-        self.percentage = 0
-      end
-
-      # see Sapling::API::Client
-      def active?(options={})
-        options = Util.normalized_options(options)
-        individually_active?(options[:user]) || percentage_active?(options)
-      end
-
-      def percentage_active?(options={})
-        (Util.modded_context_id(options)) < percentage
-      end
-
-      def individually_active?(user)
-        user && users[user.id]
-      end
-
-      def activate_user(user)
-        users[user.id]=true
-      end
-
-      def deactivate_user(user)
-        users.delete(user.id)
-      end
-
-      def activate_percentage(percentage)
-        @percentage=percentage
-      end
-
-      def deactivate_percentage
-        @percentage=0
-      end
-    end
-
-    def initialize
-      @features={}
-    end
-
-    module ClientAPI
-      # see Sapling::API::Client
-      def active?(feature, options={})
-        options = Util.normalized_options(options)
-        (f = @features[feature]) && f.active?(options)
-      end
-
-      def features
-        @features.keys.sort_by {|k| k.to_s}
-      end
-
-      # see Sapling::API::Client
-      def active_features(options={})
-        features.select {|feature| active?(feature,options)}
-      end
-    end
-
     module AdminAPI
       def activate_feature(feature)
-        @features[feature]||=Feature.new
+        features[feature]||=Feature.new
       end
 
       def activate_user(feature, user)
@@ -71,7 +11,7 @@ module Sapling
       end
 
       def deactivate_user(feature, user)
-        (f=@features[feature]) && f.deactivate_user(user)
+        (f=features[feature]) && f.deactivate_user(user)
       end
 
       def activate_percentage(feature, percentage)
@@ -82,8 +22,7 @@ module Sapling
         activate_feature(feature).deactivate_percentage
       end
     end
-
-    include ClientAPI
     include AdminAPI
+
   end
 end

data/lib/sapling/rails/action_controller.rb

@@ -1,23 +1,12 @@
 require 'action_controller'
 
 module Sapling::ActionControllerExt
-  def feature_active?(feature, options={})
-    options[:user] ||= current_user
-    sapling.active?(feature, options)
-  end
-  
-  
   def sapling
-    @@sapling ||= Sapling::ActiveRecord.new
-  end
-  
-  def sapling_js_generator
-    @@sapling_js_generator ||= Sapling::JavascriptGenerator.new(sapling)
+    @sapling ||= Sapling::ActiveRecord.new(self)
   end
-  
 end
 
 class ActionController::Base
   include Sapling::ActionControllerExt
-  helper_method :feature_active?, :sapling, :sapling_js_generator
-end
+  helper_method :sapling
+end

data/lib/sapling/rails/controllers/sapling_controller.rb

@@ -1,7 +1,11 @@
 class SaplingController < ApplicationController
   unloadable
+
   def script
-    js = sapling_js_generator.generate(:user => current_user)
+    js = sapling.js_generator.generate(
+      :features => sapling.features.keys,
+      :active_features => sapling.active_features
+    )
     render :text => js, :content_type => 'text/javascript'
   end
 end

data/lib/sapling/rails/view_helpers.rb

@@ -1,10 +1,4 @@
 module Sapling
   module ViewHelpers
-
-    # include ActionView::Helpers::CaptureHelper
-    def feature_class(feature)
-      sapling_js_generator.css_container_class(feature)
-    end
-    
   end
-end
+end

data/lib/sapling/util.rb

@@ -10,7 +10,8 @@ module Sapling
         ((cid=context_id(options)) && (cid%100)) || CONTEXT_ID_ONLY_ENABLED_IF_100_PERCENT_ENABLED
       end
 
-      def normalized_options(options)
+      def normalized_options(options,controller=nil)
+        options[:user] ||= controller.current_user if controller
         options[:user_id] ||= options[:user].id if options[:user]
         options[:context_id] ||= options[:user_id]
         options

data/lib/sapling/version.rb

@@ -1,3 +1,3 @@
 module Sapling
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spec/{memory_feature_spec.rb → feature_spec.rb}

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Sapling::Memory::Feature" do
+describe "Sapling::Feature" do
   it "should support activating users" do
-    f=Sapling::Memory::Feature.new
+    f=Sapling::Feature.new
     u=UserMock.new
 
     f.active?(:user=>u).should be_false

data/spec/javascript_generator_spec.rb

@@ -17,8 +17,15 @@ describe "Sapling::JavascriptGenerator" do
       @sapling.activate_user(:chat, stub(:id => 1))
     end
 
-    it "outputs js" do
-      Sapling::JavascriptGenerator.new(@sapling).generate(:user => stub(:id => 1)).should include 'html.addClass(\'sapling_feature_chat_on\');'
+    it "outputs js with user set via controller's current_user method" do
+      @sapling.controller = stub(:current_user => stub(:id => 1))
+      output = Sapling::JavascriptGenerator.new(@sapling).generate
+      output.should include 'html.addClass(\'sapling_feature_chat_on\');'
+    end
+
+    it "outputs js with user set by passing in the user as an option" do
+      output = Sapling::JavascriptGenerator.new(@sapling).generate(:user => stub(:id => 1))
+      output.should include 'html.addClass(\'sapling_feature_chat_on\');'
     end
   end
 
@@ -29,7 +36,7 @@ describe "Sapling::JavascriptGenerator" do
       @sapling.activate_user(:pwn, stub(:id => 102))
       @sapling.activate_user(:juggle, stub(:id => 115))
     end
-  
+
     it "test user bicycle & pwn user" do
       output = Sapling::JavascriptGenerator.new(@sapling).generate(:user => stub(:id => 102))
       expected_features = {
@@ -43,7 +50,7 @@ describe "Sapling::JavascriptGenerator" do
         output.should include "html.removeClass('sapling_feature_#{key}_#{!enabled ? 'on' : 'off'}');"
       end
     end
-  
+
     it "test chat & juggle user" do
       output = Sapling::JavascriptGenerator.new(@sapling).generate(:user => stub(:id => 115))
       expected_features = {

data/spec/rails_app/app/controllers/application_controller.rb

@@ -7,14 +7,19 @@ class ApplicationController < ActionController::Base
 
   # Scrub sensitive parameters from your log
   # filter_parameter_logging :password
-  
+
   def current_user
     u = User.new
-    u.id = session[:current_user_id] 
+    u.id = session[:current_user_id]
     u
   end
-  
+
   def current_user_id
     session[:current_user_id]
   end
+
+  def my_custom_test_feature_active?(options)
+    # if the user is in the sapling list, the feature is DISABLED for them
+    !options[:feature].users[current_user.id]
+  end
 end

data/spec/rails_app/app/controllers/spaceman_spiffs_controller.rb

@@ -2,89 +2,22 @@ class SpacemanSpiffsController < ApplicationController
   # GET /spaceman_spiffs
   # GET /spaceman_spiffs.xml
   def index
-    if feature_active?(:listing)
+    if sapling.active?(:listing)
       @spaceman_spiffs = SpacemanSpiff.all
 
       respond_to do |format|
         format.html # index.html.erb
         format.xml  { render :xml => @spaceman_spiffs }
       end
-    else 
+    else
       render :nothing => true, :status => :forbidden
     end
   end
-  
-  def multiple_features
-  end
-
-  # GET /spaceman_spiffs/1
-  # GET /spaceman_spiffs/1.xml
-  def show
-    @spaceman_spiff = SpacemanSpiff.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.xml  { render :xml => @spaceman_spiff }
-    end
-  end
-
-  # GET /spaceman_spiffs/new
-  # GET /spaceman_spiffs/new.xml
-  def new
-    @spaceman_spiff = SpacemanSpiff.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => @spaceman_spiff }
-    end
-  end
-
-  # GET /spaceman_spiffs/1/edit
-  def edit
-    @spaceman_spiff = SpacemanSpiff.find(params[:id])
-  end
 
-  # POST /spaceman_spiffs
-  # POST /spaceman_spiffs.xml
-  def create
-    @spaceman_spiff = SpacemanSpiff.new(params[:spaceman_spiff])
-
-    respond_to do |format|
-      if @spaceman_spiff.save
-        format.html { redirect_to(@spaceman_spiff, :notice => 'SpacemanSpiff was successfully created.') }
-        format.xml  { render :xml => @spaceman_spiff, :status => :created, :location => @spaceman_spiff }
-      else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @spaceman_spiff.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /spaceman_spiffs/1
-  # PUT /spaceman_spiffs/1.xml
-  def update
-    @spaceman_spiff = SpacemanSpiff.find(params[:id])
-
-    respond_to do |format|
-      if @spaceman_spiff.update_attributes(params[:spaceman_spiff])
-        format.html { redirect_to(@spaceman_spiff, :notice => 'SpacemanSpiff was successfully updated.') }
-        format.xml  { head :ok }
-      else
-        format.html { render :action => "edit" }
-        format.xml  { render :xml => @spaceman_spiff.errors, :status => :unprocessable_entity }
-      end
-    end
+  def multiple_features
   end
 
-  # DELETE /spaceman_spiffs/1
-  # DELETE /spaceman_spiffs/1.xml
-  def destroy
-    @spaceman_spiff = SpacemanSpiff.find(params[:id])
-    @spaceman_spiff.destroy
-
-    respond_to do |format|
-      format.html { redirect_to(spaceman_spiffs_url) }
-      format.xml  { head :ok }
-    end
+  def custom_test_feature
+    render :text => (sapling.active?(:my_custom_test_feature) ? "1" : "0")
   end
 end

data/spec/rails_app/app/controllers/user_sessions_controller.rb

@@ -3,9 +3,11 @@ class UserSessionsController < ApplicationController
   def show
     render :text => current_user_id.to_s
   end
+
   def create
     session[:current_user_id] = params[:user_id]
   end
+
   def set_manually
     session[:current_user_id] = params[:user_id]
     render :text => current_user_id.to_s

data/spec/rails_app/config/routes.rb

@@ -1,7 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
-  map.resources :spaceman_spiffs, :collection => {:multiple_features => :get }
+  map.resources :spaceman_spiffs, :collection => {:multiple_features => :get, :custom_test_feature => :get }
   map.resource :user_sessions, :collection => {:set_manually => :get }
-  
+
   map.sapling_script 'sapling/script.js', :controller => 'sapling', :action => 'script'
 
   # The priority is based upon order of creation: first created -> highest priority.
@@ -22,7 +22,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # Sample resource route with sub-resources:
   #   map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
-  
+
   # Sample resource route with more complex sub-resources
   #   map.resources :products do |products|
   #     products.resources :comments

data/spec/rails_app/test/fixtures/sapling_settings.yml

@@ -4,6 +4,10 @@ calvin_allowed:
   feature: listing
   user_id: 1
 
+calvin_not_allowed:
+  feature: my_custom_test_feature
+  user_id: 1
+
 hobbes_allowed:
   feature: chat
   user_id: 2

data/spec/rails_app/test/integration/feature_test.rb

@@ -10,6 +10,22 @@ class FeatureTest < ActionController::IntegrationTest
     assert_equal '1', response.body
   end
 
+  test "users cant use 'my_custom_test_feature'" do
+    # user1 is listed, user2 is not
+    assert Sapling::ActiveRecord.new.features[:my_custom_test_feature].users[1]
+    assert_nil Sapling::ActiveRecord.new.features[:my_custom_test_feature].users[2]
+
+    # but user1 is denied
+    post user_sessions_path, :user_id => 1
+    get custom_test_feature_spaceman_spiffs_path
+    assert_equal '0', response.body
+
+    # and user2 is permitted
+    post user_sessions_path, :user_id => 2
+    get custom_test_feature_spaceman_spiffs_path
+    assert_equal '1', response.body
+  end
+
   test "listing is enabled for user one" do
     post user_sessions_path, :user_id => 1
     get spaceman_spiffs_path

data/spec/sapling_examples.rb

@@ -40,11 +40,11 @@ shared_examples_for Sapling do
       (1..1000).select { |id| @sapling.active?(:chat, :user=>UserMock.new(id)) }.length.should == 200
     end
 
-    
+
     it "should not be active even without a context or user" do
       @sapling.should_not be_active(:chat)
     end
-    
+
   end
 
   describe "activating a 100 percent" do
@@ -55,7 +55,7 @@ shared_examples_for Sapling do
     it "activates the feature for that percentage of users" do
       (1..1000).select { |id| @sapling.active?(:chat, :user=>UserMock.new(id)) }.length.should == 1000
     end
-    
+
 
     it "should be active even without a context or user" do
       @sapling.should be_active(:chat)
@@ -123,7 +123,7 @@ shared_examples_for Sapling do
     end
 
     it "returns only two features" do
-      @sapling.features.should == [:chat, :pwn]
+      @sapling.features.keys.should == [:chat, :pwn]
     end
   end
 
@@ -136,8 +136,30 @@ shared_examples_for Sapling do
     end
 
     it "should return only the active features for the specific user" do
-      @sapling.active_features(:user => stub(:id => 102)).should == [:bicycle, :pwn]
-      @sapling.active_features(:user => stub(:id => 115)).should == [:chat, :juggle]
+      @sapling.active_features(:user => stub(:id => 102)).keys.should == [:bicycle, :pwn]
+      @sapling.active_features(:user => stub(:id => 115)).keys.should == [:chat, :juggle]
+    end
+  end
+
+  describe "test custom override" do
+    before do
+      @sapling.activate_user(:chat,   stub(:id => 115,:name=>"fred"))
+      @sapling.activate_user(:chat,   stub(:id => 116,:name=>"harry"))
+      @sapling.activate_user(:chat,   stub(:id => 117,:name=>"franny"))
+    end
+
+    class Override
+      def chat_active?(options)
+        !!options[:user].name[/^f/]
+      end
+    end
+
+    it "should return only the active features for the specific user" do
+      @sapling.controller = Override.new
+
+      @sapling.active?(:chat,:user => stub(:id=>115,:name => "fred")).should == true
+      @sapling.active?(:chat,:user => stub(:id=>120,:name => "h")).should == false
+      @sapling.active?(:chat,:user => stub(:id=>130,:name => "frank")).should == true
     end
   end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Shane Brinkman-Davis
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-20 00:00:00 -08:00
-default_executable: 
+date: 2012-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -111,15 +110,16 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- changelog.md
 - db/create.sql
 - lib/sapling.rb
 - lib/sapling/active_record.rb
+- lib/sapling/active_record_model.rb
 - lib/sapling/api.rb
 - lib/sapling/base.rb
-- lib/sapling/generators/css_generator.rb
+- lib/sapling/feature.rb
 - lib/sapling/generators/javascript_generator.rb
 - lib/sapling/memory.rb
-- lib/sapling/model.rb
 - lib/sapling/rails.rb
 - lib/sapling/rails/action_controller.rb
 - lib/sapling/rails/controllers/sapling_controller.rb
@@ -130,9 +130,8 @@ files:
 - rails/init.rb
 - sapling.gemspec
 - spec/active_record_spec.rb
-- spec/css_generator_spec.rb
+- spec/feature_spec.rb
 - spec/javascript_generator_spec.rb
-- spec/memory_feature_spec.rb
 - spec/memory_spec.rb
 - spec/rails_app/README
 - spec/rails_app/Rakefile
@@ -202,7 +201,6 @@ files:
 - spec/sapling_examples.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/imikimi/sapling
 licenses: []
 
@@ -232,15 +230,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sapling
-rubygems_version: 1.5.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Incrementally roll out your features. Uses ActiveRecord to store configuration and supports client-side roll-out of cached pages.
 test_files: 
 - spec/active_record_spec.rb
-- spec/css_generator_spec.rb
+- spec/feature_spec.rb
 - spec/javascript_generator_spec.rb
-- spec/memory_feature_spec.rb
 - spec/memory_spec.rb
 - spec/rails_app/README
 - spec/rails_app/Rakefile

data/lib/sapling/generators/css_generator.rb

@@ -1,31 +0,0 @@
-require "set"
-
-module Sapling
-class CssGenerator
-  attr_accessor :sapling
-
-  def initialize(sapling)
-    @sapling=sapling
-  end
-
-  def prefix
-    "sapling_css"
-  end
-  
-  def css_class(feature, on)
-    "#{prefix}_#{feature.to_s}_#{on ? 'on' : 'off'}"
-  end
-
-  # see Sapling::API::Client for options
-  def to_s(options={})
-    features = Set.new @sapling.features
-    active_features = Set.new @sapling.active_features options
-    inactive_features = features - active_features
-
-    [
-    active_features.collect   {|f|".#{css_class(f, false)} { display:none !important; }"},
-    inactive_features.collect {|f|".#{css_class(f, true)} { display:none !important; }"},
-    ].flatten.join("\n")
-  end
-end
-end

data/lib/sapling/model.rb

@@ -1,4 +0,0 @@
-require "active_record"
-class Sapling::Model < ::ActiveRecord::Base
-  set_table_name "sapling_settings"
-end

data/spec/css_generator_spec.rb

@@ -1,47 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Sapling::CssGenerator" do
-
-  before do
-    ActiveRecord::Base.establish_connection(
-      :adapter  => 'sqlite3',
-      :database => ':memory:'
-    )
-    sql = File.read(File.expand_path(File.dirname(__FILE__) + '/../db/create.sql'))
-    ActiveRecord::Base.connection.execute sql
-    @sapling = Sapling::ActiveRecord.new
-  end
-
-  describe "creating basic css" do
-    before do
-      @sapling.activate_user(:chat, stub(:id => 1))
-    end
-
-    it "outputs css" do
-      Sapling::CssGenerator.new(@sapling).to_s(:user => stub(:id => 1)).should == ".sapling_css_chat_off { display:none !important; }"
-    end
-  end
-
-  describe "creating more complex css" do
-    before do
-      @sapling.activate_percentage(:bicycle, 10)
-      @sapling.activate_user(:chat, stub(:id => 115))
-      @sapling.activate_user(:pwn, stub(:id => 102))
-      @sapling.activate_user(:juggle, stub(:id => 115))
-    end
-
-    it "test user bicycle & pwn user" do
-      output = Sapling::CssGenerator.new(@sapling).to_s(:user => stub(:id => 102))
-      %w{ bicycle_off chat_on juggle_on pwn_off }.each do |key|
-        output.should =~ /#{key}[^}]+?display:none/
-      end
-    end
-
-    it "test chat & juggle user" do
-      output = Sapling::CssGenerator.new(@sapling).to_s(:user => stub(:id => 115))
-      %w{ bicycle_on chat_off juggle_off pwn_on }.each do |key|
-        output.should =~ /#{key}[^}]+?display:none/
-      end
-    end
-  end
-end