acts_as_permalink 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 209c71d964e2e6ed7b91f5c76b5a2fbebe6eaba8
-  data.tar.gz: a95cc44e91a7845302db14f9d1fc5af160c9eb60
+  metadata.gz: 4633aa91665c5b810b32f1c2e748674d74c5d66c
+  data.tar.gz: e06d13bcdb3f1a032b71ff1659b391eb5dedb945
 SHA512:
-  metadata.gz: 01a035c4489b03e36a9191dc369908ce5c2fc8b100fd3a7d511d6c447abfbfd7a844efbbe0d29680d577ed4d4814af295af082900bf04ff49bff89ab41dc19f8
-  data.tar.gz: a8ad3501d84e3262737e657050e73d2255e207e0c08a5af36ca1513c1fe99c4247b582d28c74c3b294f84950610b4bcf934e945c0a436d78ffe7fd53a41908d0
+  metadata.gz: 663b5f0f6df7dd2527a32b17f090118a0213c8c280db92bc5abfd5c2cce23b06bd1fe73fdf49c830135775117369509cf727710cfea9e09b39cb2f793921f0e7
+  data.tar.gz: 20c6178a41efd0379dff74a4f3151f7116e06593cb9ada693253ef0c91b4a0589431cc4d5ed4f7ee37b8ea3d9c05b6422df553e3fb7c627187672ce1227165c2

data/README.markdown

@@ -44,6 +44,7 @@ The `title` and `permalink` fields can be overridden with the following options:
     from:        :title       # Name of the active record column or function used to generate the permalink
     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 `-`
 
 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:
 
@@ -67,6 +68,8 @@ $ bundle exec rspec
 
 ## Changelog
 
+* 0.6.0  --  Switch default replacement character to a dash, but allow the `underscore: true` property to go back to the old format
+
 * 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 }")`
 

data/lib/acts_as_permalink.rb

@@ -14,6 +14,9 @@ module Acts #:nodoc:
         # 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))
 
+        # Set the underscore character
+        self.base_class.instance_variable_set('@permalink_underscore', options[:underscore])
+
         # Read and validate the maximum length of the permalink
         max_length = options[:max_length].to_i rescue 0
         max_length = 60 unless max_length && max_length > 0
@@ -37,6 +40,7 @@ module Acts #:nodoc:
         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')
+        separator = obj.class.base_class.instance_variable_get('@permalink_underscore') ? "_" : "-"
 
         # If it is blank then generate a random link
         if text.blank?
@@ -45,9 +49,11 @@ module Acts #:nodoc:
         # If it is not blank, scrub
         else
           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.gsub(/[^a-z0-9\w]/, separator)  # make any character that is not nupermic or alphabetic into a special character
+          text = text.squeeze(separator)              # removes any consecutive duplicates of the special character
           text = text[0...max_length]                 # trim to length
+          text = text.sub(Regexp.new("^#{ separator }+"), "")  # remove leading special characters
+          text = text.sub(Regexp.new("#{ separator }+$"), "")  # remove trailing special characters
         end
 
         # Attempt to find the object by the permalink, and if so there is a collision and we need to de-collision it
@@ -55,7 +61,7 @@ module Acts #:nodoc:
           candidate_text = nil
 
           (1..999999).each do |num|
-            suffix = "-#{ num }"
+            suffix = "#{ separator }#{ num }"
             candidate_text = [text[0...(max_length - suffix.length)], suffix].join("")
             break unless obj.class.base_class.where(column_name => candidate_text).first
           end

data/lib/acts_as_permalink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_permalink
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails