friendly_id 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 606af0800382602b2f88d11be3a839a3e8c23255
-  data.tar.gz: a501dd78829d595fe897475bdf4a6c6d98caee9c
+  metadata.gz: 67c7eb649e6e0fa756ebcfdbae36f276d7bc6adc
+  data.tar.gz: '093984f88a0e674471260a9989673190d48c5b22'
 SHA512:
-  metadata.gz: cb2afe89084b532541152c46056649ec6bfca0a2fe51493706f7f996ee233bae010a248a735fb55451e89b1918b29e60b5471e78c0272f29a5c5c410220eacc8
-  data.tar.gz: 8a527f735585ce88c1627bc54f206745f69a826d27574f6d306ee4a29dff23421e82225b0b9e9751cdd5a3a9911f3dba755d10d7a9951758052a3bd869b26441
+  metadata.gz: 9039e1625fed0fcc1001b9b0b97cf51f6205aa103211e137ca4db834aa75f18c37a98a54e3030f42d8bb0f83489683d1fec8dce6cc2650d763ee4fb0b5e4c033
+  data.tar.gz: 120aa54db11b436a357122cfd0a53c39bba48c4724d89ce100e5a6dbf8dbec1db6955ebd3c2b118e8c0366505732b8c4e12100e44b40b9fc422904b30a48d29b

data/Changelog.md

@@ -3,6 +3,13 @@
 We would like to think our many [contributors](https://github.com/norman/friendly_id/graphs/contributors) for
 suggestions, ideas and improvements to FriendlyId.
 
+## 5.2.1 (2017-04-09)
+
+* Change ActiveRecord::Base to ApplicationRecord ([#782](https://github.com/norman/friendly_id/pull/782)).
+* Refactor `Candidates#each` method. ([#773](https://github.com/norman/friendly_id/pull/773)).
+* Assign to configured slug column, not 'slug' when validation fails. ([#779](https://github.com/norman/friendly_id/pull/779)).
+* Fix sequential slugs when using History. ([#774](https://github.com/norman/friendly_id/pull/774)).
+
 ## 5.2.0 (2016-12-01)
 
 * Add sequential slug module for FriendlyId 4.x-style sequential slugs. ([#644](https://github.com/norman/friendly_id/pull/644)).

data/README.md

@@ -179,7 +179,7 @@ rake db:migrate
 ```
 ```ruby
 # edit app/models/user.rb
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   extend FriendlyId
   friendly_id :name, use: :slugged
 end

data/lib/friendly_id/candidates.rb

@@ -10,26 +10,35 @@ module FriendlyId
 
     def initialize(object, *array)
       @object = object
-      @candidates = to_candidate_array(object, array.flatten(1))
+      @raw_candidates = to_candidate_array(object, array.flatten(1))
     end
 
-    # Visits each candidate, calls it, passes it to `normalize_friendly_id` and
-    # yields any wanted and unreserved slug candidates.
     def each(*args, &block)
-      pre_candidates = @candidates.map do |candidate|
-        @object.normalize_friendly_id(candidate.map(&:call).join(' '))
-      end.select {|x| wanted?(x)}
+      return candidates unless block_given?
+      candidates.each{ |candidate| yield candidate }
+    end
 
-      unless pre_candidates.all? {|x| reserved?(x)}
-        pre_candidates.reject! {|x| reserved?(x)}
-      end
+    private
 
-      return pre_candidates unless block_given?
+    def candidates
+      @candidates ||= begin
+        candidates = normalize(@raw_candidates)
+        filter(candidates)
+      end
+    end
 
-      pre_candidates.each {|x| yield x}
+    def normalize(candidates)
+      candidates.map do |candidate|
+        @object.normalize_friendly_id(candidate.map(&:call).join(' '))
+      end.select {|x| wanted?(x)}
     end
 
-    private
+    def filter(candidates)
+      unless candidates.all? {|x| reserved?(x)}
+        candidates.reject! {|x| reserved?(x)}
+      end
+      candidates
+    end
 
     def to_candidate_array(object, array)
       array.map do |candidate|

data/lib/friendly_id/sequentially_slugged.rb

@@ -10,16 +10,18 @@ module FriendlyId
       SequentialSlugCalculator.new(scope_for_slug_generator,
                                   candidate,
                                   friendly_id_config.slug_column,
-                                  friendly_id_config.sequence_separator).next_slug
+                                  friendly_id_config.sequence_separator,
+                                  self.class.base_class).next_slug
     end
 
     class SequentialSlugCalculator
       attr_accessor :scope, :slug, :slug_column, :sequence_separator
 
-      def initialize(scope, slug, slug_column, sequence_separator)
+      def initialize(scope, slug, slug_column, sequence_separator, base_class)
         @scope = scope
         @slug = slug
-        @slug_column = scope.connection.quote_column_name(slug_column)
+        table_name = scope.connection.quote_table_name(base_class.arel_table.name)
+        @slug_column = "#{table_name}.#{scope.connection.quote_column_name(slug_column)}"
         @sequence_separator = sequence_separator
       end
 
@@ -34,9 +36,12 @@ module FriendlyId
       end
 
       def last_sequence_number
-        if match = /#{slug}#{sequence_separator}(\d+)\z/.match(slug_conflicts.last)
-          match[1].to_i
-        end
+        regexp = /#{slug}#{sequence_separator}(\d+)\z/
+        # Reject slug_conflicts that doesn't come from the first_candidate
+        # Map all sequence numbers and take the maximum
+        slug_conflicts.reject{ |slug_conflict| !regexp.match(slug_conflict) }.map do |slug_conflict|
+          regexp.match(slug_conflict)[1].to_i
+        end.max
       end
 
       def slug_conflicts

data/lib/friendly_id/slugged.rb

@@ -327,9 +327,9 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
     private :slug_generator
 
     def unset_slug_if_invalid
-      if errors.present? && attribute_changed?(friendly_id_config.query_field)
+      if errors.present? && attribute_changed?(friendly_id_config.query_field.to_s)
         diff = changes[friendly_id_config.query_field]
-        self.slug = diff.first
+        send "#{friendly_id_config.slug_column}=", diff.first
       end
     end
     private :unset_slug_if_invalid

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = "5.2.0"
+  VERSION = "5.2.1"
 end

data/test/schema.rb

@@ -67,6 +67,9 @@ module FriendlyId
           # Used to test candidates
           add_column :cities, :code, :string, :limit => 3
 
+          # Used as a non-default slug_column
+          add_column :authors, :subdomain, :string
+
           @done = true
         end
 

data/test/sequentially_slugged_test.rb

@@ -110,3 +110,31 @@ class SequentiallySluggedTest < TestCaseClass
     assert_nil record.slug
   end
 end
+
+class SequentiallySluggedTestWithHistory < TestCaseClass
+  include FriendlyId::Test
+  include FriendlyId::Test::Shared::Core
+
+  class Article < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :name, :use => [:sequentially_slugged, :history]
+  end
+
+  def model_class
+    Article
+  end
+
+  test "should work with regeneration with history when slug already exists" do
+    transaction do
+      record1 = model_class.create! :name => "Test name"
+      record2 = model_class.create! :name => "Another test name"
+      assert_equal 'test-name', record1.slug
+      assert_equal 'another-test-name', record2.slug
+
+      record2.name = "Test name"
+      record2.slug = nil
+      record2.save!
+      assert_equal 'test-name-2', record2.slug
+    end
+  end
+end

data/test/slugged_test.rb

@@ -110,6 +110,26 @@ class SluggedTest < TestCaseClass
     end
   end
 
+  test "should not set slug on create if unrelated validations fail with custom slug_column" do
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = 'authors'
+      extend FriendlyId
+      validates_presence_of :active
+      friendly_id :name, :use => :slugged, :slug_column => :subdomain
+
+      def self.name
+        "Author"
+      end
+    end
+
+    transaction do
+      instance = klass.new :name => 'foo'
+      refute instance.save
+      refute instance.valid?
+      assert_nil instance.subdomain
+    end
+  end
+
   test "should not update slug on save if unrelated validations fail" do
     klass = Class.new model_class do
       validates_presence_of :active

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord