shortener 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ca1515978d1fd1012c45be1b83e8f32fd54d91
-  data.tar.gz: ddb3d85e34747b7d59269fb39df31edabd0c8076
+  metadata.gz: 2f4d4b7d3190fc69489c4b1801b999f68d343d63
+  data.tar.gz: 56ab4d022830a4fa77fd076bde77d0d24d995e81
 SHA512:
-  metadata.gz: a758441a05b4958c4ffcb0ab57841bb61b9c131febc87893f6f81080c27ec67346bcf9fcc89605137624f4fd51f568fa8e6ae2d16098fe10ee1a287217b93402
-  data.tar.gz: a991afd23aabc9efc4a765fa54ddee03e7902a740fc050b8670b69e053f9daa78f4de490fd0f175d621501149b798e519ece6cf57538d1d797d667d60e89de56
+  metadata.gz: f6aa5e1de18874e3c1df7ce6fe526c3ac4cc13a36dfa23c985c625b0d66b714e779409dcb9ddef2ca048fe52a0d0367628bf0384d537e05450f99d8c293cb0b3
+  data.tar.gz: 86253d34dcb01f8db8636a0df687dce67d0ca486fcab4f9754a98a01a91f3b1fc1d77b5040265a0f79ab7718f1209a73eca06c19fb08034aa903fc2b9ba50189

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.3

data/README.rdoc

@@ -36,29 +36,34 @@ The majority of the Shortener consists of three parts:
 You can use the latest Rails 3 gem with the latest Shortener gem. In your Gemfile:
 
   gem 'shortener'
-  
+
 After you install Shortener run the generator:
 
   rails generate shortener
-  
+
 This generator will create a migration to create the shortened_urls table where your shortened URLs will be stored.
 
 Then add to your routes:
 
   match '/:id' => "shortener/shortened_urls#show"
 
-== Initialization
-
-By default, the shortener will generate keys that are 5 characters long. You can change that by specifying the length of the key in the config/initializers/shortener.rb file.
+== Configuration
+The gem can be configured in a config/initializers/shortener.rb file.
 
+By default, the shortener will generate keys that are 5 characters long. You can change that by specifying the length of the key like so;
+```
   Shortener.unique_key_length = 6
-
+```
+By default, when a unique key isn't matched the site is redirected to "/". You can change that by specifying a different url like so;
+```
+  Shortener.default_redirect = "http://www.someurl.com"
+```
 == Usage
 
 To generate a Shortened URL object for the URL "http://dealush.com" within your controller / models do the following:
-  
+
   Shortener::ShortenedUrl.generate("http://dealush.com")
-  
+
 or
 
   Shortener::ShortenedUrl.generate("dealush.com")
@@ -66,7 +71,7 @@ or
 To generate and display a shortened URL in your application use the helper method:
 
   short_url("dealush.com")
-  
+
 This will generate a shortened URL. store it to the db and return a string representing the shortened URL.
 
 === Shortened URLs with owner
@@ -79,7 +84,7 @@ You can link shortened URLs to an owner, to scope them. To do so, add the follow
 
 This will allow you to pass the owner when generating URLs:
 
-  Shortener::ShortenedUrl.generate("dealush.com", user)
+  Shortener::ShortenedUrl.generate("example.com", user)
 
 And to access those URLs:
 
@@ -103,16 +108,14 @@ The interceptor supports a few more arguments, see the implementation for detail
 
 == Origins
 
-Shortener is based on code from Dealush[http://dealush.com], for a bit of backstory to Shortener see this {blog post}[http://jamespmcgrath.com/a-simple-link-shortener-in-rails/].
+Shortener is based on code from Dealush[http://example.com], for a bit of backstory to Shortener see this {blog post}[http://jamespmcgrath.com/a-simple-link-shortener-in-rails/].
 
 == In The Wild
 
-Shortener is used in a number of production systems:
+Shortener is used in a number of production systems, including, but not limited to:
 
 {Doorkeeper - An Event Management Tool}[http://www.doorkeeperhq.com/]
 
-{Dealush - A Local shopping Sales Notification Service}[http://dealush.com]
-
 If you are using Shortener in your project and would like to be added to this list, please get in touch!
 
 == Authors

data/app/controllers/shortener/shortened_urls_controller.rb

@@ -18,11 +18,11 @@ class Shortener::ShortenedUrlsController < ActionController::Base
         ActiveRecord::Base.connection.close
       end
       # do a 301 redirect to the destination url
-      redirect_to sl.url, :status => :moved_permanently
+      redirect_to sl.url, status: :moved_permanently
     else
       # if we don't find the shortened link, redirect to the root
       # make this configurable in future versions
-      redirect_to '/'
+      redirect_to Shortener.default_redirect
     end
   end
 

data/app/helpers/shortener/shortener_helper.rb

@@ -3,7 +3,7 @@ module Shortener::ShortenerHelper
   # generate a url from a url string
   def short_url(url, owner=nil)
     short_url = Shortener::ShortenedUrl.generate(url, owner)
-    short_url ? url_for(:controller => :"shortener/shortened_urls", :action => :show, :id => short_url.unique_key, :only_path => false) : url
+    short_url ? url_for(controller: :"shortener/shortened_urls", action: :show, id: short_url.unique_key, only_path: false) : url
   end
 
 end

data/app/models/shortener/shortened_url.rb

@@ -3,10 +3,10 @@ class Shortener::ShortenedUrl < ActiveRecord::Base
   URL_PROTOCOL_HTTP = "http://"
   REGEX_LINK_HAS_PROTOCOL = Regexp.new('\Ahttp:\/\/|\Ahttps:\/\/', Regexp::IGNORECASE)
 
-  validates :url, :presence => true
+  validates :url, presence: true
 
   # allows the shortened link to be associated with a user
-  belongs_to :owner, :polymorphic => true
+  belongs_to :owner, polymorphic: true
 
   # ensure the url starts with it protocol and is normalized
   def self.clean_url(url)
@@ -21,15 +21,18 @@ class Shortener::ShortenedUrl < ActiveRecord::Base
   def self.generate!(orig_url, owner=nil)
     # if we get a shortened_url object with a different owner, generate
     # new one for the new owner. Otherwise return same object
-    if orig_url.is_a?(Shortener::ShortenedUrl)
-      return orig_url.owner == owner ? orig_url : generate!(orig_url.url, owner)
+    if orig_url.is_a? Shortener::ShortenedUrl
+      if orig_url.owner == owner
+        result = orig_url
+      else
+        result generate!(orig_url.url, owner)
+      end
+    else
+      scope = owner ? owner.shortened_urls : self
+      result = scope.where(url: clean_url(orig_url)).first_or_create
     end
 
-    # don't want to generate the link if it has already been generated
-    # so check the datastore
-    cleaned_url = clean_url(orig_url)
-    scope = owner ? owner.shortened_urls : self
-    scope.where(:url => cleaned_url).first_or_create
+    result
   end
 
   # return shortened url on success, nil on failure

data/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  get '/s/:unique_key', :to => 'shortener/shortened_urls#translate', :as => 'shortener_translate'
+  get '/s/:unique_key', to: 'shortener/shortened_urls#translate', as: 'shortener_translate'
 end

data/lib/generators/shortener/shortener_generator.rb

@@ -3,10 +3,11 @@ require 'rails/generators/migration'
 
 class ShortenerGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
+
   def self.source_root
     @source_root ||= File.join(File.dirname(__FILE__), 'templates')
   end
-  
+
   def self.next_migration_number(dirname)
     if ActiveRecord::Base.timestamped_migrations
       Time.new.utc.strftime("%Y%m%d%H%M%S")
@@ -14,8 +15,9 @@ class ShortenerGenerator < Rails::Generators::Base
       "%.3d" % (current_migration_number(dirname) + 1)
     end
   end
-  
+
   def create_migration_file
     migration_template 'migration.rb', 'db/migrate/create_shortened_urls_table.rb'
   end
-end
+
+end

data/lib/generators/shortener/templates/migration.rb

@@ -3,23 +3,23 @@ class CreateShortenedUrlsTable < ActiveRecord::Migration
     create_table :shortened_urls do |t|
       # we can link this to a user for interesting things
       t.integer :owner_id
-      t.string :owner_type, :limit => 20
+      t.string :owner_type, limit: 20
 
       # the real url that we will redirect to
-      t.string :url, :null => false
+      t.string :url, null: false
 
       # the unique key
-      t.string :unique_key, :limit => 10, :null => false
+      t.string :unique_key, limit: 10, null: false
 
       # how many times the link has been clicked
-      t.integer :use_count, :null => false, :default => 0
+      t.integer :use_count, null: false, default: 0
 
       t.timestamps
     end
 
     # we will lookup the links in the db by key, urls and owners.
     # also make sure the unique keys are actually unique
-    add_index :shortened_urls, :unique_key, :unique => true
+    add_index :shortened_urls, :unique_key, unique: true
     add_index :shortened_urls, :url
     add_index :shortened_urls, [:owner_id, :owner_type]
   end

data/lib/shortener/active_record_extension.rb

@@ -1,5 +1,5 @@
 module Shortener::ActiveRecordExtension
   def has_shortened_urls
-    has_many :shortened_urls, :class_name => "::Shortener::ShortenedUrl", :as => :owner
+    has_many :shortened_urls, class_name: "::Shortener::ShortenedUrl", as: :owner
   end
 end

data/lib/shortener/shorten_url_interceptor.rb

@@ -47,7 +47,7 @@ Usage:
       end
     rescue => err
       raise err if Rails.env.test?
-      Airbrake.notify(err, :url => url) if defined?(Airbrake)
+      Airbrake.notify(err, url: url) if defined?(Airbrake)
       return url
     end
 

data/lib/shortener/version.rb

@@ -1,3 +1,3 @@
 module Shortener
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/shortener.rb

@@ -6,8 +6,9 @@ module Shortener
   autoload :ShortenUrlInterceptor, "shortener/shorten_url_interceptor"
 
   CHARSETS = {
-    :alphanum => ('a'..'z').to_a + (0..9).to_a,
-    :alphanumcase => ('a'..'z').to_a + ('A'..'Z').to_a + (0..9).to_a }
+    alphanum: ('a'..'z').to_a + (0..9).to_a,
+    alphanumcase: ('a'..'z').to_a + ('A'..'Z').to_a + (0..9).to_a
+  }
 
   # default key length: 5 characters
   mattr_accessor :unique_key_length
@@ -19,6 +20,10 @@ module Shortener
   mattr_accessor :charset
   self.charset = :alphanum
 
+  #The default redirection url when the key isn't found
+  mattr_accessor :default_redirect
+  self.default_redirect = '/'
+
   def self.key_chars
     CHARSETS[charset]
   end

data/shortener.gemspec

@@ -16,8 +16,10 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = "> 1.3.6"
   s.add_dependency "rails", ">= 3.0.7"
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rspec-rails", '~> 2.99.0'
+  s.add_development_dependency "rspec-rails", '~> 3.3.0'
   s.add_development_dependency "shoulda-matchers"
+  s.add_development_dependency "faker"
+  s.add_development_dependency "byebug"
   s.executables = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'
 end

data/spec/controllers/shortened_urls_controller_spec.rb

@@ -1,40 +1,73 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-shared_examples_for "good code" do
-  it "redirects to actual url" do
-    get :show, :id => code
-    response.should redirect_to("http://www.doorkeeperhq.com/")
-  end
-end
+describe Shortener::ShortenedUrlsController, type: :controller do
+  let(:destination) { Faker::Internet.url }
+  let(:short_url)   { Shortener::ShortenedUrl.generate(destination) }
 
-shared_examples_for "wrong code" do
-  it "redirects to actual url" do
-    get :show, :id => code
-    response.should redirect_to("/")
-  end
-end
+  describe '#show' do
+    before do
+      get :show, id: key
+    end
 
-describe Shortener::ShortenedUrlsController do
-  let(:short_url) { Shortener::ShortenedUrl.generate("www.doorkeeperhq.com") }
+    context 'valid keys' do
+      context 'real key' do
+        let(:key) { short_url.unique_key}
 
-  describe "GET show with actual code" do
-    let(:code) { short_url.unique_key}
-    it_should_behave_like "good code"
-  end
+        it 'redirects to the destination url' do
+          expect(response).to redirect_to destination
+        end
+      end
 
-  describe "GET show with good code but trailing characters" do
-    let(:code) { "#{short_url.unique_key}-" }
-    it_should_behave_like "good code"
-  end
+      context 'real key with trailing characters' do
+        let(:key) { "#{short_url.unique_key}-" }
 
-  describe "GET show with wrong code" do
-    let(:code) { "testing" }
-    it_should_behave_like "wrong code"
-  end
+        it 'redirects to the destination url' do
+          expect(response).to redirect_to destination
+        end
+      end
+    end
+
+    context 'invalid keys' do
+      context 'non existant key' do
+        let(:key) { "nonexistantkey" }
+
+        it 'redirects to the root url' do
+          expect(response).to redirect_to root_url
+        end
+      end
+
+      context 'key with invalid characters' do
+        let(:key) { "-" }
+
+        it 'redirects to the root url' do
+          expect(response).to redirect_to root_url
+        end
+      end
+
+      context "custom default redirect set" do
+        before do
+          Shortener.default_redirect = 'http://www.default_redirect.com'
+          # call again for the get is done with the setting
+          get :show, id: key
+        end
+
+        context 'non existant key' do
+          let(:key) { "nonexistantkey" }
+
+          it 'redirects to the root url' do
+            expect(response).to redirect_to 'http://www.default_redirect.com'
+          end
+        end
+
+        context 'key with invalid characters' do
+          let(:key) { "-" }
 
-  describe "GET show with code of invalid characters" do
-    let(:code) { "-" }
-    it_should_behave_like "wrong code"
+          it 'redirects to the root url' do
+            expect(response).to redirect_to 'http://www.default_redirect.com'
+          end
+        end
+      end
+    end
   end
 end

data/spec/dummy/config/application.rb

@@ -37,6 +37,6 @@ module Dummy
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
-    config.action_mailer.default_url_options = { :host => "mbln.jp" }
+    config.action_mailer.default_url_options = { host: "mbln.jp" }
   end
 end

data/spec/dummy/config/environments/development.rb

@@ -19,5 +19,7 @@ Dummy::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
+
+  config.eager_load = false
 end
 

data/spec/dummy/config/environments/test.rb

@@ -27,4 +27,6 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.eager_load = false
 end

data/spec/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/spec/dummy/config/routes.rb

@@ -1,4 +1,4 @@
 Dummy::Application.routes.draw do
   get '/:id' => "shortener/shortened_urls#show"
-  root :to => "application_controller#show"
+  root to: "application_controller#show"
 end

data/spec/dummy/db/migrate/20120213084304_create_shortened_urls_table.rb

@@ -3,23 +3,23 @@ class CreateShortenedUrlsTable < ActiveRecord::Migration
     create_table :shortened_urls do |t|
       # we can link this to a user for interesting things
       t.integer :owner_id
-      t.string :owner_type, :limit => 20
+      t.string :owner_type, limit: 20
 
       # the real url that we will redirect to
-      t.string :url, :null => false
+      t.string :url, null: false
 
       # the unique key
-      t.string :unique_key, :limit => 10, :null => false
+      t.string :unique_key, limit: 10, null: false
 
       # how many times the link has been clicked
-      t.integer :use_count, :null => false, :default => 0
+      t.integer :use_count, null: false, default: 0
 
       t.timestamps
     end
 
     # we will lookup the links in the db by key and owners.
     # also make sure the unique keys are actually unique
-    add_index :shortened_urls, :unique_key, :unique => true
+    add_index :shortened_urls, :unique_key, unique: true
     add_index :shortened_urls, :url
     add_index :shortened_urls, [:owner_id, :owner_type]
   end

data/spec/helpers/shortener_helper_spec.rb

@@ -1,12 +1,27 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe Shortener::ShortenerHelper do
-  before { @short_url = Shortener::ShortenedUrl.generate("www.doorkeeperhq.com") }
+describe Shortener::ShortenerHelper, type: :helper do
+  describe '#short_url' do
+    let(:destination) { Faker::Internet.url }
+    before do
+      expect(Shortener::ShortenedUrl).to receive(:generate).with(destination, nil).and_return(shortened_url)
+    end
+
+    context 'short url was generated' do
+      let(:shortened_url) { instance_double('ShortenedUrl', unique_key: '12345') }
+
+      it "shortens the url" do
+        expect(helper.short_url(destination)).to eq "http://test.host/12345"
+      end
+    end
+
+    context 'short url could not be generated' do
+      let(:shortened_url) { nil }
 
-  describe "short_url" do
-    it "should shorten the url" do
-      helper.short_url("www.doorkeeperhq.com").should == "http://test.host/#{@short_url.unique_key}"
+      it 'returns the original url' do
+        expect(helper.short_url(destination)).to eq destination
+      end
     end
   end
 end

data/spec/models/shortened_url_spec.rb

@@ -1,67 +1,99 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe Shortener::ShortenedUrl do
+describe Shortener::ShortenedUrl, type: :model do
   it { should belong_to :owner }
   it { should validate_presence_of :url }
 
-  shared_examples_for "shortened url" do
-    let(:short_url) { Shortener::ShortenedUrl.generate!(long_url, owner) }
-    it "should be shortened" do
-      short_url.should_not be_nil
-      short_url.url.should == expected_long_url
-      short_url.unique_key.length.should == 5
-      short_url.owner.should == owner
-    end
-  end
+  describe '#generate!' do
 
-  context "shortened url" do
-    let(:long_url) { "http://www.doorkeeperhq.com/" }
-    let(:expected_long_url) { long_url }
-    let(:owner) { nil }
-    it_should_behave_like "shortened url"
-  end
+    context 'shortened url record for requested url does not exist' do
+      let(:expected_url) { Faker::Internet.url }
 
-  context "shortened url with partial URL" do
-    let(:long_url) { "www.doorkeeperhq.com" }
-    let(:expected_long_url) { "http://www.doorkeeperhq.com/" }
-    let(:owner) { nil }
-    it_should_behave_like "shortened url"
-  end
+      shared_examples_for "shortened url" do
+        let(:short_url) { Shortener::ShortenedUrl.generate!(long_url, owner) }
+        it 'creates a shortened url record for the url' do
+          expect{short_url}.to change{Shortener::ShortenedUrl.count}.by(1)
+          expect(short_url.url).to eq expected_url
+          expect(short_url.unique_key.length).to eq 5
+          expect(short_url.owner).to eq owner
+        end
+      end
 
-  context "shortened url with i18n path" do
-    let(:long_url) { "http://www.doorkeeper.jp/%E6%97%A5%E6%9C%AC%E8%AA%9E" }
-    let(:expected_long_url) { long_url }
-    let(:owner) { nil }
-    it_should_behave_like "shortened url"
-  end
+      context 'userless url' do
+        let(:owner) { nil }
 
-  context "shortened url with user" do
-    let(:long_url) { "http://www.doorkeeperhq.com/" }
-    let(:expected_long_url) { long_url }
-    let(:owner) { User.create }
-    it_should_behave_like "shortened url"
-  end
+        context 'shortened url ' do
+          it_should_behave_like "shortened url" do
+            let(:long_url) { expected_url }
+          end
+        end
+
+        context 'shortened url with partial URL' do
+          it_should_behave_like "shortened url" do
+            let(:long_url) { expected_url.gsub('http://', '') }
+          end
+        end
+
+        context "shortened url with i18n path" do
+          it_should_behave_like "shortened url" do
+            let(:long_url) { "#{Faker::Internet.url}/%E6%97%A5%E6%9C%AC%E8%AA%9E" }
+            let(:expected_url) { long_url }
+          end
+        end
+      end
 
-  context "existing shortened URL" do
-    before { @existing = Shortener::ShortenedUrl.generate!("http://www.doorkeeperhq.com/") }
-    it "should look up exsiting URL" do
-      Shortener::ShortenedUrl.generate!("http://www.doorkeeperhq.com/").should == @existing
-      Shortener::ShortenedUrl.generate!("www.doorkeeperhq.com").should == @existing
+      context "shortened url with user" do
+        it_should_behave_like "shortened url" do
+          let(:owner) { User.create }
+          let(:long_url) { expected_url }
+        end
+      end
     end
-    it "should generate different one for different" do
-      Shortener::ShortenedUrl.generate!("www.doorkeeper.jp").should_not == @existing
+
+    context "existing shortened URL" do
+      let(:url) { Faker::Internet.url }
+      let!(:existing_shortened_url) { Shortener::ShortenedUrl.generate!(url) }
+
+      context 'same url as existing' do
+        let(:protocol_free_url) { url.gsub('http://', '') }
+
+        it 'finds the shortened url from protocol free url' do
+          expect(Shortener::ShortenedUrl.generate!(protocol_free_url)).to eq existing_shortened_url
+        end
+        it "should look up exsiting URL" do
+          expect(Shortener::ShortenedUrl.generate!(url)).to eq existing_shortened_url
+        end
+      end
+
+      context 'different url from existing' do
+        it "generates a new shortened url record for a different url" do
+          expect(Shortener::ShortenedUrl.generate!(Faker::Internet.url)).not_to eq existing_shortened_url
+        end
+      end
+
+      context "duplicate unique key" do
+        before do
+          expect_any_instance_of(Shortener::ShortenedUrl).to receive(:generate_unique_key).
+            and_return(existing_shortened_url.unique_key, 'ABCDEF')
+          Shortener::ShortenedUrl.where(unique_key: 'ABCDEF').delete_all
+        end
+        it 'should try until it finds a non-dup key' do
+          short_url = Shortener::ShortenedUrl.generate!(Faker::Internet.url)
+          expect(short_url).not_to be_nil
+          expect(short_url.unique_key).to eq "ABCDEF"
+        end
+      end
     end
+  end
 
-    context "duplicate unique key" do
+  describe '#generate' do
+    context 'cannot generate a unique key' do
       before do
-        Shortener::ShortenedUrl.any_instance.stub(:generate_unique_key).
-          and_return(@existing.unique_key, "ABCDEF")
+        expect(Shortener::ShortenedUrl).to receive(:generate!).and_raise(ActiveRecord::RecordNotUnique.new(nil))
       end
-      it "should try until it finds a non-dup key" do
-        short_url = Shortener::ShortenedUrl.generate!("client.doorkeeper.jp")
-        short_url.should_not be_nil
-        short_url.unique_key.should == "ABCDEF"
+      it 'returns nil' do
+        expect(Shortener::ShortenedUrl.generate(Faker::Internet.url)).to eq nil
       end
     end
   end

data/spec/shortener/shorten_url_interceptor_spec.rb

@@ -5,7 +5,7 @@ require 'mail'
 describe Shortener::ShortenUrlInterceptor do
 
   def create_email(body)
-    Mail.new(:from => 'test@mbln.jp', :to => 'test@mbln.jp', :body => body).tap do |m|
+    Mail.new(from: 'test@mbln.jp', to: 'test@mbln.jp', body: body).tap do |m|
       m.encoded
       Shortener::ShortenUrlInterceptor.new.delivering_email(m)
     end
@@ -17,27 +17,27 @@ describe Shortener::ShortenUrlInterceptor do
             "Test with URL: %{url}. hu!",
             "Test with URL: <a href='%{url}'>test</a>",
             "Test with URL: <a href=\"%{url}\">test</a>" ]
-  
+
   shared_examples_for "shortens URL in text" do |url|
     TEXTS.each do |raw_email_body_text|
-      email_body_text = raw_email_body_text % {:url => url}
+      email_body_text = raw_email_body_text % { url: url }
       it("shortens for #{email_body_text}") do
         email = create_email(email_body_text)
         short_url = Shortener::ShortenedUrl.find_by_url(url)
-        short_url.should_not be_nil
-        email.body.should == (raw_email_body_text % {:url => "http://mbln.jp/#{short_url.unique_key}"})
+        expect(short_url).not_to be_nil
+        expect(email.body).to eq (raw_email_body_text % { url: "http://mbln.jp/#{short_url.unique_key}" })
       end
     end
   end
 
   shared_examples_for "does not shorten URL" do |url|
     TEXTS.each do |raw_email_body_text|
-      email_body_text = raw_email_body_text % {:url => url}
+      email_body_text = raw_email_body_text % { url: url }
       it("keeps URL for #{email_body_text}") do
         email = create_email(email_body_text)
         short_url = Shortener::ShortenedUrl.find_by_url(url)
-        short_url.should be_nil
-        email.body.should == email_body_text
+        expect(short_url).to be_nil
+        expect(email.body).to eq email_body_text
       end
     end
   end
@@ -57,6 +57,6 @@ describe Shortener::ShortenUrlInterceptor do
     "http://d1dqic1fklzs1z.cloudfront.net/assets/doorkeeper_group_normal-3a3292fd09e39a70084c247aef60cba9.gif" # asset URL
   ].each do |url|
     it_should_behave_like "does not shorten URL", url
-  end    
+  end
 
 end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require 'shortener'
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
 require 'shoulda/matchers'
+require 'byebug'
+require 'faker'
 
 Rails.backtrace_cleaner.remove_silencers!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortener
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - James P. McGrath
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  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: byebug
+  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: Shortener is a Rails Engine Gem that makes it easy to create and interpret
   shortened URLs on your own domain from within your Rails application. Once installed
   Shortener will generate, store URLS and "unshorten" shortened URLs for your applications
@@ -147,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: shortener
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Shortener is a Rails Engine that makes it easy to create shortened URLs for