From 701d3c12ad323d5d0eab71599eb9dc3c20f8a2ef Mon Sep 17 00:00:00 2001
From: Dan Barber <danbee@gmail.com>
Date: Sat, 18 Aug 2012 08:44:01 +0100
Subject: [PATCH] Fixed final test. Added .gitignore file.

---
 .gitignore                                   |  18 ++++++++++++++++++
 lib/slugtastic/model_additions.rb            |   3 +--
 spec/slugtastic/.model_additions_spec.rb.swp | Bin 12288 -> 0 bytes
 spec/slugtastic/model_additions_spec.rb      |   1 +
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 spec/slugtastic/.model_additions_spec.rb.swp

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fd463ac
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+*.swp
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
diff --git a/lib/slugtastic/model_additions.rb b/lib/slugtastic/model_additions.rb
index 2585198..f5956fa 100644
--- a/lib/slugtastic/model_additions.rb
+++ b/lib/slugtastic/model_additions.rb
@@ -3,8 +3,7 @@ module Slugtastic
 
     def has_slug name, options = { :from => :title }
       before_validation do |record|
-        return if responds_to?(name) and send(name).present?
-        send("#{name}=", Slugtastic.generate_slug(send(options[:from])))
+        send("#{name}=", Slugtastic.generate_slug(send(options[:from]))) if send(name).nil? or send(name).blank?
       end
     end
 
diff --git a/spec/slugtastic/.model_additions_spec.rb.swp b/spec/slugtastic/.model_additions_spec.rb.swp
deleted file mode 100644
index 9938153a7bde10fea940e818a39473bf8799bb51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2y>1gh5P;Y80R#mF&E!%T1i1^O0Idj;;{s7cLNd5L?cI*;h4tO#b}u9i4}ioQ
zBn6^K!vpXdR8aB+NIU_|-r12wVWoyy={x`I+|2BEojuvk`1t`migyLA>q4A=h+ljj
zS3*WYXjNp0VPpMz-4qp?*s5ZE+`BGeGAuPFb(5VWQ=GfR*=FjM^CnMAs}omYzVcl%
zr)Zlht&KNj;nJ`l*V+0~yvqjIz^Z}9PqrU#h~0+|cDABTxOwB%>Mp-$18jf|umLu}
z2G{@_U;}L6KQQ2{p7>4Yyh7X}dJE`<7aL#$Y=8~00XDz}*Z><~18jf|umLvkj~Gx|
zi0us_&WP~;fA|gH=QSa|6W@q0#Cu{wJR^q0K5?7)bybK@#2Il)DB>Q`BLwk-a(*Sw
ziH}66aZ2!F18jf|umLu}2G{@_U;}J`4X}Z~3}B%JKz9Xb2chFIEgidA*;oyD2$4#i
znO7E5Z@k5b;x8iA5w3h}_hApB0TlQa7U3%am(EN{4#H4&oY$y4Zr+iL+)qRDQQHo@
zY}>g@`HhE2m*|SVhZ?6?U`=;{pCN>jU?w3%SxTl)0FRCHE&^Q&x_5c@OV_)EpU}^;
z3kRxeVp5m$wx!NXD6i4wwaE}h7X#{2wv7yy!{}|7U5_(Gqv_!|GF<ONNGPE*6Ap6h
zDQ-=wAgai1qY(zVH%Hi3l5(u9(W)JNmvX4A%~bxziQFpZy2k)dVANDtFK*aZj%N02
eJZwyj&=2GC=?pCe^u-nl%}Z^Hsf2bQSo{Gr=n8@W

diff --git a/spec/slugtastic/model_additions_spec.rb b/spec/slugtastic/model_additions_spec.rb
index 555bf4c..758ad59 100644
--- a/spec/slugtastic/model_additions_spec.rb
+++ b/spec/slugtastic/model_additions_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 class Model < SuperModel::Base
   include ActiveModel::Validations::Callbacks
   extend Slugtastic::ModelAdditions
+  attr_accessor :slug, :title
   has_slug :slug, from: :title
 end