monologue-markdown 0.3.0 → 1.0.0.beta1

data/README.md

@@ -1,9 +1,7 @@
-# monologue-markdown
+# Monologue: markdown edition
 
 This is a simple extension that will change [Monologue](https://github.com/jipiboily/monologue)'s default editor to EpicEditor which will let you use Markdown instead of a WYSIWYG edit.
 
-IMPORTANT: this README is for Monologue 0.3.X.
-
 ## Install on a brand new Monologue installation
 
 This is simple, you just have to add this file to your `Gemfile` after Monologue:
@@ -15,16 +13,14 @@ Then run this:
     bundle exec rake monologue_markdown:install:migrations
     bundle exec rake db:migrate
 
+
 ## Install on an already existing Monologue installation
 
 You do the same as for a new Monologue installation, but, keep in mind that only new posts will have EpicEditor enabled. All the posts that existed before will still be using the WYSIWYG editor.
 
-## For Code Highlighting
-
-sudo easy_install Pygments
 
 ## Notes
 
 There are [Deface](https://github.com/railsdog/deface/) overrides with this project. You might want to (read: "should") turn it off on production. If you do, you can add a Capistrano task to precompile them or precompile them locally.
 
-[Read more about this here.](https://github.com/railsdog/deface/#production--precompiling)
+[Read more about this here.](https://github.com/railsdog/deface/#production--precompiling)

data/app/assets/javascripts/monologue-markdown/epiceditor_load.coffee.erb

@@ -1,11 +1,11 @@
 class MonologueMarkdown
   constructor: ->
-    @textarea = $("#post_content")
+    @textarea = $("#post_posts_revision_content")
     @opts =
       container: "epiceditor"
       basePath: ""
-      clientSideStorage: false
       clientSideStorage: true
+      localStorageName: "epiceditor"
       parser: marked
       file:
         name: "epiceditor"
@@ -23,44 +23,34 @@ class MonologueMarkdown
         fullscreen: 70
         preview: 80
         edit: 79
-
-    @initEpicEditor()
-    @bindEvents()
-    @removeDefaultEditor() # remove CKEDITOR right now if it is already loaded
-
-  initEpicEditor: ->
     $(@textarea).after("<div id='epiceditor'></div>")
     $(@textarea).hide()
-    @editor = new EpicEditor(@opts)
-    @bindEpicEvents()
-    @editor.load()
+    that = @
 
-  bindEpicEvents: ->
-    @editor.on "load", (data) =>
-      @editor.importFile('epiceditor',$(@textarea).val())
+    editor = new EpicEditor(@opts)
 
-    @editor.on "update", (data) =>
-      @update_content(data)
+    editor.on "load", (data) ->
+      editor.importFile('epiceditor',$(that.textarea).val())
 
-  bindEvents: ->
-    $("form").submit (e) =>
-      @editor.emit("update")
+    editor.on "update", (data) ->
+      that.update_content(data)
 
-    # removing CKEDITOR when loaded
-    CKEDITOR.on 'instanceReady', =>
-      @removeDefaultEditor()
+    editor.load()
 
+    $("form").submit (e) ->
+      editor.emit("update")
   update_content: (data) =>
+    # forcing unload of tinymce to make sure it doesn't add stuff in our neat content
+    @force_unload_tiny_mce()
     # update content with our awesome markdown
     @textarea.val data.content
 
-  removeDefaultEditor: =>
+  force_unload_tiny_mce: =>
     try
-      CKEDITOR.instances["post_content"].destroy(true)
-      $(@textarea).hide()
-    catch
-      #
-    $('#cke_post_content').remove()
+      tinymce.get(0).remove()
+      $(".mceEditor").remove()
+    catch e
+      # well, it looks like TinyMCE wasn't load for some reason anyway
 
 
 $(document).ready ->

data/app/models/monologue/posts_revision_decorator.rb

@@ -0,0 +1,28 @@
+Monologue::PostsRevision.class_eval do
+  before_validation do
+    if self.post.nil? || self.post.posts_revision_id.nil?
+      self.is_markdown = true
+    else
+      self.is_markdown = self.post.active_revision.is_markdown
+    end
+  end
+
+  def is_markdown?
+    self.is_markdown != false
+  end
+
+  def content
+    if self.is_markdown? && !in_admin?(caller)
+      markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true)
+      return markdown.render(read_attribute(:content))
+    end
+    read_attribute(:content)
+  end
+
+  def in_admin? caller
+    caller.each do |c|
+      return true if c.include? "app/controllers/monologue/admin/posts_controller.rb"
+    end
+    return false
+  end
+end

data/app/views/monologue-markdown/overrides/_is_markdown.html.erb

@@ -1 +1 @@
-<div id="is_markdown" style="display:none"><%= @post.is_markdown?%></div>
+<div id="is_markdown" style="display:none"><%= @post.active_revision.is_markdown?%></div>

data/lib/monologue-markdown/engine.rb

@@ -1,5 +1,5 @@
 require "deface"
-require 'content/pipeline'
+require "redcarpet"
 
 module MonologueMarkdown
   class Engine < ::Rails::Engine
@@ -12,7 +12,6 @@ module MonologueMarkdown
 
     initializer :assets do |config|
       Rails.application.config.assets.precompile += %w( monologue-markdown/epiceditor/themes/base/epiceditor.css monologue-markdown/epiceditor/themes/editor/epic-dark.css monologue-markdown/epiceditor/themes/preview/github.css )
-      Rails.application.config.assets.precompile += %w( monologue-markdown/code-highlighting.css)
     end
 
     def self.activate

data/lib/monologue-markdown/version.rb

@@ -1,3 +1,3 @@
 module MonologueMarkdown
-  VERSION = "0.3.0"
+  VERSION = "1.0.0.beta1"
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: monologue-markdown
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Jean-Philippe Boily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,90 +30,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: monologue
   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: deface
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
-- !ruby/object:Gem::Dependency
-  name: github-markdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: content-pipeline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pygments.rb
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   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: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,71 +126,81 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A small and simple efficient extension to Monologue that replace the
@@ -221,20 +218,18 @@ files:
 - app/assets/javascripts/monologue-markdown/epiceditor/epiceditor.min.js.erb
 - app/assets/javascripts/monologue-markdown/epiceditor_load.coffee.erb
 - app/assets/stylesheets/monologue-markdown/application.css
-- app/assets/stylesheets/monologue-markdown/code-highlighting.css
 - app/assets/stylesheets/monologue-markdown/epiceditor/themes/base/epiceditor.css
 - app/assets/stylesheets/monologue-markdown/epiceditor/themes/editor/epic-dark.css
 - app/assets/stylesheets/monologue-markdown/epiceditor/themes/editor/epic-light.css
 - app/assets/stylesheets/monologue-markdown/epiceditor/themes/preview/github.css
 - app/assets/stylesheets/monologue-markdown/epiceditor/themes/preview/preview-dark.css
-- app/models/monologue/post_decorator.rb
+- app/models/monologue/posts_revision_decorator.rb
 - app/overrides/insert_epiceditor_in_admin.rb
 - app/overrides/insert_is_markdown_in_post_edit.rb
 - app/views/monologue-markdown/overrides/_epiceditor.html.erb
 - app/views/monologue-markdown/overrides/_is_markdown.html.erb
 - config/routes.rb
 - db/migrate/20120924111013_add_is_markown_to_posts_revision.rb
-- db/migrate/20130913004609_merge_markdown_revisions_into_posts.rb
 - lib/monologue-markdown/engine.rb
 - lib/monologue-markdown/version.rb
 - lib/monologue-markdown.rb
@@ -244,26 +239,27 @@ files:
 - README.md
 homepage: https://github.com/jipiboily/monologue-markdown
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A small and simple efficient extension to Monologue that replace the default
   WYSIWYG editor with a Markdown editor.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e53e97358288c48efcebed3722d71bd7c456f572
-  data.tar.gz: 26d13e69f66658abed137f80bf404d60c1aa6e65
-SHA512:
-  metadata.gz: 61045826a9579a516d167e3eaed373d2b8b2665d234ee8b6b6afc154bd8cae4f4d1ae92d9141b225669590f11f48b6e50517a01dc867609b7afbc737daf7de19
-  data.tar.gz: 2e6da97d49a11ef4e298d9f74a3b80a3d23633f76314b924b91305870f35d00d813c755c4206237b0475ed1ecb824cfaa3d83702b7eb5f3e99c9ee217d6505f9

data/app/assets/stylesheets/monologue-markdown/code-highlighting.css

@@ -1,79 +0,0 @@
-
-code .hll { background-color: #ffffcc }
-code .c { color: #408080; font-style: italic } /* Comment */
-code .err { border: 1px solid #FF0000 } /* Error */
-code .k { color: #008000; font-weight: bold } /* Keyword */
-code .o { color: #666666 } /* Operator */
-code .cm { color: #408080; font-style: italic } /* Comment.Multiline */
-code .cp { color: #BC7A00 } /* Comment.Preproc */
-code .c1 { color: #408080; font-style: italic } /* Comment.Single */
-code .cs { color: #408080; font-style: italic } /* Comment.Special */
-code .gd { color: #A00000 } /* Generic.Deleted */
-code .ge { font-style: italic } /* Generic.Emph */
-code .gr { color: #FF0000 } /* Generic.Error */
-code .gh { color: #000080; font-weight: bold } /* Generic.Heading */
-code .gi { color: #00A000 } /* Generic.Inserted */
-code .go { color: #888888 } /* Generic.Output */
-code .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
-code .gs { font-weight: bold } /* Generic.Strong */
-code .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-code .gt { color: #0044DD } /* Generic.Traceback */
-code .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
-code .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
-code .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
-code .kp { color: #008000 } /* Keyword.Pseudo */
-code .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
-code .kt { color: #B00040 } /* Keyword.Type */
-code .m { color: #666666 } /* Literal.Number */
-code .s { color: #BA2121 } /* Literal.String */
-code .na { color: #7D9029 } /* Name.Attribute */
-code .nb { color: #008000 } /* Name.Builtin */
-code .nc { color: #0000FF; font-weight: bold } /* Name.Class */
-code .no { color: #880000 } /* Name.Constant */
-code .nd { color: #AA22FF } /* Name.Decorator */
-code .ni { color: #999999; font-weight: bold } /* Name.Entity */
-code .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
-code .nf { color: #0000FF } /* Name.Function */
-code .nl { color: #A0A000 } /* Name.Label */
-code .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
-code .nt { color: #008000; font-weight: bold } /* Name.Tag */
-code .nv { color: #19177C } /* Name.Variable */
-code .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
-code .w { color: #bbbbbb } /* Text.Whitespace */
-code .mf { color: #666666 } /* Literal.Number.Float */
-code .mh { color: #666666 } /* Literal.Number.Hex */
-code .mi { color: #666666 } /* Literal.Number.Integer */
-code .mo { color: #666666 } /* Literal.Number.Oct */
-code .sb { color: #BA2121 } /* Literal.String.Backtick */
-code .sc { color: #BA2121 } /* Literal.String.Char */
-code .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
-code .s2 { color: #BA2121 } /* Literal.String.Double */
-code .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
-code .sh { color: #BA2121 } /* Literal.String.Heredoc */
-code .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
-code .sx { color: #008000 } /* Literal.String.Other */
-code .sr { color: #BB6688 } /* Literal.String.Regex */
-code .s1 { color: #BA2121 } /* Literal.String.Single */
-code .ss { color: #19177C } /* Literal.String.Symbol */
-code .bp { color: #008000 } /* Name.Builtin.Pseudo */
-code .vc { color: #19177C } /* Name.Variable.Class */
-code .vg { color: #19177C } /* Name.Variable.Global */
-code .vi { color: #19177C } /* Name.Variable.Instance */
-code .il { color: #666666 } /* Literal.Number.Integer.Long */
-
-figure.code .gutter pre {
-  margin-right: 10px;
-  padding-right: 10px;
-  border-right: 1px solid #e5e5e5;
-  text-align: right;
-}
-
-figure.code {
-  margin: 5px;
-  padding: 5px;
-  white-space:nowrap;
-  border:1px solid #eaeaea;
-  background-color:#f8f8f8;
-  border-radius:3px;
-  overflow-x: scroll;
-}

data/app/models/monologue/post_decorator.rb

@@ -1,26 +0,0 @@
-Monologue::Post.class_eval do
-  before_validation do
-    if self.new_record?
-      self.is_markdown = true
-    end
-  end
-
-  def is_markdown?
-    self.is_markdown == true
-  end
-
-  def content
-    if self.is_markdown? && !in_admin?(caller)
-      pipeline = Content::Pipeline.new
-      return pipeline.filter(read_attribute(:content), markdown: { type: :gfm, safe: false })
-    end
-    read_attribute(:content)
-  end
-
-  def in_admin? caller
-    caller.each do |c|
-      return true if c.include? "app/controllers/monologue/admin/posts_controller.rb"
-    end
-    return false
-  end
-end

data/db/migrate/20130913004609_merge_markdown_revisions_into_posts.rb

@@ -1,33 +0,0 @@
-class MergeMarkdownRevisionsIntoPosts < ActiveRecord::Migration
-  class Monologue::PostsRevision < ActiveRecord::Base
-    attr_accessible :title, :content, :url, :published_at, :post_id
-  end
-
-  class Monologue::Post < ActiveRecord::Base
-  end
-
-  def up
-    Monologue::PostsRevision.reset_column_information
-    Monologue::Post.reset_column_information
-    add_column :monologue_posts, :is_markdown, :boolean
-
-    Monologue::Post.reset_column_information
-
-    Monologue::Post.all.each do |post|
-      latest_revision =  latest_revision_for(post)
-      post.is_markdown = latest_revision.is_markdown
-      post.save(validate: false)
-    end
-
-    remove_column :monologue_posts_revisions, :is_markdown
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-
-  private
-  def latest_revision_for(post)
-    Monologue::PostsRevision.where("post_id = ?", post.id).order("monologue_posts_revisions.updated_at DESC").limit(1).first
-  end
-end