acts_as_permalink 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 791fbabd504bcc2ae08b4ef1c5299188166dbd1b
-  data.tar.gz: 85d87b94ae581e492e63a757c29ceb537a16e5ab
+  metadata.gz: 209c71d964e2e6ed7b91f5c76b5a2fbebe6eaba8
+  data.tar.gz: a95cc44e91a7845302db14f9d1fc5af160c9eb60
 SHA512:
-  metadata.gz: 6e4306529165b0afcaebb21b3eecc5c6da3d0ce42989d36059c5c4f415283f2c5f6efd3fa8f80ff04cba749d47e18c2cef17543424069b0dbabcfe6354ae42d6
-  data.tar.gz: 171c21e79bcb9fd46f1018580026c43635f51f1715520d2e9e424237b5596a9210d66bf27040935180dd9a4eadb16d77bf39a0e4c06733f16debe10d857ebaab
+  metadata.gz: 01a035c4489b03e36a9191dc369908ce5c2fc8b100fd3a7d511d6c447abfbfd7a844efbbe0d29680d577ed4d4814af295af082900bf04ff49bff89ab41dc19f8
+  data.tar.gz: a8ad3501d84e3262737e657050e73d2255e207e0c08a5af36ca1513c1fe99c4247b582d28c74c3b294f84950610b4bcf934e945c0a436d78ffe7fd53a41908d0

data/README.markdown

@@ -67,6 +67,11 @@ $ bundle exec rspec
 
 ## Changelog
 
+* 0.5.0  --  Fix bugs in `max_length` property which would sometimes allow the permalink to be longer than the value
+             Use `where().first` over `send("find_by_#{ column }")`
+
+* 0.4.2  --  Update rspec to new expect() syntax
+
 * 0.4.1  --  Documentation improvements.
 
 * 0.4.0  --  Rails 4 support.

data/lib/acts_as_permalink/version.rb

@@ -1,5 +1,5 @@
 module Acts
   module Permalink
-    VERSION = "0.4.2"
+    VERSION = "0.5.0"
   end
 end

data/lib/acts_as_permalink.rb

@@ -8,10 +8,10 @@ module Acts #:nodoc:
 
     module ClassMethods
       def acts_as_permalink(options={})
-        # Read and scrub option for the column which will save the permalink    
+        # Read and scrub option for the column which will save the permalink
         self.base_class.instance_variable_set('@permalink_column_name', options[:to].try(:to_sym) || :permalink)
 
-        # Read and scrub the option for the column or function which will generate the permalink 
+        # Read and scrub the option for the column or function which will generate the permalink
         self.base_class.instance_variable_set('@permalink_source', (options[:from].try(:to_sym) || :title))
 
         # Read and validate the maximum length of the permalink
@@ -20,24 +20,24 @@ module Acts #:nodoc:
         self.base_class.instance_variable_set('@permalink_length', max_length)
 
         if Rails.version >= "3"
-          before_validation :update_permalink, :on => :create
+          before_validation :update_permalink, on: :create
         else
           before_validation_on_create :update_permalink
         end
 
         validates_uniqueness_of @permalink_column_name
         attr_readonly @permalink_column_name
-        
+
         include Acts::Permalink::InstanceMethods
         extend Acts::Permalink::SingletonMethods
       end
-      
+
       # Returns the unique permalink string for the passed in object.
       def generate_permalink_for(obj)
-
-        # Find the source for the permalink
+        column_name = obj.class.base_class.instance_variable_get('@permalink_column_name')
         text = obj.send(obj.class.base_class.instance_variable_get('@permalink_source'))
-        
+        max_length = obj.class.base_class.instance_variable_get('@permalink_length')
+
         # If it is blank then generate a random link
         if text.blank?
           text = obj.class.base_class.to_s.downcase + rand(10000).to_s
@@ -47,37 +47,39 @@ module Acts #:nodoc:
           text = text.downcase.strip                  # make the string lowercase and scrub white space on either side
           text = text.gsub(/[^a-z0-9\w]/, "_")        # make any character that is not nupermic or alphabetic into an underscore
           text = text.sub(/_+$/, "").sub(/^_+/, "")   # remove underscores on either end, caused by non-simplified characters
-          text = text[0...obj.class.base_class.instance_variable_get('@permalink_length')]        # trim to length
+          text = text[0...max_length]                 # trim to length
         end
-        
-        # Attempt to find the object by the permalink
-        if obj.class.base_class.send("find_by_#{obj.class.base_class.instance_variable_get('@permalink_column_name')}", text)
-          num = 1
-
-          # If we find the object we know there is a collision, so just add a number to the end until there is no collision
-          while obj.class.base_class.send("find_by_#{obj.class.base_class.instance_variable_get('@permalink_column_name')}", text + num.to_s)
-            num += 1
+
+        # Attempt to find the object by the permalink, and if so there is a collision and we need to de-collision it
+        if obj.class.base_class.where(column_name => text).first
+          candidate_text = nil
+
+          (1..999999).each do |num|
+            suffix = "-#{ num }"
+            candidate_text = [text[0...(max_length - suffix.length)], suffix].join("")
+            break unless obj.class.base_class.where(column_name => candidate_text).first
           end
 
-          text = text + num.to_s
+          text = candidate_text
         end
+
         text
       end
     end
-  
+
     module SingletonMethods
     end
-    
+
     module InstanceMethods
 
       # Override this method so that find searches by permalink and not by id
       def to_param
         self.send(self.class.base_class.instance_variable_get('@permalink_column_name'))
       end
-      
+
       # Generate the permalink and assign it directly via callback
       def update_permalink
-        self.send("#{self.class.base_class.instance_variable_get('@permalink_column_name')}=", self.class.base_class.generate_permalink_for(self))
+        self.send("#{ self.class.base_class.instance_variable_get('@permalink_column_name') }=", self.class.base_class.generate_permalink_for(self))
         true
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_permalink
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Kevin McPhillips