almanac 0.6.1 → 0.7.1

data/app/assets/javascripts/almanac/{5-main.coffee.erb → 6-main.coffee.erb}

@@ -48,6 +48,9 @@ $(document).ready ->
   $("#post_title").change (e) ->
     $("#post_slug").val($(this).val().convertToSlug())
 
+  $("pre").addClass("prettyprint").addClass("linenums")
+  prettyPrint()
+
 unless String::convertToSlug?
   String::convertToSlug = ->
     @toLowerCase().replace(/[^\w ]+/g, "").replace RegExp(" +", "g"), "-"

data/app/assets/stylesheets/almanac/2-prettify.css

@@ -0,0 +1,30 @@
+.com { color: #93a1a1; }
+.lit { color: #195f91; }
+.pun, .opn, .clo { color: #93a1a1; }
+.fun { color: #dc322f; }
+.str, .atv { color: #D14; }
+.kwd, .prettyprint .tag { color: #1e347b; }
+.typ, .atn, .dec, .var { color: teal; }
+.pln { color: #48484c; }
+
+.prettyprint {
+    padding: 8px;
+    background-color: #f7f7f9;
+    border: 1px solid #e1e1e8;
+}
+.prettyprint.linenums {
+    -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+    -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+    box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+}
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums {
+    margin: 0 0 0 33px; /* IE indents via margin-left */
+}
+ol.linenums li {
+    padding-left: 12px;
+    color: #bebec5;
+    line-height: 20px;
+    text-shadow: 0 1px 0 #fff;
+}

data/app/assets/stylesheets/almanac/{2-main.css.scss → 3-main.css.scss}

@@ -12,10 +12,16 @@ $font-family-title: "HelveticaNeueBold", "HelveticaNeue-Bold", "Helvetica Neue B
     margin-bottom: 10px;
   }
 
-  li, ol {
+  li {
     margin-bottom: 14px;
     line-height: 28px;
   }
+  ol.linenums li {
+    margin-bottom: 0;
+  }
+  pre ol li code {
+    font-size: inherit;
+  }
 
   .icon-white,
   .nav-tabs > .active > a > [class^="icon-"],

data/app/controllers/almanac/application_controller.rb

@@ -6,7 +6,7 @@ module Almanac
     before_filter :set_blog
 
     before_filter do |controller|
-      @markdown_parser = MarkdownParser.new
+      @kramdown_parser = KramdownParser.new
     end
 
     def set_current_author

data/app/views/almanac/posts/_post.html.haml

@@ -3,12 +3,12 @@
     = link_to (@post.title.nil? or @post.title.empty?) ? "No Title" : @post.title, (@post.published) ? post_path(@post.slug) : draft_path(@post.id)
   - if (action_name == "index" or action_name == "tag") and !(@post.excerpt.nil? or @post.excerpt.empty?)
     .content
-      = @markdown_parser.markdown_to_html(@post.excerpt).html_safe
+      = @kramdown_parser.kramdown_to_html(@post.excerpt).html_safe
       %p
-        = link_to "Continue reading...", @post
+        = link_to "Continue reading...", (@post.published) ? post_path(@post.slug) : draft_path(@post.id)
   - else
     .content
-      = @markdown_parser.markdown_to_html(@post.body).html_safe if !(@post.body.nil? or @post.body.empty?)
+      = @kramdown_parser.kramdown_to_html(@post.body).html_safe if !(@post.body.nil? or @post.body.empty?)
   - unless @post.tag_list.empty?
     %div.tags
       - @post.tag_list.each_with_index do |tag, index|

data/app/views/almanac/posts/index.rss.builder

@@ -8,7 +8,7 @@ xml.rss :version => "2.0" do
     for post in @posts
       xml.item do
         xml.title post.title
-        xml.description @markdown_parser.markdown_to_html(post.body).html_safe
+        xml.description @kramdown_parser.kramdown_to_html(post.body).html_safe
         xml.pubDate post.written_at.to_s(:rfc822)
         xml.link post_url(post)
         xml.guid post_url(post)

data/app/views/layouts/almanac/application.html.haml

@@ -48,7 +48,6 @@
       = yield
       %hr.gradient-white
       .footer
-        - if @blog
-          = (@blog.footer.empty?) ? "© #{Date.today.year}".html_safe : @markdown_parser.markdown_to_html(@blog.footer).html_safe
-    - unless @blog.nil? or  @blog.google_analytics.nil? or @blog.google_analytics.empty?
+        = (@blog.nil? or @blog.footer.nil? or @blog.footer.empty?) ? "© #{Date.today.year}".html_safe : @kramdown_parser.kramdown_to_html(@blog.footer).html_safe
+    - unless @blog.nil? or @blog.google_analytics.nil? or @blog.google_analytics.empty?
       = render :template => 'layouts/almanac/_ga'

data/db/migrate/20121116194902_add_index_to_almanac_posts_on_slug.rb

@@ -1,6 +1,6 @@
 class AddIndexToAlmanacPostsOnSlug < ActiveRecord::Migration
   def up
-    add_index :almanac_posts, :slug, unique: true
+    add_index :almanac_posts, :slug, :unique => true
   end
    def down
    end

data/lib/almanac/MarkdownParser.rb

@@ -1,4 +1,4 @@
-class MarkdownParser
+class KramdownParser
   def initialize(*args)
     @attribute = *args[0]
   end
@@ -8,11 +8,11 @@ class MarkdownParser
     record.send("#{@attribute}=", markdown)
   end
 
-  def html_to_markdown(text)
+  def html_to_kramdown(text)
     Kramdown::Document.new(text.html_safe, :input => 'html').to_kramdown
   end
 
-  def markdown_to_html(text)
+  def kramdown_to_html(text)
     Kramdown::Document.new(text.html_safe, :input => 'kramdown').to_html
   end
 end

data/lib/almanac/version.rb

@@ -1,3 +1,3 @@
 module Almanac
-  VERSION = "0.6.1"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: almanac
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70254488253860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 3.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70254488253860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70254488252180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488252180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70254488250500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488250500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &70254488270700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488270700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70254488269640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488269640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-rails-engine
-  requirement: &70254488268420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488268420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70254488314460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488314460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70254488313860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488313860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &70254488313260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488313260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70254488312500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488312500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &70254488311820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488311820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70254488310140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488310140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &70254488308420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488308420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &70254488307260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +229,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488307260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70254488324960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +245,15 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70254488324960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: will_paginate-bootstrap
-  requirement: &70254488323960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +261,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488323960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &70254488322260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +277,15 @@ dependencies:
         version: 2.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70254488322260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: rakismet
-  requirement: &70254488321620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +293,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254488321620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70254488320940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +309,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254488320940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70254488320520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +325,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254488320520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70254488348320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +341,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254488348320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70254488346460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +357,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254488346460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70254488344720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,7 +373,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254488344720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Almanac is the most elegant mountable blog engine that can be easily
   hooked up in the existing Rails application.
 email:
@@ -283,10 +398,12 @@ files:
 - app/assets/javascripts/almanac/2-jquery.backstretch.js
 - app/assets/javascripts/almanac/3-pixastic.js
 - app/assets/javascripts/almanac/4-bootstrap-datepicker.js
-- app/assets/javascripts/almanac/5-main.coffee.erb
+- app/assets/javascripts/almanac/5-prettify.js
+- app/assets/javascripts/almanac/6-main.coffee.erb
 - app/assets/javascripts/almanac/application.js
 - app/assets/stylesheets/almanac/1-datepicker.css
-- app/assets/stylesheets/almanac/2-main.css.scss
+- app/assets/stylesheets/almanac/2-prettify.css
+- app/assets/stylesheets/almanac/3-main.css.scss
 - app/assets/stylesheets/almanac/application.css
 - app/controllers/almanac/application_controller.rb
 - app/controllers/almanac/blogs_controller.rb
@@ -370,7 +487,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20121106220325_devise_create_users.rb
 - spec/dummy/db/migrate/20121114185255_create_almanac_posts.almanac.rb
 - spec/dummy/db/migrate/20121114185256_create_almanac_blogs.almanac.rb
@@ -390,10 +506,6 @@ files:
 - spec/dummy/db/migrate/20121116192008_add_slug_to_almanac_posts.almanac.rb
 - spec/dummy/db/migrate/20121116195111_add_index_to_almanac_posts_on_slug.almanac.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/production.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -427,7 +539,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The most elegant blog engine for Rails apps.
@@ -461,7 +573,6 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20121106220325_devise_create_users.rb
 - spec/dummy/db/migrate/20121114185255_create_almanac_posts.almanac.rb
 - spec/dummy/db/migrate/20121114185256_create_almanac_blogs.almanac.rb
@@ -481,10 +592,6 @@ test_files:
 - spec/dummy/db/migrate/20121116192008_add_slug_to_almanac_posts.almanac.rb
 - spec/dummy/db/migrate/20121116195111_add_index_to_almanac_posts_on_slug.almanac.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/production.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html