blogit 0.5.0 → 0.5.1

data/app/helpers/blogit/application_helper.rb

@@ -49,7 +49,7 @@ module Blogit
         time_string = time_object.strftime(format)
         # if there's a specified format and it's a symbol, assume it's a predefined format
       elsif format && format.is_a?(Symbol)
-        time_string = time_object.to_s(format)
+        time_string = I18n.localize(time_object, format: format)
       else
         time_string = time_object.to_s
       end

data/app/views/blogit/posts/index.html.erb

@@ -7,7 +7,7 @@
   <%= render partial: "blogit/posts/post",
     collection: @posts,
     spacer_template: "blog_post_spacer",
-    locals: {show_comments_count: true}  %>
+    locals: {show_comments_count: (Blogit.configuration.include_comments == :active_records) }  %>
 <% else %>
 
   <%= render partial: "blogit/posts/empty" %>

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

@@ -1,3 +1,4 @@
 <%= render @post %>
 <%= share_bar_for @post %>
+<%= render "blogit/posts/post_footer", post: @post %>
 <%= comments_for @post %>

data/lib/blogit/configuration.rb

@@ -87,6 +87,7 @@ module Blogit
     # the "main_app." prefix ?
     attr_accessor :inline_main_app_named_routes
 
+    # When using redcarpet as content parser, pass these options as defaults.
     REDCARPET_OPTIONS = {
       hard_wrap: true,
       filter_html: true,
@@ -135,17 +136,17 @@ module Blogit
     # If the user has defined a disqus shortname but hasn't set include_comments to
     # disqus, print a warning to the console.
     def twitter_username=(username)
-      if @twitter_username.present? and not @include_share_bar
+      if not @include_share_bar
         blogit_warn "You've set config.twitter_username in your blogit config file but config.include_share_bar is set to false"
       end
       @twitter_username = username
     end
-    
+
     private
-    
+
     def blogit_warn(message)
       warn "[Blogit]: #{message}"
     end
-    
+
   end
 end

data/lib/blogit/version.rb

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

data/lib/generators/templates/blogit.rb

@@ -65,14 +65,14 @@ Blogit.configure do |config|
 
   # 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,
-    gh_blockcode: true
-  }
+  # config.redcarpet_options = {
+  #   hard_wrap: true,
+  #   filter_html: true,
+  #   autolink: true,
+  #   no_intraemphasis: true,
+  #   fenced_code_blocks: true,
+  #   gh_blockcode: true
+  # }
 
   # If set to true, it will be possible to call named routes of the main app
   # directly, without the "main_app." prefix.

data/spec/dummy/app/views/layouts/application.html.erb

@@ -27,6 +27,6 @@
   <footer id="application_footer">
     By <%= link_to("Gavin Morrice", "http://gavinmorrice.com") %>
   </footer>
-  <%= javascript_include_tag "blogit", "application" %>
+  <%= javascript_include_tag "application", "blogit" %>
 </body>
 </html>

data/spec/dummy/config/application.rb

@@ -5,6 +5,7 @@ require 'rails/all'
 Bundler.require
 
 require "blogit"
+require "jquery-rails" # this should be auto-included with the Bundler.require :default, Rails.env, but it's not happening
 
 module Dummy
   class Application < Rails::Application

data/spec/helpers/blogit/posts_helper_spec.rb

@@ -77,24 +77,24 @@ describe Blogit::PostsHelper do
       post_css = "archive-post"
 
       helper.blog_posts_archive_tag(year_css, month_css, post_css).should == ["<ul class=\"#{year_css}\">",
-                                                                                "<li><a onclick=\"toggleBrothersDisplay(this, 'UL')\">2011</a>",
+                                                                                "<li><a data-blogit-click-to-toggle-children>2011</a>",
                                                                                   "<ul class=\"#{month_css}\">",
-                                                                                    "<li><a onclick=\"toggleBrothersDisplay(this, 'UL')\">December</a>",
+                                                                                    "<li><a data-blogit-click-to-toggle-children>December</a>",
                                                                                       "<ul class=\"#{post_css}\">",
                                                                                         "<li><a href=\"#{blogit.post_path(dec_2011)}\">#{dec_2011.title}</a></li>",
                                                                                       "</ul>",
                                                                                     "</li>",
                                                                                   "</ul>",
                                                                                 "</li>",
-                                                                                "<li><a onclick=\"toggleBrothersDisplay(this, 'UL')\">2012</a>",
+                                                                                "<li><a data-blogit-click-to-toggle-children>2012</a>",
                                                                                   "<ul class=\"#{month_css}\">",
-                                                                                    "<li><a onclick=\"toggleBrothersDisplay(this, 'UL')\">July</a>",
+                                                                                    "<li><a data-blogit-click-to-toggle-children>July</a>",
                                                                                       "<ul class=\"#{post_css}\">",
                                                                                         "<li><a href=\"#{blogit.post_path(july_2012_1)}\">#{july_2012_1.title}</a></li>",
                                                                                         "<li><a href=\"#{blogit.post_path(july_2012_2)}\">#{july_2012_2.title}</a></li>",
                                                                                       "</ul>",
                                                                                     "</li>",
-                                                                                    "<li><a onclick=\"toggleBrothersDisplay(this, 'UL')\">September</a>",
+                                                                                    "<li><a data-blogit-click-to-toggle-children>September</a>",
                                                                                       "<ul class=\"#{post_css}\">",
                                                                                         "<li><a href=\"#{blogit.post_path(sept_2012)}\">#{sept_2012.title}</a></li>",
                                                                                       "</ul>",

data/spec/lib/configuration_spec.rb

@@ -11,7 +11,7 @@ describe Blogit::Configuration do
   it "should set :disqus_shortname to blank" do
     blog_configuration.disqus_shortname.should == ""
   end
-  
+
   it "should print a warning to the console if disqus_shortname is set but include_comments is not disqus" do
     blog_configuration.expects(:warn)
     blog_configuration.include_comments = :active_record
@@ -20,7 +20,7 @@ describe Blogit::Configuration do
 
   it "should print a warning to the console if twitter_username is set but include_share_bar is false" do
     blog_configuration.expects(:warn)
-    blog_configuration.include_share_bar = true
+    blog_configuration.include_share_bar = false
     blog_configuration.twitter_username = "bodacious"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blogit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
@@ -319,6 +319,7 @@ files:
 - app/views/blogit/posts/_pagination.html.erb
 - app/views/blogit/posts/_post.html.erb
 - app/views/blogit/posts/_post_body.html.erb
+- app/views/blogit/posts/_post_footer.html.erb
 - app/views/blogit/posts/_post_head.html.erb
 - app/views/blogit/posts/_post_links.html.erb
 - app/views/blogit/posts/_share_bar.html.erb
@@ -452,7 +453,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1374940806755364989
+      hash: -3493006387519842400
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -461,7 +462,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1374940806755364989
+      hash: -3493006387519842400
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24