ecrire 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fcb3e04a26a184a4a0c334415d276f85622427a
-  data.tar.gz: 4291e04867ed0c6e5f372a0f7271ae2a10557324
+  metadata.gz: 5ddb1f62d91da888fa8d3e778817290f95823bf3
+  data.tar.gz: 9864c0c4b7fc697559320e651a61ede2476ffe64
 SHA512:
-  metadata.gz: 922ddfce245632546f95b59e7866db2411f57018626aa205d9df87bd00a2c46279a23f4cecb501fd9ab1be62fea88c37cf3f9760a869a69e0ee4f3cb5c7f34a4
-  data.tar.gz: 5a5572199c40d7c95b40ee807ae914a9413992388d729b6395a5b9455b0e578666edcbef368b1446c1457322abf7a94e2b47728c6da891dd5e94d46245099d61
+  metadata.gz: 81a906e8665478f1503329e9359d6b550a3c2357a0eb68996b4c7dfe83ae3839b5cbf85ce4dc1fd7bfffd350e9c76a6dce4ad12a0a49d16f8e36fd356db54634
+  data.tar.gz: 9cc81279330504df52d6014af8b9da6f336579c8ec600c4359a771f4f2e1da05d165d8d6adbb79844fdc220452e1fff0c77ff6ade26c33e08c0eaf51b45a35dd

data/Gemfile

@@ -10,7 +10,6 @@ gem 'nokogiri',          '~> 1.6'
 gem 's3',                '~> 0.3'
 gem 'pg',                '~> 0.17'
 gem 'kaminari',          '~> 0.15'
-gem 'kramdown',          '~> 1.5'
 
 gem 'sprockets-rails',   '~> 2.1'
 gem 'sass-rails',        '~> 4.0', '>= 4.0.3'

data/Rakefile

@@ -16,7 +16,7 @@ namespace :database do
 end
 
 namespace :test do
-  ['editor', 'onboarding', 'theme'].each do |name|
+  ['markdown', 'editor', 'onboarding', 'theme'].each do |name|
     task = Ecrire::TestTask.new(name) do |t|
       t.theme = Dir.pwd + "/test/#{name}/theme"
       t.libs << "test"
@@ -28,7 +28,7 @@ namespace :test do
 end
 
 task :test do
-  %w(test:editor test:onboarding test:theme).each do |name|
+  %w(test:markdown test:editor test:onboarding test:theme).each do |name|
     Rake::Task[name].invoke
   end
 end

data/lib/ecrire/app/assets/stylesheets/admin/editor/content.css.scss

@@ -31,13 +31,21 @@ body.edit.posts > main > section {
       font-size: 1.2em;
     }
 
-    & > *, & > ul > li, & > ol > li {
+
+    & > ul > li, & > ol > li, h1, h2, h3, h4, h5, h6 {
       white-space: pre-wrap;
       min-height: 1.6em;
       line-height: 1.6em;
       margin: 0.3em 0;
     }
 
+    & > p, & > ol, & > ul, & > figure {
+      white-space: pre-wrap;
+      min-height: 1.6em;
+      line-height: 1.6em;
+      margin: 1.8em 0;
+    }
+
     & > ul, & > ol {
       margin-left: 2em;
     }

data/lib/ecrire/app/models/admin/post.rb

@@ -1,5 +1,3 @@
-require 'kramdown'
-
 module Admin
   class Post < ::Post
 
@@ -36,7 +34,7 @@ module Admin
     private
 
     def compile!
-      self.compiled_content = Kramdown::Document.new(self.content).to_html
+      self.compiled_content = Ecrire::Markdown.parse(self.content).to_html
     end
 
     def excerptize!

data/lib/ecrire/markdown/document.rb

@@ -0,0 +1,42 @@
+require 'ecrire/markdown/parsers'
+require 'ecrire/markdown/node'
+
+module Ecrire::Markdown
+  class Document
+
+    attr_reader :nodes
+
+    def initialize(content)
+      @nodes = content.lines.map do |text|
+        Node.new(text.chomp)
+      end
+    end
+
+    def parsers
+      [
+        Ecrire::Markdown::Parsers::Code,
+        Ecrire::Markdown::Parsers::Heading,
+        Ecrire::Markdown::Parsers::Image,
+        Ecrire::Markdown::Parsers::List,
+        Ecrire::Markdown::Parsers::Word,
+        Ecrire::Markdown::Parsers::Link
+      ]
+    end
+
+    def parse!
+      parsers.each do |parser|
+        parser.parse!(self)
+      end
+    end
+
+    def to_html
+      @nodes.map do |node|
+        if node.instance_of?(Ecrire::Markdown::Node)
+          "<p>#{node.to_s}</p>"
+        else
+          node.to_s
+        end
+      end.join
+    end
+  end
+end

data/lib/ecrire/markdown/node.rb

@@ -0,0 +1,21 @@
+module Ecrire::Markdown
+  module Nodes
+    autoload :Image,                   'ecrire/markdown/nodes/image'
+    autoload :UnorderedList,           'ecrire/markdown/nodes/unordered_list'
+    autoload :OrderedList,             'ecrire/markdown/nodes/ordered_list'
+    autoload :CodeBlock,               'ecrire/markdown/nodes/code_block'
+    autoload :Heading,                 'ecrire/markdown/nodes/heading'
+  end
+
+  class Node
+    attr_accessor :content
+
+    def initialize(content)
+      @content = content || String.new
+    end
+
+    def to_s
+      @content
+    end
+  end
+end

data/lib/ecrire/markdown/nodes/code_block.rb

@@ -0,0 +1,30 @@
+require 'active_support/core_ext/string'
+
+module Ecrire::Markdown
+  module Nodes
+    class CodeBlock < Node
+      def initialize(language, title, nodes)
+        @content = ERB::Util.html_escape(nodes.join("\n"))
+        @title = title
+        @language = language
+      end
+
+      def to_s
+        str = "<pre>"
+        str << "<header>#{@title}</header>"
+
+        str << "<code"
+
+        unless @language.nil?
+          str << " class='language-#{@language}'>"
+        end
+
+
+        str << @content
+        str << "</code></pre>"
+        str
+      end
+    end
+  end
+end
+

data/lib/ecrire/markdown/nodes/heading.rb

@@ -0,0 +1,15 @@
+module Ecrire::Markdown
+  module Nodes
+    class Heading < Node
+      def initialize(size, content)
+        @size = size
+        @content = content
+      end
+
+      def to_s
+        "<h#{@size}>#{@content}</h#{@size}>"
+      end
+    end
+  end
+end
+

data/lib/ecrire/markdown/nodes/image.rb

@@ -0,0 +1,14 @@
+module Ecrire::Markdown
+  module Nodes
+    class Image < Node
+      def initialize(title, src)
+        @title = title
+        @src = src
+      end
+
+      def to_s
+        "<figure><img src='#{@src}' /><figcaption>#{@title}</figcaption></figure>"
+      end
+    end
+  end
+end

data/lib/ecrire/markdown/nodes/ordered_list.rb

@@ -0,0 +1,18 @@
+module Ecrire::Markdown
+  module Nodes
+    class OrderedList < Node
+
+      def initialize(text)
+        @content = "<li>#{text}</li>"
+      end
+
+      def append(text)
+        @content << "<li>#{text}</li>"
+      end
+
+      def to_s
+        "<ol>#{@content}</ol>"
+      end
+    end
+  end
+end

data/lib/ecrire/markdown/nodes/unordered_list.rb

@@ -0,0 +1,19 @@
+module Ecrire::Markdown
+  module Nodes
+    class UnorderedList < Node
+
+      def initialize(text)
+        @content = "<li>#{text}</li>"
+      end
+
+      def append(text)
+        @content << "<li>#{text}</li>"
+      end
+
+      def to_s
+        "<ul>#{@content}</ul>"
+      end
+    end
+  end
+end
+

data/lib/ecrire/markdown/parsers/base.rb

@@ -0,0 +1,26 @@
+module Ecrire::Markdown::Parsers
+  class Base
+    class << self
+      private :new
+    end
+
+    def self.parse!(document)
+      i = 0
+      while !document.nodes[i].nil? do
+        node = new(document, document.nodes[i], i).parse!
+        i = document.nodes.index(node) + 1
+      end
+    end
+
+    def initialize(document, node, index)
+      @document = document
+      @node = node
+      @index = index
+    end
+
+    def parse!
+      return @node
+    end
+
+  end
+end

data/lib/ecrire/markdown/parsers/code.rb

@@ -0,0 +1,41 @@
+module Ecrire::Markdown::Parsers
+  class Code < Base
+    OPENING_TAG = /^((~{3,})([a-z]+)?)( (.*))?$/i
+
+    def parse!
+
+      unless @node.instance_of?(Ecrire::Markdown::Node)
+        return @node
+      end
+
+      if match = OPENING_TAG.match(@node.content)
+        count = match[2].size
+        language = match[3]
+        title = match[5]
+        nodes = extract_code_nodes!(count)
+        @node = Ecrire::Markdown::Nodes::CodeBlock.new(language, title, nodes)
+        @document.nodes[@index] = @node
+      end
+      return @node
+    end
+
+    def extract_code_nodes!(count)
+      regex = Regexp.new("^(~{#{count}}$)")
+      found_closing_tag = false
+      i = @index + 1
+      nodes = []
+
+      while !found_closing_tag
+        break if @document.nodes[i].nil?
+        node = @document.nodes.delete_at(i)
+        if regex.match(node.content)
+          found_closing_tag = true
+        else
+          nodes.push node
+        end
+      end
+      nodes
+    end
+
+  end
+end

data/lib/ecrire/markdown/parsers/heading.rb

@@ -0,0 +1,19 @@
+module Ecrire::Markdown::Parsers
+  class Heading < Base
+    RULE = /^(\#{1,6} )(.+)/i
+
+    def parse!
+
+      unless @node.instance_of?(Ecrire::Markdown::Node)
+        return @node
+      end
+
+      if match = RULE.match(@node.content)
+        size = match[1].length - 1
+        @node = Ecrire::Markdown::Nodes::Heading.new(size, match[2])
+        @document.nodes[@index] = @node
+      end
+      return @node
+    end
+  end
+end

data/lib/ecrire/markdown/parsers/image.rb

@@ -0,0 +1,19 @@
+module Ecrire::Markdown::Parsers
+  class Image < Base
+    RULE = /^(!{1}\[([^\]]+)\])(\(([^\s]+)?\))$/i
+
+    def parse!
+
+      unless @node.instance_of?(Ecrire::Markdown::Node)
+        return @node
+      end
+
+      if match = RULE.match(@node.content)
+        @node = Ecrire::Markdown::Nodes::Image.new(match[2], match[4])
+        @document.nodes[@index] = @node
+      end
+      return @node
+    end
+  end
+end
+

data/lib/ecrire/markdown/parsers/link.rb

@@ -0,0 +1,12 @@
+module Ecrire::Markdown::Parsers
+  class Link < Base
+    RULE = /!{0}(\[([^\]]+)\])(\(([^\)]+)\))/i
+
+    def parse!
+      while match = RULE.match(@node.content) do
+        @node.content.gsub! match[0], "<a href='#{match[4]}'>#{match[2]}</a>"
+      end
+      return @node
+    end
+  end
+end

data/lib/ecrire/markdown/parsers/list.rb

@@ -0,0 +1,33 @@
+module Ecrire::Markdown::Parsers
+  class List < Base
+    UL = /^(-\s)(.+)?$/i
+    OL = /^(\d+\.\s)(.+)?$/i
+
+    def parse!
+
+      unless @node.instance_of?(Ecrire::Markdown::Node)
+        return @node
+      end
+
+      if match = UL.match(@node.content)
+        list! match, Ecrire::Markdown::Nodes::UnorderedList
+      elsif match = OL.match(@node.content)
+        list! match, Ecrire::Markdown::Nodes::OrderedList
+      end
+      return @node
+    end
+
+    def list!(match, tag)
+      previous_node = @document.nodes[@index - 1]
+      if previous_node.nil? || !previous_node.instance_of?(tag)
+        @node = tag.new(match[2])
+        @document.nodes[@index] = @node
+      else
+        @index -= 1
+        @document.nodes.delete(@node)
+        previous_node.append(match[2])
+        @node = previous_node
+      end
+    end
+  end
+end

data/lib/ecrire/markdown/parsers/word.rb

@@ -0,0 +1,16 @@
+module Ecrire::Markdown::Parsers
+  class Word < Base
+    RULE = /((\*{1,2})([^\*]+)(\*{1,2}))/i
+
+    def parse!
+      while match = RULE.match(@node.content) do
+        if match[2].length == 1
+          @node.content.gsub! match[0], "<em>#{match[3]}</em>"
+        elsif match[2].length == 2
+          @node.content.gsub! match[0], "<strong>#{match[3]}</strong>"
+        end
+      end
+      return @node
+    end
+  end
+end

data/lib/ecrire/markdown/parsers.rb

@@ -0,0 +1,13 @@
+module Ecrire
+  module Markdown
+    module Parsers
+      autoload :Base,       'ecrire/markdown/parsers/base'
+      autoload :Word,       'ecrire/markdown/parsers/word'
+      autoload :List,       'ecrire/markdown/parsers/list'
+      autoload :Image,      'ecrire/markdown/parsers/image'
+      autoload :Code,       'ecrire/markdown/parsers/code'
+      autoload :Heading,    'ecrire/markdown/parsers/heading'
+      autoload :Link,       'ecrire/markdown/parsers/link'
+    end
+  end
+end

data/lib/ecrire/markdown.rb

@@ -0,0 +1,13 @@
+require 'ecrire/markdown/document'
+
+module Ecrire
+  module Markdown
+
+    def self.parse(str)
+      document = Document.new(str)
+      document.parse!
+      document
+    end
+
+  end
+end

data/lib/ecrire/theme/template/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'ecrire',               path: '~/Develop/ecrire'
+gem 'ecrire',               git: 'https://github.com/pothibo/ecrire'
 
 group :required do
   gem 'rails',             '~> 4.2'
@@ -11,7 +11,6 @@ group :required do
   gem 's3',                '~> 0.3'
   gem 'pg',                '~> 0.17'
   gem 'kaminari',          '~> 0.15'
-  gem 'kramdown',          '~> 1.5'
 
   gem 'sprockets-rails',   '~> 2.1'
   gem 'sass-rails',        '~> 4.0', '>= 4.0.3'

data/lib/ecrire/theme/template/controllers/tags_controller.rb

@@ -0,0 +1,8 @@
+class TagsController < Ecrire::ThemeController
+  def show
+    @tags = Tag.all
+    @tag = Tag.find(params[:id])
+    @posts = @tag.posts.includes(:titles).page(params[:page]).per(params[:per])
+  end
+end
+

data/lib/ecrire/theme/template/secrets.yml

@@ -0,0 +1,11 @@
+---
+development: &1
+  adapter: postgresql
+  database: ecrire
+  user: pothibo
+  password: 3dbdbc10bdf7bd7d8ad7b6dbcf4bb26c
+  encoding: utf8
+  secret_key: 43fce5ef5993544ba39821911080adfa
+  secret_key_base: 43fce5ef5993544ba39821911080adfa
+test: *1
+production: *1

data/lib/ecrire/version.rb

@@ -1,3 +1,3 @@
 module Ecrire
-  VERSION = '0.25.0'
+  VERSION = '0.25.1'
 end

data/lib/ecrire.rb

@@ -1,6 +1,7 @@
 module Ecrire
 
   autoload :Application,        'ecrire/application'
+  autoload :Markdown,           'ecrire/markdown'
 
   def self.bundle?
     ENV['BUNDLE_GEMFILE'] ||= Dir.pwd + '/Gemfile'

data/test/markdown/markdown_test.rb

@@ -0,0 +1,70 @@
+require 'ecrire/markdown'
+
+require 'minitest/autorun'
+
+class MarkdownTest < Minitest::Test
+
+  def test_paragraph
+    document = Ecrire::Markdown.parse("Hello world!\nThis is nice.")
+    assert_equal '<p>Hello world!</p><p>This is nice.</p>', document.to_html
+  end
+
+  def test_header
+    document = Ecrire::Markdown.parse('# test')
+    assert_equal  "<h1>test</h1>", document.to_html
+
+    document = Ecrire::Markdown.parse('## test and *some*')
+    assert_equal  "<h2>test and <em>some</em></h2>", document.to_html
+  end
+
+  def test_italic
+    document = Ecrire::Markdown.parse('*test*')
+    assert_equal  "<p><em>test</em></p>", document.to_html
+  end
+
+  def test_bold
+    document = Ecrire::Markdown.parse('**test**')
+    assert_equal  "<p><strong>test</strong></p>", document.to_html
+  end
+
+  def test_bold_and_italic
+    document = Ecrire::Markdown.parse('***bold and italic***')
+    assert_equal  "<p><em><strong>bold and italic</strong></em></p>", document.to_html
+
+    document = Ecrire::Markdown.parse('**bold** and *italic*')
+    assert_equal  "<p><strong>bold</strong> and <em>italic</em></p>", document.to_html
+  end
+
+  def test_code_blocks
+    document = Ecrire::Markdown.parse("~~~ruby\n# A comment\nRails.application\n~~~")
+    assert_equal  "<pre><header></header><code class='language-ruby'># A comment\nRails.application</code></pre>", document.to_html
+
+    document = Ecrire::Markdown.parse("~~~ruby a title\n# A comment\nRails.application\n~~~")
+    assert_equal  "<pre><header>a title</header><code class='language-ruby'># A comment\nRails.application</code></pre>", document.to_html
+  end
+
+  def test_unordered_list
+    document = Ecrire::Markdown.parse("- ruby\n- Go")
+    assert_equal '<ul><li>ruby</li><li>Go</li></ul>', document.to_html
+  end
+
+  def test_ordered_list
+    document = Ecrire::Markdown.parse("1. Ruby\n2. **Go**")
+    assert_equal '<ol><li>Ruby</li><li><strong>Go</strong></li></ol>', document.to_html
+  end
+
+  def test_lists
+    document = Ecrire::Markdown.parse("1. Ruby\n2. **Go**\n- Test\n- 123")
+    assert_equal '<ol><li>Ruby</li><li><strong>Go</strong></li></ol><ul><li>Test</li><li>123</li></ul>', document.to_html
+  end
+
+  def test_image
+    document = Ecrire::Markdown.parse('![An Image](http://bla.com)')
+    assert_equal "<figure><img src='http://bla.com' /><figcaption>An Image</figcaption></figure>", document.to_html
+  end
+
+  def test_link
+    document = Ecrire::Markdown.parse('[A link](http://bla.com)')
+    assert_equal "<p><a href='http://bla.com'>A link</a></p>", document.to_html
+  end
+end

data/test/test_task.rb

@@ -7,12 +7,16 @@ class Ecrire::TestTask < Rake::TestTask
     desc @description
     task @name do
       Rake::FileUtilsExt.verbose(@verbose) do
-        args =
-          "#{ruby_opts_string} #{run_code} " +
-          "#{file_list_string} #{option_list}" +
-          "#{theme}"
+        args = [
+          "#{ruby_opts_string} #{run_code} ",
+          "#{file_list_string} #{option_list}"
+        ]
 
-        ruby args do |ok, status|
+        if File.exists?(theme)
+          args << theme
+        end
+
+        ruby args.join do |ok, status|
           if !ok && status.respond_to?(:signaled?) && status.signaled?
             raise SignalException.new(status.termsig)
           elsif !ok

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecrire
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Pier-Olivier Thibault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies: []
 description: Blog engine on Rails
 email: pothibo@gmail.com
@@ -191,6 +191,22 @@ files:
 - lib/ecrire/locales/admin/partials/en.yml
 - lib/ecrire/locales/admin/posts/en.yml
 - lib/ecrire/locales/en.yml
+- lib/ecrire/markdown.rb
+- lib/ecrire/markdown/document.rb
+- lib/ecrire/markdown/node.rb
+- lib/ecrire/markdown/nodes/code_block.rb
+- lib/ecrire/markdown/nodes/heading.rb
+- lib/ecrire/markdown/nodes/image.rb
+- lib/ecrire/markdown/nodes/ordered_list.rb
+- lib/ecrire/markdown/nodes/unordered_list.rb
+- lib/ecrire/markdown/parsers.rb
+- lib/ecrire/markdown/parsers/base.rb
+- lib/ecrire/markdown/parsers/code.rb
+- lib/ecrire/markdown/parsers/heading.rb
+- lib/ecrire/markdown/parsers/image.rb
+- lib/ecrire/markdown/parsers/link.rb
+- lib/ecrire/markdown/parsers/list.rb
+- lib/ecrire/markdown/parsers/word.rb
 - lib/ecrire/onboarding/assets/images/.keep
 - lib/ecrire/onboarding/assets/images/background.png
 - lib/ecrire/onboarding/assets/images/github-logo.png
@@ -233,8 +249,10 @@ files:
 - lib/ecrire/theme/template/assets/stylesheets/theme.css.scss
 - lib/ecrire/theme/template/config.ru
 - lib/ecrire/theme/template/controllers/posts_controller.rb
+- lib/ecrire/theme/template/controllers/tags_controller.rb
 - lib/ecrire/theme/template/helpers/blog_helper.rb
 - lib/ecrire/theme/template/routes.rb
+- lib/ecrire/theme/template/secrets.yml
 - lib/ecrire/theme/template/views/layouts/application.html.erb
 - lib/ecrire/theme/template/views/posts/_post.html.erb
 - lib/ecrire/theme/template/views/posts/index.html.erb
@@ -273,7 +291,7 @@ files:
 - test/fixtures/tags.yml
 - test/fixtures/titles.yml
 - test/fixtures/users.yml
-- test/initializations/engine_test.rb
+- test/markdown/markdown_test.rb
 - test/onboarding/controllers/databases_controller_test.rb
 - test/onboarding/controllers/onboarding_controller_test.rb
 - test/onboarding/controllers/users_controller_test.rb
@@ -308,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Blog engine

data/test/initializations/engine_test.rb

@@ -1,47 +0,0 @@
-class RailtieTest < ActiveSupport::TestCase
-  include ActiveSupport::Testing::Isolation
-
-  def teardown
-    Object.send(:remove_const, :Ecrire)
-  end
-
-  test 'Ecrire onboards by default' do
-    require 'ecrire'
-    Ecrire::Application.initialize!
-    assert defined?(Ecrire::Onboarding::Engine)
-    assert !defined?(Ecrire::Theme::Engine)
-  end
-
-  test 'load the normal railtie if a secrets.yml can be found' do
-    Dir.chdir 'test/themes/onboarding' do
-
-      require 'ecrire'
-      Ecrire::Application.initialize!
-
-      assert defined?(Ecrire::Onboarding::Engine)
-      assert !defined?(Ecrire::Theme::Engine)
-    end
-  end
-
-  test 'configured completely if a connection to the database can be made' do
-    Dir.chdir 'test/themes/template' do
-
-      run_in_isolation do
-        require 'ecrire'
-        Ecrire::Application.initialize!
-        ::User.first_or_create!(email: 'test@test.ca', password: 123456)
-      end
-
-      require 'ecrire'
-      Ecrire::Application.initialize!
-
-      assert !defined?(Ecrire::Onboarding::Engine)
-      assert defined?(Ecrire::Theme::Engine)
-      # Need to destroy the user here because parallelization is fubar'ed
-      # and it's the most stable way I found it.
-      # All other options seemed to introduce racing conditions.
-      User.destroy_all
-    end
-  end
-
-end