active_blog 0.9.0 → 1.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a132034523aa9b46cb6600df99b8c728ca180a2d
-  data.tar.gz: 239db73d0d581133b932359e047bdeaf62546162
+  metadata.gz: 9540117a71563fb2de175948f8464c193fa876e5
+  data.tar.gz: 706360981815fa312ec3ffa09f902ede3a36bc62
 SHA512:
-  metadata.gz: 04a980d9ceafb8ff0d6acecab25f2fe73dd0e9c3f3a4866664a8fca241a7324b59fe947fcebf853ea78d566299d85332ee315d9b4b58475c5735f71ca52ce460
-  data.tar.gz: 96c5cbfedd524097c2caeacbc75e1ff3f69456f7f725485c7a80d83cc100665975b59fecd75dc09ae5887ffd6de345e01200376f5ce7d015c8c828812541668c
+  metadata.gz: 064324faa28367f2957d560b5cbe31d9fb9be030155831cd2c7b96cf137d89867eee10700a176080bc12ff2040dac42f9c9bb02ad1c78f60b37265545e360d5e
+  data.tar.gz: 54376d3bc24e3cec8afddde49781d7d2c471ca1e28f60c168e7a008bc3440c5edc7a4b0acb61e51e5faac8d7b2b9eee230412a17a34f910b8ce2de1ba58b9e7e

data/app/controllers/active_blog/blog_posts_controller.rb

@@ -1,5 +1,6 @@
 module ActiveBlog
   class BlogPostsController < ApplicationController
+    layout ActiveBlog.template_layout
 
     before_filter :only => [:index, :show, :archives] do
       @recent_blog_posts = BlogPost.live.recent
@@ -14,17 +15,12 @@ module ActiveBlog
     end
 
     def show
-      @blog_post = BlogPost.live.where(:cached_slug => params[:cached_slug]).first
-      if @blog_post
-        render
-      else
-        # TODO(mc): Should 404
-        redirect_to active_blog_path, :notice => "No blog post with that URL"
-      end
+      @blog_post = BlogPost.blog_post(params[:cached_slug])
     end
 
+    # Move into ActiveAdmin responsibility
     def preview
-      @blog_post = BlogPost.new(params[:active_blog_blog_post])
+      @active_blog_blog_post = BlogPost.new(post_params)
       @blog_post_partial = render_to_string(:partial => 'active_blog/active_admin/blog_post_show')
 
       respond_to do |format|
@@ -33,10 +29,16 @@ module ActiveBlog
     end
 
     def atom
-      @blog_posts = BlogPost.live.order('published_at DESC').limit(10)
+      @blog_posts = BlogPost.live.limit(10)
       respond_to do |format|
         format.xml
       end
     end
+
+    private
+
+      def post_params
+        params.require(:active_blog_blog_post).permit(:title, :body, :draft, :published_at)
+      end
   end
 end

data/app/helpers/active_blog/blog_posts_helper.rb

@@ -1,17 +1,12 @@
 module ActiveBlog
   module BlogPostsHelper
-    def markdown(text)
-      regular = { :hard_wrap => true, :autolink => true, :space_after_headers => true }
-      make_markdown(regular).render(text).html_safe
-    end
 
-    def markdown_for_schema(text)
-      truncate(strip_tags(markdown(text)).strip.gsub(/\n/, ' '), :length => 250)
+    def markdown
+      @markdown ||= ActiveBlog::Markdown.renderer
     end
 
-    def make_markdown(opts)
-      markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, opts)
-      markdown
+    def schema_blog_post(text, length = 250)
+      truncate(strip_tags(markdown.render(text)).strip.gsub(/\n/, ' '), :length => length)
     end
 
     def schema_date(date)

data/app/models/active_blog/blog_post.rb

@@ -2,10 +2,11 @@ module ActiveBlog
   class BlogPost < ActiveRecord::Base
     self.table_name = 'active_blog_blog_posts'
     paginates_per ActiveBlog.paginates_per
-    default_scope :order => 'published_at DESC'
+    default_scope { order(:published_at).reverse_order }
 
-    scope :live, where('published_at < ? AND draft = ?', Time.zone.now, false)
-    scope :recent, limit(5)
+    scope :live, -> { where('published_at < ? AND draft = ?', Time.zone.now, false) }
+    scope :recent, -> { limit(5) }
+    scope :blog_post, ->(slug) { live.where(:cached_slug => slug).first! }
 
     validates_presence_of :title, :allow_blank => false, :allow_nil => false, :message => "can't be blank"
     validates_presence_of :body, :allow_blank => false, :allow_nil => false, :message => "can't be blank"

data/app/views/active_blog/active_admin/_blog_post_show.html.erb

@@ -13,6 +13,6 @@
 
   </div>
   <div>
-    <%= markdown(@active_blog_blog_post.body || "Body") %>
+    <%= markdown.render(@active_blog_blog_post.body || "Body") %>
   </div>
 </div>

data/app/views/active_blog/blog_posts/_blog_post.html.erb

@@ -4,7 +4,7 @@
 
   Google Rich Snippets doesn't like nested schemas in certain cases.
 %>
-<div class="active_blog entry" <%= show ? '' : "itemscope itemtype='http://schema.org/BlogPosting'" %>>
+<div class="active_blog entry" <%= show ? '' : 'itemscope itemtype="http://schema.org/BlogPosting"'.html_safe %>>
   <%- if show %>
     <%= content_for :schema do %>
       <%= render :partial => 'blog_post_schema', :locals => {:blog_post => blog_post} %>
@@ -13,20 +13,15 @@
     <%= render :partial => 'blog_post_schema', :locals => {:blog_post => blog_post} %>
   <% end %>
 
-  <h6>
-    <%= blog_post.published_at.strftime("%B %e %G") %>
-    <% if blog_post.new_record? %>
-      <a href="" itemscope itemprop="url">∞</a>
-    <% else %>
-      <a href="<%= active_blog_post_path(blog_post.cached_slug) %>">∞</a>
-    <% end %>
-  </h6>
+  <h4>
+    <%= blog_post.published_at.strftime("%B %-e, %G") %>
+  </h4>
+
   <h2>
-    <%= blog_post.title %>
+    <%= link_to(blog_post.title, active_blog_post_path(blog_post.cached_slug)) %>
   </h2>
 
   <div class="active_blog body">
-    <%= markdown(blog_post.body || "") %>
+    <%= markdown.render(blog_post.body || "") %>
   </div>
 </div>
-<hr/>

data/app/views/active_blog/blog_posts/_blog_post_schema.html.erb

@@ -1,5 +1,5 @@
 <%= schema_span_for 'name', "#{blog_post.title} | #{active_blog_title}" %>
-<%= schema_span_for 'description', markdown_for_schema(blog_post.body) %>
+<%= schema_span_for 'description', schema_blog_post(blog_post.body) %>
 <%= schema_span_for 'datePublished', schema_date(blog_post.published_at) %>
 <%= schema_span_for 'headline', blog_post.title %>
 <%= schema_span_for 'url', active_blog_post_url(blog_post.cached_slug) %>

data/app/views/active_blog/blog_posts/_sidebar.html.erb

@@ -1,11 +1,13 @@
 <%= active_blog_sidebar do %>
-  <div class='section active_blog sidebar'>
-    <h6>Recent posts</h6>
-  </div>
-  <ul class='unstyled recent'>
+  <div class="panel panel-default panel-recent-posts section active_blog sidebar">
+  <div class="panel-heading">Recent posts</div>
+  <ul class="list-group list-recent-posts">
     <% @recent_blog_posts.each do |recent_blog_post| %>
-      <li><a href='<%= active_blog_post_path(recent_blog_post.cached_slug) %>' title='<%= recent_blog_post.title %>'><%= recent_blog_post.title %></a></li>
+      <li class="list-group-item recent-post"><a href='<%= active_blog_post_path(recent_blog_post.cached_slug) %>' title='<%= recent_blog_post.title %>'><%= recent_blog_post.title %></a></li>
     <% end %>
   </ul>
-  <%= link_to 'Archives', active_blog_archives_path %>
+  <div class="panel-footer">
+    <%= link_to 'Archives', active_blog_archives_path %>
+  </div>
+</div>
 <% end %>

data/app/views/active_blog/blog_posts/atom.xml.builder

@@ -9,7 +9,7 @@ atom_feed({}) do |feed|
       :url => active_blog_post_url(post.cached_slug)
     }) do |entry|
       entry.title(post.title)
-      entry.content(markdown(post.body), :type => 'html')
+      entry.content(markdown.render(post.body), :type => 'html')
 
       entry.author do |author|
         author.name(active_blog_author_name) if active_blog_author_name

data/app/views/active_blog/blog_posts/index.html.erb

@@ -5,6 +5,7 @@
   <%= schema_span_for 'description', active_blog_description %>
   <%= schema_span_for 'url', active_blog_url %>
 <% end %>
+
 <div class="section active_blog index">
   <h1><%= active_blog_title %></h1>
 

data/lib/active_blog.rb

@@ -1,6 +1,6 @@
 require 'active_blog/engine'
 require 'active_blog/mapper'
-require 'redcarpet'
+require 'active_blog/markdown'
 require 'active_blog/ext/string'
 
 module ActiveBlog
@@ -33,6 +33,10 @@ module ActiveBlog
   mattr_accessor :paginates_per
   @@paginates_per = 10
 
+  # Blog Rails template
+  mattr_accessor :template_layout
+  @@template_layout = "layouts/application"
+
   def self.setup
     yield self
   end

data/lib/active_blog/mapper.rb

@@ -13,8 +13,8 @@ module ActionDispatch::Routing
           # match '/:cached_slug', :action => :show, :on => :collection, :as => :post, :via => [:get]
         end
         match '/' => 'active_blog/blog_posts#index', :as => :active_blog, :via => [:get]
-        match '/-/preview' => 'active_blog/blog_posts#preview', :as => :active_blog_preview, :via => [:post, :put]
-        match '/atom.xml' => 'active_blog/blog_posts#atom', :as => :active_blog_feed, :via => [:get], :format => :xml
+        match '/-/preview' => 'active_blog/blog_posts#preview', :as => :active_blog_preview, :via => [:post, :put, :patch]
+        get  '/atom', :to => 'active_blog/blog_posts#atom', :as => :active_blog_feed, :constraints => { :format => 'xml' }
         match '/archives' => 'active_blog/blog_posts#archives', :as => :active_blog_archives, :via => [:get]
         # Always last.
         match '/:cached_slug' => 'active_blog/blog_posts#show', :as => :active_blog_post, :via => [:get]

data/lib/active_blog/markdown.rb

@@ -0,0 +1,29 @@
+require 'redcarpet'
+
+module ActiveBlog
+  class Markdown
+    attr_reader :markdown
+
+    def initialize
+      options = {
+        hard_wrap:                    true,
+        space_after_headers:          true
+      }
+
+      extensions = {
+        autolink:                     true,
+      }
+
+      renderer = Redcarpet::Render::HTML.new(options)
+      @markdown = Redcarpet::Markdown.new(renderer, extensions)
+    end
+
+    def render(markdown_syntax)
+      markdown.render(markdown_syntax).html_safe
+    end
+
+    def self.renderer
+      ActiveBlog::Markdown.new
+    end
+  end
+end

data/lib/active_blog/version.rb

@@ -1,3 +1,3 @@
 module ActiveBlog
-  VERSION = "0.9.0"
+  VERSION = '1.0.0.pre1'
 end

data/lib/generators/active_blog/install/templates/active_blog.rb

@@ -9,7 +9,7 @@ ActiveBlog.setup do |config|
   # config.author_name = "John Doe"
 
   # Blog author's URI
-  # config.author_name = "http://example.com"
+  # config.author_uri = "http://example.com"
 
   # Blog author's email
   # config.author_email = "mchung@example.com"
@@ -19,4 +19,7 @@ ActiveBlog.setup do |config|
 
   # Blog posts per page
   # config.paginates_per = 10
+
+  # Blog Rails template
+  # config.template_layout = "layouts/application"
 end

data/lib/generators/active_blog/install/templates/blog_posts.rb

@@ -3,4 +3,5 @@ ActiveAdmin.register ActiveBlog::BlogPost do
   show :title => :title do
     render 'active_blog/active_admin/show'
   end
+  permit_params :title, :body, :draft, :published_at
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: active_blog
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0.pre1
 platform: ruby
 authors:
 - Marc Chung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: activeadmin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0b5
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0b5
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +118,7 @@ files:
 - lib/active_blog/engine.rb
 - lib/active_blog/ext/string.rb
 - lib/active_blog/mapper.rb
+- lib/active_blog/markdown.rb
 - lib/active_blog/version.rb
 - lib/generators/active_blog/install/USAGE
 - lib/generators/active_blog/install/install_generator.rb
@@ -149,7 +150,7 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/schema.rb
-- test/dummy/log/development.log
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -177,12 +178,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A barebones, markdown, blogging Rails Engine.
@@ -210,7 +211,7 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
 - test/dummy/db/schema.rb
-- test/dummy/log/development.log
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html