cartoonist-blog 0.0.8 → 0.0.9

data/app/controllers/{blog_admin_controller.rb → admin/blog_controller.rb}

@@ -1,4 +1,4 @@
-class BlogAdminController < CartoonistController
+class Admin::BlogController < CartoonistController
   helper :blog
   before_filter :preview!, :only => [:preview]
   before_filter :ensure_ssl!
@@ -9,7 +9,7 @@ class BlogAdminController < CartoonistController
       begin
         @post = BlogPost.preview_from_url_title params[:id]
       rescue
-        redirect_to "/blog_admin/preview"
+        redirect_to "/admin/blog/preview"
       end
 
       if @post.posted_at
@@ -33,34 +33,34 @@ class BlogAdminController < CartoonistController
 
   def index
     @unposted = BlogPost.unposted.chronological
-    @posted = BlogPost.posted.reversed
+    @posted = BlogPost.posted.reverse_chronological
   end
 
   def create
     post = BlogPost.create_post current_user, params
-    redirect_to "/blog_admin/#{post.id}/edit"
+    redirect_to "/admin/blog/#{post.id}/edit"
   end
 
   def edit
     @post = BlogPost.find params[:id].to_i
   rescue ActiveRecord::RecordNotFound
-    redirect_to "/blog_admin/new"
+    redirect_to "/admin/blog/new"
   end
 
   def update
     post = BlogPost.update_post params
-    redirect_to "/blog_admin/#{post.id}/edit"
+    redirect_to "/admin/blog/#{post.id}/edit"
   end
 
   def lock
     post = BlogPost.find params[:id].to_i
     post.lock!
-    redirect_to "/blog_admin/#{post.id}/edit"
+    redirect_to "/admin/blog/#{post.id}/edit"
   end
 
   def unlock
     post = BlogPost.find params[:id].to_i
     post.unlock!
-    redirect_to "/blog_admin/#{post.id}/edit"
+    redirect_to "/admin/blog/#{post.id}/edit"
   end
 end

data/app/helpers/{blog_admin_helper.rb → admin/blog_helper.rb}

@@ -1,4 +1,4 @@
-module BlogAdminHelper
+module Admin::BlogHelper
   def lock_toggle_target
     if @post.locked
       "unlock"

data/app/helpers/blog_helper.rb

@@ -1,7 +1,7 @@
 module BlogHelper
   def blog_current_url
     if preview?
-      "/blog_admin/preview"
+      "/admin/blog/preview"
     else
       "/blog"
     end
@@ -9,7 +9,7 @@ module BlogHelper
 
   def blog_post_url(url_title)
     if preview?
-      "/blog_admin/#{url_title}/preview"
+      "/admin/blog/#{url_title}/preview"
     else
       "/blog/#{url_title}"
     end

data/app/models/blog_post.rb

@@ -1,7 +1,21 @@
 class BlogPost < ActiveRecord::Base
-  include Tweetable
+  include Postable
+  include Entity
+  entity_type :blog
+  entity_global_url "/blog"
+  entity_url &:url
+  entity_edit_url &:edit_url
+  entity_description &:title
   attr_accessor :for_preview
-  attr_accessible :title, :url_title, :author, :posted_at, :content, :tweet, :tweeted_at, :locked
+  attr_accessible :title, :url_title, :author, :posted_at, :content, :locked
+
+  def url
+    "/blog/#{url_title}"
+  end
+
+  def edit_url
+    "/admin/blog/#{id}/edit"
+  end
 
   def lock!
     self.locked = true
@@ -13,22 +27,6 @@ class BlogPost < ActiveRecord::Base
     save!
   end
 
-  def posted?
-    posted_at && posted_at <= Time.now
-  end
-
-  def expected_tweet_time
-    posted_at
-  end
-
-  def formatted_posted_at(default_msg = "not yet posted")
-    if posted_at
-      posted_at.localtime.strftime "%-m/%-d/%Y at %-l:%M %P"
-    else
-      default_msg
-    end
-  end
-
   def first_post
     return @first_post if @first_post_retrieved
     @first_post_retrieved = true
@@ -104,32 +102,22 @@ class BlogPost < ActiveRecord::Base
     url_title
   end
 
-  def absolute_url
-    "http://#{Setting[:domain]}/blog/#{url_title}"
-  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
+      create :title => params[:title], :url_title => url_title, :content => params[:content], :author => current_user.name, :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?
@@ -154,45 +142,29 @@ class BlogPost < ActiveRecord::Base
     end
 
     def newest_preview_post
-      reversed.first || new(:title => "No Posts Yet", :content => "There are no blog posts yet.")
+      reverse_chronological.first || new(:title => "No Posts Yet", :content => "There are no blog posts yet.")
     end
 
     def newest_post
-      posted.reversed.first || new(:title => "No Posts Yet", :content => "There are no blog posts yet.")
+      posted.reverse_chronological.first || new(:title => "No Posts Yet", :content => "There are no blog posts yet.")
     end
 
     def first_post
       posted.chronological.first || new(:title => "No Posts Yet", :content => "There are no blog posts yet.")
     end
 
-    def posted
-      where "blog_posts.posted_at IS NOT NULL AND blog_posts.posted_at <= ?", Time.now
-    end
-
-    def unposted
-      where "blog_posts.posted_at IS NULL OR blog_posts.posted_at > ?", Time.now
-    end
-
-    def chronological
-      order "blog_posts.posted_at ASC"
-    end
-
-    def reversed
-      order "blog_posts.posted_at DESC"
-    end
-
     def all_columns
       select "blog_posts.*"
     end
 
     def current
-      post = posted.reversed.first
+      post = posted.reverse_chronological.first
       post = new :title => "No Posts Yet", :content => "There are no blog posts yet." unless post
       post
     end
 
     def preview_current
-      post = reversed.first
+      post = reverse_chronological.first
       post = new :title => "No Posts Yet", :content => "There are no blog posts yet." unless post
       post.for_preview = true
       post
@@ -201,7 +173,7 @@ class BlogPost < ActiveRecord::Base
     def previous_post(post)
       context = BlogPost
       context = posted unless post.for_preview
-      context.where("blog_posts.posted_at < ?", post.posted_at).reversed.first
+      context.where("blog_posts.posted_at < ?", post.posted_at).reverse_chronological.first
     end
 
     def next_post(post)
@@ -224,26 +196,15 @@ class BlogPost < ActiveRecord::Base
     end
 
     def archives
-      posted.reversed.select([:url_title, :title, :posted_at]).all
-    end
-
-    def untweeted
-      posted.where(:tweeted_at => nil).all
+      posted.reverse_chronological.select([:url_title, :title, :posted_at]).all
     end
 
     def feed
-      posted.reversed.take 10
+      posted.reverse_chronological.take 10
     end
 
     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
+      posted.reverse_chronological.all
     end
   end
 end

data/app/views/{blog_admin → admin/blog}/edit.html.erb

@@ -1,14 +1,19 @@
+<% Cartoonist::Entity.hooks_with(:edit_entity_before_partial).each do |hook| %>
+  <%= render :partial => hook.edit_entity_before_partial, :locals => { :entity => @post } %>
+  <hr />
+<% end %>
+
 <p>
-  <a href="/blog_admin/<%= @post.url_title %>/preview">Preview this post</a>
+  <a href="/admin/blog/<%= @post.url_title %>/preview">Preview this post</a>
 </p>
 
 <p>
-  <%= form_tag "/blog_admin/#{@post.id}/#{lock_toggle_target}", :method => :post do %>
+  <%= form_tag "/admin/blog/#{@post.id}/#{lock_toggle_target}", :method => :post do %>
     <input type="submit" value="<%= lock_toggle_target %>" />
   <% end %>
 </p>
 
-<%= form_tag "/blog_admin/#{@post.id}", :method => :put do %>
+<%= 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 %> />
@@ -44,15 +49,6 @@
     <input type="text" name="author" size="20" value="<%= @post.author %>" <%= lock_disabled %> />
   </p>
 
-  <p>
-    Tweet:
-    <% if @post.tweeted_at %>
-      <em>(sent <%= @post.tweeted_at.strftime "%-m/%-d/%Y %-l:%M %P" %>)</em>
-    <% end %>
-    <br />
-    <textarea name="tweet" rows="2" cols="100" tabindex="5" <%= lock_disabled %>><%= @post.tweet %></textarea>
-  </p>
-
   <p>
     <input type="submit" value="Save" <%= lock_disabled %> />
     <input type="button" value="Preview" class="preview-content" />
@@ -83,7 +79,7 @@
     $(".preview-content").click(function() {
       var $this = $(this).attr("disabled", "disabled");
       $.ajax({
-        url: "/blog_admin/preview_content",
+        url: "/admin/blog/preview_content",
         type: "post",
         data: {
           authenticity_token: $("form input[name='authenticity_token']").val(),
@@ -103,3 +99,8 @@
     });
   });
 <% end %>
+
+<% Cartoonist::Entity.hooks_with(:edit_entity_after_partial).each do |hook| %>
+  <hr />
+  <%= render :partial => hook.edit_entity_after_partial, :locals => { :entity => @post } %>
+<% end %>

data/app/views/{blog_admin → admin/blog}/index.html.erb

@@ -4,8 +4,8 @@
   <% @unposted.each do |post| %>
     <li>
       <%= post.formatted_posted_at "" %>
-      <a href="/blog_admin/<%= post.id %>/edit"><%= post.title %></a>
-      (<a href="/blog_admin/<%= post.url_title %>/preview"><%= t "admin.blog.index.preview" %></a>)
+      <a href="/admin/blog/<%= post.id %>/edit"><%= post.title %></a>
+      (<a href="/admin/blog/<%= post.url_title %>/preview"><%= t "admin.blog.index.preview" %></a>)
     </li>
   <% end %>
 </ul>
@@ -16,8 +16,8 @@
   <% @posted.each do |post| %>
     <li>
       <%= post.formatted_posted_at "" %>
-      <a href="/blog_admin/<%= post.id %>/edit"><%= post.title %></a>
-      (<a href="/blog_admin/<%= post.url_title %>/preview"><%= t "admin.blog.index.preview" %></a>)
+      <a href="/admin/blog/<%= post.id %>/edit"><%= post.title %></a>
+      (<a href="/admin/blog/<%= post.url_title %>/preview"><%= t "admin.blog.index.preview" %></a>)
     </li>
   <% end %>
 </ul>

data/app/views/{blog_admin → admin/blog}/new.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag "/blog_admin", :method => :post do %>
+<%= form_tag "/admin/blog", :method => :post do %>
   <p>
     Title: <input type="text" name="title" autofocus="autofocus" size="100" /><br />
   </p>
@@ -25,7 +25,7 @@
     $(".preview-content").click(function() {
       var $this = $(this).attr("disabled", "disabled");
       $.ajax({
-        url: "/blog_admin/preview_content",
+        url: "/admin/blog/preview_content",
         type: "post",
         data: {
           authenticity_token: $("form input[name='authenticity_token']").val(),

data/app/views/layouts/{blog_admin.html.erb → admin/blog.html.erb}

@@ -1,8 +1,8 @@
 <% content_for :subtabs do %>
   <a class="subtab" href="/blog"><%= t "admin.blog.layout.latest" %></a>
-  <a class="subtab" href="/blog_admin"><%= t "admin.blog.layout.list" %></a>
-  <a class="subtab" href="/blog_admin/new"><%= t "admin.blog.layout.new" %></a>
-  <a class="subtab" href="/blog_admin/preview"><%= t "admin.blog.layout.preview" %></a>
+  <a class="subtab" href="/admin/blog"><%= t "admin.blog.layout.list" %></a>
+  <a class="subtab" href="/admin/blog/new"><%= t "admin.blog.layout.new" %></a>
+  <a class="subtab" href="/admin/blog/preview"><%= t "admin.blog.layout.preview" %></a>
 <% end %>
 
 <% content_for :page_title, t("admin.blog.layout.section") %>

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

@@ -4,9 +4,9 @@
 
 <% content_for :small_buttons do %>
   <% if @post.real? %>
-    <a class="facebook" href="https://www.facebook.com/sharer.php?u=<%= u @post.absolute_url %>&t=<%= u t("blog.layout.facebook_text_message", :title => @post.title) %>" title="<%= t "blog.layout.facebook_title" %>"><%= t "blog.layout.facebook" %></a>
-    <a class="twitter" href="https://twitter.com/intent/tweet?source=<%= u Setting[:domain] %>&text=<%= u t("blog.layout.twitter_text_message", :url => @post.absolute_url) %>" title="<%= t "blog.layout.twitter_title" %>"><%= t "blog.layout.twitter" %></a>
-    <a class="google-plus" href="https://plus.google.com/share?url=<%= u @post.absolute_url %>" title="<%= t "blog.layout.google_plus_title" %>"><%= t "blog.layout.google_plus" %></a>
+    <a class="facebook" href="https://www.facebook.com/sharer.php?u=<%= u @post.entity_absolute_url %>&t=<%= u t("blog.layout.facebook_text_message", :title => @post.title) %>" title="<%= t "blog.layout.facebook_title" %>"><%= t "blog.layout.facebook" %></a>
+    <a class="twitter" href="https://twitter.com/intent/tweet?source=<%= u Setting[:domain] %>&text=<%= u t("blog.layout.twitter_text_message", :url => @post.entity_absolute_url) %>" title="<%= t "blog.layout.twitter_title" %>"><%= t "blog.layout.twitter" %></a>
+    <a class="google-plus" href="https://plus.google.com/share?url=<%= u @post.entity_absolute_url %>" title="<%= t "blog.layout.google_plus_title" %>"><%= t "blog.layout.google_plus" %></a>
     <a class="rss" href="<%= rss_path %>" title="<%= rss_title %>"><%= t "blog.layout.rss" %></a>
   <% end %>
 <% end %>

data/config/locales/en.yml

@@ -15,6 +15,8 @@ en:
       tab:
         blog: Blog
   cartoonist:
+    entity:
+      blog: Blog Post
     layout:
       navigation:
         blog: Blog

data/db/migrate/20120308064117_create_blog_posts.rb

@@ -6,8 +6,6 @@ class CreateBlogPosts < ActiveRecord::Migration
       t.string :author, :null => false
       t.datetime :posted_at
       t.text :content, :null => false
-      t.string :tweet, :null => false, :length => 140
-      t.datetime :tweeted_at
       t.boolean :locked, :null => false, :default => false
       t.timestamps
     end

data/lib/cartoonist-blog/engine.rb

@@ -1,8 +1,9 @@
 module CartoonistBlog
   class Engine < ::Rails::Engine
-    Cartoonist::Admin::Tab.add :blog, :url => "/blog_admin", :order => 1
+    Cartoonist::Entity.add :blog, "BlogPost"
+    Cartoonist::Admin::Tab.add :blog, :url => "/admin/blog", :order => 1
     Cartoonist::RootPath.add :blog, "blog#index"
-    Cartoonist::Navigation::Link.add :url => "/blog", :preview_url => "/blog_admin/preview", :class => "blog", :label => "cartoonist.layout.navigation.blog", :order => 1
+    Cartoonist::Navigation::Link.add :url => "/blog", :preview_url => "/admin/blog/preview", :class => "blog", :label => "cartoonist.layout.navigation.blog", :order => 1
     Cartoonist::Migration.add_for self
 
     Cartoonist::Backup.for :blog_posts do
@@ -32,16 +33,18 @@ module CartoonistBlog
         end
       end
 
-      resources :blog_admin do
-        member do
-          post "lock"
-          get "preview"
-          post "unlock"
-        end
-
-        collection do
-          get "preview"
-          post "preview_content"
+      namespace :admin do
+        resources :blog do
+          member do
+            post "lock"
+            get "preview"
+            post "unlock"
+          end
+
+          collection do
+            get "preview"
+            post "preview_content"
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist-blog
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cartoonist
-  requirement: &14804380 !ruby/object:Gem::Requirement
+  requirement: &15371600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *14804380
+  version_requirements: *15371600
 description: This core plugin for Cartoonist adds a simple blog.
 email: reasonnumber@gmail.com
 executables: []
@@ -29,20 +29,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- app/controllers/blog_admin_controller.rb
+- app/controllers/admin/blog_controller.rb
 - app/controllers/blog_controller.rb
-- app/helpers/blog_admin_helper.rb
+- app/helpers/admin/blog_helper.rb
 - app/helpers/blog_helper.rb
 - app/models/blog_feed.rb
 - app/models/blog_post.rb
+- app/views/admin/blog/edit.html.erb
+- app/views/admin/blog/index.html.erb
+- app/views/admin/blog/new.html.erb
 - app/views/blog/archives.html.erb
 - app/views/blog/feed.rss.erb
 - app/views/blog/show.html.erb
-- app/views/blog_admin/edit.html.erb
-- app/views/blog_admin/index.html.erb
-- app/views/blog_admin/new.html.erb
+- app/views/layouts/admin/blog.html.erb
 - app/views/layouts/blog.html.erb
-- app/views/layouts/blog_admin.html.erb
 - app/views/layouts/blog_archives.html.erb
 - cartoonist-blog.gemspec
 - config/locales/en.yml