mongoid-slug 5.3.0 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda81e5e78c0e83e9785ff87f5b6e1f6b4ca637a
-  data.tar.gz: f89a8f074c6ac112b65a62b9a0e122cabaef1d54
+  metadata.gz: 1d893221f1b5a7c840e42c98a2f7e74d976b4381
+  data.tar.gz: 3b9afae74aab2d130496f3cf23a0811f85705047
 SHA512:
-  metadata.gz: b30566749607cda56d2b4ed929327978f8997adca09a08a2f66b2b375a5f5485a9967c2c178bf7aa6433d78345d75b814a729f3c98e85f4195e81d1fe9880be8
-  data.tar.gz: 37c91ae5d6984e3403123e7bab3e568cbce7540d002509d5d3bfa396fd2fc72f8d8096498c933dae180aceec8f5edc09fda6e4a5fe1b9c0bbb1a40ed935ce76f
+  metadata.gz: 237ffaf248bd69f1dd9927554d2ab2d6bbcd16bfffaae685fee3cbcb07f084bbe8763ccd3dc85c9d46c659179ddf9d9d0fb25127127effee78015a561260363c
+  data.tar.gz: ea089ee25f529cb8c18c206eaf3f7566668e1c788f4c0cd4e6bc7c0f381728ac8986c7e8695b8a90078a751c75fb77b80e578b1860a1e2da574b3639d2627ae1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016 Hakan Ensari & Contributors
+Copyright (c) 2010-2017 Hakan Ensari & Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/mongoid/slug/criteria.rb

@@ -1,7 +1,7 @@
 module Mongoid
   module Slug
     class Criteria < Mongoid::Criteria
-      # Find the matchind document(s) in the criteria for the provided ids or slugs.
+      # Find the matching document(s) in the criteria for the provided ids or slugs.
       #
       # If the document _ids are of the type BSON::ObjectId, and all the supplied parameters are
       # convertible to BSON::ObjectId (via BSON::ObjectId#from_string), finding will be

data/lib/mongoid/slug/unique_slug.rb

@@ -16,12 +16,13 @@ module Mongoid
           @existing_slugs = []
           @existing_history_slugs = []
           @sorted_existing = []
+          regexp_pattern = Regexp.new(@pattern)
           @documents.each do |doc|
             history_slugs = doc._slugs
             next if history_slugs.nil?
-            existing_slugs.push(*history_slugs.find_all { |cur_slug| cur_slug =~ @pattern })
-            last_entered_slug.push(*history_slugs.last) if history_slugs.last =~ @pattern
-            existing_history_slugs.push(*history_slugs.first(history_slugs.length - 1).find_all { |cur_slug| cur_slug =~ @pattern })
+            existing_slugs.push(*history_slugs.find_all { |cur_slug| cur_slug =~ regexp_pattern })
+            last_entered_slug.push(*history_slugs.last) if history_slugs.last =~ regexp_pattern
+            existing_history_slugs.push(*history_slugs.first(history_slugs.length - 1).find_all { |cur_slug| cur_slug =~ regexp_pattern })
           end
         end
 
@@ -85,13 +86,8 @@ module Mongoid
 
           @_slug = @_slug[0...slug_max_length] if slug_max_length
 
-          # Regular expression that matches slug, slug-1, ... slug-n
-          # If slug_name field was indexed, MongoDB will utilize that
-          # index to match /^.../ pattern.
-          pattern = /^#{Regexp.escape(@_slug)}(?:-(\d+))?$/
-
           where_hash = {}
-          where_hash[:_slugs.all] = [pattern]
+          where_hash[:_slugs.all] = [regex_for_slug]
           where_hash[:_id.ne]     = model._id
 
           if (scope = slug_scope) && reflect_on_association(scope).nil?
@@ -100,11 +96,11 @@ module Mongoid
             where_hash[scope] = model.try(:read_attribute, scope)
           end
 
-          if slug_by_model_type == true
+          if slug_by_model_type
             where_hash[:_type] = model.try(:read_attribute, :_type)
           end
 
-          @state = SlugState.new @_slug, uniqueness_scope.unscoped.where(where_hash), pattern
+          @state = SlugState.new @_slug, uniqueness_scope.unscoped.where(where_hash), escaped_pattern
 
           # do not allow a slug that can be interpreted as the current document id
           @state.include_slug unless model.class.look_like_slugs?([@_slug])
@@ -122,6 +118,22 @@ module Mongoid
         end
       end
 
+      def escaped_pattern
+        "^#{Regexp.escape(@_slug)}(?:-(\\d+))?$"
+      end
+
+      # Regular expression that matches slug, slug-1, ... slug-n
+      # If slug_name field was indexed, MongoDB will utilize that
+      # index to match /^.../ pattern.
+      # Use Regexp::Raw to avoid the multiline option when querying the server.
+      def regex_for_slug
+        if embedded? || Mongoid::Compatibility::Version.mongoid3? || Mongoid::Compatibility::Version.mongoid4?
+          Regexp.new(escaped_pattern)
+        else
+          Regexp::Raw.new(escaped_pattern)
+        end
+      end
+
       def uniqueness_scope
         if slug_scope && (metadata = reflect_on_association(slug_scope))
 

data/lib/mongoid/slug/version.rb

@@ -1,5 +1,5 @@
 module Mongoid #:nodoc:
   module Slug
-    VERSION = '5.3.0'.freeze
+    VERSION = '5.3.2'.freeze
   end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-slug
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.2
 platform: ruby
 authors:
 - Andreas Saebjoernsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mongoid-compatibility
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   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'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   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'
 - !ruby/object:Gem::Dependency
   name: uuid
   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: Mongoid URL slug or permalink generator
@@ -200,17 +200,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: mongoid-slug
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Mongoid URL slugs
@@ -250,3 +250,4 @@ test_files:
 - spec/shared/indexes.rb
 - spec/spec_helper.rb
 - spec/tasks/mongoid_slug_rake_spec.rb
+has_rdoc: