Cleaned up setting the :published attribute

dstrelau · dstrelau · commit cd979c325317 · 2008-06-27T00:06:46.000-04:00
* No more Article#is_published. Just use the built-in #published?
diff --git a/app/controllers/admin/articles.rb b/app/controllers/admin/articles.rb
@@ -18,14 +18,13 @@ def new
     
     def create(article)
       @article = Article.new(article)
-      @article.published = true if @article.published == "1"
       @article.user_id = self.current_user.id
       if @article.save
         # Expire the article index to reflect the newly published article
         expire_index if @article.published
         render_then_call(redirect(url(:admin_articles))) do
           # Call events after the redirect
-          Hooks::Events.after_publish_article_request(@article, request) if @article.is_published?
+          Hooks::Events.after_publish_article_request(@article, request) if @article.published?
           Hooks::Events.after_create_article_request(@article, request)
         end
       else
@@ -38,14 +37,13 @@ def edit
     end
     
     def update(article)
-      article["published"] = true if article["published"] == "1"
       if @article.update_attributes(article)
         # Expire the index and article to reflect the updated article
         expire_index
         expire_article(@article)
         render_then_call(redirect(url(:admin_article, @article))) do
           # Call events after the redirect
-          Hooks::Events.after_publish_article_request(@article, request) if @article.is_published?
+          Hooks::Events.after_publish_article_request(@article, request) if @article.published?
           Hooks::Events.after_update_article_request(@article, request)
         end
       else
diff --git a/app/models/article.rb b/app/models/article.rb
@@ -36,9 +36,9 @@ class Article
   # This sets the published date and permalink when an article is published
   def set_published_permalink
     # Check to see if we are publishing
-    if self.is_published?
+    if self.published?
       # Set the date, only if we haven't already
-      self.published_at = Time.now if self.published_at.nil?
+      self.published_at ||= Time.now
       
       # Set the permalink, only if we haven't already
       self.permalink = create_permalink
@@ -68,7 +68,7 @@ def fire_before_update_event
 
   def fire_before_save_event
     Hooks::Events.before_save_article(self)
-    Hooks::Events.before_publish_article(self) if self.is_published?
+    Hooks::Events.before_publish_article(self) if self.published?
   end
 
   def fire_after_create_event
@@ -81,12 +81,12 @@ def fire_after_update_event
 
   def fire_after_save_event
     Hooks::Events.after_save_article(self)
-    Hooks::Events.after_publish_article(self) if self.is_published?
+    Hooks::Events.after_publish_article(self) if self.published?
   end
 
-  def is_published?
+  def published=(binary_string)
     # We need this beacuse the values get populated from the params
-    self.published == "1" || self.published
+    attribute_set(:published, binary_string == "1")
   end
   
   def create_permalink
