fluidfeatures-rails 0.3.2 → 0.4.0

data/LICENSE

@@ -0,0 +1,46 @@
+
+All components of this product are
+Copyright (c) 2012 FluidFeatures Software Inc.  All rights reserved.
+
+FluidFeatures Software License
+
+This Software and all content and other materials in the Software or associated
+with the Software, including, without limitation, all logos, and all designs,
+text, graphics, pictures, reviews, information, data, software, sound files,
+other files and the selection and arrangement thereof (collectively, the
+"Software Materials") are the proprietary property of FluidFeatures Software
+Inc., or its licensors or users, and are protected by Canada, U.S. and
+international copyright laws.
+
+You are granted a limited, non-sublicensable license to access and use the
+Software, for your commercial use by you and your website users only. The
+license does not include or authorize: (a) any resale of the Software or the
+Software Materials therein; (b) modifying or otherwise making any derivative
+uses of the Software and the Software Materials, or any portion thereof, except
+where such modification or derivative use is made in connection with your use of
+the FluidFeatures online service; or (c) any use of the Software or the Software
+Materials other than for its intended purpose. Any use of the Software or the
+Software Materials other than as specifically authorized in these license,
+without the prior written permission of FluidFeatures Software Inc, is strictly
+prohibited and will terminate the license granted here. Such unauthorized use
+may also violate applicable laws including without limitation copyright and
+trademark laws and applicable communications regulations and statutes. Unless
+explicitly stated herein, nothing in this license shall be construed as
+conferring any license to intellectual property rights, whether by estoppel,
+implication or otherwise.  This license is revocable at any time for any reason.
+
+THE SOFTWARE AND THE SOFTWARE MATERIALS (INCLUDING ANY INFORMATION) ARE PROVIDED
+ON AN "AS IS" AND "AS AVAILABLE" BASIS WITHOUT WARRANTIES OF ANY KIND, EITHER
+EXPRESS OR IMPLIED, AND INCLUDING WITHOUT LIMITATION IMPLIED REPRESENTATIONS,
+WARRANTIES OR CONDITIONS OF OR RELATING TO ACCURACY, ACCESSIBILITY,
+AVAILABILITY, COMPLETENESS, ERRORS, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABILITY, NON-INFRINGEMENT, PERFORMANCE, QUALITY, RESULTS, SECURITY,
+SEQUENCE, OR TIMELINESS, ALL OF WHICH ARE HEREBY DISCLAIMED BY FLUIDFEATURES
+SOFTWARE INC TO THE FULLEST EXTENT PERMITTED BY LAW.
+
+THE AGGREGATE LIABILITY OF FLUID FEATURES SOFTWARE INC. TO YOU, WHETHER IN
+CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE, WHETHER ACTIVE, PASSIVE OR
+IMPUTED), PRODUCT LIABILITY, STRICT LIABILITY OR OTHER THEORY OF LIABILITY,
+SHALL NOT EXCEED ANY COMPENSATION YOU PAY, IF ANY, FOR ACCESS TO OR USE OF THE
+SOFTWARE.
+

data/fluidfeatures-rails.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |s|
   #s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
   #s.add_dependency "rails", "~>3.0"
-  s.add_dependency "fluidfeatures" unless ENV["FF_DEV"]
+  s.add_dependency "fluidfeatures", "~>0.4.0" unless ENV["FF_DEV"]
 end

data/lib/fluidfeatures/rails/version.rb

@@ -1,5 +1,5 @@
 module FluidFeatures
   module Rails
-    VERSION = '0.3.2'
+    VERSION = '0.4.0'
   end
 end

data/lib/fluidfeatures/rails.rb

@@ -58,6 +58,8 @@ end
 module ActionController
   class Base
 
+    attr_accessor :ff_transaction
+
     # allow fluidfeature to be called from templates
     helper_method :fluidfeature
 
@@ -81,14 +83,17 @@ module ActionController
         raise "fluidfeatures_current_user returned invalid user (Hash expected) : #{user}"
       end
 
-      # default to anonymous is not user id given
+      # default to anonymous is no user id given
       user[:anonymous] = false unless user[:id]
 
       # if no user id given, then attempt to get the unique id of this visitor from the cookie
       user[:id] ||= cookies[:fluidfeatures_anonymous]
 
-      @ff_user = ::FluidFeatures::Rails.ff_app.user(
+      url = "#{request.protocol}#{request.host_with_port}#{request.fullpath}"
+
+      transaction = ::FluidFeatures::Rails.ff_app.user_transaction(
         user[:id],
+        url,
         user[:name],
         !!user[:anonymous],
         user[:uniques],
@@ -96,9 +101,9 @@ module ActionController
       )
 
       # Set/delete cookies for anonymous users
-      if @ff_user.anonymous
+      if transaction.user.anonymous
         # update the cookie, with the unique id of this user
-        cookies[:fluidfeatures_anonymous] = @ff_user.unique_id
+        cookies[:fluidfeatures_anonymous] = transaction.user.unique_id
       else
         # We are no longer an anoymous user. Delete the cookie
         if cookies.has_key? :fluidfeatures_anonymous
@@ -106,11 +111,14 @@ module ActionController
         end
       end
 
-      @ff_user
+      transaction
     end
 
-    def fluidfeatures_user
-      @ff_user ||= fluidfeatures_initialize_user
+    #
+    # Initialize the FluidFeatures state for this request.
+    #
+    def fluidfeatures_request_before
+      @ff_transaction = fluidfeatures_initialize_user
     end
 
     #
@@ -120,38 +128,36 @@ module ActionController
     # We call user_id to get the current user's unique id.
     #
     def fluidfeature(feature_name, version_name=nil, default_enabled=nil)
+
+      # also support: fluidfeature(feature_name, default_enabled)
       if default_enabled == nil and (version_name.is_a? FalseClass or version_name.is_a? TrueClass)
         default_enabled = version_name
         version_name = nil
       end
+
       unless default_enabled.is_a? FalseClass or default_enabled.is_a? TrueClass
         default_enabled = fluidfeatures_default_enabled
       end
+
       unless ::FluidFeatures::Rails.enabled
         return default_enabled || false
       end
-      fluidfeatures_user.feature_enabled?(feature_name, version_name, default_enabled)
+
+      ff_transaction.feature_enabled?(feature_name, version_name, default_enabled)
     end
 
     def fluidgoal(goal_name, goal_version_name=nil)
       unless ::FluidFeatures::Rails.enabled
         return default_enabled || false
       end
-      fluidfeatures_user.goal_hit(goal_name, goal_version_name)
-    end
-
-    #
-    # Initialize the FluidFeatures state for this request.
-    #
-    def fluidfeatures_request_before
-      @ff_request_start_time = Time.now
+      ff_transaction.goal_hit(goal_name, goal_version_name)
     end
 
     #
     # Returns the features enabled for this request's user.
     #
     def fluidfeatures_retrieve_user_features
-      fluidfeatures_user.features
+      ff_transaction.features
     end
 
     #
@@ -162,21 +168,12 @@ module ActionController
     # without requiring the developer to do it manually.
     # 
     def fluidfeatures_request_after
-      request_duration = Time.now - @ff_request_start_time
-      url = "#{request.protocol}#{request.host_with_port}#{request.fullpath}"
-      fluidfeatures_user.end_transaction(
-        url,
-        # stats
-        {
-          :request => {
-            :duration => request_duration
-          }
-        }
-      )
+      ff_transaction.end_transaction
     end
 
     def fluidfeatures_default_enabled
       # By default unknown features are disabled.
+      # Override and return "true" to have features enabled by default.
       false
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluidfeatures-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluidfeatures
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 description: Ruby on Rails client for the FluidFeatures service.
 email:
 - phil@fluidfeatures.com
@@ -37,6 +37,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - fluidfeatures-rails.gemspec
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluidfeatures-rails
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails client for the FluidFeatures service.