urchin_tracking_module 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e178ebe92fe8c07ebdfc73fb9ba15afc86135918
-  data.tar.gz: 40b77d0dfb8b7a1884f5bf85364ba9d2a4b69c42
+  metadata.gz: e0519945a69d20b0cd3656f07d058af6f585fe69
+  data.tar.gz: 12141b46ff967702d6ee3c28263f9ed7e0b4fbf8
 SHA512:
-  metadata.gz: dc52e6adb9f505e45e4a8e525a88afc202c0f60372bc284f982b8b052d759846eff8fad054382c2d1fcf1a9efa77f7ebbcbf62cb6f60b11ed076415a50c4fd8d
-  data.tar.gz: 570a955bc823b507df562e4e871d45a0855995dda2132967a335719d2aa4987ed7782e2b35ee57cb61fe64b4cc37a4f8ac165a3846bc340345a0a17f146a191b
+  metadata.gz: eb58cfbc6ba80c07e9cdd240803a602f0e166df474d2b6023b35ad1d9890bb2e8fb4ade3dcbb78328fea95f23bc3bb8795313c8b90b21da28d8c599020cd4fe4
+  data.tar.gz: ffd0afe1f63486884a110de6cf5d2a155c682ad68d4edb3675d1b3161730dd244f467530269275e989615a75b6df80a18e2cfa135d01214063a99f39b54e0250

data/.gitignore

@@ -1,2 +1,5 @@
 pkg/
-tmp/
+tmp/
+/.bundle
+/vendor/bundle
+.idea

data/Gemfile

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'active_support'
-
 group :test do
   gem 'rspec'
   gem 'guard-rspec'

data/Gemfile.lock

@@ -1,14 +1,11 @@
 PATH
   remote: .
   specs:
-    urchin_tracking_module (1.0.1)
+    urchin_tracking_module (1.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    active_support (3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
     coderay (1.0.9)
     diff-lcs (1.2.4)
     ffi (1.9.0)
@@ -56,7 +53,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_support
   bundler (~> 1.3)
   guard-bundler
   guard-rspec

data/README.md

@@ -40,18 +40,15 @@ Your thought's/improvements are welcome :)
 
 ## TODOs
 
-  * remove dependency to Rails
   * remove bonusbox specific `src` param or make this kind of
   additions configurable.
-  * `UrchinTrackingModule.configure {|c| c[:utm_source] => nil }` would generate
-  invalid params. It should pick up defaults instead.
   * `UrchinTrackingModule.configure {|c| c[:utm_source] => 'my_app' }` could have a
   configuration object instead of a hash, to become
   `UrchinTrackingModule.configure {|c| c.utm_source = 'my_app' }`
 
 ## Code status
 
-* [![Build Status](https://api.travis-ci.org/bonusboxme/urchin_tracking_module.png)](https://travis-ci.org/bonusboxme/urchin_tracking_module)
+[![Build Status](https://travis-ci.org/bonusboxme/urchin_tracking_module.png?branch=master)](https://travis-ci.org/bonusboxme/urchin_tracking_module)
 
 ## License
 

data/lib/urchin_tracking_module/version.rb

@@ -1,3 +1,3 @@
 class UrchinTrackingModule
-  VERSION = "1.0.3"
+  VERSION = "1.0.5"
 end

data/lib/urchin_tracking_module.rb

@@ -1,6 +1,5 @@
 require 'urchin_tracking_module/version'
 require 'singleton'
-require 'active_support/core_ext/hash/slice'
 
 def UTM(url, params={})
   UrchinTrackingModule.new(url).tracking(params)
@@ -8,6 +7,11 @@ end
 
 class UrchinTrackingModule
   TRACKING_PARAMETERS = %i(utm_source utm_medium utm_term utm_content utm_campaign)
+  module Slicable
+    def slice(*keys)
+      keys.inject(Hash.new) {|h,k| h.merge(k => self[k]) }
+    end
+  end
 
   def initialize(url)
     @url = url
@@ -15,8 +19,10 @@ class UrchinTrackingModule
 
   def tracking(params=defaults)
     filtered_params(params).inject(@url) do |url,(name,value)|
-      url = add_param(url, "#{name}", value)
-      url = add_param(url, "src", value) if name == :utm_source
+      unless value.nil?
+        url = add_param(url, "#{name}", value)
+        url = add_param(url, "src", value) if name == :utm_source
+      end
       url
     end
   end
@@ -27,10 +33,12 @@ class UrchinTrackingModule
   private :defaults
 
   def filtered_params(params)
+    params.extend Slicable unless params.respond_to?(:slice)
     defaults.merge(params.slice(*TRACKING_PARAMETERS))
   end
   private :filtered_params
 
+
   def add_param(url, param_name, param_value)
     uri = URI(url)
     params = url_params(uri).merge(param_name => param_value)
@@ -79,7 +87,11 @@ class UrchinTrackingModule
     end
 
     def default_source
-      Rails.application.class.parent_name
+      if defined?(Rails)
+        Rails.application.class.parent_name
+      else
+        'urchin_tracking_module'
+      end
     end
     private :default_source
 

data/spec/spec_helper.rb

@@ -1,14 +1,5 @@
 Dir["./support/**/*.rb"].each { |f| require f }
 
-unless defined?(Rails)
-  module Rails
-    class Application
-      def self.parent_name; "urchin_tracking_module" end
-    end
-    def self.application; Application.new end
-  end
-end
-
 RSpec.configure do |config|
   config.order = "random"
 end

data/spec/urchin_tracking_module_spec.rb

@@ -24,6 +24,15 @@ describe UrchinTrackingModule do
     end
   end
 
+  context 'nil parameter values' do
+    let(:params) {{ utm_content: nil }}
+
+    it 'is not tracked' do
+      uri = subject.tracking(params)
+      expect(uri).not_to match(/utm_content=/)
+    end
+  end
+
   describe '.configure' do
     EXAMPLE_CONFIG = {
       utm_source:   'b2b_application',
@@ -61,6 +70,10 @@ describe UrchinTrackingModule do
     expect(UrchinTrackingModule.medium).to eq EXAMPLE_CONFIG[:utm_medium]
   end
 
+  it 'ignores non utm params' do
+    expect(UTM(url, foo: 'bar')).not_to match(/foo=bar/)
+  end
+
   describe 'UTM helper' do
     let(:utm) { double }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: urchin_tracking_module
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Jan Riethmayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,4 +86,3 @@ summary: utm params for your URL.
 test_files:
 - spec/spec_helper.rb
 - spec/urchin_tracking_module_spec.rb
-has_rdoc: