google_analytics_mailer 0.1.2 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzgzNzRjMDNlNDg2ODlhMTE2MGE3MGFjOTY5ZjU5Y2U1YTViNDY1OQ==
+  data.tar.gz: !binary |-
+    NzVmNmI0NjRhMzg0NmRkYjIwMDNhZTk0NDVhOTFiMzFkOTk5OGEwMQ==
+SHA512:
+  metadata.gz: !binary |-
+    Y2IzMGI1ZTlmYmZjZDBiNDViNDhlN2JjMDIxM2NhMWY3Y2JlMTFjNTdkY2Zl
+    ZmRiYTllZTRiYWFjZDhiNTJkMWE5Y2I5YzRlODdlMWZiMThhMjI2OTE5ZGMy
+    NWUxZjZhNjYyMzZiYTdmODA5ODAzNTMyYzAxNzNhYjJmZmVlYmQ=
+  data.tar.gz: !binary |-
+    ZjRlM2M2MTBmOTk4ZTk5YzI4YmFkZmY0ZTcyZmY1ZjQ2OTlhYjY1NDM3N2Jl
+    MTMzMzhhZjRhOTRkNjMwN2E5OTg0ZmMxOTE3NDBmMTdkMDMzN2JjZjJjMTdi
+    ZGQyODE5MmRkNDJhOTMxOTA4MDI2M2U4NmI3Nzg1OTNmNzQwNWM=

data/.yardopts

@@ -0,0 +1,2 @@
+--main Readme.md
+--files=Changelog.md

data/Changelog.md

@@ -1,3 +1,13 @@
+Not released changes
+
+## 0.2.0, released 2013-09-28
+
+* Inserted rspec-rails as development dependency to allow easier testing of helper methods
+* Now view helpers use output buffering to allow inline usage. It means that they must be used with equal sign in ERB templates
+* Allow disabling gem for a block of code with helper `without_google_analytics_params`
+* Allow usage also in controllers since they have the same structure of `ActionMailer::Base`
+* Extracted uri parser in its own class
+
 ## 0.1.2, released 2013-09-26
 
 * Removed blank params from generated urls

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in google_analytics_mailer.gemspec
 gemspec
+
+# used locally for documentation
+gem 'redcarpet'
+gem 'yard'

data/README.md

@@ -1,6 +1,7 @@
 # GoogleAnalyticsMailer [![Build Status](https://secure.travis-ci.org/fabn/google_analytics_mailer.png)](http://travis-ci.org/fabn/google_analytics_mailer)
 
-This gem automatically rewrites **absolute** links generated by ActionMailer. It intercepts all'`url_for` calls (so `link_to` calls are intercepted as well) and change the final url to add [Custom Campaign parameters](http://support.google.com/analytics/bin/answer.py?hl=en&answer=1033867) to your URLs.
+This gem automatically rewrites **absolute** links generated by ActionMailer. It intercepts all'`url_for` calls (so `link_to` calls are intercepted as well)
+and change the final url to add [Custom Campaign parameters](http://support.google.com/analytics/bin/answer.py?hl=en&answer=1033867) to your URLs.
 
 ## Installation
 
@@ -71,13 +72,45 @@ At view level you can override generated parameters using the `with_google_analy
 
 ```erb
 <div class="footer">
-  <%- with_google_analytics_params(utm_term: 'footer') do -%>
+  <%= with_google_analytics_params(utm_term: 'footer') do -%>
     <!-- this will override other params and produces ?utm_medium=email&utm_source=newsletter&utm_term=footer -->
     <%= link_to('Read online', newsletter_url) -%>
   <%- end -%>
 </div>
 ```
 
+or you can disable them for a specific block
+
+```erb
+<div class="footer">
+  <%= without_google_analytics_params do -%>
+    <!-- this will output link with no analytics params at all -->
+    <%= link_to('Read online', newsletter_url) -%>
+  <%- end -%>
+</div>
+```
+
+## Action Controller integration
+
+Since ActionMailer and ActionController use the same code base to provide view rendering this gem can be used in the
+ same way in any action controller which inherits from `ActionController::Base` (i.e. almost every controller in a
+ Rails application). The alias `google_analytics_controller` is provided for better compatibility thus in a controller
+
+```ruby
+class UserController < ApplicationController
+
+  # declare url parameters for this controller. Absolute links in this controller will be tagged with GA parameters
+  google_analytics_controller utm_source: 'some site', utm_medium: 'web' # etc
+
+  # Override for single action
+  def index
+    google_analytics_params(utm_source: 'index page', utm_term: 'foo bar')
+  end
+end
+```
+
+View syntax is obviously the same as in mailer.
+
 ## Contributing
 
 1. Fork it

data/google_analytics_mailer.gemspec

@@ -4,27 +4,28 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'google_analytics_mailer/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "google_analytics_mailer"
+  gem.name          = 'google_analytics_mailer'
   gem.version       = GoogleAnalyticsMailer::VERSION
-  gem.authors       = ["Fabio Napoleoni"]
-  gem.email         = ["f.napoleoni@gmail.com"]
+  gem.authors       = ['Fabio Napoleoni']
+  gem.email         = ['f.napoleoni@gmail.com']
   gem.description   = %q{This gem add google analytics campagin tags to every link in your action mailer}
   gem.summary       = %q{This gem provides automatic Google Analytics tagged links in ActionMailer generated emails}
-  gem.homepage      = "https://github.com/fabn/google_analytics_mailer"
+  gem.homepage      = 'https://github.com/fabn/google_analytics_mailer'
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   # gem dependencies for runtime
-  gem.add_runtime_dependency "addressable", "~> 2.3.0"
-  gem.add_runtime_dependency "actionmailer", ">= 3.2.0"
+  gem.add_runtime_dependency 'addressable', '~> 2.3.0'
+  gem.add_runtime_dependency 'actionmailer', '>= 3.2.0'
 
   # gem dependencies for development
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 2.12.0"
-  gem.add_development_dependency "email_spec", "~> 1.2.0"
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rails', '>= 3.2.0'
+  gem.add_development_dependency 'rspec-rails', '~> 2.13.0'
+  gem.add_development_dependency 'email_spec', '~> 1.2.0'
   gem.add_development_dependency 'appraisal'
 end

data/lib/google_analytics_mailer/uri_builder.rb

@@ -0,0 +1,25 @@
+require 'addressable/uri'
+
+# Class used to do the actual insertion of parameters
+class GoogleAnalyticsMailer::UriBuilder
+
+  # Append google analytics params to the given uri
+  # @param [String] uri the original uri
+  # @param [Hash] params options for url to build
+  # @option params [String] :utm_campaign required is the main GA param
+  # @option params [String] :utm_content content of the campaign
+  # @option params [String] :utm_source campaign source
+  # @option params [String] :utm_medium campaign medium
+  # @option params [String] :utm_term keyword for this campaign
+  def build(uri, params)
+    # remove empty GA params
+    params.delete_if { |_, v| v.blank? }
+    # if no params return untouched url
+    return uri if params.empty?
+    # build the final url
+    ::Addressable::URI.parse(uri).tap do |parsed|
+      parsed.query_values = (parsed.query_values || {}).reverse_merge(params) if parsed.absolute?
+    end.to_s.html_safe
+  end
+
+end

data/lib/google_analytics_mailer/url_for.rb

@@ -1,5 +1,3 @@
-require "addressable/uri"
-
 module GoogleAnalyticsMailer # :nodoc:
 
   # This module is added as helper to ActionMailer objects and override
@@ -14,27 +12,69 @@ module GoogleAnalyticsMailer # :nodoc:
       params_to_add = controller.computed_analytics_params.with_indifferent_access
       # temporary override coming from with_google_analytics_params method
       params_to_add.merge!(@_override_ga_params) if @_override_ga_params.try(:any?)
-      # remove empty GA params
-      params_to_add.delete_if { |_, v| v.blank? }
-      # if there are no parameters return super value
-      if params_to_add.empty?
-        super(original_url)
-      else
-        # else parse the url and append given parameters
-        ::Addressable::URI.parse(super(original_url)).tap do |url|
-          url.query_values = (url.query_values || {}).reverse_merge(params_to_add) if url.absolute?
-        end.to_s.html_safe
-      end
+      # Avoid parse if params not given
+      params_to_add.empty? ? super(original_url) : builder.build(super(original_url), params_to_add)
     end
 
-    # Allow to override Google Analytics params for a given block in views
-    # @return [String]
-    def with_google_analytics_params(params)
-      raise ArgumentError, "Missing block" unless block_given?
+    # Acts as an around filter from the given block and return its content
+    # by merging the given analytics parameters to current ones
+    #
+    # @param [Hash] params options for url to build
+    # @option params [String] :utm_campaign required is the main GA param
+    # @option params [String] :utm_content content of the campaign
+    # @option params [String] :utm_source campaign source
+    # @option params [String] :utm_medium campaign medium
+    # @option params [String] :utm_term keyword for this campaign
+    #
+    # @yield The given block is executed with overridden analytics parameters
+    # @yieldreturn [String] content returned from the block with filtered parameters
+    #
+    # @example in an ERB template
+    #   <%= with_google_analytics_params(utm_content: 'foo') do -%>
+    #     <%= link_to 'foo', 'http://example.com' -%>
+    #   <%- end -%>
+    #
+    # @example Inline usage now possible because of captured output
+    #   <%= with_google_analytics_params(utm_content: 'foo') { link_to ... } -%>
+    #
+    # @return [String] the output returned by block
+    def with_google_analytics_params(params, &block)
+      raise ArgumentError, 'Missing block' unless block_given?
       @_override_ga_params = params
-      yield
+      capture(&block)
+    ensure
+      @_override_ga_params = nil
+    end
+
+    # Acts as an around filter from the given block and return its content
+    # without inserting any analytics tag
+    #
+    # @yield The given block is executed with appeding analytics parameters
+    # @yieldreturn [String] content returned from the block with no parameters appended
+    #
+    # @example in an ERB template
+    #   <%= without_google_analytics_params(utm_content: 'foo') do -%>
+    #     <%= link_to 'foo', 'http://example.com' -%>
+    #   <%- end -%>
+    #
+    # @example Inline usage now possible because of captured output
+    #   <%= without_google_analytics_params(utm_content: 'foo') { link_to ... } -%>
+    #
+    # @return [String] the output of the block executed without analytics params
+    def without_google_analytics_params(&block)
+      raise ArgumentError, 'Missing block' unless block_given?
+      @_override_ga_params = Hash[VALID_ANALYTICS_PARAMS.zip([nil])]
+      capture(&block)
+    ensure
       @_override_ga_params = nil
-      nil # do not return any value
+    end
+
+    private
+
+    # Return a UriBuilder instance
+    # @return [UriBuilder]
+    def builder
+      @_builder ||= UriBuilder.new
     end
 
   end

data/lib/google_analytics_mailer/version.rb

@@ -1,3 +1,4 @@
 module GoogleAnalyticsMailer
-  VERSION = "0.1.2"
+  # Application version
+  VERSION = '0.2.0'
 end

data/lib/google_analytics_mailer.rb

@@ -1,18 +1,25 @@
-require "google_analytics_mailer/version"
-require "google_analytics_mailer/url_for"
-require "action_mailer"
-require "active_support/concern"
+require 'google_analytics_mailer/version'
+require 'google_analytics_mailer/url_for'
+require 'google_analytics_mailer/uri_builder'
+require 'action_mailer'
+require 'active_support/concern'
 
 # This module declares the main class method which is then callable from every
-# ActionMailer class
+# ActionMailer class and in ActionController::Base if available.
 module GoogleAnalyticsMailer
 
   # These are the currently GA allowed get params for link tagging
-  VALID_ANALYTICS_PARAMS = [:utm_source, :utm_medium, :utm_campaign,
-                            :utm_term, :utm_content]
+  VALID_ANALYTICS_PARAMS = [:utm_source, :utm_medium, :utm_campaign, :utm_term, :utm_content]
 
-  # Enable google analytics link tagging for the mailer which call this method
-  def google_analytics_mailer params = {}
+  # Enable google analytics link tagging for the mailer (or controller) which call this method
+  #
+  # @param [Hash] params options for url to build
+  # @option params [String] :utm_campaign required is the main GA param
+  # @option params [String] :utm_content content of the campaign
+  # @option params [String] :utm_source campaign source
+  # @option params [String] :utm_medium campaign medium
+  # @option params [String] :utm_term keyword for this campaign
+  def google_analytics_mailer(params = {})
     if (params.keys - VALID_ANALYTICS_PARAMS).any?
       raise ArgumentError, "Invalid parameters keys #{params.keys - VALID_ANALYTICS_PARAMS}"
     end
@@ -25,6 +32,9 @@ module GoogleAnalyticsMailer
 
   end
 
+  # Allow usage also in controllers since they have the same structure of ActionMailer
+  alias_method :google_analytics_controller, :google_analytics_mailer
+
   # This module provides methods to deal with parameter merging and similar stuff
   module GoogleAnalytics
 
@@ -53,4 +63,7 @@ module GoogleAnalyticsMailer
 end
 
 # Add the class method to ActionMailer::Base
-ActionMailer::Base.send :extend, GoogleAnalyticsMailer
+ActionMailer::Base.send :extend, GoogleAnalyticsMailer
+
+# Allow usage also in application controller if required in dependencies
+ActionController::Base.send :extend, GoogleAnalyticsMailer if defined?(ActionController::Base)

data/spec/helpers/url_for_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe GoogleAnalyticsMailer::UrlFor do
+
+  before(:each) do
+    controller.stub(computed_analytics_params: {utm_source: 'foo'})
+  end
+
+  describe '#with_google_analytics_params' do
+
+    it 'should override used parameters while in the block' do
+      helper.with_google_analytics_params utm_source: 'bar' do
+        helper.url_for('http://www.example.com').should include 'utm_source=bar'
+      end
+      helper.url_for('http://www.example.com').should include 'utm_source=foo'
+    end
+
+  end
+
+  describe '#without_google_analytics_params' do
+
+    it 'should ignore analytic params in the block' do
+      helper.without_google_analytics_params do
+        helper.url_for('http://www.example.com').should == 'http://www.example.com'
+      end
+      helper.url_for('http://www.example.com').should include 'utm_source=foo'
+    end
+
+  end
+
+end

data/spec/lib/google_analytics_mailer_spec.rb

@@ -2,27 +2,31 @@ require 'spec_helper'
 
 describe GoogleAnalyticsMailer do
 
-  it "ActionMailer::Base should extend GoogleAnalyticsMailer" do
+  it 'ActionMailer::Base should extend GoogleAnalyticsMailer' do
     (class << ActionMailer::Base; self end).included_modules.should include(GoogleAnalyticsMailer)
   end
 
-  describe ".google_analytics_mailer" do
+  describe '.google_analytics_mailer' do
 
     class TestMailer1 < ActionMailer::Base
     end
 
-    it "should raise on invalid options for GA params" do
+    it 'should raise on invalid options for GA params' do
       expect {
         ActionMailer::Base.google_analytics_mailer(foo: 'bar')
       }.to raise_error(ArgumentError, /:foo/)
     end
 
-    it "should assign given parameters to a class variable" do
+    it 'should assign given parameters to a class variable' do
       params = {utm_source: 'newsletter', utm_medium: 'email'}
       TestMailer1.google_analytics_mailer(params)
       TestMailer1.google_analytics_class_params.should == params
     end
 
+    it 'should be aliased to google_analytics_controller' do
+      ActionMailer::Base.should respond_to :google_analytics_controller
+    end
+
   end
 
   class UserMailer < ActionMailer::Base
@@ -59,41 +63,41 @@ describe GoogleAnalyticsMailer do
   describe UserMailer do
 
     # see view in spec/support/views/user_mailer/welcome.html.erb
-    describe "#welcome" do
+    describe '#welcome' do
 
       subject { UserMailer.welcome }
 
-      it "should have analytics link with params taken from class definition" do
+      it 'should have analytics link with params taken from class definition' do
         subject.should have_body_text 'http://www.example.com/newsletter?utm_medium=email&utm_source=newsletter'
       end
 
-      it "should have analytics link with overridden params" do
+      it 'should have analytics link with overridden params' do
         subject.should have_body_text 'http://www.example.com/newsletter?utm_medium=email&utm_source=my_newsletter'
       end
 
     end
 
     # see view in spec/support/views/user_mailer/welcome2.html.erb
-    describe "#welcome2" do
+    describe '#welcome2' do
 
       subject { UserMailer.welcome2 }
 
-      it "should have analytics link with params taken from instance" do
+      it 'should have analytics link with params taken from instance' do
         subject.should have_body_text 'http://www.example.com/newsletter?utm_medium=email&utm_source=second_newsletter&utm_term=welcome2'
       end
 
-      it "should have analytics link with overridden params" do
+      it 'should have analytics link with overridden params' do
         subject.should have_body_text 'http://www.example.com/newsletter?utm_medium=email&utm_source=my_newsletter&utm_term=welcome2'
       end
 
     end
 
     # see view in spec/support/views/user_mailer/welcome3.html.erb
-    describe "#welcome3" do
+    describe '#welcome3' do
 
       subject { UserMailer.welcome3 }
 
-      it "should have analytics link with params taken from view" do
+      it 'should have analytics link with params taken from view' do
         subject.should have_body_text 'http://www.example.com/newsletter?utm_medium=email&utm_source=newsletter&utm_term=footer'
       end
 

data/spec/lib/uri_builder_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe GoogleAnalyticsMailer::UriBuilder do
+
+  describe '#build' do
+
+    it 'should not include blank GA params' do
+      subject.build('http://www.example.com', utm_campaign: nil).should_not include 'utm_campaign'
+    end
+
+    it 'should uri encode GA parameter values' do
+      subject.build('http://www.example.com', utm_campaign: 'Foo Bar').should include 'utm_campaign=Foo%20Bar'
+    end
+
+    it 'should not add GA parameters if uri is not absolute' do
+      subject.build('/some/path', utm_campaign: 'abc').should == '/some/path'
+    end
+
+    it 'should not touch uri with empty params' do
+      subject.build('http://www.example.com', {}).should == 'http://www.example.com'
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,14 +1,16 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
+ENV['RAILS_ENV'] ||= 'test'
 
 # Gem main file
 require 'google_analytics_mailer'
 require 'active_support/all'
 require 'email_spec'
+require 'rails/all'
+require 'rspec/rails'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
 
 # Configure action mailer for test deliveries
 ActionMailer::Base.delivery_method = :test

data/spec/support/views/user_mailer/welcome3.html.erb

@@ -3,7 +3,7 @@
   <p>Lorem ipsum</p>
 </div>
 <div class="footer">
-  <%- with_google_analytics_params(utm_term: 'footer') do -%>
+  <%= with_google_analytics_params(utm_term: 'footer') do -%>
     <!-- this will override params and produces ?utm_medium=email&utm_source=newsletter&utm_term=footer -->
     <%= link_to('Read online', newsletter_url) -%>
   <%- end -%>

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: google_analytics_mailer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Fabio Napoleoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,31 +48,41 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,6 +120,7 @@ files:
 - .rspec
 - .rvmrc
 - .travis.yml
+- .yardopts
 - Appraisals
 - Changelog.md
 - Gemfile
@@ -129,10 +131,12 @@ files:
 - gemfiles/actionmailer4_0.gemfile
 - google_analytics_mailer.gemspec
 - lib/google_analytics_mailer.rb
+- lib/google_analytics_mailer/uri_builder.rb
 - lib/google_analytics_mailer/url_for.rb
 - lib/google_analytics_mailer/version.rb
+- spec/helpers/url_for_spec.rb
 - spec/lib/google_analytics_mailer_spec.rb
-- spec/lib/url_for_spec.rb
+- spec/lib/uri_builder_spec.rb
 - spec/spec_helper.rb
 - spec/support/views/user_mailer/welcome.html.erb
 - spec/support/views/user_mailer/welcome2.html.erb
@@ -140,33 +144,34 @@ files:
 homepage: https://github.com/fabn/google_analytics_mailer
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem provides automatic Google Analytics tagged links in ActionMailer
   generated emails
 test_files:
+- spec/helpers/url_for_spec.rb
 - spec/lib/google_analytics_mailer_spec.rb
-- spec/lib/url_for_spec.rb
+- spec/lib/uri_builder_spec.rb
 - spec/spec_helper.rb
 - spec/support/views/user_mailer/welcome.html.erb
 - spec/support/views/user_mailer/welcome2.html.erb
 - spec/support/views/user_mailer/welcome3.html.erb
+has_rdoc: 

data/spec/lib/url_for_spec.rb

@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-# Mock helper used to test module methods
-# @see http://stackoverflow.com/questions/5944278/overriding-method-by-another-defined-in-module
-class MockHelper
-  # No op implementation of url_for
-  def url_for(url)
-    url
-  end
-
-  # Used by implementation
-  def controller
-    self
-  end
-
-  def computed_analytics_params
-    {}.with_indifferent_access
-  end
-end
-
-describe GoogleAnalyticsMailer::UrlFor do
-
-  let(:dummy_class) { Class.new(MockHelper) { include GoogleAnalyticsMailer::UrlFor } }
-  let(:subject) { dummy_class.new }
-
-  describe '#url_for' do
-
-    it 'should not include blank GA params' do
-      subject.stub(computed_analytics_params: {utm_campaign: nil})
-      subject.url_for('http://www.example.com').should_not include 'utm_campaign'
-    end
-
-    it 'should uri encode GA parameter values' do
-      subject.stub(computed_analytics_params: {utm_campaign: 'Foo Bar'})
-      subject.url_for('http://www.example.com').should include 'utm_campaign=Foo%20Bar'
-    end
-
-  end
-
-end