shortener 0.6.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae732fd2135a915ebf0565d0350279894ed29ddc
-  data.tar.gz: 730ea8bc1f3c867ae3f3caa6ca2695399d61b8fc
+  metadata.gz: 7dcaac83914269aad38d35834f0a8550ce8ccb51
+  data.tar.gz: 31f10e8bd149d9a9ed5378e136571e6a0d5ce2e8
 SHA512:
-  metadata.gz: 628ab6bb9d1bc641a3727e26643b617df6092aecb20ee0f9cdc4418b889418a85609b45231754fc462d813e203709ba48b61a7972520efbef1ef65f93e65abb9
-  data.tar.gz: 3adb8897c37e618ce3fe27c999895b1519ae9e97d2d370ad2d16e2a27a6cca94ae646feb97617bcd370d607d5ce50244c244535c5c30c4f122e9d650ceae1865
+  metadata.gz: 6e87227bf0b46869caec0e518631104d93f245d79746d25606ae4790ee9f912ebdf5d1bb691c132be918a0736cfdf568137c8176ffe5ba3c056c122d3260411f
+  data.tar.gz: e1626bae89579ca2928e24d6f093432220464b34fb42beab57852f739200416576789216f82fac1b17ab0b0710ca10027029a5d6495262a7a2aa4184bd1cca55

data/.travis.yml

@@ -1,5 +1,16 @@
 language: ruby
+
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.3
+  - 2.2.10
+  - 2.3
+  - 2.4
+  - 2.5
+
+matrix:
+  fast_finish: true
+
+gemfile:
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile

data/Appraisals

@@ -0,0 +1,15 @@
+appraise "rails_4" do
+  gem "rails", "~> 4.2.10"
+end
+
+appraise "rails_5.0" do
+  gem "rails", "~> 5.0.7"
+end
+
+appraise "rails_5.1" do
+  gem "rails", "~> 5.1.6"
+end
+
+appraise "rails_5.2" do
+  gem "rails", "5.2.0"
+end

data/README.rdoc

@@ -33,21 +33,21 @@ v0.5.2 introduced the ability to set an expiration date for a shortened URL. The
 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
+  class AddExpiresAtToShortenedUrl < ActiveRecord::Migration[4.2]
     def change
       add_column :shortened_urls, :expires_at, :datetime
     end
   end
 
 === v0.5.6 to v0.6.1
-v0.6.1 introduced the ability to category a shortened URL. The category value
-is stored in a string column in the database, which can be added to your schema with the following
+v0.6.1 introduced the ability to categorize a shortened URL. The category value
+is stored in a string column in the database, which must be added to your schema with the following
 migration:
 
-  bundle exec rails g migration add_category_to_shortened_url
+  bundle exec rails g migration add_category_to_shortened_url category:string:index
 
 
-  class AddCategoryToShortenedUrl < ActiveRecord::Migration
+  class AddCategoryToShortenedUrl < ActiveRecord::Migration[4.2]
     def change
       add_column :shortened_urls, :category, :string
       add_index :shortened_urls, :category

data/app/controllers/shortener/shortened_urls_controller.rb

@@ -1,5 +1,3 @@
-require 'voight_kampff'
-
 class Shortener::ShortenedUrlsController < ActionController::Base
   include Shortener
 

data/app/models/shortener/shortened_url.rb

@@ -4,6 +4,8 @@ class Shortener::ShortenedUrl < ActiveRecord::Base
 
   validates :url, presence: true
 
+  before_create :generate_unique_key
+
   # allows the shortened link to be associated with a user
   belongs_to :owner, polymorphic: true
 
@@ -47,7 +49,6 @@ class Shortener::ShortenedUrl < ActiveRecord::Base
 
       scope.where(url: clean_url(destination_url), category: category).send(
         creation_method,
-        unique_key: custom_key,
         custom_key: custom_key,
         expires_at: expires_at
       )
@@ -93,12 +94,14 @@ class Shortener::ShortenedUrl < ActiveRecord::Base
   end
 
   def self.merge_params_to_url(url: nil, params: {})
-    params.try(:except!, *[:id, :action, :controller])
+    if params.respond_to?(:permit!)
+      params = params.permit!.to_h.with_indifferent_access.except!(:id, :action, :controller)
+    end
 
     if params.present?
       uri = URI.parse(url)
       existing_params = Rack::Utils.parse_nested_query(uri.query)
-      uri.query       = existing_params.symbolize_keys.merge(params).to_query
+      uri.query       = existing_params.with_indifferent_access.merge(params).to_query
       url = uri.to_s
     end
 
@@ -106,11 +109,7 @@ class Shortener::ShortenedUrl < ActiveRecord::Base
   end
 
   def increment_usage_count
-    Thread.new do
-      ActiveRecord::Base.connection_pool.with_connection do |conn|
-        increment!(:use_count)
-      end
-    end
+    self.class.increment_counter(:use_count, id)
   end
 
   def to_param
@@ -119,46 +118,15 @@ class Shortener::ShortenedUrl < ActiveRecord::Base
 
   private
 
-  # the create method changed in rails 4...
-  CREATE_METHOD_NAME =
-    if Rails::VERSION::MAJOR >= 5
-      "_create_record"
-    elsif Rails::VERSION::MAJOR == 4
-      # And again in 4.0.6/4.1.2
-      if Rails::VERSION::MAJOR == 4 && (
-          ((Rails::VERSION::MINOR == 0) && (Rails::VERSION::TINY < 6)) ||
-          ((Rails::VERSION::MINOR == 1) && (Rails::VERSION::TINY < 2)))
-        "create_record"
-      else
-        "_create_record"
-      end
-  else
-    "create"
-  end
-
-  # we'll rely on the DB to make sure the unique key is really unique.
-  # if it isn't unique, the unique index will catch this and raise an error
-  define_method CREATE_METHOD_NAME do
-    count = 0
+  def generate_unique_key
     begin
-      self.unique_key = custom_key || generate_unique_key
-      super()
-    rescue ActiveRecord::RecordNotUnique, ActiveRecord::StatementInvalid => err
-      logger.info("Failed to generate ShortenedUrl with unique_key: #{unique_key}")
-      self.unique_key = nil
-      if (count +=1) < 5
-        logger.info("retrying with different unique key")
-        retry
-      else
-        logger.info("too many retries, giving up")
-        raise
-      end
-    end
+      self.unique_key = custom_key || self.class.unique_key_candidate
+      self.custom_key = nil
+    end while self.class.exists?(unique_key: unique_key) && custom_key.blank?
   end
 
-  def generate_unique_key
+  def self.unique_key_candidate
     charset = ::Shortener.key_chars
     (0...::Shortener.unique_key_length).map{ charset[rand(charset.size)] }.join
   end
-
 end

data/gemfiles/rails_4.gemfile

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

data/gemfiles/rails_5.0.gemfile

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

data/gemfiles/rails_5.1.gemfile

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

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "5.2.0"
+
+gemspec path: "../"

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

@@ -1,4 +1,4 @@
-class CreateShortenedUrlsTable < ActiveRecord::Migration
+class CreateShortenedUrlsTable < ActiveRecord::Migration[4.2]
   def change
     create_table :shortened_urls do |t|
       # we can link this to a user for interesting things
@@ -11,8 +11,8 @@ class CreateShortenedUrlsTable < ActiveRecord::Migration
       # the unique key
       t.string :unique_key, limit: 10, null: false
 
-      # a label to help categorize shortened urls
-      t.string :label, :string
+      # a category to help categorize shortened urls
+      t.string :category
 
       # how many times the link has been clicked
       t.integer :use_count, null: false, default: 0
@@ -28,6 +28,6 @@ class CreateShortenedUrlsTable < ActiveRecord::Migration
     add_index :shortened_urls, :unique_key, unique: true
     add_index :shortened_urls, :url
     add_index :shortened_urls, [:owner_id, :owner_type]
-    add_index :shortened_urls, :label
+    add_index :shortened_urls, :category
   end
 end

data/lib/shortener/active_record_extension.rb

@@ -3,3 +3,12 @@ module Shortener::ActiveRecordExtension
     has_many :shortened_urls, class_name: "::Shortener::ShortenedUrl", as: :owner
   end
 end
+
+if Rails::VERSION::MAJOR < 5 && !ActiveRecord::Migration.respond_to?(:[])
+  module VersionedMigrationPatch
+    def [](*args)
+      ActiveRecord::Migration
+    end
+  end
+  ActiveRecord::Migration.extend VersionedMigrationPatch
+end

data/lib/shortener/engine.rb

@@ -1,4 +1,5 @@
 require "rails/engine"
+require "voight_kampff"
 require "shortener"
 
 class Shortener::Engine < ::Rails::Engine #:nodoc:

data/lib/shortener/version.rb

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

data/shortener.gemspec

@@ -13,14 +13,18 @@ Gem::Specification.new do |s|
   s.email                     = [ "gems@jamespmcgrath.com", "michael@mobalean.com" ]
   s.homepage                  = "http://jamespmcgrath.com/projects/shortener"
   s.rubyforge_project         = "shortener"
-  s.required_rubygems_version = "> 1.3.6"
-  s.add_dependency "rails", ">= 3.0.7"
-  s.add_dependency "voight_kampff", '~>1.0.2'
+  s.required_rubygems_version = "> 2.1.0"
+
+  s.add_dependency "voight_kampff", '~> 1.1.2'
+
+  s.add_development_dependency "rails", '>= 3'
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rspec-rails", '~> 3.3.0'
-  s.add_development_dependency "shoulda-matchers", '~> 3'
+  s.add_development_dependency "rspec-rails", '~> 3.6.0'
+  s.add_development_dependency "shoulda-matchers"
   s.add_development_dependency "faker"
   s.add_development_dependency "byebug"
+  s.add_development_dependency "appraisal"
+
   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

@@ -8,7 +8,11 @@ describe Shortener::ShortenedUrlsController, type: :controller do
   describe '#show' do
     let(:params) { {} }
     before do
-      get :show, { id: key }.merge(params)
+      if Rails::VERSION::MAJOR < 5
+        get :show, { id: key }.merge(params)
+      else
+        get :show, params: { id: key }.merge(params)
+      end
     end
 
     context 'valid keys' do
@@ -20,21 +24,28 @@ describe Shortener::ShortenedUrlsController, type: :controller do
         end
 
         context "when request is not from an human" do
+          let(:run_action!) do
+            if Rails::VERSION::MAJOR < 5
+              get :show, { id: key }
+            else
+              get :show, params: { id: key }
+            end
+          end
           before do
-            allow_any_instance_of(Rack::Request).to receive(:human?).and_return(false)
+            allow_any_instance_of(ActionController::TestRequest).to receive(:human?).and_return(false)
           end
           context 'Shortener.ignore_robots == true' do
             it "calls fetch with token with track argument as false" do
               Shortener.ignore_robots = true
               expect(Shortener::ShortenedUrl).to receive(:fetch_with_token).with(hash_including(track: false)).and_call_original
-              get :show, { id: key }
+              run_action!
             end
           end
           context 'Shortener.ignore_robots == false (default)' do
             it "calls fetch with token with track argument as true" do
               Shortener.ignore_robots = false
               expect(Shortener::ShortenedUrl).to receive(:fetch_with_token).with(hash_including(track: true)).and_call_original
-              get :show, { id: key }
+              run_action!
             end
           end
         end
@@ -97,7 +108,11 @@ describe Shortener::ShortenedUrlsController, type: :controller 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
+          if Rails::VERSION::MAJOR < 5
+            get :show, id: key
+          else
+            get :show, params: { id: key }
+          end
         end
 
         context 'non existant key' do

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

@@ -1,9 +1,9 @@
-class CreateShortenedUrlsTable < ActiveRecord::Migration
+class CreateShortenedUrlsTable < ActiveRecord::Migration[4.2]
   def change
     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: 40
+      t.string :owner_type, limit: 20
 
       # the real url that we will redirect to
       t.text :url, null: false

data/spec/dummy/db/migrate/20120214023758_create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :users do |t|
 

data/spec/dummy/db/migrate/20150919033038_change_url_field_to_text_on_shortened_url.rb

@@ -1,4 +1,4 @@
-class ChangeUrlFieldToTextOnShortenedUrl < ActiveRecord::Migration
+class ChangeUrlFieldToTextOnShortenedUrl < ActiveRecord::Migration[4.2]
   # def up
   #   change_column :shortened_urls, :url, :text
   # end

data/spec/dummy/db/migrate/20150919033108_add_expires_at_to_shortened_url.rb

@@ -1,4 +1,4 @@
-class AddExpiresAtToShortenedUrl < ActiveRecord::Migration
+class AddExpiresAtToShortenedUrl < ActiveRecord::Migration[4.2]
   # def change
   #   add_column :shortened_urls, :expires_at, :datetime
   # end

data/spec/dummy/db/migrate/20161104055303_add_category_to_shortened_url.rb

@@ -1,4 +1,4 @@
-class AddCategoryToShortenedUrl < ActiveRecord::Migration
+class AddCategoryToShortenedUrl < ActiveRecord::Migration[4.2]
   # def change
   #   add_column :shortened_urls, :category, :string
   #   add_index :shortened_urls, :category

data/spec/models/shortened_url_spec.rb

@@ -122,15 +122,14 @@ describe Shortener::ShortenedUrl, type: :model do
       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
+        let(:duplicate_key) { 'ABCDEF' }
         it 'should try until it finds a non-dup key' do
-          short_url = Shortener::ShortenedUrl.generate!(Faker::Internet.url)
+          Shortener::ShortenedUrl.where(unique_key: duplicate_key).delete_all
+          Shortener::ShortenedUrl.create!(url: Faker::Internet.url, custom_key: duplicate_key)
+          short_url = Shortener::ShortenedUrl.create!(url: Faker::Internet.url, unique_key: duplicate_key)
           expect(short_url).not_to be_nil
-          expect(short_url.unique_key).to eq "ABCDEF"
+          expect(short_url.unique_key).not_to be_nil
+          expect(short_url.unique_key).not_to eq duplicate_key
         end
       end
     end
@@ -180,8 +179,7 @@ describe Shortener::ShortenedUrl, type: :model do
     it 'increments the use_count on the shortenedLink' do
       original_count = short_url.use_count
       short_url.increment_usage_count
-      sleep 0.001
-      expect(short_url.use_count).to eq (original_count + 1)
+      expect(short_url.reload.use_count).to eq (original_count + 1)
     end
   end
 

data/spec/spec_helper.rb

@@ -18,4 +18,8 @@ Shoulda::Matchers.configure do |config|
 end
 
 # Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+if ActiveRecord::Migrator.respond_to?(:migrate)
+  ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+else
+  ActiveRecord::MigrationContext.new(File.expand_path("../dummy/db/migrate/", __FILE__)).migrate
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortener
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.1
 platform: ruby
 authors:
 - James P. McGrath
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: voight_kampff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: voight_kampff
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
+        version: '3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -59,28 +59,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !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: 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
@@ -122,6 +136,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -129,6 +144,10 @@ files:
 - app/controllers/shortener/shortened_urls_controller.rb
 - app/helpers/shortener/shortener_helper.rb
 - app/models/shortener/shortened_url.rb
+- gemfiles/rails_4.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
 - lib/generators/shortener/shortener_generator.rb
 - lib/generators/shortener/templates/migration.rb
 - lib/shortener.rb
@@ -189,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 2.1.0
 requirements: []
 rubyforge_project: shortener
 rubygems_version: 2.5.1