smooch 0.1.3 → 0.1.5

data/lib/smooch.rb

@@ -1,5 +1,13 @@
 module Smooch
   API_KEY = ''
+  
+  def self.ab_static?
+    !!@ab_static
+  end
+  def self.ab_static=val
+    @ab_static=val
+  end
+  
 end
 
 begin

data/lib/smooch/base.rb

@@ -5,28 +5,43 @@ module Smooch
      def initialize(controller=nil)
        self.controller = controller
        self.view = view
-       @choices = {}
-       @records = {}
-       @sets = {}
-
        init_flash
      end
 
+     FLASH_KEY = :smooch
      def record(property, hash={})
-       flash[:kiss_metrics] = property.to_s
        @records[property.to_s] = hash
+       write_flash
      end
      def init_flash
-       property = flash[:kiss_metrics]
-       return unless property
-       record(property) 
+       hash = flash[FLASH_KEY] || {}
+       @records = hash[:r] || {}
+       @sets = hash[:s] || {}
+       @choices = hash[:c] || {}
+     end
+     def write_flash
+       hash = nil
+       unless @records.empty?
+         hash ||= {}
+         hash[:r] = @records
+       end
+       unless @sets.empty?
+          hash ||= {}
+          hash[:s] = @sets
+        end
+        unless @choices.empty?
+           hash ||= {}
+           hash[:c] = @choices
+         end
+       flash[FLASH_KEY] = hash
      end
      def clear_flash
-       flash[:kiss_metrics] = nil
+       flash[FLASH_KEY] = nil
      end
 
      def set(property, value)
        @sets[property.to_s] = value
+       write_flash
      end
 
      def ab(name, choices=nil)
@@ -48,6 +63,10 @@ module Smooch
        val = get_ab_cookie(name) unless val
        val = nil if val and choices and not choices.include?(val)
 
+       if choices and Smooch.ab_static?
+         val = choices.first unless val
+       end
+       
        # pick a random one
        val = get_ab_random_choice(choices) unless val
 
@@ -69,6 +88,9 @@ module Smooch
      def get_ab_cached(name)
        @choices[name]
      end
+     def get_ab_cache_key
+       [@records, @sets, @choices].to_param
+     end
      def get_ab_cookie(name)
        get_cookie(key(name))
      end
@@ -76,6 +98,7 @@ module Smooch
        set_ab_database(name, val)
        set_cookie(key(name), val)
        @choices[name] = val
+       write_flash
        val
      end
 
@@ -96,7 +119,9 @@ module Smooch
        controller.kiss_identity
      end
      def set_cookie(key, value)
-       cookies[key] = { :value => value, :expires => 2.months.from_now }
+       unless cookies[key] == value
+         cookies[key] = { :value => value, :expires => 2.months.from_now }
+       end
      end
      def get_cookie(key)
        cookies[key]
@@ -113,7 +138,7 @@ module Smooch
        hash.each do |key, value|
          out += "_kmq.push(['record', '#{js(key)}'"
          unless value.empty?
-           out += ", #{value.to_json}"
+           out += ", #{value.to_json.gsub(/<\/?script>/i, "")}"
          end
          out += "]);\n"
        end

data/lib/smooch/version.rb

@@ -1,3 +1,3 @@
 module Smooch
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/spec/controller_spec.rb

@@ -7,6 +7,16 @@ class SmoochUser
   end
 end
 class SmoochController < ActionController::Base
+  def record_one
+    km.record("one")
+  end
+  def record_lots
+    km.record("one")
+    km.record("two")
+    km.set("three", "val3")
+    km.set("four", "val4")
+  end
+
   def get_km
     @results = km
   end
@@ -55,10 +65,38 @@ describe SmoochController, :type => :controller do
     end
     
     describe "records" do
+      it "should set the flash record property" do
+        flash[:smooch].should be_nil
+        get :record_one
+        flash[:smooch].should_not be_nil
+        flash[:smooch].should == {:r => { "one" => {}}}
+        
+        get :get_km
+        assigns[:results].has_record?("one").should == true
+      end
+      it "should set everything via flash" do
+        flash[:smooch].should be_nil
+        get :record_lots
+        flash[:smooch].should_not be_nil
+                
+        get :get_km
+        assigns[:results].has_record?("one").should == true
+        assigns[:results].has_record?("two").should == true
+        assigns[:results].has_set?("three").should == true
+        assigns[:results].has_set?("four").should == true
+        assigns[:results].has_set?("five").should == false
+      end
+      it "should render script from flash" do
+        get :record_lots
+      end
+      
       it "should transfer flash property" do
-        flash[:kiss_metrics] = "whatever"
+        flash[:smooch] = {:r => { "whatever" => {}, "else" => {:ok => true}}, :s => {"something" => {}}, :c => {"ab" => "one"}}
         get :get_km
+        assigns[:results].has_record?("else").should == true
         assigns[:results].has_record?("whatever").should == true
+        assigns[:results].has_set?("something").should == true
+        assigns[:results].ab("ab").should == "one"
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smooch
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Brian Leonard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
+date: 2011-12-09 00:00:00 -08:00
 default_executable: 
 dependencies: []