shortener 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c844faf59a32a6bc3c3bbaba68f8281296e010e
-  data.tar.gz: d4f9edc81356aba4c03fda63cfb4dac7884f5b30
+  metadata.gz: e1ff25934680ccaffed2ea4b7a05d14c033fb450
+  data.tar.gz: dedf6fdcd81671c96dadccbd14b89e724a919107
 SHA512:
-  metadata.gz: 11178f236215ab473d80bd630337056779e20519d8cde40e48e37f0958ce1b2a9cfb8dea1fc05bd829a23bd6b2e8046481523e7652cd8b8bbdb2ae9220c30188
-  data.tar.gz: ce0e61e18cf452f062243d106fab7c5a0c6fac373e018998b57e6d6f08b4ec6902cc66771f7c3b74f93466b800bbc60a10b3db01a4a43fc68c22819a053a5d93
+  metadata.gz: 8a87d5020c3f51791794d037ee206ebfee4e6f6595ec88e749c03e02a88e5c8aa9914f7dd8a0f25e680f4466c43c523989d5b4eac597393dea3f5fc24c46691d
+  data.tar.gz: f3dcc1ad1ec6b6bd5f6a93ff9838c022c3d2b9c407e57c026915f98202ad4ebd1518421e85c88e439fcf20108bf2f12373a065de52fa1fe67ad06ab3e9438f02

data/README.rdoc

@@ -58,7 +58,7 @@ This generator will create a migration to create the shortened_urls table where
 
 Then add to your routes:
 
-  match '/:id' => "shortener/shortened_urls#show"
+  get '/:id' => "shortener/shortened_urls#show"
 
 == Configuration
 The gem can be configured in a config/initializers/shortener.rb file.
@@ -131,6 +131,12 @@ In rails you can put next line into config/initializers/shortener.rb
 
   Shortener.forbidden_keys.concat %w(terms promo)
 
+=== Parameters
+
+Parameters are passed though from the shortened url, to the destination URL. If the destination
+URL has the same parameters as the destination URL, the parameters on the shortened url take
+precedence over those on the destination URL.
+
 === Shorten URLs in generated emails
 
 You can register the included mail interceptor to shorten all links in the emails generated by your Rails app. For example, add to your mailer:

data/app/controllers/shortener/shortened_urls_controller.rb

@@ -17,8 +17,20 @@ class Shortener::ShortenedUrlsController < ActionController::Base
         sl.increment!(:use_count)
         ActiveRecord::Base.connection.close
       end
+
+      params.except! *[:id, :action, :controller]
+      url = sl.url
+
+      if params.present?
+        uri = URI.parse(sl.url)
+        existing_params = Rack::Utils.parse_nested_query(uri.query)
+        merged_params   = existing_params.merge(params)
+        uri.query       = merged_params.to_query
+        url             = uri.to_s
+      end
+
       # do a 301 redirect to the destination url
-      redirect_to sl.url, status: :moved_permanently
+      redirect_to url, status: :moved_permanently
     else
       # if we don't find the shortened link, redirect to the root
       # make this configurable in future versions

data/lib/shortener/version.rb

@@ -1,3 +1,3 @@
 module Shortener
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/controllers/shortened_urls_controller_spec.rb

@@ -6,8 +6,9 @@ describe Shortener::ShortenedUrlsController, type: :controller do
   let(:short_url)   { Shortener::ShortenedUrl.generate(destination) }
 
   describe '#show' do
+    let(:params) { {} }
     before do
-      get :show, id: key
+      get :show, { id: key }.merge(params)
     end
 
     context 'valid keys' do
@@ -26,6 +27,33 @@ describe Shortener::ShortenedUrlsController, type: :controller do
           expect(response).to redirect_to destination
         end
       end
+
+      context 'parameters on short url' do
+        let(:params) { { foo: 34, bar: 49 } }
+        let(:key) { short_url.unique_key }
+
+        context 'no parameters on long url' do
+          it 'redirects to the destination url with the parmeters' do
+            redirect_url_params = Rack::Utils.parse_nested_query(URI.parse(response.location).query)
+
+            expect(redirect_url_params['foo']).to eq '34'
+            expect(redirect_url_params['bar']).to eq '49'
+            expect(response.code).to eq '301'
+          end
+        end
+        context 'clashing parameters on long url' do
+          let(:destination) { "#{Faker::Internet.url}?foo=26&noclash=56" }
+
+          it 'redirects to the destination url with the parmeters on the short url taking priority' do
+            redirect_url_params = Rack::Utils.parse_nested_query(URI.parse(response.location).query)
+
+            expect(redirect_url_params['foo']).to     eq '34'
+            expect(redirect_url_params['bar']).to     eq '49'
+            expect(redirect_url_params['noclash']).to eq '56'
+            expect(response.code).to eq '301'
+          end
+        end
+      end
     end
 
     context 'invalid keys' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortener
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - James P. McGrath