snogmetrics 0.1.6 → 0.1.7

data/lib/snogmetrics.rb

@@ -16,7 +16,7 @@ require 'snogmetrics/railtie' if defined? Rails::Railtie
 # the default implementation outputs the real API only when 
 # `Rails.env.production?` is true.
 module Snogmetrics
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 
   # Returns an instance of KissmetricsApi, which is an interface to the
   # KISSmetrics API. It has the methods #record and #identify, which work just
@@ -105,22 +105,18 @@ private
     # subsequent calls to #js will not send events that have already been sent.
     def js(options={})
       options = {:reset => false}.merge(options)
-      
-      if queue.empty?
-        ''
-      else
-        buffer = queue.map { |item| %(_kmq.push(#{item.to_json});) }
-        
-        queue.clear if options[:reset]
-        
-        <<-JAVASCRIPT
-        <script type="text/javascript">
-        var _kmq = _kmq || [];
-        #{api_js}
-        #{buffer.join("\n")}
-        </script>
-        JAVASCRIPT
-      end
+
+      buffer = queue.map { |item| %(_kmq.push(#{item.to_json});) }
+
+      queue.clear if options[:reset]
+
+      <<-JAVASCRIPT
+      <script type="text/javascript">
+      var _kmq = _kmq || [];
+      #{api_js}
+      #{buffer.join("\n")}
+      </script>
+      JAVASCRIPT
     end
   
   private
@@ -151,4 +147,4 @@ private
       end
     end
   end
-end
+end

data/spec/snogmetrics_spec.rb

@@ -111,10 +111,6 @@ describe Snogmetrics do
   end
   
   describe '#js' do
-    it 'outputs nothing if there are no events and no identity' do
-      @context.km.js.should be_empty
-    end
-    
     context 'in production' do
       before do
         Rails.stub!(:env).and_return(mock('env', :production? => true))
@@ -135,6 +131,10 @@ describe Snogmetrics do
         @context.km.js.should_not include('scripts.kissmetrics.com')
       end
     end
+
+    it 'outputs javascript even if there are no events and no identity' do
+      @context.km.js.should include('kmq')
+    end
     
     it 'outputs code that conditionally sets the _kmq variable' do
       @context.km.identify('Phil')
@@ -151,7 +151,7 @@ describe Snogmetrics do
     it 'resets the session when passed :reset => true' do
       @context.km.record('hello world')
       @context.km.js(:reset => true)
-      @context.km.js.should be_empty
+      @context.km.js.should_not include('hello world')
     end
     
     it 'does not let HTML slip through' do
@@ -164,7 +164,7 @@ describe Snogmetrics do
     it 'works like #js(:reset => true)' do
       @context.km.record('hello world')
       @context.km.js!
-      @context.km.js.should be_empty
+      @context.km.js!.should_not include('_kmq.push(["record"')
     end
     
     it 'does not push an identify call if the identity has already been sent once' do

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: snogmetrics
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors: 
 - Theo Hultberg
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 +02:00
+date: 2011-06-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
         version: 0.8.7
   type: :development
   version_requirements: *id002
@@ -55,8 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -68,8 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -81,8 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -94,8 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -107,8 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -177,23 +155,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: snogmetrics
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: SNOGmetrics is a KISSmetrics helper for Rails