cartoonist-blog 0.0.16 → 0.0.17

data/app/controllers/blog_controller.rb

@@ -36,25 +36,16 @@ class BlogController < CartoonistController
       format.html { redirect_to "/blog/feed" }
 
       format.rss do
-        @feed = feed_content
-        render :content_type => "application/xml", :layout => "cartoonist"
+        @feed = BlogFeed.new BlogPost.feed
+
+        cache_page_as "blog/feed.#{cache_type}.tmp.rss" do
+          render :content_type => "application/xml", :layout => "cartoonist"
+        end
       end
     end
   end
 
   private
-  def feed_content
-    result = blog_cache.read "blog-feed"
-    return result if result
-    result = BlogFeed.new BlogPost.feed
-    blog_cache.write "blog-feed", result
-    result
-  end
-
-  def blog_cache
-    @@blog_cache ||= ActiveSupport::Cache::MemoryStore.new(:expires_in => 2.hours)
-  end
-
   def show_page_cache_path
     if @disabled_next
       "blog/#{@post.url_title}.#{cache_type}.tmp.html"

data/app/helpers/admin/blog_helper.rb

@@ -1,20 +1,10 @@
 module Admin::BlogHelper
-  def lock_toggle_target
-    if @post.locked
-      "unlock"
-    else
-      "lock"
-    end
-  end
-
   def lock_disabled
-    if @post.locked
-      'disabled="disabled"'.html_safe
-    end
+    @post.lock_disabled_html
   end
 
   def post_lock_disabled
-    if @post.locked || @post.posted?
+    if @post.locked? || @post.posted?
       'disabled="disabled"'.html_safe
     end
   end

data/app/models/blog_post.rb

@@ -1,6 +1,7 @@
 class BlogPost < ActiveRecord::Base
   include Postable
   include Entity
+  include Lockable
   entity_type :blog
   entity_global_url "/blog"
   entity_url &:url
@@ -28,16 +29,6 @@ class BlogPost < ActiveRecord::Base
     "/admin/blog/#{id}/edit"
   end
 
-  def lock!
-    self.locked = true
-    save!
-  end
-
-  def unlock!
-    self.locked = false
-    save!
-  end
-
   def first_post
     return @first_post if @first_post_retrieved
     @first_post_retrieved = true
@@ -125,29 +116,14 @@ class BlogPost < ActiveRecord::Base
 
     def update_post(params)
       post = find params[:id].to_i
-      raise "Cannot update locked post!" if post.locked
+      post.ensure_unlocked!
       original_url_title = post.url_title
       post.title = params[:title]
       post.url_title = url_titlize params[:title]
       post.author = params[:author]
       post.content = params[:content]
       post.locked = true
-
-      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.post_from params
       post.save!
       post
     end

data/app/views/admin/blog/edit.html.erb

@@ -1,5 +1,5 @@
 <% Cartoonist::Entity.hooks_with(:edit_entity_before_partial).each do |hook| %>
-  <%= render :partial => hook.edit_entity_before_partial, :locals => { :entity => @post } %>
+  <%= partial hook.edit_entity_before_partial, :entity => @post %>
   <hr />
 <% end %>
 
@@ -8,31 +8,14 @@
 </p>
 
 <p>
-  <%= form_tag "/admin/blog/#{@post.id}/#{lock_toggle_target}", :method => :post do %>
-    <input type="submit" value="<%= lock_toggle_target %>" />
+  <%= form_tag "/admin/blog/#{@post.id}/#{@post.toggle_lock_target}", :method => :post do %>
+    <input type="submit" value="<%= @post.toggle_lock_target %>" />
   <% end %>
 </p>
 
 <%= form_tag "/admin/blog/#{@post.id}", :method => :put do %>
   <p>
-    <label><input type="checkbox" name="posted" value="true" <%= checked="checked".html_safe if @post.posted_at %> <%= lock_disabled %> />Posted at</label>
-    <input type="text" name="posted_at_date" value="<%= format_posted_at "%Y-%m-%d" %>" <%= lock_disabled %> />
-    <select name="posted_at_hour" <%= lock_disabled %>>
-      <% 1.upto 12 do |h| %>
-        <option value="<%= h %>" <%= selected h, format_posted_at("%-l").to_i %>><%= h %></option>
-      <% end %>
-    </select>
-    <select name="posted_at_minute" <%= lock_disabled %>>
-      <% 0.upto 60 do |m| %>
-        <option value="<%= m %>" <%= selected m, format_posted_at("%-M").to_i %>><%= m %></option>
-      <% end %>
-    </select>
-    <select name="posted_at_meridiem" <%= lock_disabled %>>
-      <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 %> />
+    <%= partial "shared/post_date_time", :postable => @post %>
   </p>
 
   <p>
@@ -72,5 +55,5 @@
 
 <% Cartoonist::Entity.hooks_with(:edit_entity_after_partial).each do |hook| %>
   <hr />
-  <%= render :partial => hook.edit_entity_after_partial, :locals => { :entity => @post } %>
+  <%= partial hook.edit_entity_after_partial, :entity => @post %>
 <% end %>

data/app/views/layouts/blog.html.erb

@@ -13,7 +13,7 @@
 
 <% content_for :content do %>
   <% Cartoonist::Entity.hooks_with(:show_entity_before_partial).each do |hook| %>
-    <%= render :partial => hook.show_entity_before_partial, :locals => { :entity => @post } %>
+    <%= partial hook.show_entity_before_partial, :entity => @post %>
     <hr />
   <% end %>
 
@@ -62,7 +62,7 @@
   </div>
 
   <% Cartoonist::Entity.hooks_with(:show_entity_after_partial).each do |hook| %>
-    <%= render :partial => hook.show_entity_after_partial, :locals => { :entity => @post } %>
+    <%= partial hook.show_entity_after_partial, :entity => @post %>
     <hr />
   <% end %>
 <% end %>

data/lib/cartoonist-blog/version.rb

@@ -2,7 +2,7 @@ module CartoonistBlog
   class Version
     class << self
       def to_s
-        "0.0.16"
+        "0.0.17"
       end
     end
   end

metadata

@@ -1,59 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cartoonist-blog
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.17
   prerelease: 
-  version: 0.0.16
 platform: ruby
-authors: 
+authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jquery-rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jquery-ui-rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cartoonist
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.0.16
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: cartoonist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.17
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.17
 description: This core plugin for Cartoonist adds a simple blog.
 email: reasonnumber@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/assets/javascripts/admin/blog.js.coffee
 - app/assets/stylesheets/admin/blog.css.scss
 - app/controllers/admin/blog_controller.rb
@@ -79,30 +90,26 @@ files:
 - lib/cartoonist-blog/version.rb
 homepage: http://reasonnumber.com/cartoonist
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cartoonist Blog
 test_files: []
-