friendly_id 5.2.5 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd9172f2c624c948c208a4e89b1d8de61f895d8d2cf0d233a3622d1f03da53f2
-  data.tar.gz: 1cb881d8be37a992cbac2d8def2c18338829e84b577bb364b36901a627849533
+  metadata.gz: 8fb8d2b37002508059b4480fe303a2ff277e4ee1264cd4dd3de6261a127aaa8d
+  data.tar.gz: 8cc571f9b42192a2ff254ed5f134817b6b3d0d7c37bb5cd82df1493055e21830
 SHA512:
-  metadata.gz: 9bca1be76cbc05a4d5dde5b936121ecf89b44c9949eb9b7ad574a20affd34fef104a443379b13d9a1a4843bbba9812366bd99d9b6db7eb56ace44581fecdad4a
-  data.tar.gz: d9c2ba647f04848ab3a690fd064e1669316bfc69116aa868a17034bed6916758e643365e425bc88f024fdec9bc7b5faaba89a5200696e0c1a3fddac04f140a30
+  metadata.gz: 7549da1a767fefcf3cd05913fc59801d4ffe9fe1bac77429d39ad42e544dcd1a03942c74515c5eee47207269c0a7e34a48a728e1d66b2e8d4a86cb7dabe9a84b
+  data.tar.gz: 181750c6dc3a12cb6e0948504aa2888fbd95823ee3282d2c18938eb3805cc3c86b9ddaabefd18e1d2bcaec3ea8d3e8546260caed38cf9504af768e8fa905c02d

data/.travis.yml

@@ -1,16 +1,26 @@
 language: ruby
 cache: bundler
-
+services:
+  - postgresql
+  - mysql
+dist: trusty
+addons:
+  postgresql: "9.6"
 rvm:
-  - 2.4.0
-  - 2.3.0
+  - 2.6.3
+  - 2.5.5
+  - 2.4.6
+  - 2.3.8
   - 2.2.0
   - 2.1.0
   - jruby-9.1.13.0
 
 env:
-  - DB=postgres
-  - DB=mysql
+  global:
+    - COVERALLS=true 
+  matrix:
+    - DB=postgres
+    - DB=mysql
 
 gemfile:
   - gemfiles/Gemfile.rails-4.0.rb
@@ -19,6 +29,7 @@ gemfile:
   - gemfiles/Gemfile.rails-5.0.rb
   - gemfiles/Gemfile.rails-5.1.rb
   - gemfiles/Gemfile.rails-5.2.rb
+  - gemfiles/Gemfile.rails-6.0.rb
 
 before_install:
   - gem update bundler
@@ -27,31 +38,59 @@ matrix:
   exclude:
     - rvm: 2.1.0
       gemfile: gemfiles/Gemfile.rails-5.2.rb
+    - rvm: 2.1.0
+      gemfile: gemfiles/Gemfile.rails-6.0.rb
     - rvm: 2.2.0
       gemfile: gemfiles/Gemfile.rails-5.2.rb
+    - rvm: 2.2.0
+      gemfile: gemfiles/Gemfile.rails-6.0.rb
     - rvm: jruby-9.1.13.0
       gemfile: gemfiles/Gemfile.rails-5.2.rb
+    - rvm: jruby-9.1.13.0
+      gemfile: gemfiles/Gemfile.rails-6.0.rb
+    - rvm: 2.1.0
+      gemfile: gemfiles/Gemfile.rails-5.0.rb
     - rvm: 2.1.0
       gemfile: gemfiles/Gemfile.rails-5.1.rb
+    - rvm: 2.1.0
+      gemfile: gemfiles/Gemfile.rails-6.0.rb
     - rvm: 2.2.0
       gemfile: gemfiles/Gemfile.rails-5.1.rb
-    - rvm: 2.1.0
+    - rvm: 2.2.0
       gemfile: gemfiles/Gemfile.rails-5.0.rb
     - rvm: 2.2.0
+      gemfile: gemfiles/Gemfile.rails-6.0.rb
+    - rvm: 2.3.8
+      gemfile: gemfiles/Gemfile.rails-6.0.rb
+    - rvm: 2.4.6
+      gemfile: gemfiles/Gemfile.rails-4.0.rb
+    - rvm: 2.4.6
+      gemfile: gemfiles/Gemfile.rails-4.1.rb
+    - rvm: 2.4.6
+      gemfile: gemfiles/Gemfile.rails-6.0.rb
+    - rvm: 2.5.5
+      gemfile: gemfiles/Gemfile.rails-4.0.rb
+    - rvm: 2.5.5
+      gemfile: gemfiles/Gemfile.rails-4.1.rb
+    - rvm: 2.5.5
       gemfile: gemfiles/Gemfile.rails-5.0.rb
-    - rvm: 2.4.0
+    - rvm: 2.5.5
+      gemfile: gemfiles/Gemfile.rails-5.1.rb
+    - rvm: 2.6.3
       gemfile: gemfiles/Gemfile.rails-4.0.rb
-    - rvm: 2.4.0
+    - rvm: 2.6.3
       gemfile: gemfiles/Gemfile.rails-4.1.rb
+    - rvm: 2.6.3
+      gemfile: gemfiles/Gemfile.rails-5.0.rb
+    - rvm: 2.6.3
+      gemfile: gemfiles/Gemfile.rails-5.1.rb
   allow_failures:
     - rvm: jruby-9.1.13.0
       gemfile: gemfiles/Gemfile.rails-5.1.rb
     - rvm: jruby-9.1.13.0
       gemfile: gemfiles/Gemfile.rails-5.0.rb
 
-sudo: false
-
 before_script:
   - bundle exec rake db:create db:up
 
-script: 'COVERALLS=true bundle exec rake test'
+script: 'bundle exec rake test'

data/Changelog.md

@@ -3,6 +3,21 @@
 We would like to think our many [contributors](https://github.com/norman/friendly_id/graphs/contributors) for
 suggestions, ideas and improvements to FriendlyId.
 
+## 5.3.0 (2019-09-25)
+
+* Record history when scope changes but slug does not ([#916](https://github.com/norman/friendly_id/pull/916))
+* Add support for Rails 6 ([#897](https://github.com/norman/friendly_id/pull/897))
+
+## 5.2.5 (2018-12-30)
+
+* Pass all possible parameters to ActiveRecord::RecordNotFound.new when raising the exception ([#890](https://github.com/norman/friendly_id/pull/890))
+* Use composite index for queries by sluggable ([#882](https://github.com/norman/friendly_id/pull/882))
+* Scoped: generate new slug if scope changed ([#878](https://github.com/norman/friendly_id/pull/878))
+* Fix History + SequentiallySlugged issues ([#877](https://github.com/norman/friendly_id/pull/877))
+* Support scoped with STI ([#745](https://github.com/norman/friendly_id/pull/745))
+* Fix exists? to behave the same as find for numeric slugs ([#875](https://github.com/norman/friendly_id/pull/875))
+* Remove dirty tracking code from to_param ([#867](https://github.com/norman/friendly_id/pull/867))
+
 ## 5.2.4 (2018-04-24)
 
 * Fix compatibility with Rails versions 4.0 -> 5.2. ([#863](https://github.com/norman/friendly_id/pull/863)).

data/README.md

@@ -117,8 +117,8 @@ If you have a bug to report, please include the following information:
 If you are able to, it helps even more if you can fork FriendlyId on Github,
 and add a test that reproduces the error you are experiencing.
 
-For more info on how to report bugs, please see [this
-article](http://yourbugreportneedsmore.info/).
+For more inspiration on how to report bugs, please see [this
+article](https://www.chiark.greenend.org.uk/~sgtatham/bugs.html).
 
 ## Thanks and Credits
 

data/friendly_id.gemspec

@@ -8,7 +8,6 @@ Gem::Specification.new do |s|
   s.email             = ["norman@njclarke.com", "p@arndt.io"]
   s.homepage          = "https://github.com/norman/friendly_id"
   s.summary           = "A comprehensive slugging and pretty-URL plugin."
-  s.rubyforge_project = "friendly_id"
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- {test}/*`.split("\n")
   s.require_paths     = ["lib"]

data/gemfiles/Gemfile.rails-6.0.rb

@@ -0,0 +1,27 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 6.0.0'
+gem 'railties', '~> 6.0.0'
+
+# Database Configuration
+group :development, :test do
+  platforms :jruby do
+    gem 'activerecord-jdbcmysql-adapter', '~> 51.1'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 51.1'
+    gem 'kramdown'
+  end
+
+  platforms :ruby, :rbx do
+    gem 'sqlite3'
+    gem 'mysql2'
+    gem 'pg'
+    gem 'redcarpet'
+  end
+
+  platforms :rbx do
+    gem 'rubysl', '~> 2.0'
+    gem 'rubinius-developer_tools'
+  end
+end

data/lib/friendly_id/finders.rb

@@ -76,7 +76,7 @@ for models that use FriendlyId with something similar to the following:
     def self.setup(model_class)
       model_class.instance_eval do
         relation.class.send(:include, friendly_id_config.finder_methods)
-        if (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 2) || ActiveRecord::VERSION::MAJOR == 5
+        if (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 2) || ActiveRecord::VERSION::MAJOR >= 5
           model_class.send(:extend, friendly_id_config.finder_methods)
         end
       end

data/lib/friendly_id/history.rb

@@ -122,7 +122,7 @@ method.
 
     def create_slug
       return unless friendly_id
-      return if slugs.first.try(:slug) == friendly_id
+      return if history_is_up_to_date?
       # Allow reversion back to a previously used slug
       relation = slugs.where(:slug => friendly_id)
       if friendly_id_config.uses?(:scoped)
@@ -134,5 +134,14 @@ method.
         record.scope = serialized_scope if friendly_id_config.uses?(:scoped)
       end
     end
+
+    def history_is_up_to_date?
+      latest_history = slugs.first
+      check = latest_history.try(:slug) == friendly_id
+      if friendly_id_config.uses?(:scoped)
+        check = check && latest_history.scope == serialized_scope
+      end
+      check
+    end
   end
 end

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = '5.2.5'.freeze
+  VERSION = '5.3.0'.freeze
 end

data/test/history_test.rb

@@ -377,6 +377,33 @@ class ScopedHistoryTest < TestCaseClass
     end
   end
 
+  test "should record history when scope changes" do
+    transaction do
+      city1 = City.create!
+      city2 = City.create!
+      with_instance_of(Restaurant) do |record|
+        record.name = "x"
+        record.slug = nil
+
+        record.city = city1
+        record.save!
+        assert_equal("city_id:#{city1.id}", record.slugs.reload.first.scope)
+        assert_equal("x", record.slugs.reload.first.slug)
+
+        record.city = city2
+        record.save!
+        assert_equal("city_id:#{city2.id}", record.slugs.reload.first.scope)
+
+        record.name = "y"
+        record.slug = nil
+        record.city = city1
+        record.save!
+        assert_equal("city_id:#{city1.id}", record.slugs.reload.first.scope)
+        assert_equal("y", record.slugs.reload.first.slug)
+      end
+    end
+  end
+
   test "should allow equal slugs in different scopes" do
     transaction do
       city = City.create!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.2.5
+  version: 5.3.0
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -167,6 +167,7 @@ files:
 - gemfiles/Gemfile.rails-5.0.rb
 - gemfiles/Gemfile.rails-5.1.rb
 - gemfiles/Gemfile.rails-5.2.rb
+- gemfiles/Gemfile.rails-6.0.rb
 - guide.rb
 - lib/friendly_id.rb
 - lib/friendly_id/.gitattributes
@@ -228,8 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: friendly_id
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A comprehensive slugging and pretty-URL plugin.