blogit 0.4.8 → 0.5.0

data/lib/blogit/version.rb

@@ -1,3 +1,3 @@
 module Blogit
-  VERSION = "0.4.8"
+  VERSION = "0.5.0"
 end

data/lib/generators/templates/blogit.rb

@@ -1,8 +1,17 @@
 # These configuration options can be used to customise the behaviour of Blogit
 Blogit.configure do |config|
-  
-  # Do you want to add comments to your blog?
-  # config.include_comments = true
+
+  # What kind of comments do you want to add to your blog ? (:active_record, :disqus or :no)
+  # config.include_comments = :active_record
+
+  # When using disqus comments, what is the shortname of your forum ?
+  # config.disqus_shortname = ""
+
+  # Should there be a share bar on every post ?
+  # config.include_share_bar = false
+
+  # Twitter username used in the share bar
+  # config.twitter_username = ""
 
   # The name of the controller method we'll call to return the current blogger.
   # Change this if you use something other than current_user.
@@ -14,7 +23,7 @@ Blogit.configure do |config|
 
   # Which DateTime::FORMATS format do we use to display blog and comment publish time
   # config.datetime_format = :short
-  
+
   # Should the controllers cache the blog pages as HTML?
   # config.cache_pages = false
 
@@ -24,17 +33,17 @@ Blogit.configure do |config|
   # The name of the before filter we'll call to authenticate the current user.
   # config.authentication_method = :login_required
 
-  # If set to true, the comments form will POST and DELETE to the comments 
+  # If set to true, the comments form will POST and DELETE to the comments
   # controller using AJAX calls.
   # config.ajax_comments = true
 
   # If set to true, the create, edit, update and destroy actions
-  # will be included. If set to false, you'll have to set these 
+  # will be included. If set to false, you'll have to set these
   # yourself elsewhere in the app.
   # config.include_admin_actions = true
 
   # If set to true, links for new posts, editing posts and deleting comments
-  # will be available. If set to false, you'll have to set these 
+  # will be available. If set to false, you'll have to set these
   # yourself in the templates.
   # config.include_admin_links = true
 
@@ -44,25 +53,32 @@ Blogit.configure do |config|
   # If blog content contains code, this should be highlighted using
   # albino.
   # config.highlight_code_syntax = true
-  
+
   # RSS Feed title content
   # config.rss_feed_title = "A blog about ponies!"
-  
+
   # RSS Feed description content
   # config.rss_feed_description = "Get your daily pony news here!"
-  
+
   # RSS Feed language
   # config.rss_feed_language = "en"
-  
+
   # When using redcarpet as content parser, pass these options as defaults.
   # @see here for more options: https://github.com/tanoku/redcarpet
   config.redcarpet_options = {
-    hard_wrap: true, 
-    filter_html: true, 
-    autolink: true, 
-    no_intraemphasis: true, 
-    fenced_code_blocks: true, 
+    hard_wrap: true,
+    filter_html: true,
+    autolink: true,
+    no_intraemphasis: true,
+    fenced_code_blocks: true,
     gh_blockcode: true
   }
-  
-end
+
+  # If set to true, it will be possible to call named routes of the main app
+  # directly, without the "main_app." prefix.
+  # Useful in the case where you don't want to change the main app's layout,
+  # but it does not expand correctly from inside blogit because some main
+  # app's named routes are missing.
+  # config.inline_main_app_named_routes = true
+
+end

data/spec/controllers/blogit/posts_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe PostsController do
-  
+
   before do
     reset_configuration
   end
@@ -11,268 +11,268 @@ describe PostsController do
   describe "GET 'index'" do
 
     let(:posts) { [] }
-    
+
     def do_get(page=nil)
       get :index, :use_route => :blogit, page: page.to_s
     end
-    
+
     it "should set posts to Blogit::Post.for_index" do
       Blogit::Post.expects(:for_index).returns(posts)
       do_get
       assigns(:posts).should == posts
     end
-    
+
     it "should pass the page param to for_index" do
       Blogit::Post.expects(:for_index).with("2").returns(posts)
       do_get("2")
       assigns(:posts).should == posts
     end
-    
+
   end
-  
+
   describe "GET /index.xml" do
-    
+
 
     let(:posts) { [] }
-    
+
     def do_get(page=nil)
       get :index, :use_route => :blogit, page: page.to_s, format: :xml
     end
-    
+
     it "should load all posts in reverse date order" do
       Blogit::Post.expects(:order).with('created_at DESC').returns(posts)
       do_get
       assigns(:posts).should == posts
     end
-    
+
   end
-  
+
   describe "GET 'new'" do
-    
+
     context "when logged in" do
-      
+
       before do
         mock_login
       end
-      
+
       def do_get
         get :new, use_route: :blogit
       end
-    
+
       it "should be successful" do
         do_get
         response.should be_success
       end
-      
+
       it "should set post to a new blog post" do
         do_get
         assigns(:post).should be_a(Blogit::Post)
         assigns(:post).should be_a_new_record
       end
-      
+
     end
-    
+
     context "when not logged in" do
-      
+
       def do_get
         get :new, use_route: :blogit
       end
-      
-      # It's not really the responsibility of the gem to manage authentication 
+
+      # It's not really the responsibility of the gem to manage authentication
       # so testing for specific behaviour here is not required
       # at the very least though, we'd expect the status not to be 200
       it "should redirect to another page" do
         do_get
         response.should_not be_success
       end
-      
+
     end
   end
-  
+
   describe "POST /create" do
-    
+
     context "when logged in" do
-      
+
       before do
         mock_login
       end
-      
+
       context "with valid params" do
-        
+
         let(:post_attributes) { attributes_for(:post) }
-        
+
         def do_post
           post :create, use_route: :blogit, post: post_attributes
         end
-        
+
         before do
           @blog_posts = []
           @current_blogger.expects(:blog_posts).returns(@blog_posts)
           @blog_posts.expects(:new).with(post_attributes.stringify_keys).returns(blog_post)
           blog_post.expects(:save).returns(true)
         end
-                
+
         it "should redirect to the blog post page" do
           do_post
           response.should redirect_to(controller.posts_url)
         end
-        
+
       end
-      
+
     end
-    
+
   end
 
-  
+
   describe "GET 'edit'" do
-    
+
     context "when logged in" do
-            
+
       before do
         mock_login
         @current_blogger.expects(:blog_posts).returns(@blog_posts = [])
         @blog_posts.expects(:find).with("1").returns(blog_post)
       end
-      
+
       def do_get
         get :edit, :id => 1, use_route: :blogit
       end
-      
+
       it "should find the blog post by the ID" do
         do_get
         assigns(:post).should eql(blog_post)
       end
-      
+
     end
-    
+
     context "when not logged in" do
-      
+
       def do_get
         get :edit, :id => 1, use_route: :blogit
       end
-      
-      # It's not really the responsibility of the gem to manage authentication 
+
+      # It's not really the responsibility of the gem to manage authentication
       # so testing for specific behaviour here is not required
       # at the very least though, we'd expect the status not to be 200
       it "should redirect to another pages" do
         do_get
         response.should_not be_success
       end
-      
+
     end
 
   end
-  
+
   describe "PUT 'update'" do
-        
+
     context "when logged in" do
-      
+
       before do
         @post_attributes = { "title" => "Something new" }
         mock_login
         @current_blogger.expects(:blog_posts).returns(@blog_posts = [])
         @blog_posts.expects(:find).with("1").returns(blog_post)
       end
-      
+
       def do_put
         put :update, id: "1", use_route: :blogit, post: @post_attributes
       end
-      
+
       it "should update the post attributes from params" do
         blog_post.expects(:update_attributes).with(@post_attributes).returns(true)
         do_put
       end
-      
+
       it "should redirect to the blog post page" do
         do_put
         response.should redirect_to(controller.post_url(blog_post))
       end
-      
+
       it "should set a flash notice" do
         do_put
         flash[:notice].should be_present
       end
     end
-    
+
     context "when not logged in" do
-      
+
       before do
         @post_attributes = { "title" => "Something new" }
       end
-      
+
       def do_put
         put :update, id: "1", use_route: :blogit, post: @post_attributes
       end
-      
-      # It's not really the responsibility of the gem to manage authentication 
+
+      # It's not really the responsibility of the gem to manage authentication
       # so testing for specific behaviour here is not required
       # at the very least though, we'd expect the status not to be 200
       it "should redirect to another page" do
         do_put
         response.should_not be_success
       end
-      
+
     end
-    
+
   end
-  
+
   describe "GET 'show'" do
-      
+
     before do
       Blogit::Post.expects(:find).with("1").returns(blog_post)
     end
-    
+
     def do_get
       get :show, :id => 1, use_route: :blogit
     end
-    
+
     it "should find blog post by id" do
       do_get
       assigns(:post).should eql(blog_post)
     end
 
   end
-  
+
   describe "DELETE 'destroy'" do
-        
+
     def do_delete
       delete :destroy, id: "1", use_route: :blogit
     end
-    
+
     describe "when logged in" do
-            
+
       before do
         mock_login
         @current_blogger.expects(:blog_posts).returns(@blog_posts = [])
         @blog_posts.expects(:find).with("1").returns(blog_post)
       end
-      
+
       it "should destroy the blog post" do
         blog_post.expects(:destroy)
         do_delete
       end
-      
+
       it "should redirect to the blog posts url" do
         do_delete
         response.should redirect_to(controller.posts_url)
       end
-      
+
       it "should show a flash notice" do
         do_delete
         flash[:notice].should be_present
       end
-      
+
     end
-    
+
     describe "when not logged in" do
-      
+
       it "should redirect to another page" do
         do_delete
         response.should_not be_success
       end
-      
+
     end
-    
+
   end
 
-end
+end