slugalicious 1.2.0 → 1.2.1

data/README.textile

@@ -3,7 +3,7 @@ h1. Slugalicious -- Easy and powerful URL slugging for Rails 3
 _*(no monkey-patching required)*_
 
 | *Author* | Tim Morgan |
-| *Version* | 1.2 (Aug 31, 2011) |
+| *Version* | 1.2.1 (Mar 2, 2012) |
 | *License* | Released under the MIT license. |
 
 h2. About

data/lib/slugalicious.rb

@@ -18,10 +18,8 @@ module Slugalicious
   MAX_SLUG_LENGTH = 126
 
   included do
-    extend ActiveSupport::Memoizable
-    memoize :slug, :active_slug?
     alias_method :to_param, :slug_with_path
-    has_many :slugs, as: :sluggable
+    has_many :slugs, as: :sluggable, dependent: :delete_all
   end
 
   # Methods added to the class when this module is included.
@@ -143,39 +141,36 @@ module Slugalicious
     end
   end
 
-  # Methods added to instances when this module is included.
-
-  module InstanceMethods
-
-    def slug_object
-      slugs.loaded? ? slugs.detect(&:active) : slugs.active.first
-    end
-    private :slug_object
+  def slug_object
+    slugs.loaded? ? slugs.detect(&:active) : slugs.active.first
+  end
+  private :slug_object
 
-    # @return [String, nil] The slug for this object, or @nil@ if none has been
-    #   assigned.
+  # @return [String, nil] The slug for this object, or @nil@ if none has been
+  #   assigned.
 
-    def slug
-      Rails.cache.fetch("Slug/#{self.class.to_s}/#{id}/slug") do
-        slug_object.try(:slug)
-      end
+  def slug
+    Rails.cache.fetch("Slug/#{self.class.to_s}/#{id}/slug") do
+      slug_object.try(:slug)
     end
+  end
 
-    # @return [String, nil] The full slug and path for this object, with scope
-    #   included, or @nil@ if none has been assigned.
+  # @return [String, nil] The full slug and path for this object, with scope
+  #   included, or @nil@ if none has been assigned.
 
-    def slug_with_path
-      Rails.cache.fetch("Slug/#{self.class.to_s}/#{id}/slug_with_path") do
-        slug_object ? (slug_object.scope.to_s + slug_object.slug) : nil
-      end
+  def slug_with_path
+    Rails.cache.fetch("Slug/#{self.class.to_s}/#{id}/slug_with_path") do
+      slug_object ? (slug_object.scope.to_s + slug_object.slug) : nil
     end
+  end
 
-    # @param [String] slug A slug for this object.
-    # @return [true, false, nil] @true@ if the slug is the currently active one
-    #   (should not redirect), @false@ if it's inactive (should redirect), and
-    #   @nil@ if it's not a known slug for the object (should 404).
+  # @param [String] slug A slug for this object.
+  # @return [true, false, nil] @true@ if the slug is the currently active one
+  #   (should not redirect), @false@ if it's inactive (should redirect), and
+  #   @nil@ if it's not a known slug for the object (should 404).
 
-    def active_slug?(slug)
+  def active_slug?(slug)
+    @active_slug ||= begin
       slug = if slugs.loaded? then
                slugs.detect { |s| s.slug.downcase == slug.downcase }
              else
@@ -187,60 +182,60 @@ module Slugalicious
         nil
       end
     end
+  end
 
-    private
-
-    def make_slug
-      slugs_in_use = if slugs.loaded? then
-                       slugs.map(&:slug)
-                     else
-                       slugs.select(:slug).all.map(&:slug)
-                     end
-
-      # grab a list of all potential slugs derived from the generators
-      potential_slugs = self.class._slug_procs.map { |slug_proc| slug_proc[self] }.
-        compact.
-        map { |slug| self.class._slugifier[slug] }.
-        map { |slug| slug[0, MAX_SLUG_LENGTH] }
-      raise "All slug generators returned nil for #{self.inspect}" if potential_slugs.empty?
-      # include the last-resort slug, trimmed for length
-      last_resort_append = "#{self.class._slug_id_separator}#{id}"
-      potential_slugs << "#{potential_slugs.first[0, [ 1, MAX_SLUG_LENGTH - last_resort_append.length ].max]}#{last_resort_append}"[0, MAX_SLUG_LENGTH]
-      # subtract out blacklisted slugs
-      potential_slugs -= self.class._slug_blacklist
-      
-      # if one of these slugs is already in use, we don't need to change the slug
-      # instead, activate the one of highest prioirty and we're done
-      valid_slugs_in_use = potential_slugs & slugs_in_use
-      unless valid_slugs_in_use.empty?
-        Slug.transaction do
-          slugs.update_all(active: false)
-          slugs.where(slug: valid_slugs_in_use.first).update_all(active: true)
-        end
-        return
-      end
-
+  private
+
+  def make_slug
+    slugs_in_use = if slugs.loaded? then
+                     slugs.map(&:slug)
+                   else
+                     slugs.select(:slug).all.map(&:slug)
+                   end
+
+    # grab a list of all potential slugs derived from the generators
+    potential_slugs = self.class._slug_procs.map { |slug_proc| slug_proc[self] }.
+      compact.
+      map { |slug| self.class._slugifier[slug] }.
+      map { |slug| slug[0, MAX_SLUG_LENGTH] }
+    raise "All slug generators returned nil for #{self.inspect}" if potential_slugs.empty?
+    # include the last-resort slug, trimmed for length
+    last_resort_append = "#{self.class._slug_id_separator}#{id}"
+    potential_slugs << "#{potential_slugs.first[0, [ 1, MAX_SLUG_LENGTH - last_resort_append.length ].max]}#{last_resort_append}"[0, MAX_SLUG_LENGTH]
+    # subtract out blacklisted slugs
+    potential_slugs -= self.class._slug_blacklist
+    
+    # if one of these slugs is already in use, we don't need to change the slug
+    # instead, activate the one of highest prioirty and we're done
+    valid_slugs_in_use = potential_slugs & slugs_in_use
+    unless valid_slugs_in_use.empty?
       Slug.transaction do
-        # grab a list of all the slugs we can't use
-        scope = Slug.select(:slug).where(sluggable_type: self.class.to_s, slug: potential_slugs)
-        if self.class._slug_scope then
-          scope = scope.where(scope: self.class._slug_scope[self])
-        end
-        taken_slug_objects = scope.all
-
-        # subtract them out from all the potential slugs to make the available slugs
-        available_slugs = potential_slugs - taken_slug_objects.map(&:slug)
-        # no slugs available? nothing much else we can do
-        raise "Couldn't find a slug for #{self.inspect}; tried #{potential_slugs.join(', ')}" if available_slugs.empty?
-        
         slugs.update_all(active: false)
-        Slug.create!(sluggable: self,
-                     slug: available_slugs.first,
-                     active: true,
-                     scope: self.class._slug_scope.try(:call, self))
+        slugs.where(slug: valid_slugs_in_use.first).update_all(active: true)
       end
+      return
+    end
 
-      unmemoize_all
+    Slug.transaction do
+      # grab a list of all the slugs we can't use
+      scope = Slug.select(:slug).where(sluggable_type: self.class.to_s, slug: potential_slugs)
+      if self.class._slug_scope then
+        scope = scope.where(scope: self.class._slug_scope[self])
+      end
+      taken_slug_objects = scope.all
+
+      # subtract them out from all the potential slugs to make the available slugs
+      available_slugs = potential_slugs - taken_slug_objects.map(&:slug)
+      # no slugs available? nothing much else we can do
+      raise "Couldn't find a slug for #{self.inspect}; tried #{potential_slugs.join(', ')}" if available_slugs.empty?
+
+      slugs.update_all(active: false)
+      Slug.create!(sluggable: self,
+                   slug: available_slugs.first,
+                   active: true,
+                   scope: self.class._slug_scope.try(:call, self))
     end
+
+    @active_slug = nil
   end
 end

data/slugalicious.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{slugalicious}
-  s.version = "1.2.0"
+  s.name = "slugalicious"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Tim Morgan}]
-  s.date = %q{2011-08-31}
-  s.description = %q{Slugalicious adds simple and powerful slugging to your ActiveRecord models.}
-  s.email = %q{git@timothymorgan.info}
+  s.authors = ["Tim Morgan"]
+  s.date = "2012-03-02"
+  s.description = "Slugalicious adds simple and powerful slugging to your ActiveRecord models."
+  s.email = "git@timothymorgan.info"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.textile"
@@ -25,11 +25,11 @@ Gem::Specification.new do |s|
     "templates/create_slugs.rb",
     "templates/slug.rb"
   ]
-  s.homepage = %q{http://github.com/riscfuture/slugalicious}
-  s.require_paths = [%q{lib}]
+  s.homepage = "http://github.com/riscfuture/slugalicious"
+  s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = %q{1.8.9}
-  s.summary = %q{Easy-to-use and powerful slugging for Rails 3}
+  s.rubygems_version = "1.8.17"
+  s.summary = "Easy-to-use and powerful slugging for Rails 3"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/templates/create_slugs.rb

@@ -1,5 +1,5 @@
 class CreateSlugs < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :slugs do |t|
       t.belongs_to :sluggable, polymorphic: true, null: false
       t.boolean :active, null: false, default: true
@@ -13,8 +13,4 @@ class CreateSlugs < ActiveRecord::Migration
       t.index [ :sluggable_type, :scope, :slug ], unique: true, name: 'slugs_unique'
     end
   end
-
-  def self.down
-    drop_table :slugs
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slugalicious
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2169205560 !ruby/object:Gem::Requirement
+  requirement: &70280246265900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2169205560
+  version_requirements: *70280246265900
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &2169205060 !ruby/object:Gem::Requirement
+  requirement: &70280246265420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169205060
+  version_requirements: *70280246265420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2169195740 !ruby/object:Gem::Requirement
+  requirement: &70280246264940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169195740
+  version_requirements: *70280246264940
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2169195200 !ruby/object:Gem::Requirement
+  requirement: &70280246264460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169195200
+  version_requirements: *70280246264460
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2169194540 !ruby/object:Gem::Requirement
+  requirement: &70280246263980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169194540
+  version_requirements: *70280246263980
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2169193980 !ruby/object:Gem::Requirement
+  requirement: &70280246263500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169193980
+  version_requirements: *70280246263500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2169193380 !ruby/object:Gem::Requirement
+  requirement: &70280246263020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169193380
+  version_requirements: *70280246263020
 description: Slugalicious adds simple and powerful slugging to your ActiveRecord models.
 email: git@timothymorgan.info
 executables: []
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Easy-to-use and powerful slugging for Rails 3