persist_campaign 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDM4YWQ4N2YyY2FiY2UzZjA0ZjkyZTYyM2IxNzFkMDE4ZTY5MGI2ZQ==
-  data.tar.gz: !binary |-
-    MjdhMGM2YzAxYTMzMTRkYTg2NzgxMzNmYTQ4NWMwMTg4NzM5NTM0Yw==
+SHA1:
+  metadata.gz: 1b82f1c95d7fab634604c373cdabbc334c781015
+  data.tar.gz: 04f643c8a836396a7d5554d3ad8f2ab1e7f6b884
 SHA512:
-  metadata.gz: !binary |-
-    YWJmMmEzNGMxNDhjMDJmYTJjZTc5NjcxZTVmNjhiNjhjZDI5ZThmNGIxZDUw
-    MWE0ZDYwOTA2NGE0NDc5MjkwOWVhZWEyYWJkYTBjOWUyNjEwYzA0MWY5OWIw
-    MjY3NWJlOGU4MjM0ZGRhY2IzZWZjOGJkN2M4NTYzMDE1NWI5OTE=
-  data.tar.gz: !binary |-
-    NTJlMTkzZDgxZjAyN2UwZTZlODU4YjI2NDgzMDI0NjEwMTViZjM3MTFjNTI0
-    YzExNjMxYjIyMWU4NzQzNzEyMjI4ZDdmMWFmYzRmZWE4ZWJkYWIzZWQ1NTg5
-    OGIzY2NmYzc1ZjIxOWJiMjk1NjE4ZDc1MzVlZmQ3NmQzMmRjM2M=
+  metadata.gz: 43dbdc2fcad408c45976bcd54dc4ed08ae5bc04082c307847de09e645261e37f49efb63baf8fec18e9ee221bff02ba2535bcdb52630f1b8ef6d5901e5a970151
+  data.tar.gz: cd52998655c3771d7d9b98dca6f7cf772319bed0a478f9b5d1b0c0bea5cc78dc8fea3d999cc25718161dc8b7863e28cd02f37982c32a45c2ee2e20af51fa315e

data/.gitignore

@@ -16,3 +16,4 @@ spec/dummy/log
 test/tmp
 test/version_tmp
 tmp
+/gemfiles/*.lock

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+cache: bundler
+rvm:
+  - 2.1.3
+gemfile:
+  - gemfiles/rails_3.1.gemfile
+  - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.0.gemfile
+  - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.2.gemfile
+before_install:
+  gem install bundler

data/Appraisals

@@ -0,0 +1,24 @@
+appraise "rails-3.1" do
+  gem "rails", "~> 3.1.0"
+  gemspec
+end
+
+appraise "rails-3.2" do
+  gem "rails", "~> 3.2.1"
+  gemspec
+end
+
+appraise "rails-4.0" do
+  gem "rails", "~> 4.0.0"
+  gemspec
+end
+
+appraise "rails-4.1" do
+  gem "rails", "~> 4.1.0"
+  gemspec
+end
+
+appraise "rails-4.2" do
+  gem "rails", "~> 4.2"
+  gemspec
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Andy Dust
+Copyright (c) 2014 MUBI
 
 MIT License
 

data/README.md

@@ -1,5 +1,7 @@
 # PersistCampaign
 
+[![Build Status](https://travis-ci.org/mubi/persist_campaign.svg)](https://travis-ci.org/mubi/persist_campaign)
+
 Persist campaign parameters - such as utm_campaign, utm_source, etc - on Rails redirect_to.
 
 ## Installation
@@ -56,4 +58,4 @@ MIT license.
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/gemfiles/rails_3.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.1.0"
+
+gemspec :path => "../"

data/gemfiles/rails_3.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2.1"
+
+gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2"
+
+gemspec :path => "../"

data/lib/persist_campaign/controller.rb

@@ -8,10 +8,22 @@ module PersistCampaign
     module InstanceMethods
       # Solution provided by ndp's save-the-campaign gem (http://github.com/ndp/save-the-campaign),
       # reproduced here under the MIT license
-      def _compute_redirect_to_location_with_persist_campaign_params(options = {})
+
+      if Gem::Version.new(Rails.version) >= Gem::Version.new('4.2.1')
+        def _compute_redirect_to_location_with_persist_campaign_params(request, options = {})
+          url = _compute_redirect_to_location_without_persist_campaign_params(request, options)
+          _add_persisted_keys_to(request, url)
+        end
+      else
+        def _compute_redirect_to_location_with_persist_campaign_params(options = {})
+          url = _compute_redirect_to_location_without_persist_campaign_params(options)
+          _add_persisted_keys_to(request, url)
+        end
+      end
+
+      def _add_persisted_keys_to(request, url)
         keys = PersistCampaign.config.keys.map(&:to_s)
         to_persist = request.params.slice(*keys)
-        url = _compute_redirect_to_location_without_persist_campaign_params(options)
 
         unless to_persist.empty?
           url << (url =~ /\?/ ? '&' : '?')
@@ -22,4 +34,4 @@ module PersistCampaign
       end
     end
   end
-end
+end

data/lib/persist_campaign/version.rb

@@ -1,3 +1,3 @@
 module PersistCampaign
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/persist_campaign.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'rails', '>= 3.1.12'
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency 'rspec-rails', '~> 2.14'
-  spec.add_development_dependency 'generator_spec', '~> 0.9.2'
+  spec.add_development_dependency 'rspec-rails', '~> 3.4.0'
+  spec.add_development_dependency 'generator_spec', '~> 0.9.3'
+  spec.add_development_dependency "appraisal"
 end

data/spec/dummy/config/application.rb

@@ -10,6 +10,7 @@ module Dummy
   end
 end
 
-Rails.application.configure do
+Dummy::Application.configure do
   config.eager_load = false
-end
+  config.secret_key_base = 'abcdef123456'
+end

data/spec/spec_helper.rb

@@ -7,4 +7,4 @@ Rails.backtrace_cleaner.remove_silencers!
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
-end
+end

metadata

@@ -1,100 +1,107 @@
 --- !ruby/object:Gem::Specification
 name: persist_campaign
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andy Dust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.12
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.12
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
-description: ! "This Rails gem allows you to persist analytics parameters through
-  redirects. By default its\n                          persists utm_campaign, utm_source,
-  utm_term, utm_medium, utm_content and gclid (for Google Adwords).\n                          Additional
-  param keys can be configured."
+        version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |-
+  This Rails gem allows you to persist analytics parameters through redirects. By default its
+                            persists utm_campaign, utm_source, utm_term, utm_medium, utm_content and gclid (for Google Adwords).
+                            Additional param keys can be configured.
 email:
 - adust@mubi.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails_3.1.gemfile
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
 - lib/generators/persist_campaign/install_generator.rb
 - lib/generators/persist_campaign/templates/initializer.rb
 - lib/persist_campaign.rb
@@ -126,17 +133,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Persist campaign parameters - such as utm_campaign, utm_source, etc - on