slugalicious 1.2.1 → 2.0.0

data/README.textile

@@ -3,9 +3,17 @@ h1. Slugalicious -- Easy and powerful URL slugging for Rails 3
 _*(no monkey-patching required)*_
 
 | *Author* | Tim Morgan |
-| *Version* | 1.2.1 (Mar 2, 2012) |
+| *Version* | 2.0 (Jun 5, 2012) |
 | *License* | Released under the MIT license. |
 
+h3. Note about version 2.0
+
+Version 2.0 is so-versioned because it breaks the API for previous versions.
+Previously, where you would have used
+{Slugalicious::ClassMethods#find_from_slug find_from_slug}, you would now use
+{Slugalicious::ClassMethods#find_from_slug! find_from_slug!}. The old method now
+returns @nil@ when an object is not found, rather than raising an exception.
+
 h2. About
 
 Slugalicious is an easy-to-use slugging library that helps you generate pretty

data/lib/slugalicious.rb

@@ -26,18 +26,28 @@ module Slugalicious
 
   module ClassMethods
     
+    # Identical to {#find_from_slug}, but raises an exception if the object is
+    # not found.
+    #
+    # @raise [ActiveRecord::RecordNotFound] If no object with that slug is
+    #   found.
+    # @see #find_from_slug
+
+    def find_from_slug!(*args)
+      find_from_slug(*args) || raise(ActiveRecord::RecordNotFound)
+    end
+
     # Locates a record matching a given slug.
     #
     # @param [String] slug The slug to locate.
     # @param [String] scope The scope to search in (for use with scoped-unique
     #   slugs). This should be a string equal to the portion of the URL path
     #   preceding the slug.
-    # @return [ActiveRecord::Base] The object with that slug.
-    # @raise [ActiveRecord::RecordNotFound] If no object with that slug is
-    #   found.
+    # @return [ActiveRecord::Base, nil] The object with that slug, or `nil` if
+    #   not found.
 
     def find_from_slug(slug, scope=nil)
-      Slug.from_slug(self, scope, slug).first.try(:sluggable) || raise(ActiveRecord::RecordNotFound)
+      Slug.from_slug(self, scope, slug).first.try(:sluggable)
     end
 
     # Locates a record from a given path, that consists of a slug and its scope,

data/slugalicious.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "slugalicious"
-  s.version = "1.2.1"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = "2012-03-02"
+  s.date = "2012-06-06"
   s.description = "Slugalicious adds simple and powerful slugging to your ActiveRecord models."
   s.email = "git@timothymorgan.info"
   s.extra_rdoc_files = [
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/riscfuture/slugalicious"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "1.8.24"
   s.summary = "Easy-to-use and powerful slugging for Rails 3"
 
   if s.respond_to? :specification_version then

metadata

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