shortener 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eefb46cddedbe3f232ef038a7f2385b3c2a3121d
-  data.tar.gz: 8018071c727b482ca8c503951d4b4ad59d2ddd71
+  metadata.gz: 0b5132743f6f7bf1ccab83e28c3ae18f822b277a
+  data.tar.gz: 58d20decd09055a4a76a21548e66010acac00da5
 SHA512:
-  metadata.gz: 68fbe46e207434cb7405d149fef86e7644b05d9f76a6c050d1065f2aeb6b2608c63340b9f7365feb6069b1bf844b33a85060da9eb86265322d581a03d024bf10
-  data.tar.gz: 180eeff9eaa296bf89ecfaa09ffe626bdd7174c2930b6fbe69f59480b3b81bb487ccf6d78fd2f3e0f27c17ac4b3b90962fb865e622f9e0a6ec352f712dc71092
+  metadata.gz: 1f307fff4f9bdb34387849e33c424c109606f1a0abd8c55b769c4b96da08dedbc1da3380748cb8b5ef2ff4c58603878a2c372ce9054a4052dd25d563c7619326
+  data.tar.gz: 0c682ae7f3f3ef7fd99020e8ee31e69124f4f1d6bb825962c6eca853afa6db11f1c6027778f4a13f555cae91951977718022bfd3aa2156e12d907f68e78e131a

data/README.rdoc

@@ -28,6 +28,17 @@ There have been some breaking changes:
 1. The owner argument is passed into the generator and helper methods as a named parameter.
 2. Original URLs arguments without a hypertext protocol (http|https) will be assumed to be relative paths.
 
+=== v0.5.1 to v0.5.2
+v0.5.2 introduced the ability to set an expiration date for a shortened URL. The expiration dates
+are stored in a expires_at column in the database, which can be added to your schema with the following
+migration:
+
+  class AddExpiresAtToShortenedUrl < ActiveRecord::Migration
+    def change
+      add_column :shortened_urls, :expires_at, :datetime
+    end
+  end
+
 === Some niceities of Shortener:
 
 * The controller does a 301 redirect, which is the recommended type of redirect for maintaining maximum google juice to the original URL;
@@ -113,7 +124,7 @@ And to access those URLs:
 
   user.shortened_urls
 
-=== Shortened URLs with custom unqiue key
+=== Shortened URLs with custom unique key
 
 You can pass in your own key when generating a shortened URL. This should be unique.
 
@@ -198,4 +209,4 @@ To contribute:
 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 a new Pull Request
+5. Create a new Pull Request

data/lib/shortener/shorten_url_interceptor.rb

@@ -17,7 +17,7 @@ Usage:
                             'cloudfront\.net/' ].map {|r| Regexp.new(r) }
     DEFAULT_LENGTH_THRESHOLD = 20
 
-    URL_REGEX = /\b((https?):\/\/[\w\.-]+[\.]\w+)([-A-Z0-9+&@#\/%?=~_|$!:,.;]*[-A-Z0-9+&@#\/%=~_|$])?/i
+    URL_REGEX = /\b((https?):\/\/([\w\.-]+[\.]\w+)?)([-A-Z0-9+&@#\/%?=~_|$!:,.;]*[-A-Z0-9+&@#\/%=~_|$])?/i
     MIME_TYPES = %w(text/plain text/html application/xhtml+xml)
 
     def initialize(opts = {})

data/lib/shortener/version.rb

@@ -1,3 +1,3 @@
 module Shortener
-  VERSION = "0.5.4"
+  VERSION = '0.5.5'
 end

data/shortener.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", ">= 3.0.7"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec-rails", '~> 3.3.0'
-  s.add_development_dependency "shoulda-matchers"
+  s.add_development_dependency "shoulda-matchers", '~> 3'
   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
+end

data/spec/models/shortened_url_spec.rb

@@ -2,8 +2,8 @@
 require 'spec_helper'
 
 describe Shortener::ShortenedUrl, type: :model do
-  it { should belong_to :owner }
-  it { should validate_presence_of :url }
+  it { is_expected.to belong_to :owner }
+  it { is_expected.to validate_presence_of :url }
 
   describe '#generate!' do
 

data/spec/models/user_spec.rb

@@ -2,8 +2,8 @@
 require 'spec_helper'
 
 # user defined in dummy app, uses has_shortened_urls
-describe User do
-  it { should have_many :shortened_urls }
+describe User, type: :model do
+  it { is_expected.to have_many(:shortened_urls) }
 
   context 'shortened url created with owner' do
     let (:user) { User.create }

data/spec/shortener/shorten_url_interceptor_spec.rb

@@ -46,7 +46,8 @@ describe Shortener::ShortenUrlInterceptor do
     "http://client.doorkeeper.jp/events/124-",
     "http://client.doorkeeper.jp/events/124-title?auth_token=xabagangs",
     "http://client.doorkeeper.jp/events/124-%E4%F6%A0",
-    "https://www.test-site.com/"
+    "https://www.test-site.com/",
+    "https://test-suite.com/"
   ].each do |url|
     it_should_behave_like "shortens URL in text", url
   end

data/spec/spec_helper.rb

@@ -10,5 +10,12 @@ require 'faker'
 
 Rails.backtrace_cleaner.remove_silencers!
 
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end
+
 # Run any available migration
 ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortener
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - James P. McGrath
@@ -9,90 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !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
@@ -106,8 +106,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -167,17 +167,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: 1.3.6
 requirements: []
 rubyforge_project: shortener
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Shortener is a Rails Engine that makes it easy to create shortened URLs for