blogo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1742ff32a077f69bc0786edfb895bd09b73ba04
-  data.tar.gz: 4eb0b1c4c08b70aae5494c18668d5f2635606b13
+  metadata.gz: 4a5d5e94faa7fd7ef4024abe6af2d124bdf42ea9
+  data.tar.gz: 6986ac3ac73f001163bbceae1f1e4f1b3103a632
 SHA512:
-  metadata.gz: ee7b9854089efdf2000f44cb0dccc5446101507b41b25fbf6d4fd068f435176e291d5bb6d881a10f8fa90c4afe87f03d6d8cf395174d14f7a8cd95c8b22681c1
-  data.tar.gz: 6e1ea9c205975584e3eab3c7f8d49bfaac3e74ab36abc1b6cd6bf9bfa14473be54d5141dc4e3a1348a1827d6541cb5331c641ae2b53c6e3fe887cab466f7989b
+  metadata.gz: 9014979dad91d0d792a39e53aa30bddad628f5df5ee2c39d87784893bb8ba9c48e3d4af7cb2104e96705cc7ce4006c4966a700affacb70ea19109a95a68c7a10
+  data.tar.gz: 499b77ec8f1d2aaf30d9f8f0bdccc130058066c722a9e94edee8e0beb9bfca4449c47060094e1d5957131d7f9df7a5c3167f19ab006cdfea2483ac14014343fa

data/README.markdown

@@ -2,21 +2,34 @@
 
 Mountable blog engine for Ruby on Rails 4.
 
-## How it looks like?
-
-Blog:
-
-<a href="http://i1078.photobucket.com/albums/w484/greyblake/blogo_mountable_blog_rails_engine.png" target="_blank">
-    <img src="http://i1078.photobucket.com/albums/w484/greyblake/th_blogo_mountable_blog_rails_engine.png" border="0" title="Blogo - mountable blog engine for Ruby on Rails" alt="Blogo - mountable blog engine for Ruby on Rails" style=""></a>
-</a>
-
+[![Build Status](https://travis-ci.org/greyblake/blogo.png?branch=master)](https://travis-ci.org/greyblake/blogo)
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/greyblake/blogo/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
+## How it looks like?
 
-Admin:
+<table cellspacing="0">
+    <thread>
+        <tr>
+            <th>Blog</th>
+            <th>Admin</th>
+        </tr>
+    </thread>
+    <tbody>
+        <tr>
+            <td>
+                <a href="http://i1078.photobucket.com/albums/w484/greyblake/blogo_mountable_blog_rails_engine.png" target="blog">
+                    <img src="http://i1078.photobucket.com/albums/w484/greyblake/th_blogo_mountable_blog_rails_engine.png" border="0" title="Blogo - mountable blog engine for Ruby on Rails" alt="Blogo - mountable blog engine for Ruby on Rails" style=""></a>
+                </a>
+            </td>
+            <td>
+                <a href="http://i1078.photobucket.com/albums/w484/greyblake/blogo_admin_mountable_blog_rails_engine.png" target="admin">
+                    <img src="http://i1078.photobucket.com/albums/w484/greyblake/th_blogo_admin_mountable_blog_rails_engine.png" border="0" title="Blogo - mountable blog engine for Ruby on Rails(admin)" alt="Blogo - mountable blog engine for Ruby on Rails" style=""></a>
+                </a>
+            </td>
+        </tr>
+    </tbody>
+</table>
 
-<a href="http://i1078.photobucket.com/albums/w484/greyblake/blogo_admin_mountable_blog_rails_engine.png" target="_blank">
-    <img src="http://i1078.photobucket.com/albums/w484/greyblake/th_blogo_admin_mountable_blog_rails_engine.png" border="0" title="Blogo - mountable blog engine for Ruby on Rails(admin)" alt="Blogo - mountable blog engine for Ruby on Rails" style=""></a>
-</a>
 
 ## Quick start
 
@@ -36,8 +49,8 @@ bundle install
 Install blogo migrations and run them:
 
 ```
-  bundle exec rake blogo:install:migrations
-  bundle exec rake db:migrate
+  rake blogo:install:migrations
+  rake db:migrate
 ```
 
 
@@ -47,10 +60,10 @@ Create a user:
 rake blogo:create_user[user_name,user@email.com,password]
 ```
 
-Mount the blog engine to you rails application in `config/routes.rb`:
+Mount the blog routes to you rails application in `config/routes.rb`
 
 ```
-  mount Blogo::Engine, at: '/blog'
+  Blogo::Routes.mount_to(self, at: '/blog')
 ```
 
 Run the rails application and go to http://localhost:3000/blog/admin to create you first post!

data/app/assets/javascripts/blogo/ckeditor/config.js.erb

@@ -32,7 +32,7 @@ CKEDITOR.editorConfig = function( config ) {
   config.extraPlugins = 'wpmore';
 
   // URL to upload images with image plugin
-  config.filebrowserUploadUrl = '<%= Blogo::Engine.routes.url_helpers.admin_images_path %>';
+  config.filebrowserUploadUrl = '<%= Rails.application.routes.url_helpers.blogo_admin_images_path %>';
 
   // Height
   config.height = '350px';

data/app/controllers/blogo/admin/posts_controller.rb

@@ -15,7 +15,7 @@ module Blogo::Admin
       if service.create!
         @post = service.post
         flash[:notice] = "The post is created"
-        redirect_to admin_posts_path
+        redirect_to blogo_admin_posts_path
       else
         @post = service.post
         render 'new'
@@ -32,7 +32,7 @@ module Blogo::Admin
 
       if service.update!
         flash[:notice] = "The post is updated"
-        redirect_to admin_posts_path
+        redirect_to blogo_admin_posts_path
       else
         render 'edit'
       end
@@ -43,7 +43,7 @@ module Blogo::Admin
       Blogo::DestroyPostService.new(post).destroy!
 
       flash[:notice] = "The post is removed"
-      redirect_to admin_posts_path
+      redirect_to blogo_admin_posts_path
     end
 
     def preview

data/app/controllers/blogo/application_controller.rb

@@ -1,2 +1,3 @@
 class Blogo::ApplicationController < ::ApplicationController
+  include Rails.application.routes.url_helpers
 end

data/app/helpers/blogo/application_helper.rb

@@ -1,17 +1,19 @@
 module Blogo
   # Note, +_path+ postfix is avoided to not mess helper methods and routes.
   module ApplicationHelper
+    include Rails.application.routes.url_helpers
+
     # Path to a post with year prefix.
     #
     # @param post [Blogo::Post]
     #
     # @return [String]
     def path_to_post(post)
-      post_path(:permalink => post.permalink)
+      blogo_post_path(:permalink => post.permalink)
     end
 
     def url_to_post(post)
-      post_url(:permalink => post.permalink)
+      blogo_post_url(:permalink => post.permalink)
     end
 
     # Path to a page or a page in scope of a particular tag.
@@ -22,9 +24,9 @@ module Blogo
     # @retun [String]
     def path_to_page(page, tag = nil)
       if tag
-        tag_page_path(tag, page)
+        blogo_tag_page_path(tag, page)
       else
-        page_path(page)
+        blogo_page_path(page)
       end
     end
 

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

@@ -51,7 +51,7 @@
 
     $('#post-title').titleToUrl('#permalink')
 
-    var preview = new PostPreview('button-preview', 'post-form', '<%= admin_post_preview_path %>', 'modal-preview');
+    var preview = new PostPreview('button-preview', 'post-form', '<%= blogo_admin_post_preview_path %>', 'modal-preview');
     preview.init();
   })
 </script>

data/app/views/blogo/admin/posts/_post_li.html.erb

@@ -3,12 +3,12 @@
 %>
 
 <tr>
-  <td><%= link_to post.title, edit_admin_post_path(post) %></td>
+  <td><%= link_to post.title, edit_blogo_admin_post_path(post) %></td>
   <td><%= post.status %></td>
   <td><%= post.user.name %></td>
   <td><%= post.published_at.to_date %></td>
   <td>
-    <%= link_to 'edit', edit_admin_post_path(post), class: "pure-button  button-secondary" %>
-    <%= link_to 'delete', admin_post_path(post), method: :delete, data: {confirm: confirm_message}, class: "pure-button  button-warning" %>
+    <%= link_to 'edit', edit_blogo_admin_post_path(post), class: "pure-button  button-secondary" %>
+    <%= link_to 'delete', blogo_admin_post_path(post), method: :delete, data: {confirm: confirm_message}, class: "pure-button  button-warning" %>
   </td>
 </tr>

data/app/views/blogo/admin/posts/edit.html.erb

@@ -1,5 +1,5 @@
 <h1 class="admin-header">Edit post</h1>
 
-<%= blogo_form_for [:admin, @post], method: :patch, html: {id: 'post-form', class: 'pure-form pure-form-stacked'} do |f| %>
+<%= blogo_form_for [:blogo, :admin, @post], method: :patch, html: {id: 'post-form', class: 'pure-form pure-form-stacked'} do |f| %>
   <%= render partial: 'form', locals: {f: f} %>
 <% end %>

data/app/views/blogo/admin/posts/new.html.erb

@@ -1,5 +1,5 @@
 <h1 class="admin-header">Add a new post</h1>
 
-<%= blogo_form_for @post, :url => admin_posts_path, html: {id: 'post-form', class: 'pure-form pure-form-stacked'} do |f| %>
+<%= blogo_form_for @post, :url => blogo_admin_posts_path, html: {id: 'post-form', class: 'pure-form pure-form-stacked'} do |f| %>
   <%= render partial: 'form', locals: {f: f} %>
 <% end %>

data/app/views/blogo/admin/sessions/new.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag admin_sessions_path, class: 'pure-form pure-form-stacked' do %>
+<%= form_tag blogo_admin_sessions_path, class: 'pure-form pure-form-stacked' do %>
   <fieldset>
 
     <legend>Login</legend>

data/app/views/blogo/admin/shared/_nav_bar.html.erb

@@ -1,10 +1,10 @@
 <div class="pure-menu pure-menu-open pure-menu-horizontal nav">
   <ul>
-    <li><%= link_to "Blogo", admin_path %> </li>
-    <li><%= link_to "New Post", new_admin_post_path %></li>
-    <li><%= link_to "Comments",  admin_comments_path %></li>
+    <li><%= link_to "Blogo"   , blogo_admin_path %> </li>
+    <li><%= link_to "New Post", new_blogo_admin_post_path %></li>
+    <li><%= link_to "Comments", blogo_admin_comments_path %></li>
   </ul>
   <ul class="pull-right">
-    <li><%= link_to "Sign out", admin_logout_path  %></li>
+    <li><%= link_to "Sign out", blogo_admin_logout_path  %></li>
   </ul>
 </div>

data/app/views/blogo/posts/_icons.html.erb

@@ -7,5 +7,5 @@
 <% end %>
 
 <% if Blogo.config.show_rss_icon %>
-  <%= link_to '', feed_path, class: 'rss-icon', target: 'rss' %>
+  <%= link_to '', blogo_feed_path, class: 'rss-icon', target: 'rss' %>
 <% end %>

data/app/views/blogo/posts/_post_header.html.erb

@@ -13,7 +13,7 @@
 
     <div class="article-tags">
       <% post.tag_names.each do |tag_name| %>
-        <%= link_to tag_name, tag_path(tag_name), class: 'tag pure-button button-secondary' %>
+        <%= link_to tag_name, blogo_tag_path(tag_name), class: 'tag pure-button button-secondary' %>
       <% end %>
     </div>
   </div>

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

@@ -1,4 +1,4 @@
 <div id="main">
   <%= render 'blogo/shared/post' %>
-  <%= render 'blogo/shared/disqus_comments' if Blogo.config.disqus_shortname %>
+  <%= render 'blogo/shared/disqus_comments' %>
 </div>

data/app/views/blogo/shared/_aside.html.erb

@@ -18,7 +18,7 @@
   </header>
   <div class="tags">
     <% @tags.each do |tag| %>
-      <%= link_to tag.name, tag_path(tag), class: 'tag pure-button button-secondary' %>
+      <%= link_to tag.name, blogo_tag_path(tag), class: 'tag pure-button button-secondary' %>
     <% end %>
   <div>
 </aside>

data/app/views/blogo/shared/_disqus_comments.html.erb

@@ -1,20 +1,22 @@
-<section id='disqus-comments'>
-  <h1> Comments </h1>
-  <div id="disqus_thread" aria-live="polite"></div>
-  <noscript>Please enable JavaScript to view the comments.</noscript>
-</section>
+<% if Blogo.config.disqus_shortname %>
+  <section id='disqus-comments'>
+    <h1> Comments </h1>
+    <div id="disqus_thread" aria-live="polite"></div>
+    <noscript>Please enable JavaScript to view the comments.</noscript>
+  </section>
 
 
-<script type="text/javascript">
-  var disqus_shortname  = '<%= Blogo.config.disqus_shortname %>';
-  var disqus_identifier = 'blog-post-<%= @post.id %>';
-  var disqus_url        = '<%= url_to_post(@post) %>';
-  var disqus_title      = '<%= @post.title %>';
-  var disqus_script     = 'embed.js';
+  <script type="text/javascript">
+    var disqus_shortname  = '<%= Blogo.config.disqus_shortname %>';
+    var disqus_identifier = 'blog-post-<%= @post.id %>';
+    var disqus_url        = '<%= url_to_post(@post) %>';
+    var disqus_title      = '<%= @post.title %>';
+    var disqus_script     = 'embed.js';
 
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = 'http://' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
-</script>
+    (function () {
+      var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+      dsq.src = 'http://' + disqus_shortname + '.disqus.com/' + disqus_script;
+      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    }());
+  </script>
+<% end %>

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

@@ -8,14 +8,14 @@
   <%= csrf_meta_tags %>
   <%= stylesheet_link_tag "blogo/blog" %>
 
-  <%= auto_discovery_link_tag :atom, feed_path %>
+  <%= auto_discovery_link_tag :atom, blogo_feed_path %>
   <%= render 'blogo/shared/google_analytics' %>
 </head>
 <body>
   <div id="container">
     <header class="blogo-header">
       <div class='header-titles'>
-        <h1><%= link_to Blogo.config.site_title, root_path %></h1>
+        <h1><%= link_to Blogo.config.site_title, blogo_root_path %></h1>
         <h2><%= Blogo.config.site_subtitle %></h2>
       </div>
 

data/lib/blogo.rb

@@ -2,6 +2,7 @@ require 'blogo/version'
 require 'blogo/errors'
 require 'blogo/engine'
 require 'blogo/config'
+require 'blogo/routes'
 
 require 'blogo/renderer'
 require 'blogo/paginator'

data/lib/blogo/routes.rb

@@ -0,0 +1,38 @@
+module Blogo
+  module Routes
+    def self.mount_to(context, opts)
+      blog_scope = opts[:at] || '/blogo'
+
+      context.instance_eval do
+        scope(path: blog_scope, module: 'blogo', as: 'blogo') do
+
+          namespace :admin do
+            # blogo_admin_path
+            get "/" => "posts#index", as:  ""
+            get "logout" => "sessions#destroy"
+            get "login" => "sessions#new", as: 'login'
+
+            post  '/posts/preview' => 'posts#preview', as: :post_preview
+            patch '/posts/preview' => 'posts#preview'
+
+            resources :sessions, only: %w(new create destroy)
+            resources :posts, except: %w(show)
+            resources :users
+            resources 'comments', only: %w(index)
+            resources 'images'  , only: %w(create)
+          end
+
+          get '/'                    => "posts#index", as: 'root'
+          get '/page/:page'          => 'posts#index', as: 'page'
+          get '/tag/:tag'            => 'posts#index', as: 'tag'
+          get '/tag/:tag/page/:page' => 'posts#index', as: 'tag_page'
+          get '/feed'                => 'posts#feed' , as: 'feed', defaults: { format: 'atom' }
+          get ":permalink"           => "posts#show" , as: "post"
+
+
+
+        end
+      end
+    end
+  end
+end

data/lib/blogo/version.rb

@@ -1,3 +1,3 @@
 module Blogo
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blogo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sergey Potapov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -120,7 +120,7 @@ files:
 - app/views/blogo/shared/_post.html.erb
 - app/views/layouts/blogo/admin.html.erb
 - app/views/layouts/blogo/blog.html.erb
-- config/routes.rb
+- config/environment.rb
 - db/migrate/20140218134508_create_blogo_users.rb
 - db/migrate/20140218134512_create_blogo_tags.rb
 - db/migrate/20140218134550_create_blogo_posts.rb
@@ -134,6 +134,7 @@ files:
 - lib/blogo/renderer/base.rb
 - lib/blogo/renderer/html.rb
 - lib/blogo/renderer/markdown.rb
+- lib/blogo/routes.rb
 - lib/blogo/version.rb
 - lib/tasks/blogo_tasks.rake
 - vendor/assets/images/blogo/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
@@ -411,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Mountable blog engine for Ruby on Rails

data/config/routes.rb

@@ -1,27 +0,0 @@
-Blogo::Engine.routes.draw do
-
-  namespace :admin do
-    get "/" => "posts#index", as:  "" # responds to admin_url and admin_path
-    get "logout" => "sessions#destroy"
-    get "login" => "sessions#new", as: 'login'
-
-    post  '/posts/preview' => 'posts#preview', as: :post_preview
-    patch '/posts/preview' => 'posts#preview'
-
-    resources :sessions, only: %i(new create destroy)
-    resources :posts, except: %i(show)
-    resources :users
-    resources 'comments', only: %w(index)
-    resources 'images'  , only: %w(create)
-  end
-
-  root to: "posts#index"
-  get '/page/:page' =>  'posts#index', as: 'page'
-  get '/tag/:tag' => 'posts#index', as: 'tag'
-  get '/tag/:tag/page/:page' => 'posts#index', as: 'tag_page'
-
-  get '/feed' => 'posts#feed', as: 'feed', defaults: { format: 'atom' }
-
-
-  get ":permalink" => "posts#show", as: "post"
-end