middleman-gemoji 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f50f6f055ce328d71bf7eab706157e5f9efbc6
-  data.tar.gz: f5132e6faf7da809f7abca27cd731e51123bdd32
+  metadata.gz: f1e4c131cc9751f78169b7f188d43aed54a88e57
+  data.tar.gz: e36f0ffdd9878424bfbb44504c4387015fa1fa3b
 SHA512:
-  metadata.gz: 6f24c540b99bfa279fdbd0d5c0e7fa720b2769b5511a548aafcf2d262436a0fd789bb44012dd588a5158328565ea4f10fee205e5bb5e63419650c298733dfd17
-  data.tar.gz: 633244ec0e09f0ae3de98fa67a2517e465215c19566699b2f30e5fa60b8d850911438693f070f288c0301cd1d900ac186d8cec5670d41a32f8b3f4a18fe1848d
+  metadata.gz: 05bdcddd6c01bb1fa99b1f86f822975a4f8b85dfab110a9989b7fcaf2e5d5f8dd231926bc0f4d479991694665afa8cf34178b47db4aee248f52bf54a31e9a7e6
+  data.tar.gz: b960acfbfac95f60a9c4255bc0ee77768d9c51d88bef0363fcbba50cceed5b51a9009b143754e1832ba8531a441b8813c2bf918db9b624724859f08669133b7c

data/Rakefile

@@ -1,2 +1,14 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
+task default: [:test, :cucumber]
+
+Rake::TestTask.new do |test|
+  test.test_files = Dir['test/**/test_*.rb']
+  test.verbose = true
+end
+
+desc 'cucumber test'
+task :cucumber do
+  sh 'cucumber --backtrace features/'
+end

data/lib/middleman-gemoji/converter.rb

@@ -0,0 +1,68 @@
+require 'gemoji'
+
+module Middleman
+  module Gemoji
+    class Converter
+      attr_reader :app, :options, :base_path
+
+      def initialize(app, options)
+        if !app.is_a?(Middleman::Application)
+          raise "app is not Middleman::Application"
+        end
+
+        @app = app
+        @options = options
+        set_base_path
+      end
+
+      def convert(content)
+        return content if content.blank?
+
+        content.to_str.gsub(/:([\w+-]+):/) do |match|
+          emoji = Emoji.find_by_alias($1)
+          if emoji
+            image = []
+            image << %(alt="#{$1}")
+            image << src(emoji.image_filename)
+            image << size if size
+            image << style if style
+
+            %(<img class="gemoji" #{image.join(' ').strip} />)
+          else
+            match
+          end
+        end
+      end
+
+      def src(path)
+        %(src="#{File.join(@base_path, path)}")
+      end
+
+      def size
+        %(width="#{@options[:size]}" height="#{@options[:size]}") if @options[:size]
+      end
+
+      def style
+        %(style="#{@options[:style]}") if @options[:style]
+      end
+
+      def emoji_file_exist?
+        Dir.exist?(
+          File.join(@app.root, @app.config.source, @options[:emoji_dir], 'unicode')
+        )
+      end
+
+      def set_base_path
+        @base_path = 'https://assets-cdn.github.com/images/icons/emoji/'
+        if emoji_file_exist?
+          if /^http/ =~ @app.config[:http_prefix]
+            @base_path = File.join(app.config[:http_prefix], options[:emoji_dir])
+          else
+            @base_path = File.join('/', app.config[:http_prefix], options[:emoji_dir])
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/middleman-gemoji/extension.rb

@@ -1,4 +1,4 @@
-require 'gemoji'
+require_relative './converter'
 
 module Middleman
   module Gemoji
@@ -10,56 +10,9 @@ module Middleman
 
       def initialize(app, options_hash = {}, &block)
         super
-        @emoji_exist = Dir.exist?(
-          File.join(app.root, app.config.source, options[:emoji_dir], 'unicode')
-        )
-        extension    = self
-
+        converter = Middleman::Gemoji::Converter.new(app, options)
         app.before_render do |content|
-          extension.emojify(content)
-        end
-      end
-
-      def emojify(content)
-        @base_path = base_path
-        content.to_str.gsub(/:([\w+-]+):/) do |match|
-          emoji = Emoji.find_by_alias($1)
-          if emoji
-            image = []
-            image << %(alt="#{$1}")
-            image << src(emoji.image_filename)
-            image << size(options[:size]) if options[:size]
-            image << style(options[:style]) if options[:style]
-
-            %(<img class="gemoji" #{image.join(' ')} />)
-          else
-            match
-          end if content.present?
-        end
-      end
-
-      def src(path)
-        %(src="#{File.join(@base_path, path)}")
-      end
-
-      def size(size)
-        %(width="#{size}" height="#{size}")
-      end
-
-      def style(style)
-        %(style="#{style}")
-      end
-
-      def base_path
-        if @emoji_exist
-          prefix = app.config[:http_prefix]
-          if prefix && (/^http/ =~ prefix)
-            File.join(app.config[:http_prefix], options[:emoji_dir])
-          else
-            File.join('/', app.config[:http_prefix], options[:emoji_dir])
-          end
-        else
-          'https://assets-cdn.github.com/images/icons/emoji/'
+          converter.convert(content)
         end
       end
     end

data/lib/middleman-gemoji/version.rb

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

data/middleman-gemoji.gemspec

@@ -28,4 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", ">= 1.5"
   spec.add_development_dependency "rake", ">= 10"
   spec.add_development_dependency "slim", ">= 3.0"
+  spec.add_development_dependency "rb-inotify", "~> 0.9"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-reporters"
 end

data/test/test_converter.rb

@@ -0,0 +1,108 @@
+require './test/test_helper'
+require 'middleman'
+require './lib/middleman-gemoji/converter'
+
+class TestConverter < Minitest::Test
+  def setup
+    @root = ENV['MM_ROOT']
+    ENV['MM_ROOT'] = File.join(Dir.pwd, 'fixtures', 'gemoji-file-exist')
+    @converter = converter
+  end
+
+  def teardown
+    ENV['MM_ROOT'] = @root
+  end
+
+  def converter(app: Middleman::Application.new, size: nil, style: nil, emoji_dir: 'images/emoji')
+    Middleman::Gemoji::Converter.new(app, {size: size, style: style, emoji_dir: emoji_dir})
+  end
+
+  def test_initialize
+    assert_instance_of(Middleman::Application, @converter.app)
+  end
+
+  def test_initialize_raise_runtime_error
+    assert_raises RuntimeError do
+      converter(app: nil)
+    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'));
+  end
+
+  def test_src
+    path = @converter.src('unicode/1f44d.png')
+    assert_equal('src="/images/emoji/unicode/1f44d.png"', path)
+  end
+
+  def test_src_with_cdn
+    ENV['MM_ROOT'] = File.join(@converter.app.root, 'fixtures', 'gemoji-file-not-exist')
+    @converter.set_base_path
+    path = @converter.src('unicode/1f44d.png')
+    assert_equal(
+      'src="https://assets-cdn.github.com/images/icons/emoji/unicode/1f44d.png"',
+      path
+    )
+  end
+
+  def test_size_rerutn_nil
+    @converter.options[:size] = nil
+    assert_nil(@converter.size)
+  end
+
+  def test_size_return_string
+    @converter.options[:size] = 40
+    assert_equal('width="40" height="40"', @converter.size)
+  end
+
+  def test_style_return_nil
+    @converter.options[:style] = nil
+    assert_nil(@converter.style)
+  end
+
+  def test_style_return_string
+    @converter.options[:style] = 'padding-right: .2em'
+    assert_equal('style="padding-right: .2em"', @converter.style)
+  end
+
+  def test_emoji_file_exist_return_true
+    assert_equal(true, @converter.emoji_file_exist?)
+  end
+
+  def test_emoji_file_exist_return_false
+    ENV['MM_ROOT'] = File.join(@converter.app.root, 'fixtures', 'gemoji-file-not-exist')
+    assert_equal(false, @converter.emoji_file_exist?)
+  end
+
+  def test_set_base_path__cdn
+    ENV['MM_ROOT'] = File.join(@converter.app.root, 'fixtures', 'gemoji-file-not-exist')
+    @converter.set_base_path
+    assert_equal(
+      'https://assets-cdn.github.com/images/icons/emoji/',
+      @converter.base_path
+    )
+  end
+
+  def test_set_base_path__relative_path
+    assert_equal('/images/emoji', @converter.base_path)
+  end
+
+  def test_set_base_path__full_path
+    @converter.app.config[:http_prefix] = 'http://example.com/'
+    @converter.set_base_path
+    assert_equal('http://example.com/images/emoji', @converter.base_path)
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+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.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Yuya Terajima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
@@ -108,6 +108,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Github-flavored emoji plugin for Middleman.
 email:
 - terra@e2esound.com
@@ -140,6 +182,7 @@ files:
 - fixtures/gemoji-empty-app/source/images/.gitkeep
 - fixtures/gemoji-empty-app/source/img/.gitkeep
 - fixtures/gemoji-empty-app/source/index.html.erb
+- fixtures/gemoji-file-exist/source/images/emoji/unicode/.gitkeep
 - fixtures/haml-app/config.rb
 - fixtures/haml-app/source/images/emoji/unicode/.gitkeep
 - fixtures/haml-app/source/index.html.haml
@@ -154,10 +197,13 @@ files:
 - fixtures/slim-app/source/no-emoji.html.slim
 - lib/middleman-gemoji.rb
 - lib/middleman-gemoji/command.rb
+- lib/middleman-gemoji/converter.rb
 - lib/middleman-gemoji/extension.rb
 - lib/middleman-gemoji/version.rb
 - lib/middleman_extension.rb
 - middleman-gemoji.gemspec
+- test/test_converter.rb
+- test/test_helper.rb
 homepage: https://github.com/yterajima/middleman-gemoji
 licenses:
 - MIT
@@ -190,3 +236,5 @@ test_files:
 - features/markdown.feature
 - features/slim.feature
 - features/support/env.rb
+- test/test_converter.rb
+- test/test_helper.rb