friendly_id 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e2080c5099215c8dafa04072948b2ac30907bb8
-  data.tar.gz: bee56373516dd5ed394d7de3bc554a08560d5433
+  metadata.gz: 8ecc233dd377f5400a788a6a6fb7d37e2f4b200c
+  data.tar.gz: 9c848d7c0f238d70577cb0737b1f6411e779a6d5
 SHA512:
-  metadata.gz: 015d359758f15798d9f51ff5cd22462510a48e523fa4b3c0c4a7a8aefd8b370039dce2bc78484a54d05be82e0b7b57284d4763d943eaec35c1418fb5b23cc2ba
-  data.tar.gz: 66ebbb5b6f6345c6beb0d5c4668ba61d5f9e26b2cff24ab8c8591ed36489559584f24fb00ef41b52aefc568ebc5fd121a200d89db8a04948a23a06aa100cb758
+  metadata.gz: 4c0a2db2212245e2dcadd50a6f62e3970a10ca72d7230e92cebf31a03da6772c23d2203303e08ff51ed9c9985f234310e01db91f0baa79c663c9756b84181b7a
+  data.tar.gz: cc539ec2396d5736499c3852d0bd967c10d1d6d0ec3afd63b137634e9ac7f6365d7b073895c5297390a42ad74a9cb363064c81c317ad899f3e44f6f15a312f19

data/README.md

@@ -177,7 +177,6 @@ rails generate friendly_id
 ```
 >Temp solution for Rails 5.1+ : Before running the migration, go into the generated migration file and specify the Rails version:  
 `class CreateFriendlyIdSlugs < ActiveRecord::Migration[5.1]`  
-```
 ```shell
 rails generate scaffold user name:string slug:string:uniq
 rake db:migrate

data/friendly_id.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'railties', '~> 4.0'
-  s.add_development_dependency 'minitest', '~> 5.3.5'
-  s.add_development_dependency 'mocha', '~> 1.1.0'
+  s.add_development_dependency 'minitest', '~> 5.3'
+  s.add_development_dependency 'mocha', '~> 1.1'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'i18n'
   s.add_development_dependency 'ffaker'

data/lib/friendly_id/reserved.rb

@@ -46,6 +46,7 @@ message to a different field. For example:
     # {FriendlyId::Configuration FriendlyId::Configuration}.
     module Configuration
       attr_accessor :reserved_words
+      attr_accessor :treat_reserved_as_conflict
     end
   end
 end

data/lib/friendly_id/scoped.rb

@@ -132,7 +132,7 @@ an example of one way to set this up:
     private :scope_for_slug_generator
 
     def slug_generator
-      friendly_id_config.slug_generator_class.new(scope_for_slug_generator)
+      friendly_id_config.slug_generator_class.new(scope_for_slug_generator, friendly_id_config)
     end
     private :slug_generator
 

data/lib/friendly_id/slug_generator.rb

@@ -3,11 +3,16 @@ module FriendlyId
   # availability.
   class SlugGenerator
 
-    def initialize(scope)
+    def initialize(scope, config)
       @scope = scope
+      @config = config
     end
 
     def available?(slug)
+      if @config.uses?(::FriendlyId::Reserved) && @config.reserved_words.present? && @config.treat_reserved_as_conflict
+        return false if @config.reserved_words.include?(slug)
+      end
+
       !@scope.exists_by_friendly_id?(slug)
     end
 

data/lib/friendly_id/slugged.rb

@@ -370,7 +370,7 @@ Github issue](https://github.com/norman/friendly_id/issues/185) for discussion.
     private :scope_for_slug_generator
 
     def slug_generator
-      friendly_id_config.slug_generator_class.new(scope_for_slug_generator)
+      friendly_id_config.slug_generator_class.new(scope_for_slug_generator, friendly_id_config)
     end
     private :slug_generator
 

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = '5.2.2'.freeze
+  VERSION = '5.2.3'.freeze
 end

data/test/object_utils_test.rb

@@ -14,8 +14,8 @@ class ObjectUtilsTest < TestCaseClass
   end
 
   test "numeric strings are neither friendly nor unfriendly" do
-    assert_equal nil, "1".friendly_id?
-    assert_equal nil, "1".unfriendly_id?
+    assert_nil "1".friendly_id?
+    assert_nil "1".unfriendly_id?
   end
 
   test "ActiveRecord::Base instances should be unfriendly_ids" do
@@ -24,4 +24,4 @@ class ObjectUtilsTest < TestCaseClass
     end
     assert model_class.new.unfriendly_id?
   end
-end
+end

data/test/reserved_test.rb

@@ -62,4 +62,14 @@ class ReservedTest < TestCaseClass
     end
   end
 
+  test "should optionally treat reserved words as conflict" do
+    klass = Class.new(model_class) do
+      friendly_id :slug_candidates, :use => [:slugged, :reserved], :reserved_words => %w(new edit), :treat_reserved_as_conflict => true
+    end
+
+    with_instance_of(klass, name: 'new') do |record|
+      assert_match(/new-([0-9a-z]+\-){4}[0-9a-z]+\z/, record.slug)
+    end
+  end
+
 end

data/test/shared.rb

@@ -64,7 +64,7 @@ module FriendlyId
           with_instance_of my_model_class do |record|
             record.update_attributes my_model_class.friendly_id_config.slug_column => nil
             record = my_model_class.friendly.find(record.id)
-            record.class.validate Proc.new {errors[:name] = "FAIL"}
+            record.class.validate Proc.new {errors.add(:name, "FAIL")}
             record.save
             assert_equal record.to_param, record.friendly_id
           end
@@ -174,7 +174,7 @@ module FriendlyId
         end
 
         test "should return nil for to_param with a new record" do
-          assert_equal nil, model_class.new.to_param
+          assert_nil model_class.new.to_param
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -59,28 +59,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.5
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.5
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement