effective_slugs 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aa5f0a3c6777c563c28d3924a9ffed0f382e807
-  data.tar.gz: ba13e7ca75a21e6fe93699168c74ce8033e8b3c2
+  metadata.gz: d0875f47623bbaccf338ab9af234f1da14cb8cc1
+  data.tar.gz: f52f76f5543f0ba46e2608d141a4e92ab81d739e
 SHA512:
-  metadata.gz: 053338eb7f19cc37a35036987b40c066ee486eec023530686e2c287606fe821f1654127b8bc6b2b06310835f4fe4a45eb5a2dcd0dfbede11689187a6d48f4551
-  data.tar.gz: a40b50644123a979dbc2ad8578b4e0cb4e43c004597044376ecbc049cf0f4a6e39cb5f035976bb22262379e4c2322e00c6ada01980c141d4a843513a0d87bb9d
+  metadata.gz: 147999df32daee2087b25d029e5c8d1c1031521e0392e3a1cacf09db5d863577b8ec422ea20b5ba717165a57a0a8c1f90f9ee608c18ff6ca3523b72696c94b67
+  data.tar.gz: 4b7909bf46d75699f77545afdf99dc536454a4e4975fadc97b7862c7006000c623bf338a68315d4e960ac893d09c600d08fe7a6ce836d4028c1f3d6ee0328ddb

data/README.md

@@ -47,7 +47,7 @@ As we're doing lookups on this column, a database index makes a lot of sense too
 rails generate migration add_slug_to_post slug:string:index
 ```
 
-which will create a migration something like
+which will create a migration something like:
 
 ```ruby
 class AddSlugToPost < ActiveRecord::Migration
@@ -58,6 +58,22 @@ class AddSlugToPost < ActiveRecord::Migration
 end
 ```
 
+Then collect the slug field with your object's form.  The below example will not be displayed on a #new but it will on #edit or if the slug is in error.
+
+```haml
+- if f.object.persisted? || f.object.errors.include?(:slug)
+  - current_url = (post_path(f.object) rescue nil)
+  = f.input :slug, hint: "The slug controls this post's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This post is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
+```
+
+and include the permitted param within your controller:
+
+```ruby
+def permitted_params
+  params.require(:post).permit(:slug)
+end
+```
+
 ## Behavior
 
 ### Slug Generation

data/app/models/concerns/acts_as_sluggable.rb

@@ -46,7 +46,7 @@ module ActsAsSluggable
   module ActiveRecord
     def acts_as_sluggable(options = {})
       if self.methods.include?(:is_site_specific) # ActsAsSiteSpecific
-        @acts_as_sluggable_opts = {:validation_scope => :site_id}.merge(options)
+        @acts_as_sluggable_opts = { validation_scope: :site_id }.merge(options)
       else
         @acts_as_sluggable_opts = {}.merge(options)
       end
@@ -56,18 +56,14 @@ module ActsAsSluggable
   end
 
   included do
-    before_validation :set_slug, :if => proc { should_generate_new_slug? }
+    before_validation :set_slug, if: proc { should_generate_new_slug? }
 
-    validates_presence_of :slug
-    validates_exclusion_of :slug, :in => EffectiveSlugs.all_excluded_slugs
-    validates_length_of :slug, :maximum => 255
-    validates_format_of :slug, :with => /\A[a-zA-Z0-9_-]*\z/, :message => 'only _ and - symbols allowed. no spaces either.'
-
-    if @acts_as_sluggable_opts[:validation_scope]
-      validates_uniqueness_of :slug, :scope => @acts_as_sluggable_opts[:validation_scope]
-    else
-      validates_uniqueness_of :slug
-    end
+    validates :slug,
+      exclusion: { in: EffectiveSlugs.all_excluded_slugs },
+      format: { with: /\A[a-zA-Z0-9_-]*\z/, message: 'only _ and - symbols allowed. no spaces either.' },
+      length: { maximum: 255 },
+      presence: true,
+      uniqueness: @acts_as_sluggable_opts[:validation_scope] ? { scope: @acts_as_sluggable_opts[:validation_scope] } : true
 
     if ::ActiveRecord::VERSION::MAJOR == 4 && ::ActiveRecord::VERSION::MINOR == 2
       extend FinderMethods
@@ -75,17 +71,17 @@ module ActsAsSluggable
   end
 
   def set_slug
-    raise StandardError, "ActsAsSluggable expected a table column :slug to exist" unless self.respond_to?(:slug)
+    raise StandardError, "ActsAsSluggable expected a table column :slug to exist" unless respond_to?(:slug)
 
     new_slug = slug_source.to_s.try(:parameterize)
 
     if new_slug.present?
       while EffectiveSlugs.excluded_slugs.include?(new_slug) do
-        new_slug << "-" << self.class.name.demodulize.parameterize
+        new_slug << '-'.freeze << self.class.name.demodulize.parameterize
       end
 
       # TODO: Could make this a bit smarter about conflicts
-      num_slugs = self.class.name.constantize.where(:slug => new_slug).count
+      num_slugs = self.class.name.constantize.where(slug: new_slug).count
       num_slugs = self.class.name.constantize.where('slug LIKE ?', "#{new_slug}%").count if num_slugs > 0
 
       num_slugs == 0 ? self.slug = new_slug : self.slug = "#{new_slug}-#{num_slugs}"
@@ -95,8 +91,8 @@ module ActsAsSluggable
   end
 
   def slug_source
-    return title if self.respond_to?(:title)
-    return name if self.respond_to?(:name)
+    return title if respond_to?(:title)
+    return name if respond_to?(:name)
     to_s
   end
 
@@ -116,23 +112,32 @@ module ActsAsSluggable
 
   module FinderMethods
     def find(*args)
-      if regular_find?(args)
-        super
+      first = args.first || ''.freeze
+      return super if first.kind_of?(Array) || first.kind_of?(Integer)
+
+      slug = first.to_s
+
+      if (slug.delete('^0-9'.freeze).length == slug.length)  # The slug could be '400'
+        find_by_slug(args) || find_by_id!(args)
       else
-        find_by_slug(args) or raise ::ActiveRecord::RecordNotFound
+        find_by_slug!(args)
       end
+
     end
 
     def exists?(*args)
-      regular_find?(args) ? super : (find_by_slug(args).present? rescue false)
-    end
+      first = args.first || ''.freeze
+      return super if first.kind_of?(Array) || first.kind_of?(Integer)
 
-    private
+      slug = first.to_s
 
-    def regular_find?(args)
-      first = args.first || ''.freeze
-      first.kind_of?(Array) || first.kind_of?(Integer) || (first.delete('^0-9').length == first.length)
+      if (slug.delete('^0-9'.freeze).length == slug.length)  # The slug could be '400'
+        (where(arel_table[:slug].eq(slug).or(arel_table[:id].eq(slug))).present? rescue false)
+      else
+        (find_by_slug(args).present? rescue false)
+      end
     end
+
   end
 end
 

data/lib/effective_slugs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveSlugs
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_slugs
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails