jekyll-mentioji 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2f7969c91c7033c67e9327d2cb3dac8687bc30bd
-  data.tar.gz: a61f334384fc26db61b2adf0a9996768f55a02c9
+SHA256:
+  metadata.gz: 5780653cb3ca8ff53c97caf8eb1762091ca4291189e635f385f35aae494cf559
+  data.tar.gz: 221017e768a7e8915fcb5a1f82637aa873374bf2e3a36a2b91ceafcbe05c74ba
 SHA512:
-  metadata.gz: 6ecf13698e63ef1cd5ce1565108e0d678b5f3610086456202fcb9091594706ae79467e0cd750200ade2d7a6344f029be16ddf0ecbb517a773b9fb6409fad39f6
-  data.tar.gz: 8b04cc659afae2e1f9666c9b5ca9be95444351da0e5b38ca3260b757be43310219f0717f630524222daf65518c1072600b75bef623d841533dcb769d25f2f4be
+  metadata.gz: d74d26dc66052032c755fbfe1063b2f7342058cc90a59af7783cf7cb3c5ce316cf096365838b6a43bf7896754ce8422ce92aed40d1cfcbc70489baa6c6c6687e
+  data.tar.gz: 16d73e11136508ed7fe4a70f1528b1911531c9ee4f32df07bc38da8183fd0a1a97adb6605ab1ba6f7a388975cf4fa15743e955a9d00424f0137ccd36d777837b

data/lib/jekyll-mentioji.rb

@@ -5,9 +5,9 @@ require "nokogiri"
 
 module Jekyll
   class Mentioji
-    MENTIONPATTERNS = %r~(?:^|\B)@((?>[\w][\w-]*))(?!/)(?=\.+[ \t\W]|\.+$|[^\w.]|$)~i
+    MENTIONPATTERNS = %r~(?:^|\B)@((?>[\w][\w-]*))(?!/)(?=\.+[ \t\W]|\.+$|[^\w.]|$)~i.freeze
 
-    OPENING_BODY_TAG_REGEX = %r!<body(.*?)>\s*!
+    OPENING_BODY_TAG_REGEX = %r!<body(.*?)>\s*!.freeze
 
     IGNORE_MENTION_PARENTS = %w(pre code a script style).freeze
     IGNORE_EMOJI_PARENTS = %w(pre code tt).freeze
@@ -15,7 +15,8 @@ module Jekyll
     class << self
       def transform(doc)
         content = doc.output
-        return unless content.include?("@") || content.include?(":")
+        return unless prelim_check_regex.match?(content)
+
         setup_transformer(doc.site.config)
         doc.output = if content.include?("<body")
                        process_html_body(content)
@@ -39,11 +40,13 @@ module Jekyll
       end
 
       def process(body_content)
-        return body_content unless body_content =~ prelim_check_regex
+        return body_content unless prelim_check_regex.match?(body_content)
+
         parsed_body = Nokogiri::HTML::DocumentFragment.parse(body_content)
         parsed_body.search(".//text()").each do |node|
           content = node.text
-          next if !content.include?("@") && !content.include?(":")
+          next unless prelim_check_regex.match?(content)
+
           node.replace(
             mention_renderer(
               node, emoji_renderer(node, content)
@@ -92,7 +95,7 @@ module Jekyll
 
       def default_asset_root
         if ENV["ASSET_HOST_URL"].to_s.empty?
-          File.join("https://assets-cdn.github.com", "/images/icons")
+          File.join("https://github.githubassets.com", "/images/icons")
         else
           File.join(ENV["ASSET_HOST_URL"], "/images/icons")
         end
@@ -108,12 +111,14 @@ module Jekyll
       def mention_renderer(node, text)
         return text unless text.include?("@")
         return text if has_ancestor?(node, IGNORE_MENTION_PARENTS)
+
         text.gsub(MENTIONPATTERNS) { mention_markup(Regexp.last_match(1)) }
       end
 
       def emoji_renderer(node, text)
         return text unless text.include?(":")
         return text if has_ancestor?(node, IGNORE_EMOJI_PARENTS)
+
         text.gsub(emoji_pattern) { emoji_markup(Regexp.last_match(1)) }
       end
 
@@ -126,25 +131,11 @@ module Jekyll
 
       def emoji_markup(name)
         emoji_stash[name] ||= begin
-          attrs = []
-          img_attrs(name).each do |key, value|
-            attrs << "#{key}='#{value}'"
-          end
-          "<img #{attrs.join(" ")}>"
+          "<img class='emoji' title=':#{name}:' alt=':#{name}:' " \
+          "src='#{emoji_url(name)}' height='20' width='20'>"
         end
       end
 
-      def img_attrs(name)
-        {
-          "class"  => "emoji",
-          "title"  => ":#{name}:",
-          "alt"    => ":#{name}:",
-          "src"    => emoji_url(name).to_s,
-          "height" => "20",
-          "width"  => "20",
-        }
-      end
-
       def mention_stash
         @mention_stash ||= {}
       end
@@ -154,7 +145,7 @@ module Jekyll
       end
 
       def emoji_names
-        ::Emoji.all.flat_map(&:aliases).sort!.map! { |name| Regexp.escape(name) }
+        ::Emoji.all.flat_map(&:aliases).map! { |name| Regexp.escape(name) }
       end
 
       def emoji_pattern

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-mentioji
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ashwin Maroli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemoji
@@ -28,14 +28,14 @@ dependencies:
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -139,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Faster version of the 'Jekyll::Mentions + Jekyll::Emoji' combo