fluidfeatures-rails 0.1.4 → 0.2.0

data/lib/fluidfeatures/rails/app/controllers/fluidfeatures_controller.rb

@@ -0,0 +1,20 @@
+
+class FluidFeatureAjaxController < ApplicationController
+  
+  def index
+    render :json => {
+      :enabled => fluidfeature(params[:feature_name])
+    }, :status => 200
+  end
+end
+
+#
+# This is a controller you can use to sends stats from your browser
+#
+
+class FluidGoalAjaxController < ApplicationController
+  def index
+    fluidgoal(params[:goal_name], { :version => params[:goal_version] })
+    render :json => {}, :status => 200
+  end
+end

data/lib/fluidfeatures/rails/config/routes.rb

@@ -0,0 +1,8 @@
+
+require 'fluidfeatures/rails/app/controllers/fluidfeatures_controller'
+
+Rails.application.routes.draw do
+  match "/fluidfeature/:feature_name"         => "fluid_feature_ajax#index"
+  match "/fluidgoal/:goal_name"               => "fluid_goal_ajax#index"
+  match "/fluidgoal/:goal_name/:goal_version" => "fluid_goal_ajax#index"
+end

data/lib/fluidfeatures/rails/version.rb

@@ -1,5 +1,5 @@
 module FluidFeatures
   module Rails
-    VERSION = '0.1.4'
+    VERSION = '0.2.0'
   end
 end

data/lib/fluidfeatures/rails.rb

@@ -207,9 +207,13 @@ module ActionController
     # This must be overriden within the user application.
     # We recommend doing this in application_controller.rb
     #
-    def fluidfeatures_set_user_id(user_id, options={})
+    def fluidfeatures_initialize_user
 
-      if user_id and not options[:anonymous]
+      # TODO: Do not always get verbose user details.
+      #       Get for new users and then less frequently.
+      user = fluidfeature_current_user(verbose=true)
+
+      if user[:id] and not user[:anonymous]
         # We no longer an anoymous users. Let's delete the cookie
         if cookies.has_key? :fluidfeatures_anonymous
           cookies.delete(:fluidfeatures_anonymous)
@@ -217,28 +221,31 @@ module ActionController
       else
         # We're an anonymous user
 
-        # if we were not given a user_id for this anonymous user, then get
+        # if we were not given a user[:id] for this anonymous user, then get
         # it from an existing cookie or create a new one.
-        unless user_id
+        unless user[:id]
           # Have we seen them before?
           if cookies.has_key? :fluidfeatures_anonymous
-            user_id = cookies[:fluidfeatures_anonymous]
+            user[:id] = cookies[:fluidfeatures_anonymous]
           else
             # Create new cookie. Use rand + micro-seconds of current time
-            user_id = "anon-" + Random.rand(9999999999).to_s + "-" + ((Time.now.to_f * 1000000).to_i % 1000000).to_s
+            user[:id] = "anon-" + Random.rand(9999999999).to_s + "-" + ((Time.now.to_f * 1000000).to_i % 1000000).to_s
           end
         end
-        # update the cookie, with whatever the user_id has been set to
-        cookies[:fluidfeatures_anonymous] = user_id
+        # update the cookie, with whatever the user[:id] has been set to
+        cookies[:fluidfeatures_anonymous] = user[:id]
       end
+      user[:anonymous] = !!user[:anonymous]
+      @ff_user = user
+    end
 
-      @ff_user_id = user_id
-      @ff_user_anonymous = !!options[:anonymous]
-      @ff_user_attributes = options[:attributes]
-
-      user_id
+    def fluidfeatures_user
+      unless @ff_user
+        fluidfeatures_initialize_user
+      end
+      @ff_user
     end
-    
+
     #
     # This is called by the developer's code to determine if the
     # feature, specified by "feature_name" is enabled for the
@@ -254,15 +261,15 @@ module ActionController
       end
       global_defaults = fluidfeatures_defaults || {}
       version_name = (defaults[:version] || global_defaults[:version]).to_s
-      if not @features
+      if not @ff_features
         fluidfeatures_retrieve_user_features
       end
-      if @features.has_key? feature_name
-        if @features[feature_name].is_a? FalseClass or @features[feature_name].is_a? TrueClass
-          enabled = @features[feature_name]
-        elsif @features[feature_name].is_a? Hash
-          if @features[feature_name].has_key? version_name
-            enabled = @features[feature_name][version_name]
+      if @ff_features.has_key? feature_name
+        if @ff_features[feature_name].is_a? FalseClass or @ff_features[feature_name].is_a? TrueClass
+          enabled = @ff_features[feature_name]
+        elsif @ff_features[feature_name].is_a? Hash
+          if @ff_features[feature_name].has_key? version_name
+            enabled = @ff_features[feature_name][version_name]
           end
         end
       end
@@ -279,26 +286,34 @@ module ActionController
         FluidFeatures::Rails.unknown_feature_hit(feature_name, version_name, options)
       end
       if enabled
-        @features_hit ||= {}
-        @features_hit[feature_name] ||= {}
-        @features_hit[feature_name][version_name.to_s] = {}
+        @ff_features_hit[feature_name] ||= {}
+        @ff_features_hit[feature_name][version_name.to_s] = {}
       end
       enabled
     end
 
+    def fluidgoal(goal_name, defaults={})
+      global_defaults = fluidfeatures_defaults || {}
+      version_name = (defaults[:version] || global_defaults[:version]).to_s
+      @ff_goals_hit[goal_name] ||= {}
+      @ff_goals_hit[goal_name][version_name.to_s] = {}
+    end
+
     #
     # Initialize the FluidFeatures state for this request.
     #
     def fluidfeatures_request_before
       @ff_request_start_time = Time.now
-      @features = nil
+      @ff_features = nil
+      @ff_features_hit = {}
+      @ff_goals_hit = {}
     end
     
     #
     # Returns the features enabled for this request's user.
     #
     def fluidfeatures_retrieve_user_features
-      @features = FluidFeatures::Rails.get_user_features(@ff_user_id)
+      @ff_features = FluidFeatures::Rails.get_user_features(fluidfeatures_user[:id])
     end
      
     #
@@ -309,28 +324,30 @@ module ActionController
     # without requiring the developer to do it manually.
     # 
     def fluidfeatures_request_after
-      if @features
-        request_duration = Time.now - @ff_request_start_time
-        url = "#{request.protocol}#{request.host_with_port}#{request.fullpath}"
-        payload = {
-          :stats => {
-            :request => {
-              :duration => request_duration
-            }
-          },
-          :features => {
-            :hit => @features_hit
-          },
-          :url => url
-        }
-        if @ff_user_anonymous
-          (payload[:user] ||= {})[:anonymous] = true
-        end
-        if @ff_user_attributes
-          (payload[:user] ||= {})[:attributes] = @ff_user_attributes
-        end
-        FluidFeatures::Rails.log_request(@ff_user_id, payload)
+      request_duration = Time.now - @ff_request_start_time
+      url = "#{request.protocol}#{request.host_with_port}#{request.fullpath}"
+      payload = {
+        :user => {
+          :id => fluidfeatures_user[:id]
+        },
+        :stats => {
+          :request => {
+            :duration => request_duration
+          }
+        },
+        :hits => {
+          :feature => @ff_features_hit,
+          :goal    => @ff_goals_hit
+        },
+        :url => url
+      }
+      if fluidfeatures_user[:anonymous]
+        (payload[:user] ||= {})[:anonymous] = true
+      end
+      if fluidfeatures_user[:attributes]
+        (payload[:user] ||= {})[:attributes] = fluidfeatures_user[:attributes]
       end
+      FluidFeatures::Rails.log_request(fluidfeatures_user[:id], payload)
     end
     
     def fluidfeatures_defaults

data/test/testapp/app/controllers/application_controller.rb

@@ -1,17 +1,16 @@
 class ApplicationController < ActionController::Base
-  protect_from_forgery
-
-  before_filter :authenticate_user
 
   # simple authentication. user passes their id
   def authenticate_user
-    user_id = params[:user_id]
-    unless user_id
-      raise "user_id not given"
-    end
-    
-    # inform fluidfeatures gem of the user id
-    fluidfeatures_set_user_id(user_id)
+    params[:user_id]
+  end
+
+  def current_user_id
+    @current_user_id ||= authenticate_user
+  end
+
+  def fluidfeature_current_user(verbose=false)
+    { :id => current_user_id }
   end
 
 end

data/test/testapp/spec/controllers/home_controller_spec.rb

@@ -40,12 +40,19 @@ describe HomeController do
       features_hit_request = FakeWeb.last_request
       JsonSpec.exclude_keys("duration", "ff_latency")
       features_hit_request.body.should be_json_eql(%({
-        "features": {
-          "hit": {
+        "user": {
+          "id": "1"
+        },
+        "hits": {
+          "feature": {
             "apples": {
                 "default": {}
             }
           },
+          "goal": {
+          }
+        },
+        "features": {
           "unknown": {
             // features that we have not seen before
             "apples": {
@@ -90,8 +97,11 @@ describe HomeController do
       features_hit_request = FakeWeb.last_request
       JsonSpec.exclude_keys("duration", "ff_latency")
       features_hit_request.body.should be_json_eql(%({
-        "features": {
-          "hit": {
+        "user": {
+          "id": "2"
+        },
+        "hits": {
+          "feature": {
             "oranges": {
                 "default": {}
             },
@@ -99,6 +109,10 @@ describe HomeController do
                 "default": {}
             }
           },
+          "goal": {
+          }
+        },
+        "features": {
           "unknown": {
             // no unknown features
           }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluidfeatures-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent_http
@@ -41,6 +41,8 @@ files:
 - Rakefile
 - fluidfeatures-rails.gemspec
 - lib/fluidfeatures/rails.rb
+- lib/fluidfeatures/rails/app/controllers/fluidfeatures_controller.rb
+- lib/fluidfeatures/rails/config/routes.rb
 - lib/fluidfeatures/rails/version.rb
 - test/testapp/.gitignore
 - test/testapp/Gemfile