vanities 0.1.1 → 0.1.2

data/README.rdoc

@@ -74,6 +74,17 @@ Finally, do:
 
 And you're all set!
 
+=== A word about routes...
+
+Vanities should be set as the absolute last route in your routes.rb file.  The reason
+is because Rails' routing system is set up to take the first route in the file (from the top)
+that matches, and stop there.  If a vanity URL that doesn't exist is higher in routing
+priority than, say, a user's show action, things are going to be a little funky.
+
+All you need to do is cut and paste the route installed for the vanities controller
+from wherever it is in your routes.rb file after installation, and move it to be the
+last route in your system.
+
 == Using vanities
 
 Every model that has a call to 'has_vanity' will have a vanity object associated with it.
@@ -89,4 +100,10 @@ console.  This would be as simple as:
   u.vanity = Vanity.new(:name => "leeroy")
 
 Finally, you can go to http://localhost:3000/leeroy to be automatically redirected
-to the user's 'show' action.
+to the user's 'show' action.
+
+== Changelog
+
+20 March 2011: Slight refactor to make the vanities controller render a 404 if it can't
+find a vanity object.  Small documentation update about routes (make sure vanities is
+the LAST route in your routes.rb file).

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('vanities', '0.1.1') do |x|
+Echoe.new('vanities', '0.1.2') do |x|
   x.description               = "Give each of your models a simple 'vanity' URL.  
                                 Makes example.com/users/1 into something like example.com/foobar"
   x.url                       = "https://github.com/jaustinhughey/vanities"

data/lib/generators/vanities/templates/vanities_controller.rb

@@ -1,8 +1,18 @@
 class VanitiesController < ApplicationController
+
   def show
-    v = Vanity.find_by_name params[:vname]
-    redirect_to v.vain
     # Note that in this case, any model using the vanities system
     # MUST be set up via REST.
+
+    if(v = Vanity.find_by_name(params[:vname]))
+      redirect_to v.vain
+    else
+      # If the vanity name can't be found, render a 404
+      respond_to do |f|
+        f.html { render :status => :not_found, :file => File.join(Rails.root, "public", "404.html") }
+        f.xml  { head :not_found }
+        f.any  { head :not_found }
+      end
+    end    
   end
 end

data/vanities.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vanities}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["J. Austin Hughey"]
-  s.date = %q{2010-11-07}
+  s.date = %q{2011-03-20}
   s.description = %q{Give each of your models a simple 'vanity' URL.  
                                 Makes example.com/users/1 into something like example.com/foobar}
   s.email = %q{jaustinhughey@gmail.com}
@@ -16,11 +16,10 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Vanities", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{vanities}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Give each of your models a simple 'vanity' URL.   Makes example.com/users/1 into something like example.com/foobar}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: vanities
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors: 
 - J. Austin Hughey
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 01:00:00 -06:00
+date: 2011-03-20 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -65,24 +60,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
       version: "1.2"
 requirements: []
 
 rubyforge_project: vanities
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Give each of your models a simple 'vanity' URL.   Makes example.com/users/1 into something like example.com/foobar