middleman-gemoji 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1e4c131cc9751f78169b7f188d43aed54a88e57
-  data.tar.gz: e36f0ffdd9878424bfbb44504c4387015fa1fa3b
+  metadata.gz: 182decec0a717e2365be5ef8b312b7cc09a104b7
+  data.tar.gz: 90a52cfb6fc2c390f1a4a33024d5fbc411e7dd8d
 SHA512:
-  metadata.gz: 05bdcddd6c01bb1fa99b1f86f822975a4f8b85dfab110a9989b7fcaf2e5d5f8dd231926bc0f4d479991694665afa8cf34178b47db4aee248f52bf54a31e9a7e6
-  data.tar.gz: b960acfbfac95f60a9c4255bc0ee77768d9c51d88bef0363fcbba50cceed5b51a9009b143754e1832ba8531a441b8813c2bf918db9b624724859f08669133b7c
+  metadata.gz: c12e825805d09bd3472ce76c306a4b1038c50afd1ded7ce65f8f6c32cfc8e9279d9efcad80d8b64b34bbfae8f87fc0d08b1e5f06f4c1276a0d79cdc8d5f8b14e
+  data.tar.gz: d0d50b426b9e6fb4eaf3095c94ab155f818e1fadb017053791613ac8ac8bc4c519b835a0a193eda8701633c8470c22ce64130dea0369b166d1b631e88bf2d6ec

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# 0.1.0
+
+- middleman-gemoji has ability to convert the `:emoji:` to `<img ~>` tag.
+- If body-tag exists, this extension will convert only inner body-tag.
+- If body-tag does not exists, this extension will convert all.

data/features/emoji_build.feature

@@ -12,6 +12,10 @@ Feature: Emoji convert when build
     When I run `middleman build`
     Then the exit status should be 0
     And the file "build/index.html" should not contain "<p>:+1:</p>"
+    And the file "build/index.html" should contain:
+      """
+      <title>something title :+1:</title>
+      """
     And the file "build/index.html" should contain:
       """
       <p><img class="gemoji" alt="+1" src="/images/emoji/unicode/1f44d.png" /></p>
@@ -21,7 +25,7 @@ Feature: Emoji convert when build
     Given a fixture app "gemoji-app"
     When I run `middleman build`
     Then the exit status should be 0
-    And the file "build/no-emoji.html" should contain "hoge"
+    And the file "build/no-emoji.html" should contain "<p>hoge</p>"
 
   Scenario: Convert ":+1+" to emoji with :size option
     Given a fixture app "gemoji-app"

data/features/emoji_server.feature

@@ -4,6 +4,10 @@ Feature: Emoji convert under `middleman server`
     Given the Server is running at "gemoji-app"
     When I go to "/index.html"
     Then I should see:
+      """
+      <title>something title :+1:</title>
+      """
+    And I should see:
       """
       <p><img class="gemoji" alt="+1" src="/images/emoji/unicode/1f44d.png" /></p>
 
@@ -14,5 +18,9 @@ Feature: Emoji convert under `middleman server`
     When I go to "/no-emoji.html"
     Then I should see:
       """
-      hoge
+      <title>something title :+1:</title>
+      """
+    And I should see:
+      """
+      <p>hoge</p>
       """

data/features/haml.feature

@@ -5,15 +5,24 @@ Feature: Emoji convert in Markdown
     When I run `middleman build`
     Then the exit status should be 0
     And the file "build/index.html" should not contain "<p>:+1:</p>"
+    And the file "build/index.html" should contain:
+      """
+      <title>something title :+1:</title>
+      """
     And the file "build/index.html" should contain:
       """
       <p><img class="gemoji" alt="+1" src="/images/emoji/unicode/1f44d.png" /></p>
+
       """
 
   Scenario: Convert content that doesn't have :emoji:
     Given a fixture app "haml-app"
     When I run `middleman build`
     Then the exit status should be 0
+    And the file "build/index.html" should contain:
+      """
+      <title>something title :+1:</title>
+      """
     And the file "build/no-emoji.html" should contain:
       """
       <p>hoge</p>

data/features/markdown.feature

@@ -5,6 +5,10 @@ Feature: Emoji convert in Markdown
     When I run `middleman build`
     Then the exit status should be 0
     And the file "build/index.html" should not contain "<p>:+1:</p>"
+    And the file "build/index.html" should contain:
+      """
+      <title>something title :+1:</title>
+      """
     And the file "build/index.html" should contain:
       """
       <p><img class="gemoji" alt="+1" src="/images/emoji/unicode/1f44d.png" /></p>
@@ -15,6 +19,10 @@ Feature: Emoji convert in Markdown
     Given a fixture app "markdown-app"
     When I run `middleman build`
     Then the exit status should be 0
+    And the file "build/index.html" should contain:
+      """
+      <title>something title :+1:</title>
+      """
     And the file "build/no-emoji.html" should contain:
       """
       <p>hoge</p>
@@ -23,9 +31,11 @@ Feature: Emoji convert in Markdown
   Scenario: Convert ":+1+" to emoji under `middleman server`
     Given the Server is running at "markdown-app"
     When I go to "/index.html"
-    Then I should see '<p><img class="gemoji" alt="+1" src="/images/emoji/unicode/1f44d.png" /></p>'
+    Then I should see '<title>something title :+1:</title>'
+    And I should see '<p><img class="gemoji" alt="+1" src="/images/emoji/unicode/1f44d.png" /></p>'
 
   Scenario: Convert content that doesn't have :emoji: under `middleman server`
     Given the Server is running at "markdown-app"
     When I go to "/no-emoji.html"
-    Then I should see '<p>hoge</p>'
+    Then I should see '<title>something title :+1:</title>'
+    And I should see '<p>hoge</p>'

data/features/slim.feature

@@ -5,20 +5,30 @@ Feature: Emoji convert in Markdown
     When I run `middleman build`
     Then the exit status should be 0
     And the file "build/index.html" should not contain "<p>:+1:</p>"
+    And the file "build/index.html" should contain:
+      """
+      <title>something title :+1:</title>
+      """
     And the file "build/index.html" should contain '<p><img class="gemoji" alt="+1" src="/images/emoji/unicode/1f44d.png" /></p>'
 
   Scenario: Convert content that doesn't have :emoji:
     Given a fixture app "slim-app"
     When I run `middleman build`
     Then the exit status should be 0
+    And the file "build/index.html" should contain:
+      """
+      <title>something title :+1:</title>
+      """
     And the file "build/no-emoji.html" should contain '<p>hoge</p>'
 
   Scenario: Convert ":+1+" to emoji under `middleman server`
     Given the Server is running at "slim-app"
     When I go to "/index.html"
-    Then I should see '<p><img class="gemoji" alt="+1" src="/images/emoji/unicode/1f44d.png" /></p>'
+    Then I should see '<title>something title :+1:</title>'
+    And I should see '<p><img class="gemoji" alt="+1" src="/images/emoji/unicode/1f44d.png" /></p>'
 
   Scenario: Convert content that doesn't have :emoji: under `middleman server`
     Given the Server is running at "slim-app"
     When I go to "/no-emoji.html"
-    Then I should see '<p>hoge</p>'
+    Then I should see '<title>something title :+1:</title>'
+    And I should see '<p>hoge</p>'

data/fixtures/gemoji-app/source/layouts/layout.erb

@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+  <head>
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <meta charset="utf-8">
+    <meta content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport">
+
+    <!-- Use title if it's in the page YAML frontmatter -->
+    <title>something title :+1:</title>
+
+    <link href='//fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
+
+    <%= stylesheet_link_tag :site %>
+    <%= javascript_include_tag :all %>
+  </head>
+
+  <body class="<%= page_classes %>">
+    <%= yield %>
+  </body>
+</html>

data/fixtures/gemoji-app/source/no-emoji.html.erb

@@ -1 +1 @@
-hoge
+<p>hoge</p>

data/fixtures/haml-app/source/layouts/layout.erb

@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+  <head>
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <meta charset="utf-8">
+    <meta content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport">
+
+    <!-- Use title if it's in the page YAML frontmatter -->
+    <title>something title :+1:</title>
+
+    <link href='//fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
+
+    <%= stylesheet_link_tag :site %>
+    <%= javascript_include_tag :all %>
+  </head>
+
+  <body class="<%= page_classes %>">
+    <%= yield %>
+  </body>
+</html>

data/fixtures/markdown-app/source/index.html.md

@@ -1,2 +1 @@
 :+1:
-

data/fixtures/markdown-app/source/layouts/layout.erb

@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+  <head>
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <meta charset="utf-8">
+    <meta content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport">
+
+    <!-- Use title if it's in the page YAML frontmatter -->
+    <title>something title :+1:</title>
+
+    <link href='//fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
+
+    <%= stylesheet_link_tag :site %>
+    <%= javascript_include_tag :all %>
+  </head>
+
+  <body class="<%= page_classes %>">
+    <%= yield %>
+  </body>
+</html>

data/fixtures/slim-app/source/layouts/layout.erb

@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+  <head>
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <meta charset="utf-8">
+    <meta content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport">
+
+    <!-- Use title if it's in the page YAML frontmatter -->
+    <title>something title :+1:</title>
+
+    <link href='//fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
+
+    <%= stylesheet_link_tag :site %>
+    <%= javascript_include_tag :all %>
+  </head>
+
+  <body class="<%= page_classes %>">
+    <%= yield %>
+  </body>
+</html>

data/lib/middleman-gemoji/converter.rb

@@ -18,6 +18,14 @@ module Middleman
       def convert(content)
         return content if content.blank?
 
+        if has_body?(content)
+          emojify_inner_body(content)
+        else
+          emojify(content)
+        end
+      end
+
+      def emojify(content)
         content.to_str.gsub(/:([\w+-]+):/) do |match|
           emoji = Emoji.find_by_alias($1)
           if emoji
@@ -34,6 +42,18 @@ module Middleman
         end
       end
 
+      # emojify only in the body tag
+      def emojify_inner_body(content)
+        pattern = /<body.+?>(.+?)<\/body>/m
+        content.to_str.gsub(pattern) do |html|
+          emojify(html).gsub(pattern, '\1')
+        end
+      end
+
+      def has_body?(content)
+        !(/<body.+?>.+?<\/body>/m =~ content.to_str).nil?
+      end
+
       def src(path)
         %(src="#{File.join(@base_path, path)}")
       end

data/lib/middleman-gemoji/extension.rb

@@ -11,7 +11,7 @@ module Middleman
       def initialize(app, options_hash = {}, &block)
         super
         converter = Middleman::Gemoji::Converter.new(app, options)
-        app.before_render do |content|
+        app.after_render do |content|
           converter.convert(content)
         end
       end

data/lib/middleman-gemoji/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Gemoji
-    VERSION = '0.0.8'
+    VERSION = '0.1.0'
   end
 end

data/test/test_converter.rb

@@ -1,5 +1,4 @@
 require './test/test_helper'
-require 'middleman'
 require './lib/middleman-gemoji/converter'
 
 class TestConverter < Minitest::Test
@@ -27,20 +26,70 @@ class TestConverter < Minitest::Test
     end
   end
 
-  def test_convert
-    assert_equal(
-      '<img class="gemoji" alt="+1" src="/images/emoji/unicode/1f44d.png" />',
-      @converter.convert(':+1:')
-    );
-  end
-
   def test_convert_received_blank
     assert_equal('', @converter.convert(''))
     assert_equal(nil, @converter.convert(nil))
   end
 
-  def test_convert_received_normal_string
-    assert_equal('hoge', @converter.convert('hoge'));
+  def test_emojify
+    assert_equal(
+      '<img class="gemoji" alt="+1" src="/images/emoji/unicode/1f44d.png" />',
+      @converter.emojify(':+1:')
+    );
+  end
+
+  def test_emojify_received_normal_string
+    html = '<p>hoge</p>'
+    assert_equal(html, @converter.emojify(html));
+  end
+
+  def test_emojify_inner_body
+    html = "<html><head><title>something title :+1:</title></head><body>\n<p>somethig emoji :+1:</p>\n</body></html>"
+    result = @converter.emojify_inner_body(html)
+    assert_match(/1f44d.png/, result)
+    assert_match(/something title :\+1:/, result)
+  end
+
+  def test_emojify_inner_body_received_normal_string
+    html = '<p>hoge</p>'
+    assert_equal(html, @converter.emojify_inner_body(html))
+  end
+
+  def test_has_body_return_true
+    html = <<-'HTML'
+      <!doctype html>
+      <html>
+        <head>
+          <meta charset="utf-8">
+          <title>something title :+1:</title>
+        </head>
+        <body>
+          <p>:+1:</p>
+        </body>
+      </html>
+    HTML
+    assert_equal(true, @converter.has_body?(html))
+  end
+
+  def test_has_body_return_true__body_has_class
+    html = <<-'HTML'
+      <!doctype html>
+      <html>
+        <head>
+          <meta charset="utf-8">
+          <title>something title :+1:</title>
+        </head>
+        <body class="index">
+          <p>:+1:</p>
+        </body>
+      </html>
+    HTML
+    assert_equal(true, @converter.has_body?(html))
+  end
+
+  def test_has_body_return_false
+    html = '<p>somethig emoji :+1:</p>'
+    assert_equal(false, @converter.has_body?(html))
   end
 
   def test_src

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+require 'middleman'
 require 'minitest/autorun'
 require 'minitest/reporters'
 Minitest::Reporters.use!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-gemoji
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Yuya Terajima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
@@ -159,6 +159,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -177,6 +178,7 @@ files:
 - fixtures/gemoji-app/source/images/emoji/unicode/.gitkeep
 - fixtures/gemoji-app/source/img/emoji/unicode/.gitkeep
 - fixtures/gemoji-app/source/index.html.erb
+- fixtures/gemoji-app/source/layouts/layout.erb
 - fixtures/gemoji-app/source/no-emoji.html.erb
 - fixtures/gemoji-empty-app/config.rb
 - fixtures/gemoji-empty-app/source/images/.gitkeep
@@ -186,14 +188,17 @@ files:
 - fixtures/haml-app/config.rb
 - fixtures/haml-app/source/images/emoji/unicode/.gitkeep
 - fixtures/haml-app/source/index.html.haml
+- fixtures/haml-app/source/layouts/layout.erb
 - fixtures/haml-app/source/no-emoji.html.haml
 - fixtures/markdown-app/config.rb
 - fixtures/markdown-app/source/images/emoji/unicode/.gitkeep
 - fixtures/markdown-app/source/index.html.md
+- fixtures/markdown-app/source/layouts/layout.erb
 - fixtures/markdown-app/source/no-emoji.html.md
 - fixtures/slim-app/config.rb
 - fixtures/slim-app/source/images/emoji/unicode/.gitkeep
 - fixtures/slim-app/source/index.html.slim
+- fixtures/slim-app/source/layouts/layout.erb
 - fixtures/slim-app/source/no-emoji.html.slim
 - lib/middleman-gemoji.rb
 - lib/middleman-gemoji/command.rb