activeadmin-blog 0.4.3 → 0.4.4

data/Gemfile.lock

@@ -1,139 +1,31 @@
 PATH
   remote: .
   specs:
-    activeadmin-blog (0.4.3)
-      activeadmin-mongoid
+    activeadmin-blog (0.4.4)
       activeadmin-mongoid-reorder
       activeadmin-settings
-      mongoid_search (~> 0.2.8)
-      mongoid_slug
       nokogiri
+      stringex
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activeadmin (0.4.4)
-      bourbon (>= 1.0.0)
-      devise (>= 1.1.2)
-      fastercsv
-      formtastic (~> 2.1.1)
-      inherited_resources (>= 1.3.1)
-      jquery-rails (>= 1.0.0)
-      kaminari (>= 0.13.0)
-      meta_search (>= 0.9.2)
-      rails (>= 3.0.0)
-      sass (>= 3.1.0)
-    activeadmin-mongoid (0.0.1)
-      activeadmin (~> 0.4)
-      meta_search (>= 1.1.0.pre)
-      mongoid (~> 2.0)
-      sass-rails (~> 3.1, >= 3.1.4)
     activeadmin-mongoid-reorder (0.2.1)
-    activeadmin-settings (0.3.2)
-      aws-s3
-      carrierwave-mongoid
-      fog
-      heroku-mongo-backup
-      mini_magick
+    activeadmin-settings (0.3.4)
       mongoid_globalize
-      select2-rails
     activemodel (3.2.8)
       activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
     activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.2)
-    aws-s3 (0.6.3)
-      builder
-      mime-types
-      xml-simple
-    bcrypt-ruby (3.0.1)
-    bourbon (2.1.1)
-      sass (>= 3.1)
-    bson (1.6.4)
-    bson_ext (1.6.4)
-      bson (~> 1.6.4)
+    bson (1.7.0)
+    bson_ext (1.7.0)
+      bson (~> 1.7.0)
     builder (3.0.0)
-    carrierwave (0.6.2)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-    carrierwave-mongoid (0.2.1)
-      carrierwave (~> 0.6.1)
-      mongoid (~> 2.1)
-    devise (2.1.2)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
-    erubis (2.7.0)
-    excon (0.16.1)
-    fast-stemmer (1.0.1)
-    fastercsv (1.5.5)
-    fog (1.5.0)
-      builder
-      excon (~> 0.14)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.0.4)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5.0)
-      ruby-hmac
-    formatador (0.2.3)
-    formtastic (2.1.1)
-      actionpack (~> 3.0)
-    has_scope (0.5.1)
-    heroku-mongo-backup (0.3.9)
-    hike (1.2.1)
     i18n (0.6.0)
-    inherited_resources (1.3.1)
-      has_scope (~> 0.5.0)
-      responders (~> 0.6)
-    journey (1.0.4)
-    jquery-rails (2.1.1)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.5)
-    kaminari (0.13.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    meta_search (1.1.3)
-      actionpack (~> 3.1)
-      activerecord (~> 3.1)
-      activesupport (~> 3.1)
-      polyamorous (~> 0.5.0)
-    mime-types (1.19)
-    mini_magick (3.4)
-      subexec (~> 0.2.1)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
     mongoid (2.4.12)
       activemodel (~> 3.1)
       mongo (<= 1.6.2)
@@ -141,72 +33,10 @@ GEM
     mongoid_globalize (0.2.1)
       bson_ext (~> 1.5)
       mongoid (~> 2.4)
-    mongoid_search (0.2.8)
-      bson_ext (>= 1.2)
-      fast-stemmer (~> 1.0.0)
-      mongoid (>= 2.0.0)
-    mongoid_slug (0.10.0)
-      mongoid (~> 2.0)
-      stringex (~> 1.3)
     multi_json (1.3.6)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.5.2)
     nokogiri (1.5.5)
-    orm_adapter (0.4.0)
-    polyamorous (0.5.0)
-      activerecord (~> 3.0)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
-      bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    responders (0.9.2)
-      railties (~> 3.1)
-    ruby-hmac (0.4.0)
-    sass (3.2.1)
-    sass-rails (3.2.5)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    select2-rails (3.0.0)
-      thor (~> 0.14)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
     stringex (1.4.0)
-    subexec (0.2.2)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
     tzinfo (0.3.33)
-    warden (1.2.1)
-      rack (>= 1.0)
-    xml-simple (1.1.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -22,25 +22,43 @@ This command creates new rails project fully configured and ready for Heroku dep
 
 ### Setup and configure ActiveAdmin
 
-Add these gems to Gemfile and run `bundle` command:
+#### Mongoid 2.x gem set
 
-    # Activeadmin
     gem "bson_ext"
-    gem "mongoid"
+    gem "mongoid",            '~> 2.0'
+    gem 'mongoid_search',     '~> 0.2.8'
     gem "devise"
     gem "activeadmin-mongoid"
-
-    # Activeadmin Mongoid Blog
-    gem "activeadmin-settings"
+    gem "carrierwave-mongoid"
     gem "activeadmin-blog"
 
-    # Bootstrap styles
-    gem "therubyracer"
-    gem "twitter-bootstrap-rails"
+    # Assets
+    gem "aws-s3"
+    gem "fog"
+    gem "mini_magick"
+    gem "asset_sync"
+
+
+#### Mongoid 3.x gem set
+
+    # Mongoid 3.x
+    gem 'moped',                git: 'git://github.com/mongoid/moped.git'
+    gem "mongoid",              "~> 3.0.5"
+    gem "mongoid_search"
+    gem "devise",               ">= 2.1.2"
+    gem "activeadmin-mongoid",  git: "git://github.com/elia/activeadmin-mongoid.git"
+    gem "carrierwave-mongoid",  git: "git://github.com/jnicklas/carrierwave-mongoid.git",
+                                branch: "mongoid-3.0",
+                                require: 'carrierwave/mongoid'
+    gem "activeadmin-blog"
 
     # Assets
+    gem "aws-s3"
+    gem "fog"
+    gem "mini_magick"
     gem "asset_sync"
 
+
 Run following generators:
 
     $ rails g mongoid:config

data/activeadmin-blog.gemspec

@@ -2,29 +2,26 @@
 require File.expand_path('../lib/activeadmin-blog/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name        = 'activeadmin-blog'
-  gem.summary     = 'Blog app on the top of activeadmin and mongoid.'
-  gem.description = ''
-  gem.license     = 'MIT'
+  gem.name          = 'activeadmin-blog'
+  gem.version       = ActiveadminBlog::VERSION
+  gem.summary       = 'Blog app on the top of activeadmin and mongoid.'
+  gem.description   = ''
+  gem.license       = 'MIT'
 
-  gem.authors  = ['Alex Kravets']
-  gem.email    = 'santyor@gmail.com'
-  gem.homepage = 'https://github.com/alexkravets/activeadmin-blog'
+  gem.authors       = ['Alex Kravets']
+  gem.email         = 'santyor@gmail.com'
+  gem.homepage      = 'https://github.com/slate-studio/activeadmin-blog'
 
+  gem.require_paths = ['lib']
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ['lib']
-  gem.version       = ActiveadminBlog::VERSION
 
   # Supress the warning about no rubyforge project
   gem.rubyforge_project = 'nowarning'
 
-  # Dependencies
-  gem.add_runtime_dependency "nokogiri"
-  gem.add_runtime_dependency "mongoid_slug"
-  gem.add_runtime_dependency "mongoid_search", "~> 0.2.8" # "mongoid_search" this uses mongoid 3.x
   gem.add_runtime_dependency "activeadmin-mongoid-reorder"
-  gem.add_runtime_dependency "activeadmin-mongoid"
   gem.add_runtime_dependency "activeadmin-settings"
+  gem.add_runtime_dependency "nokogiri"
+  gem.add_runtime_dependency "stringex"
 end

data/app/controllers/activeadmin_blog/posts_controller.rb

@@ -36,7 +36,7 @@ class ActiveadminBlog::PostsController < ApplicationController
   end
 
   def show
-    @post = ActiveadminBlog::BlogPost.find_by_permalink!(params[:slug])
+    @post = ActiveadminBlog::BlogPost.find_by(slug:params[:slug])
   end
 
   def feed

data/app/models/activeadmin_blog/blog_category.rb

@@ -1,23 +1,33 @@
 class ActiveadminBlog::BlogCategory
   include Mongoid::Document
   include Mongoid::Timestamps
-  include Mongoid::Slug
   include Mongoid::Reorder
 
   # Fields
   field :name
+  field :slug,      default: ''
   field :_position, :type => Float, :default => 0.0
 
+  # Callbacks
+  set_callback(:save, :before) do |doc|
+    doc.slug = doc.name.to_url if doc.slug.nil? or doc.slug.empty?
+  end
+
   # Validations
-  validates_presence_of :name
-  validates_uniqueness_of :name
+  validates :name, presence: true, uniqueness: true
 
-  # Features
-	slug :name, :as => :permalink, :permanent => true
-  
   # Relations
   has_and_belongs_to_many :blog_posts, :class_name => "ActiveadminBlog::BlogPost"
 
   # Scope
   default_scope order_by(:_position => :desc)
+
+  # Indexes
+  index :slug rescue index slug: 1
+            # Mongoid 3.x workaround
+
+  # Helpers       
+  def new? # Mongoid 3.x
+    new_record?
+  end
 end

data/app/models/activeadmin_blog/blog_post.rb

@@ -1,26 +1,29 @@
 class ActiveadminBlog::BlogPost
   include Mongoid::Document
   include Mongoid::Timestamps
-  include Mongoid::Slug
   include Mongoid::Search
 
   include ActionView::Helpers::TextHelper
 
   # Fields
   field :title
-  field :content
-  field :tags,      :default => ""
-  field :published, :type => Boolean, :default => false
-  field :date,      :type => Date
+  field :content,   default: ''
+  field :tags,      default: ''
+  field :published, type: Boolean, default: false
+  field :date,      type: Date
+  field :slug,      default: ''
+
+  # Callbacks
+  set_callback(:save, :before) do |post|
+    post.slug = post.title.to_url if post.slug.nil? or post.slug.empty?
+  end
 
   # Validations
-  validates_presence_of :title
-  validates_uniqueness_of :title
+  validates :title, presence: true, uniqueness: true
 
   # Features
-  slug            :title, :as => :permalink, :permanent => true
   search_in       :title, :content, :tags
-  mount_uploader  :featured_image, ActiveadminSettings::RedactorPictureUploader
+  mount_uploader  :featured_image, ActiveadminBlog::FeaturedImageUploader
   paginates_per 6
 
   # Relations
@@ -30,6 +33,10 @@ class ActiveadminBlog::BlogPost
   default_scope order_by(:published => :asc).order_by({:date => :desc})
   scope         :published, where(published: true)
 
+  # Indexes
+  index :slug rescue index slug: 1
+            # Mongoid 3.x workaround
+
   # Helpers
   def has_featured_image?
     not featured_image.to_s.empty?
@@ -48,9 +55,13 @@ class ActiveadminBlog::BlogPost
     Nokogiri::HTML(excerpt).text
   end
 
+  def new? # Mongoid 3.x
+    new_record?
+  end
+
   # Class methods
   def self.published_in_category(category_slug)
-    category = ActiveadminBlog::BlogCategory.find_by_permalink!(category_slug)
+    category = ActiveadminBlog::BlogCategory.find_by(slug: category_slug)
     category.blog_posts.published
   end
 

data/app/uploaders/activeadmin_blog/featured_image_uploader.rb

@@ -0,0 +1,65 @@
+# encoding: utf-8
+class ActiveadminBlog::FeaturedImageUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or ImageScience support:
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
+  # include CarrierWave::ImageScience
+
+  # Instance
+  def strip
+    manipulate! do |img|
+      img.strip
+      img = yield(img) if block_given?
+      img
+    end
+  end
+
+  # process :quality => 85
+  def quality(percentage)
+    manipulate! do |img|
+      img.quality(percentage)
+      img = yield(img) if block_given?
+      img
+    end
+  end
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "system/blog/featured_images/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  version :thumb do
+    process :resize_to_fill => [118, 100]
+  end
+
+  #version :content do
+  #  process :resize_to_limit => [800, 800]
+  #end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+    ActiveadminSettings.image_file_types
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+end

data/app/views/activeadmin_blog/posts/_footer.html.erb

@@ -5,6 +5,5 @@
   </form>
   <p>
     <a href="<%= blog_rss_feed_path %>.rss" title="RSS Feed">RSS Feed</a></br>
-    Dlivered by <%= settings_link_value "Delivered By", :target => "_blank" %>
   </p>
 </footer>

data/app/views/activeadmin_blog/posts/_header.html.erb

@@ -1,10 +1,10 @@
 <header style="margin-bottom:2em;">
-  <h1><%= settings_value "Blog Title" %></h1>
+  <h1><%= Rails.application.class.parent_name %></h1>
   <p>
     <ul>
       <li><a href="<%= blog_path %>" title="All Posts">All Posts</a></li>
       <% @categories.all.each do |c| %>
-        <li><a href="<%= blog_category_path(c) %>" title="<%= c.name %>"><%= c.name %></a></li>
+        <li><a href="<%= blog_category_path(c.slug) %>" title="<%= c.name %>"><%= c.name %></a></li>
       <% end %>
     </ul>
   </p>

data/app/views/activeadmin_blog/posts/_post.html.erb

@@ -1,6 +1,6 @@
 <div style="margin-bottom:2em;">
   <!-- TITLE -->
-  <a href="<%= blog_post_path(post) %>" title="Read this post"><h2><%= post.title %></h2></a>
+  <a href="<%= blog_post_path(post.slug) %>" title="Read this post"><h2><%= post.title %></h2></a>
 
   <!-- DATE & CATEGORIES -->
   <p>
@@ -8,7 +8,7 @@
     <% if post.categories.size > 0 %>
       <ul>
         <% post.categories.each do |c| %>
-        <li><a href="<%= blog_category_path(c) %>" title="<%= c.name %>"><%= c.name %></a></li>
+        <li><a href="<%= blog_category_path(c.slug) %>" title="<%= c.name %>"><%= c.name %></a></li>
         <% end %>
       </ul>
     <% end %>
@@ -17,7 +17,7 @@
   <!-- FEATURED IMAGE LINK -->
   <% if post.has_featured_image? %>
     <p>
-      <a href="<%= blog_post_path(post) %>" title="Read More">
+      <a href="<%= blog_post_path(post.slug) %>" title="Read More">
         <%= image_tag post.featured_image_url, :alt=>post.title %>
       </a>
     </p>
@@ -27,5 +27,5 @@
   <p><%= post.excerpt %></p>
 
   <!-- READ MORE -->
-  <a href="<%= blog_post_path(post) %>" title="Read More">Read More</a>
+  <a href="<%= blog_post_path(post.slug) %>" title="Read More">Read More</a>
 </div>

data/app/views/activeadmin_blog/posts/feed.rss.builder

@@ -10,8 +10,8 @@ xml.rss :version => "2.0" do
         xml.title post.title
         xml.description post.excerpt
         xml.pubDate post.date.to_s(:rfc822)
-        xml.link blog_post_url(post)
-        xml.guid blog_post_url(post)
+        xml.link blog_post_url(post.slug)
+        xml.guid blog_post_url(post.slug)
       end
     end
   end

data/app/views/activeadmin_blog/posts/show.html.erb

@@ -11,7 +11,7 @@
       <% if @post.categories.size > 0 %>
         <ul>
           <% @post.categories.each do |c| %>
-          <li><a href="<%= blog_category_path(c) %>" title="<%= c.name %>"><%= c.name %></a></li>
+          <li><a href="<%= blog_category_path(c.slug) %>" title="<%= c.name %>"><%= c.name %></a></li>
           <% end %>
         </ul>
       <% end %>

data/app/views/admin/categories/_form.html.erb

@@ -1,7 +1,7 @@
 <fieldset class="inputs"><legend><span>Details</span></legend><ol>
   <%= f.input :name, :required => true %>
   <% if not f.object.new? %>
-    <%= f.input :permalink %>
+    <%= f.input :slug %>
   <% end %>
 </ol></fieldset>
 

data/app/views/admin/categories/_show.html.erb

@@ -1,5 +1,11 @@
-<% if category.blog_posts.size > 0 %>
-  <%= render :partial => "admin/posts/table", :locals => {:posts => category.blog_posts} %>
-<% else %>
-  <p>No posts here yet.</p>
-<% end %>
+<div class="panel blog-posts-sidebar">
+  <%= render partial: "admin/posts/sidebar", locals: { categories: categories } %>
+</div>
+
+<div class="blog-posts-table">
+  <% if category.blog_posts.size > 0 %>
+    <%= render :partial => "admin/posts/table", :locals => {:posts => category.blog_posts} %>
+  <% else %>
+    <p>No posts here yet.</p>
+  <% end %>
+</div>

data/app/views/admin/posts/_form.html.erb

@@ -17,7 +17,7 @@
   <% end %>
 
   <% if not f.object.new? %>
-    <%= f.input :permalink %>
+    <%= f.input :slug %>
   <% end %>
 
   <%= f.input :date,  :input_html => { :class => "datepicker", :placeholder => "Click field to pick date" } %>

data/app/views/admin/posts/_sidebar.html.erb

@@ -0,0 +1,23 @@
+<h3>Categories</h3>
+<div class="panel_contents">
+  <%= link_to "All Posts", all_admin_posts_path %><br/>
+
+  <% if categories.size > 0 %>
+  <ul id="blog_categories_list">
+    <% categories.each do |c| %>
+      <li id="category_<%= c.id %>">
+        <span>
+          <%= link_to c.name, admin_category_path(c) %>
+          <% if c.blog_posts.size > 0 %>(<%= c.blog_posts.size %>)<% end %>
+        </span>
+        <span class="action-buttons">
+          <%= link_to "Edit", edit_admin_category_path(c) %>
+        </span>
+      </li>
+    <% end %>
+  </ul>
+  <br/>
+  <% end %>
+
+  <%= link_to "New Category", new_admin_category_path %>
+</div>

data/app/views/admin/posts/all.html.erb

@@ -1,5 +1,11 @@
-<% if @posts.size > 0 %>
-  <%= render :partial => "table", :locals => {:posts => @posts} %>
-<% else %>
-  <p>No posts here yet.</p>
-<% end %>
+<div class="panel blog-posts-sidebar">
+  <%= render partial: "sidebar", locals: { categories: @categories } %>
+</div>
+
+<div class="blog-posts-table">
+  <% if @posts.size > 0 %>
+    <%= render :partial => "table", :locals => {:posts => @posts} %>
+  <% else %>
+    <p>No posts here yet.</p>
+  <% end %>
+</div>

data/lib/activeadmin-blog.rb

@@ -1,7 +1,6 @@
 require "nokogiri"
-require "mongoid_slug"
-require "mongoid_search"
-require "activeadmin-mongoid"
+require "stringex"
+
 require "activeadmin-mongoid-reorder"
 require "activeadmin-settings"
 

data/lib/activeadmin-blog/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminBlog
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/lib/generators/activeadmin_blog/templates/admin/blog_categories.rb

@@ -21,16 +21,11 @@ ActiveAdmin.register ActiveadminBlog::BlogCategory, :as => "Category" do
         format.html { redirect_to admin_posts_path }
       end
     end
-
-    defaults :finder => :find_by_permalink
   end
 
   show :title => :name do
-    render :partial => "show", :locals => { :category => category }
-  end
-
-  sidebar :categories, :only => :show do
-    render :partial => "admin/posts/categories", :locals => { :categories => ActiveadminBlog::BlogCategory.all }
+    render partial: "show", locals: { category:   category,
+                                      categories: ActiveadminBlog::BlogCategory.all }
   end
 
   form do |f|

data/lib/generators/activeadmin_blog/templates/admin/blog_posts.rb

@@ -7,8 +7,6 @@ ActiveAdmin.register ActiveadminBlog::BlogPost, :as => "Post" do
     def index
       redirect_to all_admin_posts_path
     end
-
-    defaults :finder => :find_by_permalink
   end
 
   form do |f|
@@ -16,16 +14,13 @@ ActiveAdmin.register ActiveadminBlog::BlogPost, :as => "Post" do
   end
 
   collection_action :tags, :method => :get do
-    tags    = ActiveadminBlog::BlogPost.all.collect{ |p| p.tags }.join(",").split(',').uniq
+    tags = ActiveadminBlog::BlogPost.all.collect{ |p| p.tags }.join(",").split(',').uniq
     render :json => tags
   end
 
   collection_action :all do
     @page_title = "All Posts"
-    @posts = ActiveadminBlog::BlogPost.all
-  end
-
-  sidebar :categories, :only => :all do
-    render :partial => "categories", :locals => { :categories => ActiveadminBlog::BlogCategory.all }
+    @posts      = ActiveadminBlog::BlogPost.all
+    @categories = ActiveadminBlog::BlogCategory.all
   end
 end

data/vendor/assets/stylesheets/activeadmin_blog.css.scss

@@ -28,7 +28,10 @@
   }
 }
 
-#categories_sidebar_section {
+.blog-posts-sidebar {
+  float: right;
+  width: 270px;
+
   ul {
     margin:0px; padding:0px;
     list-style:none;
@@ -38,6 +41,10 @@
   }
 }
 
+.blog-posts-table {
+  margin-right:300px;
+}
+
 #category_posts_page {
   margin:0px;
   padding:0px;
@@ -70,3 +77,7 @@
     display:none;
   }
 }
+
+#main_content_wrapper {
+  overflow:hidden;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-blog
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,26 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid_slug
+  name: activeadmin-mongoid-reorder
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,23 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid_search
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.8
-- !ruby/object:Gem::Dependency
-  name: activeadmin-mongoid-reorder
+  name: activeadmin-settings
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activeadmin-mongoid
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activeadmin-settings
+  name: stringex
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -122,6 +90,7 @@ files:
 - app/controllers/activeadmin_blog/posts_controller.rb
 - app/models/activeadmin_blog/blog_category.rb
 - app/models/activeadmin_blog/blog_post.rb
+- app/uploaders/activeadmin_blog/featured_image_uploader.rb
 - app/views/activeadmin_blog/posts/_footer.html.erb
 - app/views/activeadmin_blog/posts/_header.html.erb
 - app/views/activeadmin_blog/posts/_post.html.erb
@@ -134,8 +103,8 @@ files:
 - app/views/activeadmin_blog/posts/tag.html.erb
 - app/views/admin/categories/_form.html.erb
 - app/views/admin/categories/_show.html.erb
-- app/views/admin/posts/_categories.html.erb
 - app/views/admin/posts/_form.html.erb
+- app/views/admin/posts/_sidebar.html.erb
 - app/views/admin/posts/_table.html.erb
 - app/views/admin/posts/all.html.erb
 - install.sh
@@ -150,7 +119,7 @@ files:
 - lib/generators/activeadmin_blog/views_generator.rb
 - vendor/assets/javascripts/activeadmin_blog.js.coffee
 - vendor/assets/stylesheets/activeadmin_blog.css.scss
-homepage: https://github.com/alexkravets/activeadmin-blog
+homepage: https://github.com/slate-studio/activeadmin-blog
 licenses:
 - MIT
 post_install_message: 
@@ -165,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3018790596276565686
+      hash: -2824675411598608602
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3018790596276565686
+      hash: -2824675411598608602
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.24

data/app/views/admin/posts/_categories.html.erb

@@ -1,20 +0,0 @@
-<%= link_to "All Posts", all_admin_posts_path %>
-
-<% if categories.size > 0 %>
-<ul id="blog_categories_list">
-  <% categories.each do |c| %>
-    <li id="category_<%= c.id %>">
-      <span>
-        <%= link_to c.name, admin_category_path(c) %>
-        <% if c.blog_posts.size > 0 %>(<%= c.blog_posts.size %>)<% end %>
-      </span>
-      <span class="action-buttons">
-        <%= link_to "Edit", edit_admin_category_path(c) %>
-      </span>
-    </li>
-  <% end %>
-</ul>
-<br/>
-<% end %>
-
-<%= link_to "New Category", new_admin_category_path %>