don't override a slug if it was submitted

coreypurcell · coreypurcell · commit 4bfa4e6d95d4 · 2011-11-01T22:01:06.000-04:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -46,8 +46,8 @@ GEM
       multi_json (~> 1.0)
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
-    bson (1.4.1)
-    bson_ext (1.4.1)
+    bson (1.3.1)
+    bson_ext (1.3.1)
     builder (3.0.0)
     cancan (1.6.7)
     capybara (1.1.1)
@@ -67,10 +67,10 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.1.2)
-    cucumber (1.1.0)
+    cucumber (1.1.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.5.0)
+      gherkin (~> 2.6.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     cucumber-rails (1.1.1)
@@ -90,7 +90,7 @@ GEM
     faker (1.0.1)
       i18n (~> 0.4)
     ffi (1.0.9)
-    gherkin (2.5.4)
+    gherkin (2.6.1)
       json (>= 1.4.6)
     haml (3.1.3)
     haml-rails (0.3.4)
@@ -117,16 +117,16 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    method_source (0.6.6)
-      ruby_parser (~> 2.0.5)
-    mime-types (1.16)
+    method_source (0.6.7)
+      ruby_parser (>= 2.3.1)
+    mime-types (1.17.2)
     mm-devise (1.3)
       devise (>= 1.2)
       mongo_mapper (>= 0.9.0)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
-    mongo (1.4.1)
-      bson (= 1.4.1)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
     mongo_mapper (0.9.2)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
@@ -138,10 +138,10 @@ GEM
     plucky (0.3.8)
       mongo (~> 1.3)
     polyglot (0.3.2)
-    pry (0.9.6.2)
+    pry (0.9.7.3)
       coderay (~> 0.9.8)
-      method_source (~> 0.6.5)
-      ruby_parser (~> 2.0.5)
+      method_source (~> 0.6.7)
+      ruby_parser (>= 2.3.1)
       slop (~> 2.1.0)
     rack (1.3.5)
     rack-cache (1.0.3)
@@ -168,7 +168,7 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     raindrops (0.8.0)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rdiscount (1.6.8)
     rdoc (3.11)
       json (~> 1.4)
@@ -186,7 +186,7 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.7.0)
-    ruby_parser (2.0.6)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
     rubyzip (0.9.4)
     sass (3.1.10)
@@ -196,7 +196,7 @@ GEM
       sass (>= 3.1.4)
       sprockets (~> 2.0.0)
       tilt (~> 1.3.2)
-    selenium-webdriver (2.9.1)
+    selenium-webdriver (2.10.0)
       childprocess (>= 0.2.1)
       ffi (= 1.0.9)
       json_pure
diff --git a/app/models/program.rb b/app/models/program.rb
@@ -11,7 +11,7 @@ class Program
   before_create :make_slug
 
   def make_slug
-    unless slug
+    if slug.blank?
       all_slugs = Program.where(:author_username => author_username).map(&:slug)
       self.slug = Sluggifier.generate(title)
     end
