acts_as_permalink 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21bbd9e737f969690260d4ccf970262c5dd26431
-  data.tar.gz: b54660d0c5ddcf54f72750b602380e31ba0753ed
+  metadata.gz: 6d5b611f96f9ccb7d5173c770274bf567f84b286
+  data.tar.gz: 7b061e771348291f3231592651e98486be9ae760
 SHA512:
-  metadata.gz: 694db9367e291c4b64064d75d09ee099133ca73db5a03e6090d6b5ce8b4b20e2a6d8be710a7e6179c203e3895c2e7499605cb46a04eebac2394c10a64622ee3e
-  data.tar.gz: 8fdf8dc8d3e9e9a8b12cf9db02e52e47bf160f44eebcd7dda8ca221ac93b4fa462c3fd3569a60250bad34994b10f0fe273330b7bab14212991e44a95e8d503a7
+  metadata.gz: e048b3627e8d731bf372b62b5bf418d7a15470d2d7835ad2e78a1cc5842f921f138d5af07295f8fc2a631e35ae33023ed99436780af366a167006791114ad5fb
+  data.tar.gz: 168bf287c8b6ab73e33ed730e03d4cff7b4a6563153787c6f5899069e511717ad240a186355a1749d4e6fab34ba257ed3591ba9400fd287f07c577c202e4194d

data/README.md

@@ -51,12 +51,15 @@ The `title` and `permalink` fields can be overridden with the following options:
     to:          :permalink   # Name of the column where the permalink will be stored
     max_length:  60           # Maximum number of characters the permalink will be
     underscore:  false        # Prefer using the `_` character as a replacement over the default `-`
+    scope:       nil          # Make the permalink unique scoped to a particular attribute
 
-So, for example you have want to store your permalink in a column called `path_name` and you want to generate your permalink using first and last name, and you want to restrict it to 40 characters, your model would look like:
+So, for example you have want to store your permalink in a column called `path_name` and you want to generate your permalink using first and last name, and you want to restrict it to 40 characters, and scope the permalink by organization, your model would look like:
 
 ```ruby
 class User < ActiveRecord::Base
-  acts_as_permalink from: :full_name, to: :path, max_length: 40
+  acts_as_permalink from: :full_name, to: :path, max_length: 40, scope: :organization_id
+
+  belongs_to :organization
 
   def full_name
     [first_name, last_name].join(" ")
@@ -74,6 +77,8 @@ $ bundle exec rspec
 
 ## Changelog
 
+* 1.1.0  --  Allow the option to `scope: :column_id` for uniquness.
+
 * 1.0.3  --  Update tests to use DatabaseCleaner, and bump some dependency versions.
 
 * 1.0.2  --  Use `ActiveSupport::Inflector.transliterate` to convert accented letters to simple ASCII letters.

data/lib/acts_as_permalink/version.rb

@@ -1,5 +1,5 @@
 module Acts
   module Permalink
-    VERSION = "1.0.3"
+    VERSION = "1.1.0"
   end
 end

data/lib/acts_as_permalink.rb

@@ -11,9 +11,15 @@ module Acts
         self.acts_as_permalink_config = Acts::Permalink::Config.new(options)
 
         before_validation :update_permalink, on: :create
-        validates_uniqueness_of self.acts_as_permalink_config.to
         attr_readonly self.acts_as_permalink_config.to
 
+        if self.acts_as_permalink_config.scope
+          validates self.acts_as_permalink_config.to, uniqueness: {scope: self.acts_as_permalink_config.scope}
+        else
+          validates self.acts_as_permalink_config.to, uniqueness: true
+        end
+
+
         include Acts::Permalink::InstanceMethods
       end
     end
@@ -35,15 +41,19 @@ module Acts
         text = [self.class.base_class.to_s, rand(10000)].join(config.separator) if text.blank?
         text = text.to_permalink(separator: config.separator, max_length: config.max_length)
 
+        # scope it if one is present
+        conditions = {}
+        conditions[config.scope] = self.public_send(config.scope) if config.scope.present?
+
         # Attempt to find the object by the permalink, and if so there is a collision and we need to de-collision it
-        if self.class.base_class.where(config.to => text).first
+        if self.class.base_class.where(conditions.merge(config.to => text)).any?
           candidate_text = nil
 
           # This will fail if you have a million records with the same name
           (1..999999).each do |num|
             suffix = "#{ config.separator }#{ num }"
             candidate_text = [text[0...(config.max_length - suffix.length)], suffix].join("")
-            break unless self.class.base_class.where(config.to => candidate_text).first
+            break unless self.class.base_class.where(conditions.merge(config.to => candidate_text)).any?
           end
 
           text = candidate_text

data/lib/config.rb

@@ -1,7 +1,7 @@
 module Acts
   module Permalink
     class Config
-      attr_reader :to, :from, :separator, :max_length
+      attr_reader :to, :from, :separator, :max_length, :scope
 
       def initialize(options={})
         @config = options.with_indifferent_access
@@ -9,6 +9,7 @@ module Acts
         @to = @config[:to].try(:to_sym) || :permalink
         @from = @config[:from].try(:to_sym) || :title
         @separator = @config[:underscore] ? "_" : "-"
+        @scope = @config[:scope].presence
 
         @max_length = @config[:max_length].to_i rescue 0
         @max_length = 60 unless @max_length > 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_permalink
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails