cartoonist-comics 0.0.7 → 0.0.8

data/app/controllers/comic_admin_controller.rb

@@ -53,9 +53,7 @@ class ComicAdminController < CartoonistController
       return redirect_to "/comic_admin/new"
     end
 
-    last = Comic.current_created
-    comic_number = Comic.next_number last
-    comic = Comic.create :number => comic_number, :title => params[:title], :posted_at => Comic.next_post_date(last), :description => params[:description], :scene_description => params[:scene_description], :dialogue => params[:dialogue], :title_text => params[:title_text], :tweet => params[:tweet], :database_file => DatabaseFile.create(:content => params[:image].read), :locked => true
+    comic = Comic.create_comic params
     redirect_to "/comic_admin/#{comic.number}/edit"
   end
 
@@ -69,31 +67,18 @@ class ComicAdminController < CartoonistController
 
   def lock
     comic = Comic.from_number params[:id].to_i
-    comic.locked = true
-    comic.save!
+    comic.lock!
     redirect_to "/comic_admin/#{comic.number}/edit"
   end
 
   def unlock
     comic = Comic.from_number params[:id].to_i
-    comic.locked = false
-    comic.save!
+    comic.unlock!
     redirect_to "/comic_admin/#{comic.number}/edit"
   end
 
   def update
-    comic_number = params[:id].to_i
-    comic = Comic.from_number comic_number
-    raise "Cannot update locked comic!" if comic.locked
-    comic.title = params[:title]
-    comic.description = params[:description]
-    comic.scene_description = params[:scene_description]
-    comic.dialogue = params[:dialogue]
-    comic.title_text = params[:title_text]
-    comic.tweet = params[:tweet] unless comic.tweeted?
-    comic.locked = true
-    comic.database_file = DatabaseFile.create(:content => params[:image].read) if params[:image]
-    comic.save!
+    comic = Comic.update_comic params
     redirect_to "/comic_admin/#{comic.number}/edit"
   end
 

data/app/models/comic.rb

@@ -3,6 +3,16 @@ class Comic < ActiveRecord::Base
   belongs_to :database_file
   include Tweetable
 
+  def lock!
+    self.locked = true
+    save!
+  end
+
+  def unlock!
+    self.locked = false
+    save!
+  end
+
   def expected_tweet_time
     Time.local posted_at.year, posted_at.month, posted_at.day, 8, 0
   end
@@ -64,6 +74,26 @@ class Comic < ActiveRecord::Base
 
     VALID_DAYS = [MONDAY, WEDNESDAY, FRIDAY]
 
+    def create_comic(params)
+      last = current_created
+      create :number => next_number(last), :title => params[:title], :posted_at => next_post_date(last), :description => params[:description], :scene_description => params[:scene_description], :dialogue => params[:dialogue], :title_text => params[:title_text], :tweet => params[:tweet], :database_file => DatabaseFile.create(:content => params[:image].read), :locked => true
+    end
+
+    def update_comic(params)
+      comic = from_number params[:id].to_i
+      raise "Cannot update locked comic!" if comic.locked
+      comic.title = params[:title]
+      comic.description = params[:description]
+      comic.scene_description = params[:scene_description]
+      comic.dialogue = params[:dialogue]
+      comic.title_text = params[:title_text]
+      comic.tweet = params[:tweet] unless comic.tweeted?
+      comic.locked = true
+      comic.database_file = DatabaseFile.create(:content => params[:image].read) if params[:image]
+      comic.save!
+      comic
+    end
+
     def next_number(comic)
       if comic
         comic.number + 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist-comics
 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: &11099940 !ruby/object:Gem::Requirement
+  requirement: &19861160 !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: *11099940
+  version_requirements: *19861160
 description: This core plugin for Cartoonist adds comics.
 email: reasonnumber@gmail.com
 executables: []