cartoonist-blog 0.0.7 → 0.0.8

data/app/controllers/blog_admin_controller.rb

@@ -37,8 +37,7 @@ class BlogAdminController < CartoonistController
   end
 
   def create
-    url_title = BlogPost.url_titlize params[:title]
-    post = BlogPost.create :title => params[:title], :url_title => url_title, :content => params[:content], :author => current_user.name, :tweet => tweet_message(url_title), :locked => true
+    post = BlogPost.create_post current_user, params
     redirect_to "/blog_admin/#{post.id}/edit"
   end
 
@@ -49,54 +48,19 @@ class BlogAdminController < CartoonistController
   end
 
   def update
-    post = BlogPost.find params[:id].to_i
-    raise "Cannot update locked post!" if post.locked
-    original_tweet = post.tweet
-    original_url_title = post.url_title
-    post.title = params[:title]
-    post.url_title = BlogPost.url_titlize params[:title]
-    post.author = params[:author]
-    post.tweet = params[:tweet]
-    post.content = params[:content]
-    post.locked = true
-
-    if original_tweet == post.tweet && original_url_title != post.url_title && !post.tweeted?
-      post.tweet = tweet_message post.url_title
-    end
-
-    if params[:posted] && params[:posted_at_date].present?
-      time = "#{params[:posted_at_date]} #{params[:posted_at_hour]}:#{params[:posted_at_minute]} #{params[:posted_at_meridiem]}"
-      time = DateTime.parse time
-      time = Time.local time.year, time.month, time.day, time.hour, time.min
-      post.posted_at = time
-    elsif params[:posted]
-      post.posted_at = 1.hour.from_now
-    else
-      post.posted_at = nil
-    end
-
-    post.save!
+    post = BlogPost.update_post params
     redirect_to "/blog_admin/#{post.id}/edit"
   end
 
   def lock
     post = BlogPost.find params[:id].to_i
-    post.locked = true
-    post.save!
+    post.lock!
     redirect_to "/blog_admin/#{post.id}/edit"
   end
 
   def unlock
     post = BlogPost.find params[:id].to_i
-    post.locked = false
-    post.save!
+    post.unlock!
     redirect_to "/blog_admin/#{post.id}/edit"
   end
-
-  private
-  def tweet_message(url_title)
-    tweet = "New blog post: http://#{Setting[:domain]}/blog/#{url_title}"
-    tweet = "New blog post: http://#{Setting[:domain]}/blog" if tweet.length > 140
-    tweet
-  end
 end

data/app/helpers/blog_admin_helper.rb

@@ -13,6 +13,12 @@ module BlogAdminHelper
     end
   end
 
+  def post_lock_disabled
+    if @post.locked || @post.posted?
+      'disabled="disabled"'.html_safe
+    end
+  end
+
   def format_posted_at(fmt)
     if @post && @post.posted_at
       @post.posted_at.localtime.strftime fmt

data/app/models/blog_post.rb

@@ -3,6 +3,20 @@ class BlogPost < ActiveRecord::Base
   attr_accessor :for_preview
   attr_accessible :title, :url_title, :author, :posted_at, :content, :tweet, :tweeted_at, :locked
 
+  def lock!
+    self.locked = true
+    save!
+  end
+
+  def unlock!
+    self.locked = false
+    save!
+  end
+
+  def posted?
+    posted_at && posted_at <= Time.now
+  end
+
   def expected_tweet_time
     posted_at
   end
@@ -95,6 +109,46 @@ class BlogPost < ActiveRecord::Base
   end
 
   class << self
+    def create_post(current_user, params)
+      url_title = url_titlize params[:title]
+      create :title => params[:title], :url_title => url_title, :content => params[:content], :author => current_user.name, :tweet => tweet_message(url_title), :locked => true
+    end
+
+    def update_post(params)
+      post = find params[:id].to_i
+      raise "Cannot update locked post!" if post.locked
+      original_tweet = post.tweet
+      original_url_title = post.url_title
+      post.title = params[:title]
+      post.url_title = url_titlize params[:title]
+      post.author = params[:author]
+      post.tweet = params[:tweet]
+      post.content = params[:content]
+      post.locked = true
+
+      if original_tweet == post.tweet && original_url_title != post.url_title && !post.tweeted?
+        post.tweet = tweet_message post.url_title
+      end
+
+      if params[:post_now].present? && !post.posted?
+        post.posted_at = Time.now
+      elsif params[:post_in_hour].present? && !post.posted?
+        post.posted_at = 1.hour.from_now
+      elsif params[:posted] && params[:posted_at_date].present?
+        time = "#{params[:posted_at_date]} #{params[:posted_at_hour]}:#{params[:posted_at_minute]} #{params[:posted_at_meridiem]}"
+        time = DateTime.parse time
+        time = Time.local time.year, time.month, time.day, time.hour, time.min
+        post.posted_at = time
+      elsif params[:posted]
+        post.posted_at = 1.hour.from_now
+      else
+        post.posted_at = nil
+      end
+
+      post.save!
+      post
+    end
+
     def url_titlize(title)
       title.downcase.gsub(" ", "-").gsub(/[^-_a-z0-9]/, "")
     end
@@ -184,5 +238,12 @@ class BlogPost < ActiveRecord::Base
     def sitemap
       posted.reversed.all
     end
+
+    private
+    def tweet_message(url_title)
+      tweet = "New blog post: http://#{Setting[:domain]}/blog/#{url_title}"
+      tweet = "New blog post: http://#{Setting[:domain]}/blog" if tweet.length > 140
+      tweet
+    end
   end
 end

data/app/views/blog_admin/edit.html.erb

@@ -26,6 +26,8 @@
       <option value="am" <%= selected "am", format_posted_at("%P") %>>am</option>
       <option value="pm" <%= selected "pm", format_posted_at("%P") %>>pm</option>
     </select>
+    <input type="submit" name="post_now" value="Post Now" <%= post_lock_disabled %> />
+    <input type="submit" name="post_in_hour" value="Post in an Hour" <%= post_lock_disabled %> />
   </p>
 
   <p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist-blog
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cartoonist
-  requirement: &15495680 !ruby/object:Gem::Requirement
+  requirement: &14804380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *15495680
+  version_requirements: *14804380
 description: This core plugin for Cartoonist adds a simple blog.
 email: reasonnumber@gmail.com
 executables: []