shortener 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe28326cb43bf61b21d93e6b358942fc5252c761
-  data.tar.gz: 9f974fd5c92613dbbd1548d9257c3b24a097cf1b
+  metadata.gz: ae732fd2135a915ebf0565d0350279894ed29ddc
+  data.tar.gz: 730ea8bc1f3c867ae3f3caa6ca2695399d61b8fc
 SHA512:
-  metadata.gz: b60cc661851633cd890c7ce4c2c8aa0329b6be9132f05385104fe289bd47f0fe4fb11a121688d333bf4be078e939228829715c43b4f67f473b7c2e558e428a0e
-  data.tar.gz: 3e1376fb0c2f376672b14338dad3e6e58c3f76c051a3a863640e3b2fe44708420608d2817cef8368f2be74ca8e32ca7b095696d9e2c96e84ef079d884b29519d
+  metadata.gz: 628ab6bb9d1bc641a3727e26643b617df6092aecb20ee0f9cdc4418b889418a85609b45231754fc462d813e203709ba48b61a7972520efbef1ef65f93e65abb9
+  data.tar.gz: 3adb8897c37e618ce3fe27c999895b1519ae9e97d2d370ad2d16e2a27a6cca94ae646feb97617bcd370d607d5ce50244c244535c5c30c4f122e9d650ceae1865

data/app/helpers/shortener/shortener_helper.rb

@@ -1,13 +1,15 @@
 module Shortener::ShortenerHelper
 
   # generate a url from a url string
-  def short_url(url, owner: nil, custom_key: nil, expires_at: nil, fresh: false, url_options: {})
-    short_url = Shortener::ShortenedUrl.generate(url,
-                                                  owner:      owner,
-                                                  custom_key: custom_key,
-                                                  expires_at: expires_at,
-                                                  fresh:      fresh
-                                                )
+  def short_url(url, owner: nil, custom_key: nil, expires_at: nil, fresh: false, category: nil, url_options: {})
+    short_url = Shortener::ShortenedUrl.generate(
+      url,
+      owner:      owner,
+      custom_key: custom_key,
+      expires_at: expires_at,
+      fresh:      fresh,
+      category:   category
+    )
 
     if short_url
       options = { controller: :"/shortener/shortened_urls", action: :show, id: short_url.unique_key, only_path: false }.merge(url_options)

data/lib/shortener/version.rb

@@ -1,3 +1,3 @@
 module Shortener
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/spec/helpers/shortener_helper_spec.rb

@@ -7,7 +7,7 @@ describe Shortener::ShortenerHelper, type: :helper do
 
     context 'without user or custom key' do
       before do
-        expect(Shortener::ShortenedUrl).to receive(:generate).with(destination, owner: nil, custom_key: nil, expires_at: nil, fresh: false).and_return(shortened_url)
+        expect(Shortener::ShortenedUrl).to receive(:generate).with(destination, owner: nil, custom_key: nil, expires_at: nil, fresh: false, category: nil).and_return(shortened_url)
       end
 
       context 'short url was generated' do
@@ -30,25 +30,32 @@ describe Shortener::ShortenerHelper, type: :helper do
     context 'with owner' do
       let(:owner) { double('User') }
       it 'sends user to generate function' do
-        expect(Shortener::ShortenedUrl).to receive(:generate).with(destination, owner: owner, custom_key: nil, expires_at: nil, fresh: false)
+        expect(Shortener::ShortenedUrl).to receive(:generate).with(destination, owner: owner, custom_key: nil, expires_at: nil, fresh: false, category: nil)
         helper.short_url(destination, owner: owner)
       end
     end
 
     context 'with custom_key' do
       it 'sends custom key code to generate function' do
-        expect(Shortener::ShortenedUrl).to receive(:generate).with(destination, owner: nil, custom_key: 'custkey', expires_at: nil, fresh: false)
+        expect(Shortener::ShortenedUrl).to receive(:generate).with(destination, owner: nil, custom_key: 'custkey', expires_at: nil, fresh: false, category: nil)
         helper.short_url(destination, custom_key: 'custkey')
       end
     end
 
     context 'with expires_at' do
       it 'sends custom key code to generate function' do
-        expect(Shortener::ShortenedUrl).to receive(:generate).with(destination, owner: nil, custom_key: nil, expires_at: 'testtime', fresh: false)
+        expect(Shortener::ShortenedUrl).to receive(:generate).with(destination, owner: nil, custom_key: nil, expires_at: 'testtime', fresh: false, category: nil)
         helper.short_url(destination, expires_at: 'testtime')
       end
     end
 
+    context 'with category' do
+      it 'sends custom key code to generate function' do
+        expect(Shortener::ShortenedUrl).to receive(:generate).with(destination, owner: nil, custom_key: nil, expires_at: nil, fresh: false, category: 'testcat')
+        helper.short_url(destination, category: 'testcat')
+      end
+    end
+
     context 'with url options for https and subdomain' do
       let(:short_url) { double('ShortUrl', unique_key: 'knownkey') }
       it 'sends custom key code to generate function' do

metadata

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