sfanalytics 0.2.13 → 0.2.15

data/README.rdoc

@@ -16,7 +16,7 @@ A simple example of its usage is:
       :city         => 'Test City',
       :county       => 'Test County',
       :country      => 'Test Kingdom'
-    }, 'UA-1234567-1'
+    }
   )
 
   analytics_add_item( {
@@ -25,7 +25,7 @@ A simple example of its usage is:
       :category   => 'Test Categoru',
       :price      => '1.99',
       :quantity   => '2'
-    }, 'UA-1234567-1'
+    }
   )
 
   analytics_add_item( {
@@ -34,14 +34,14 @@ A simple example of its usage is:
       :category   => 'Test Categoru',
       :price      => '1.99',
       :quantity   => '3'
-    }, 'UA-1234567-2'
+    }
   )
 
   %>
 
   <%= analytics_generate('UA-1234566-1') %>
   
-This adds a transaction, then some line items to the transaction, then outputs the analytics code when analytics_generate is called. Technically the analytics ID is only required on the first helper call, but it does no harm to include it on each call.
+This adds a transaction, then some line items to the transaction, then outputs the analytics code when analytics_generate is called.
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.15

data/lib/sfanalytics/view_helpers.rb

@@ -2,17 +2,17 @@ module SFanalytics
   module ViewHelpers
     attr_reader :analytics
     def analytics_generate(analytics_id = '')
-      @analytics = SFanalytics::SFa::new(analytics_id) unless @analytics
-      return @analytics.generate
+      @analytics = SFanalytics::SFa::new() unless @analytics
+      return @analytics.generate(analytics_id)
     end
     
-    def analytics_add_transaction(transaction, analytics_id = '')
-      @analytics = SFanalytics::SFa::new(analytics_id) unless @analytics
+    def analytics_add_transaction(transaction)
+      @analytics = SFanalytics::SFa::new() unless @analytics
       return @analytics.add_transaction(transaction)
     end
     
-    def analytics_add_item(item, analytics_id = '')
-      @analytics = SFanalytics::SFa::new(analytics_id) unless @analytics
+    def analytics_add_item(item)
+      @analytics = SFanalytics::SFa::new() unless @analytics
       return @analytics.add_line_item(item)
     end
   end

data/lib/sfanalytics.rb

@@ -9,15 +9,16 @@ module SFanalytics
       ActionView::Base.send :include, ViewHelpers
     end
 
-    def initialize(analytics_id)
-      raise ArgumentError.new if ! analytics_id.match(/UA-\d{0,8}-\d{0,3}/)
-      @analytics_id = analytics_id
+    def initialize()
       @line_items = ''
     end
 
-    def generate
+    def generate(analytics_id)
       template = File.read(File.dirname(__FILE__) + '/../templates/analytics.html.haml')
-  
+
+      raise ArgumentError.new if ! analytics_id.match(/UA-\d{0,8}-\d{0,3}/)
+      @analytics_id = analytics_id
+      
       obj = Object.new
       Haml::Engine.new(template).def_method(obj, :render, :analytics_id, :analytics_transaction, :line_items)
       return obj.render(

data/sfanalytics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sfanalytics}
-  s.version = "0.2.13"
+  s.version = "0.2.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Graeme Lawton"]
-  s.date = %q{2010-05-04}
+  s.date = %q{2010-05-05}
   s.description = %q{
         SFanalytics provides Google Analytics for your app. Probably only really
         useful for Ecommerce users of analytics, to provide the functionality to add

data/test/sfanalytics_spec.rb

@@ -3,9 +3,8 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe SFanalytics do
   describe SFanalytics::SFa, "initialize" do
   
-    it "should be instantiated with a valid looking analytics id" do
-      lambda { SFanalytics::SFa.new( "UA-1234567-1" ) }.should_not raise_error
-      lambda { SFanalytics::SFa.new() }.should raise_error(ArgumentError)
+    it "should be instantiated" do
+      lambda { SFanalytics::SFa.new() }.should_not raise_error
       lambda { SFanalytics::SFa.new( "foobar" ) }.should raise_error(ArgumentError)
     end
   
@@ -14,16 +13,17 @@ describe SFanalytics do
   describe SFanalytics::SFa, "generate" do
 
     before(:each) do
-      @sfanalytics = SFanalytics::SFa.new('UA-1234567-1')
+      @sfanalytics = SFanalytics::SFa.new()
     end
 
     it "should be able to generate output code" do
       @sfanalytics.should respond_to(:generate)
-      @sfanalytics.generate.class.should == String
+      lambda { SFanalytics::SFa.new.generate() }.should raise_error(ArgumentError)
+      @sfanalytics.generate('UA-1234567-1').class.should == String
     end
   
     it "should generate the correct basic tracking code" do
-      @sfanalytics.generate.should == <<-EOS
+      @sfanalytics.generate('UA-1234567-1').should == <<-EOS
 <script type='text/javascript'>
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-1234567-1']);
@@ -43,7 +43,7 @@ describe SFanalytics do
 
   describe SFanalytics::SFa, "generate_transaction" do
     before(:each) do
-      @sfanalytics = SFanalytics::SFa.new('UA-1234567-1')
+      @sfanalytics = SFanalytics::SFa.new
       @trx_data = {
         :id           => 'A01',
         :store_name   => 'TEST STORE',
@@ -64,7 +64,7 @@ describe SFanalytics do
   
     it "should generate the correct code with a transaction" do
       @sfanalytics.add_transaction(@trx_data).should
-      @sfanalytics.generate().should == <<-EOS
+      @sfanalytics.generate('UA-1234567-1').should == <<-EOS
 <script type='text/javascript'>
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-1234567-1']);
@@ -93,7 +93,7 @@ describe SFanalytics do
   describe SFanalytics::SFa, "Add order items" do
   
     before(:each) do
-      @sfanalytics = SFanalytics::SFa.new('UA-1234567-1')
+      @sfanalytics = SFanalytics::SFa.new()
       @sfanalytics.add_transaction({
         :id           => 'A01',
         :store_name   => 'TEST STORE',
@@ -117,17 +117,17 @@ describe SFanalytics do
       @sfanalytics.should respond_to(:add_line_item)
       lambda {@sfanalytics.add_line_item}.should raise_error(ArgumentError)
       @sfanalytics.add_line_item(@line_item).should == true
-      @sfanalytics.generate.should match /_addItem/
+      @sfanalytics.generate('UA-1234567-1').should match /_addItem/
     end
   
     it "should allow multiple line_items to be added" do
       @sfanalytics.add_line_item(@line_item)
       @sfanalytics.add_line_item(@line_item)
       #Check there are two instances of _addItem
-      @sfanalytics.generate.split(/_addItem/).count.should == 3
+      @sfanalytics.generate('UA-1234567-1').split(/_addItem/).count.should == 3
     
-      @sfanalytics.generate.split(/TEST123/).count.should == 3
-      @sfanalytics.generate.split(/A01/).count.should == 4    
+      @sfanalytics.generate('UA-1234567-1').split(/TEST123/).count.should == 3
+      @sfanalytics.generate('UA-1234567-1').split(/A01/).count.should == 4    
     end
   
   end
@@ -144,7 +144,7 @@ describe SFanalytics do
     end
 
     it "should fail if you try to add items with no transaction" do
-      sfanalytics = SFanalytics::SFa.new('UA-1234567-1')
+      sfanalytics = SFanalytics::SFa.new
       lambda{sfanalytics.add_line_item(@line_item)}.should raise_error
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 13
-  version: 0.2.13
+  - 15
+  version: 0.2.15
 platform: ruby
 authors: 
 - Graeme Lawton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 +01:00
+date: 2010-05-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency