shortener 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12594d11b56f84e7c4654bee681887dc084978604ee158c803e384c839b6a937
-  data.tar.gz: 8550a33e8bd06229cd66c5e9f340ba6cd9c49c77acb5481555b23f43ea659883
+  metadata.gz: 2a041977450099a1aa8e72195069372424cdf4ad9df7950691225db3e7e07f4d
+  data.tar.gz: c9e9910d269d4c6e0c20e1719900d4e43b34e7fc851d151a8363cf31db40e9d7
 SHA512:
-  metadata.gz: 911ad7cc429c015d090760690b53aa5151588f3c384090f293cd608484d0804ba3e72034c97bc31cb99730deabf5c5103045e0ffd89b809dd7c12030b732b57e
-  data.tar.gz: 8fe1bd76f2a97dc3a9f2b0c1cfe9b4798591f84654f40eb341724df41e1ed6b4f8ae461d54759b2059163e440cf72b81df8246a7a7715cc68cecc57d3279a1c6
+  metadata.gz: 358eaf44a89b822bf9fa05c5a334a3d767bdec866def5bf94233e37241c8da9247f419a0bef02e8ee263682d1deda4ee65f0aa696fe2fa10a310fe096567f551
+  data.tar.gz: 8a328acff8d9f1f0a110920f1e5589f6bde54c75ad558070afd3a94b5384fb9b41bdc8886b0c2a2dd60e534a7a4a5b3f3bf5fdb1eda926c56a2ff165b48f8b24

data/.github/workflows/ruby.yml

@@ -10,52 +10,37 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        ruby-version: 
-          - '2.4'
-          - '2.6'
-          - '2.7'
-          - '3.0'
+        ruby-version:
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          - '3.4'
         gemfile:
-          - rails_4.gemfile
-          - rails_5.0.gemfile
-          - rails_5.1.gemfile
-          - rails_5.2.gemfile
-          - rails_6.0.gemfile
-          - rails_6.1.gemfile
           - rails_7.0.gemfile
+          - rails_7.1.gemfile
+          - rails_7.2.gemfile
+          - rails_8.0.gemfile
         include:
           - ruby-version: '2.4'
-            gemfile: rails_4.gemfile
+            gemfile: rails_4.2.gemfile
             bundler-version: 1
+          - ruby-version: '2.7'
+            gemfile: rails_5.2.gemfile
+          - ruby-version: '2.7'
+            gemfile: rails_6.0.gemfile
+          - ruby-version: '3.0'
+            gemfile: rails_7.1.gemfile
         exclude:
-        - ruby-version: '2.6'
-          gemfile: rails_4.gemfile
-        - ruby-version: '2.7'
-          gemfile: rails_4.gemfile
-        - ruby-version: '3.0'
-          gemfile: rails_4.gemfile
-        - ruby-version: '3.0'
-          gemfile: rails_5.0.gemfile
-        - ruby-version: '3.0'
-          gemfile: rails_5.1.gemfile
-        - ruby-version: '3.0'
-          gemfile: rails_5.2.gemfile
-        - ruby-version: '2.4'
-          gemfile: rails_6.0.gemfile
-        - ruby-version: '2.4'
-          gemfile: rails_6.1.gemfile
-        - ruby-version: '2.4'
-          gemfile: rails_7.0.gemfile
-        - ruby-version: '2.6'
-          gemfile: rails_7.0.gemfile
+          - ruby-version: '3.1'
+            gemfile: rails_8.0.gemfile
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.gitignore

@@ -11,6 +11,7 @@ bin/*
 *.gem
 *.swp
 Gemfile.lock
+.ruby-version
 .rvmrc
 .redcar/*
 gemfiles/*.lock

data/Appraisals

@@ -1,32 +1,39 @@
-appraise "rails_4" do
+appraise "rails_4.2" do
   gem "rails", "~> 4.2.10"
   gem "rspec-rails", "~> 3.0"
   gem "sqlite3", "~> 1.3.6"
-end
-
-appraise "rails_5.0" do
-  gem "rails", "~> 5.0.7"
-  gem "rspec-rails", "~> 4.0"
-  gem "sqlite3", "~> 1.3.6"
-end
-
-appraise "rails_5.1" do
-  gem "rails", "~> 5.1.6"
-  gem "rspec-rails", "~> 4.0"
+  gem "loofah", "~> 2.20.0"
 end
 
 appraise "rails_5.2" do
   gem "rails", "~> 5.2.0"
+  gem "loofah", "~> 2.20.0"
 end
 
 appraise "rails_6.0" do
   gem "rails", "~> 6.0.0"
+  gem 'concurrent-ruby', '1.3.4'
 end
 
 appraise "rails_6.1" do
   gem "rails", "~> 6.1.0"
+  gem 'concurrent-ruby', '1.3.4'
 end
 
 appraise "rails_7.0" do
-  gem "rails", "~> 7.0.0.rc1"
+  gem "rails", "~> 7.0.0"
+  gem 'concurrent-ruby', '1.3.4'
+end
+
+appraise "rails_7.1" do
+  gem "rails", "~> 7.1.0"
+end
+
+appraise "rails_7.2" do
+  gem "rails", "~> 7.2.0"
 end
+
+appraise "rails_8.0" do
+  gem "rails", "~> 8.0.0"
+end
+

data/{README.rdoc → README.md}

@@ -1,12 +1,12 @@
-{<img src="https://github.com/jpmcgrath/shortener/actions/workflows/ruby.yml/badge.svg" alt="Build Status" />}[https://github.com/jpmcgrath/shortener/actions]
-{<img src="https://codeclimate.com/github/jpmcgrath/shortener/badges/gpa.svg" />}[https://codeclimate.com/github/jpmcgrath/shortener]
-{<img src="https://badge.fury.io/rb/shortener.svg" alt="Gem version" />}[http://badge.fury.io/rb/shortener]
+[![Build Status](https://github.com/jpmcgrath/shortener/actions/workflows/ruby.yml/badge.svg)](https://codeclimate.com/github/jpmcgrath/shortener)
+[![Code Climate](https://codeclimate.com/github/jpmcgrath/shortener/badges/gpa.svg)](https://codeclimate.com/github/jpmcgrath/shortener)
+[![Gem version](https://badge.fury.io/rb/shortener.svg)](http://badge.fury.io/rb/shortener)
 
-= Shortener
+# Shortener
 
 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 visitors, all whilst collecting basic usage metrics.
 
-== Overview
+## Overview
 
 The majority of the Shortener consists of three parts:
 
@@ -14,64 +14,73 @@ The majority of the Shortener consists of three parts:
 * a controller to accept incoming requests and redirecting them to the target URL;
 * a helper for generating shortened URLs from controllers and views.
 
-=== Dependencies
+### Dependencies
 
 Shortener is designed to work from within a Ruby on Rail  applications. It has dependancies Rails core components like ActiveRecord, ActionController, the rails routing engine and more.
 
-=== Ruby Version Support
+### Ruby Version Support
 
 As Ruby 1.9.3 entered end of maintainance in early 2015, the last version of the Shortener gem
 to support Ruby 1.9.3 is 0.4.x. Shortener v0.5 onwards will require Ruby 2+.
 
-=== Upgrading
+### Upgrading
 
-==== v0.4.0 to v0.5.0
+#### v0.4.0 to v0.5.0
 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.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[4.2]
-    def change
-      add_column :shortened_urls, :expires_at, :datetime
-    end
+```ruby
+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.5.6 to v0.6.1
 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 category:string:index
-
+```console
+bundle exec rails g migration add_category_to_shortened_url category:string:index
+```
 
-  class AddCategoryToShortenedUrl < ActiveRecord::Migration[4.2]
-    def change
-      add_column :shortened_urls, :category, :string
-      add_index :shortened_urls, :category
-    end
+```ruby
+class AddCategoryToShortenedUrl < ActiveRecord::Migration[4.2]
+  def change
+    add_column :shortened_urls, :category, :string
+    add_index :shortened_urls, :category
   end
+end
+```
 
-=== Some niceities of Shortener:
+### 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;
 * A unique alphanumeric code of generated for each shortened link, this means that we can get more unique combinations than if we just used numbers;
 * The link records a count of how many times it has been “un-shortened”;
 * The link can be associated with a user, this allows for stats of the link usage for a particular user and other interesting things;
 
-== Installation
+## Installation
 
 Shortener is compatible with Rails v4, v5, & v6. To install, add to your Gemfile:
 
-  gem 'shortener'
+```ruby
+gem 'shortener'
+```
 
 After you install Shortener run the generator:
 
-  rails generate shortener
+```console
+rails generate shortener
+```
 
 This generator will create a migration to create the shortened_urls table where your shortened URLs will be stored.
 
@@ -79,109 +88,148 @@ This generator will create a migration to create the shortened_urls table where
 
 Then add to your routes:
 
-  get '/:id' => "shortener/shortened_urls#show"
+```ruby
+get '/:id' => "shortener/shortened_urls#show"
+```
 
-== Configuration
+## 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
+```ruby
+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"
+```ruby
+Shortener.default_redirect = "http://www.someurl.com"
+```
 
 By default, Shortener will generate unique keys using numbers and lowercase a-z. If you desire more combinations, you can enable
 the upper and lower case charset, by including the following:
 
-  Shortener.charset = :alphanumcase
+```ruby
+Shortener.charset = :alphanumcase
+```
 
 If you want to use a custom charset, you can create your own combination by creating an array of possible values, such as allowing underscore and dashes:
 
-  Shortener.charset = ("a".."z").to_a + (0..9).to_a + ["-", "_"]
+```ruby
+Shortener.charset = ("a".."z").to_a + (0..9).to_a + ["-", "_"]
+```
 
 By default, <b>Shortener assumes URLs to be valid web URLs</b> and normalizes them in an effort to make sure there are no duplicate records generated for effectively same URLs with differences of only non-effective slash etc.
 You can control this option if it interferes for any of your logic. One common case is for mobile app links or universal links where normalization can corrupt the URLs of form <tt>appname://some_route</tt>
 
-  Shortener.auto_clean_url = true
+```ruby
+Shortener.auto_clean_url = true
+```
 
-== Usage
+## Usage
 
 To generate a Shortened URL object for the URL "http://example.com" within your controller / models do the following:
 
-  Shortener::ShortenedUrl.generate("http://example.com")
+```ruby
+Shortener::ShortenedUrl.generate("http://example.com")
+```
 
 Alternatively, you can create a shortened url to a relative path within your application:
 
-  Shortener::ShortenedUrl.generate("/relative-path?param=whatever")
+```ruby
+Shortener::ShortenedUrl.generate("/relative-path?param=whatever")
+```
 
 To generate and display a shortened URL in your application use the helper method:
 
-  short_url("http://example.com")
+```ruby
+short_url("http://example.com")
+```
 
 Pass in subdomain, protocol and other options that the UrlHelper url_for accepts:
 
-  short_url("http://example.com", url_options: { subdomain: 'foo', host: 'bar', protocol: 'https' } )
+```ruby
+short_url(
+  "http://example.com", 
+  url_options: { subdomain: 'foo', host: 'bar', protocol: 'https' } 
+)
+```
 
 This will generate a shortened URL. store it to the db and return a string representing the shortened URL.
 
-=== Shortened URLs with owner
+### Shortened URLs with owner
 
 You can link shortened URLs to an owner, to scope them. To do so, add the following line to the models which will act as owners:
 
-  class User < ActiveRecord::Base
-    has_shortened_urls
-  end
+```ruby
+class User < ActiveRecord::Base
+  has_shortened_urls
+end
+```
 
 This will allow you to pass the owner when generating URLs:
 
-  Shortener::ShortenedUrl.generate("example.com", owner: user)
+```ruby
+Shortener::ShortenedUrl.generate("example.com", owner: user)
 
-  short_url("http://example.com", owner: user)
+short_url("http://example.com", owner: user)
+```
 
 And to access those URLs:
 
-  user.shortened_urls
+```ruby
+user.shortened_urls
+```
 
-=== Shortened URLs with custom unique key
+### Shortened URLs with custom unique key
 
 You can pass in your own key when generating a shortened URL. This should be unique.
 
 *Important:* Custom keys can't contain characters other than those defined in *Shortener.charset*. Default is numbers and lowercase a-z (See *Configuration*).
 
-  Shortener::ShortenedUrl.generate("example.com", owner: user, custom_key: "mykey")
+```ruby
+Shortener::ShortenedUrl.generate("example.com", owner: user, custom_key: "mykey")
 
-  short_url("http://example.com", custom_key: 'yourkey')
+short_url("http://example.com", custom_key: 'yourkey')
+```
 
-=== Expirable Shortened URLs
+### Expirable Shortened URLs
 
 You can create expirable URLs.
 Probably, most of the time it would be used with owner:
 
-  Shortener::ShortenedUrl.generate("example.com/page", owner: user, expires_at: 24.hours.since)
+```ruby
+Shortener::ShortenedUrl.generate("example.com/page", owner: user, expires_at: 24.hours.since)
+```
 
 You can omit owner:
 
-  Shortener::ShortenedUrl.generate("example.com/page", expires_at: 24.hours.since)
+```ruby
+Shortener::ShortenedUrl.generate("example.com/page", expires_at: 24.hours.since)
+```
 
-=== Fresh Links
+### Fresh Links
 
 Sometimes you just need that feeling of a fresh, untouched Shortened URL. By default,
 Shortener will find an existing ShortenedUrl record for a supplied URL. If you want
 to create a fresh record, you can pass the following argument:
 
-  Shortener::ShortenedUrl.generate("example.com/page", fresh: true)
-  short_url("http://example.com", fresh: true)
+```ruby
+Shortener::ShortenedUrl.generate("example.com/page", fresh: true)
+short_url("http://example.com", fresh: true)
+```
 
-=== Forbidden keys
+### Forbidden keys
 
 You can ensure that records with forbidden keys will not be generated.
 In Rails you can put next line into config/initializers/shortener.rb
 
-  Shortener.forbidden_keys.concat %w(terms promo)
+```ruby
+Shortener.forbidden_keys.concat %w(terms promo)
+```
 
-=== Ignoring Robots
+### Ignoring Robots
 
 By default Shortener will count all visits to a shortened url, including any crawler
 robots like the Google Web Crawler, or Twitter's link unshortening bot. To ignore
@@ -189,24 +237,30 @@ these visits, Shortener makes use of the excellent voight_kampff gem to identify
 web robots. This feature is disabled by default. To enable add the following to
 your shortener configuration:
 
-  Shortener.ignore_robots = true
+```ruby
+Shortener.ignore_robots = true
+```
 
-=== Mounting on a Subdomain
+### Mounting on a Subdomain
 
 If you want to constrain the shortener route to a subdomain, the following config will
 prevent the subdomain parameter from leaking in to shortened URLs if it matches the configured subdomain.
 
-Within config/initializers/shortener.rb
+Within `config/initializers/shortener.rb`
 
-  Shortener.subdomain = 's'
+```ruby
+Shortener.subdomain = 's'
+```
 
-Within config/routes.rb
+Within `config/routes.rb`
 
-  constraints subdomain: 's' do
-    get '/:id' => "shortener/shortened_urls#show"
-  end
+```ruby
+constraints subdomain: 's' do
+  get '/:id' => "shortener/shortened_urls#show"
+end
+```
 
-=== URL Parameters
+### URL 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
@@ -220,43 +274,49 @@ Then, the resulting URL will be:
 >http://destination.com?test=no&happy=defo&why=not
 Note how the test parameter takes the value given on the short URL.
 
-=== Shorten URLs in generated emails
+### 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:
 
-  class MyMailer < ActionMailer::Base
-    register_interceptor Shortener::ShortenUrlInterceptor.new
-  end
+```ruby
+class MyMailer < ActionMailer::Base
+  register_interceptor Shortener::ShortenUrlInterceptor.new
+end
+```
 
 This will replace all long URLs in the emails generated by MyMailer with shortened versions. The base URL for the shortener will be infered from the mailer's default_url_options. If you use a different hostname for your shortener, you can use:
 
-  class MyMailer < ActionMailer::Base
-    register_interceptor Shortener::ShortenUrlInterceptor.new :base_url => "http://shortener.host"
-  end
+```ruby
+class MyMailer < ActionMailer::Base
+  register_interceptor Shortener::ShortenUrlInterceptor.new :base_url => "http://shortener.host"
+end
+```
 
 The interceptor supports a few more arguments, see the implementation for details.
 
-=== Logging, stats and other tricks
+### Logging, stats and other tricks
 
 If you want more things to happen when a user accesses one of your short urls, you can create your own `show` action as follows:
 
-    def show
-      token = ::Shortener::ShortenedUrl.extract_token(params[:id])
-      url   = ::Shortener::ShortenedUrl.fetch_with_token(token: token, additional_params: params)
-      # do some logging, store some stats
-      redirect_to url[:url], status: :moved_permanently
-    end
+```ruby
+def show
+  token = ::Shortener::ShortenedUrl.extract_token(params[:id])
+  url   = ::Shortener::ShortenedUrl.fetch_with_token(token: token, additional_params: params)
+  # do some logging, store some stats
+  redirect_to url[:url], status: :moved_permanently
+end
+```
 
-=== Fetch with Token
-  The `::Shortener::ShortenedUrl.fetch_with_token(token: token, additional_params: params)` does the following:
-  1. finds the ShortenedUrl for the supplied token
-  2. increments the use_count for the retrieved ShortenedURL
-  3. combines the additional parameters with the URL in the retrieved ShortenedURL
-  4. returns a hash of the format `{url: <the original url>, shortened_url: <the retrieved ShortenedURL>}
+### Fetch with Token
+The `::Shortener::ShortenedUrl.fetch_with_token(token: token, additional_params: params)` does the following:
+1. finds the ShortenedUrl for the supplied token
+2. increments the use_count for the retrieved ShortenedURL
+3. combines the additional parameters with the URL in the retrieved ShortenedURL
+4. returns a hash of the format `{url: <the original url>, shortened_url: <the retrieved ShortenedURL>}
 
-  *note:* If no shortened URL is found, the url will be `default_redirect` or `/`
+*note:* If no shortened URL is found, the url will be `default_redirect` or `/`
 
-=== Configuring a different database for shortened_urls table
+### Configuring a different database for shortened_urls table
 
 You can store a `shortened_urls` table in another database and connecting to it by creating a initializer with the following:
 
@@ -268,26 +328,31 @@ end
 
 **Note:** Please, replace `dbname` and `dbname_replica` to match your database configuration.
 
-== Origins
-
-For a bit of backstory to Shortener see this {blog post}[http://jamespmcgrath.com/a-simple-link-shortener-in-rails/].
+### Configuring Reader and Writer Multi-DB Roles
 
-== In The Wild
+Shortener has one write operation that happens on a GET request. To allow this you can override this method in an initializer.
 
-Shortener is used in a number of production systems, including, but not limited to:
-
-- {Doorkeeper - An Event Management Tool}[http://www.doorkeeperhq.com/]
-- {1001tweets - Repost your tweets to get more clicks}[http://www.1001tweets.com/]
-- {NewsMaker.io - The curated newsletter builder}[https://www.newsmaker.io/]
+```ruby
+module ShortenerWriterMonkeyPatch
+  def increment_usage_count
+    ActiveRecord::Base.connected_to(role: :writing) do
+      self.class.increment_counter(:use_count, id)
+    end
+  end
+end
 
-If you are using Shortener in your project and would like to be added to this list, please get in touch!
+ActiveSupport.on_load(:shortener_shortened_url) do
+  Shortener::ShortenedUrl.prepend(ShortenerWriterMonkeyPatch)
+end
+```
 
-== Contributing
+## Contributing
 
 We welcome new contributors. Because we're all busy people, and because Shortener
 is used/relied upon by many projects, it is essential that new Pull Requests
 are opened with good spec coverage, and a passing build on supported ruby versions
-and Rails versions.
+and Rails versions. Please create a single PR per feature/contribution, with as
+few changes per PR as possible to make it easier to review.
 
 To contribute:
 

data/app/models/shortener/shortened_url.rb

@@ -147,3 +147,5 @@ class Shortener::ShortenedUrl < Shortener::Record
     end
   end
 end
+
+ActiveSupport.run_load_hooks :shortener_shortened_url, Shortener::ShortenedUrl

data/gemfiles/{rails_4.gemfile → rails_4.2.gemfile}

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "rails", "~> 4.2.10"
 gem "rspec-rails", "~> 3.0"
 gem "sqlite3", "~> 1.3.6"
+gem "loofah", "~> 2.20.0"
 
 gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.2.0"
+gem "loofah", "~> 2.20.0"
 
 gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 6.0.0"
+gem 'concurrent-ruby', '1.3.4'
 
 gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 6.1.0"
+gem 'concurrent-ruby', '1.3.4'
 
 gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -2,6 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.0.0.rc1"
+gem "rails", "~> 7.0.0"
+gem 'concurrent-ruby', '1.3.4'
+gem "sqlite3", "~> 1.4.4"
+
+# For Ruby 3.4+ as they transitioned from being Default Gems to Bundled Gems
+gem 'bigdecimal'
+gem 'mutex_m'
+gem 'drb'
 
 gemspec path: "../"

data/gemfiles/{rails_5.1.gemfile → rails_7.1.gemfile}

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.6"
-gem "rspec-rails", "~> 4.0"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5.0.gemfile → rails_7.2.gemfile}

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.7"
-gem "rspec-rails", "~> 4.0"
-gem "sqlite3", "~> 1.3.6"
+gem "rails", "~> 7.2.0"
 
 gemspec path: "../"

data/gemfiles/rails_8.0.gemfile

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

data/lib/generators/shortener/shortener_generator.rb

@@ -9,7 +9,7 @@ class ShortenerGenerator < Rails::Generators::Base
   end
 
   def self.next_migration_number(dirname)
-    if ActiveRecord::Base.timestamped_migrations
+    if ActiveRecord.respond_to?(:timestamped_migrations) ? ActiveRecord.timestamped_migrations : ActiveRecord::Base.timestamped_migrations
       Time.new.utc.strftime("%Y%m%d%H%M%S")
     else
       "%.3d" % (current_migration_number(dirname) + 1)

data/lib/shortener/engine.rb

@@ -1,5 +1,8 @@
+require "rack"
 require "rails/engine"
+require 'action_dispatch/railtie'
 require "voight_kampff"
+require "voight_kampff/rails"
 require "shortener"
 
 class Shortener::Engine < ::Rails::Engine #:nodoc:

data/lib/shortener/version.rb

@@ -1,3 +1,3 @@
 module Shortener
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/shortener.gemspec

@@ -10,11 +10,11 @@ Gem::Specification.new do |s|
   s.version                   = Shortener::VERSION
   s.platform                  = Gem::Platform::RUBY
   s.authors                   = [ "James P. McGrath", "Michael Reinsch" ]
-  s.email                     = [ "gems@jamespmcgrath.com", "michael@mobalean.com" ]
-  s.homepage                  = "http://jamespmcgrath.com/projects/shortener"
+  s.email                     = [ "gems@jamespmcgrath.com" ]
+  s.homepage                  = "https://github.com/jpmcgrath/shortener/"
   s.required_rubygems_version = "> 2.1.0"
 
-  s.add_dependency "voight_kampff", '~> 1.1.2'
+  s.add_dependency "voight_kampff", '~> 2.0'
 
   s.add_development_dependency "rails", '>= 3'
   s.add_development_dependency "sqlite3"

data/spec/dummy/.gitignore

@@ -1 +1 @@
-db/*.sqlite3
+db/*.sqlite3*

data/spec/generators/shortener_generator_spec.rb

@@ -0,0 +1,10 @@
+require "spec_helper"
+require File.expand_path("../../../lib/generators/shortener/shortener_generator.rb", __FILE__)
+
+RSpec.describe ShortenerGenerator do
+  describe ".next_migration_number" do
+    it "returns the next migration number" do
+      expect { described_class.next_migration_number(".") }.not_to raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -23,8 +23,10 @@ end
 migration_path = File.expand_path("../dummy/db/migrate/", __FILE__)
 if ActiveRecord::Migrator.respond_to?(:migrate)
   ActiveRecord::Migrator.migrate(migration_path)
-elsif Rails::VERSION::MAJOR < 6
-  ActiveRecord::MigrationContext.new(migration_path).migrate
-else
+elsif "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" == '6.0'
   ActiveRecord::MigrationContext.new(migration_path, ActiveRecord::Base.connection.schema_migration).migrate
-end
+elsif Rails::VERSION::MAJOR > 6 || (Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR >= 1)
+  ActiveRecord::MigrationContext.new(migration_path).up
+else
+  ActiveRecord::MigrationContext.new(migration_path).migrate
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortener
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - James P. McGrath
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2025-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: voight_kampff
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +143,6 @@ description: Shortener is a Rails Engine Gem that makes it easy to create and in
   visitors, all whilst collecting basic usage metrics.
 email:
 - gems@jamespmcgrath.com
-- michael@mobalean.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -153,19 +152,20 @@ files:
 - Appraisals
 - Gemfile
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - app/controllers/shortener/shortened_urls_controller.rb
 - app/helpers/shortener/shortener_helper.rb
 - app/models/shortener/record.rb
 - app/models/shortener/shortened_url.rb
-- gemfiles/rails_4.gemfile
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
+- gemfiles/rails_8.0.gemfile
 - lib/generators/shortener/shortener_generator.rb
 - lib/generators/shortener/templates/migration.rb
 - lib/shortener.rb
@@ -210,12 +210,13 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/features/shortener_feature_spec.rb
+- spec/generators/shortener_generator_spec.rb
 - spec/helpers/shortener_helper_spec.rb
 - spec/models/shortened_url_spec.rb
 - spec/models/user_spec.rb
 - spec/shortener/shorten_url_interceptor_spec.rb
 - spec/spec_helper.rb
-homepage: http://jamespmcgrath.com/projects/shortener
+homepage: https://github.com/jpmcgrath/shortener/
 licenses: []
 metadata: {}
 post_install_message:
@@ -233,8 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.1.0
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Shortener is a Rails Engine that makes it easy to create shortened URLs for