fluidfeatures-rails 0.2.0 → 0.2.2

data/lib/fluidfeatures/rails/version.rb

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

data/lib/fluidfeatures/rails.rb

@@ -118,25 +118,58 @@ module FluidFeatures
     # This will depend on the user_id and how many users each
     # feature is enabled for.
     #
-    def self.get_user_features(user_id)
-      if not user_id
-        raise "user_id is not given for get_user_features"
+    def self.get_user_features(user)
+
+      if not user
+        raise "user object should be a Hash"
+      end
+      if not user[:id]
+        raise "user does not contain :id field"
+      end
+
+      # extract just attribute ids into simple hash
+      attribute_ids = {
+        :anonymous => !!user[:anonymous]
+      }
+      [:unique, :cohorts].each do |attr_type|
+        if user.has_key? attr_type
+          user[attr_type].each do |attr_key, attr|
+            if attr.is_a? Hash
+              if attr.has_key? :id
+                attribute_ids[attr_key] = attr[:id]
+              end
+            else
+              attribute_ids[attr_key] = attr
+            end
+          end
+        end
       end
+
+      # normalize attributes ids as strings
+      attribute_ids.each do |attr_key, attr_id|
+        if attr_id.is_a? FalseClass or attr_id.is_a? TrueClass
+          attribute_ids[attr_key] = attr_id.to_s.downcase
+        elsif not attr_id.is_a? String
+          attribute_ids[attr_key] = attr_id.to_s
+        end
+      end
+
       features = {}
       fetch_start_time = Time.now
       begin
-        uri = URI(@@baseuri + "/app/" + @@app_id.to_s + "/user/" + user_id.to_s + "/features")
-        request = Net::HTTP::Get.new uri.path
+        uri = URI("#{@@baseuri}/app/#{@@app_id}/user/#{user[:id]}/features")
+        uri.query = URI.encode_www_form( attribute_ids )
+        request = Net::HTTP::Get.new "#{uri.path}?#{uri.query}"
         request["Accept"] = "application/json"
         request['AUTHORIZATION'] = @@secret
         response = @@http.request request
         if response.is_a?(Net::HTTPSuccess)
           features = JSON.parse(response.body)
         else
-          ::Rails.logger.error "[" + response.code.to_s + "] Failed to get user features : " + uri.to_s + " : " + response.body.to_s
+          ::Rails.logger.error "[#{response.code}] Failed to get user features : #{uri} : #{response.body}"
         end
       rescue
-        ::Rails.logger.error "Request to get user features failed : " + uri.to_s
+        ::Rails.logger.error "Request to get user features failed : #{uri}"
         raise
       end
       @@last_fetch_duration = Time.now - fetch_start_time
@@ -220,6 +253,7 @@ module ActionController
         end
       else
         # We're an anonymous user
+        user[:anonymous] = true
 
         # if we were not given a user[:id] for this anonymous user, then get
         # it from an existing cookie or create a new one.
@@ -313,7 +347,8 @@ module ActionController
     # Returns the features enabled for this request's user.
     #
     def fluidfeatures_retrieve_user_features
-      @ff_features = FluidFeatures::Rails.get_user_features(fluidfeatures_user[:id])
+      user = fluidfeatures_user
+      @ff_features = FluidFeatures::Rails.get_user_features(user)
     end
      
     #
@@ -341,11 +376,10 @@ module ActionController
         },
         :url => url
       }
-      if fluidfeatures_user[:anonymous]
-        (payload[:user] ||= {})[:anonymous] = true
-      end
-      if fluidfeatures_user[:attributes]
-        (payload[:user] ||= {})[:attributes] = fluidfeatures_user[:attributes]
+      [:name, :anonymous, :unique, :cohorts].each do |key|
+        if fluidfeatures_user[key]
+          (payload[:user] ||= {})[key] = fluidfeatures_user[key]
+        end
       end
       FluidFeatures::Rails.log_request(fluidfeatures_user[:id], payload)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluidfeatures-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent_http