html-pipeline-gitlab 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7313484da93e94bb584aa3176ea1017937b3cc2
-  data.tar.gz: b44f39f65e35854f45e32ab7fd2f3fca5b0196fd
+  metadata.gz: c84b06ddf12420f2ccdb9d2eb4e8704f6f4f5745
+  data.tar.gz: c5ad5e05767490da93d8a840698c3f1f29c9cb8a
 SHA512:
-  metadata.gz: d2fc11352c8a791d6ef9be5f550f929f5787aaa95cc63b66bf9a0d44cdf578351d0f13abeb468606d13a92c58a0da5498e4c324ee2a01ae4f171ce4953f6d555
-  data.tar.gz: 7083bb915724aafecb0bc77bb399a1312a555a3977a45bbb4fd8981c579c0cfe30930b0a2670c764cf9255748d54267687a02c2b97c4a02bf35aa74546e6d45b
+  metadata.gz: f86ed1f0880c9dc13d7fafc6e4a28afd803443d0676a19e7aeb0bc7178bcc5b3397f4476df95cdd63bbb79bf47b5b7c8f5c22d39f67175b77003e448d91eb63e
+  data.tar.gz: c3230cf3e24f63dc94688c6e365bed5647ce00e6a83a3094457ecf2c0e21c7548d20eb6240ad295758801a0761dee8b82abcc1febc10cb397aa38395c590e952

data/README.md

@@ -21,15 +21,29 @@ Or install it yourself as:
 
     $ gem install html-pipeline-gitlab
 
+## Testing
+
+Install required gems
+
+```bash
+bundle
+```
+
+and then run the test suite:
+
+```bash
+bundle exec rake test
+```
+
 ## Filters
 
-* `GitLabEmojiFilter` - replaces emoji references with images from
+* `GitlabEmojiFilter` - replaces emoji references with images from
 [PhantomOpenEmoji](https://github.com/Genshin/PhantomOpenEmoji)
 
 ## Contributing
 
-1. Fork it ( https://github.com/razer6/html-pipeline-gitlab/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+1. Fork it
+1. Create your feature branch (`git checkout -b my-new-feature`)
+1. Commit your changes (`git commit -am 'Add some feature'`)
+1. Push to the branch (`git push origin my-new-feature`)
+1. Create a new Merge Request

data/html-pipeline-gitlab.gemspec

@@ -6,11 +6,11 @@ require 'html/pipeline/gitlab/version'
 Gem::Specification.new do |spec|
   spec.name          = 'html-pipeline-gitlab'
   spec.version       = Html::Pipeline::Gitlab::VERSION
-  spec.authors       = ['Robert Schilling']
+  spec.authors       = ['Robert Schilling', 'Marin Jankovski']
   spec.email         = ['schilling.ro@gmail.com']
   spec.summary       = %q{Extension filters for html-pipeline used by GitLab}
   spec.description   = %q{Extension filters for html-pipeline used by GitLab}
-  spec.homepage      = 'https://github.com/Razer6/html-pipeline-gitlab'
+  spec.homepage      = 'https://gitlab.com/gitlab-org/html-pipeline-gitlab'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
 
   spec.add_runtime_dependency 'html-pipeline', '~> 1.11.0'
-  spec.add_runtime_dependency 'gitlab_emoji', '~> 0.0.1.1'
+  spec.add_runtime_dependency 'gitlab_emoji', '~> 0.0.1'
   spec.add_runtime_dependency 'sanitize', '~> 2.1'
 end

data/lib/html/pipeline/gitlab.rb

@@ -3,17 +3,17 @@ require 'html/pipeline/gitlab/version'
 
 module HTML
   class Pipeline
-    class GitLab
+    class Gitlab
       # GitLab related filters for html-pipeline. Implements new filters used
       # by GitLab.
 
       # Custom filter implementations
-      autoload :GitLabEmojiFilter, 'html/pipeline/gitlab/gitlab_emoji_filter'
+      autoload :GitlabEmojiFilter, 'html/pipeline/gitlab/gitlab_emoji_filter'
 
       # Most used markdown pipeline in GitLab. Performs emoji replacement.
       MarkdownPipeline = HTML::Pipeline.new [
         SanitizationFilter,
-        GitLabEmojiFilter
+        GitlabEmojiFilter
       ]
     end
   end

data/lib/html/pipeline/gitlab/gitlab_emoji_filter.rb

@@ -2,10 +2,9 @@ require 'cgi'
 require 'gitlab_emoji'
 require 'html/pipeline/filter'
 
-
 module HTML
   class Pipeline
-    class GitLab
+    class Gitlab
       # HTML filter that replaces :emoji: with images.
       #
       # Context:
@@ -13,7 +12,7 @@ module HTML
       #   :asset_path (optional) - url path to link to emoji sprite.
       #      :file_name can be used as a placeholder for the sprite file name.
       #      If no asset_path is set "emoji/:file_name" is used.
-      class GitLabEmojiFilter < Filter
+      class GitlabEmojiFilter < Filter
         def call
           search_text_nodes(doc).each do |node|
             content = node.to_html
@@ -57,7 +56,7 @@ module HTML
         private
 
         def emoji_url(name)
-          File.join(asset_root, 'emoji', emoji_filename(name))
+          ActionController::Base.helpers.url_to_image("emoji/#{emoji_filename(name)}")
         end
 
         # Build a regexp that matches all valid :emoji: names.
@@ -74,7 +73,12 @@ module HTML
         end
 
         def emoji_filename(name)
-          "#{::CGI.escape(name)}.png"
+          # CGI.escape makes + into %20, skip that in this case
+          if name == "+1"
+            "+1.png"
+          else
+            "#{::CGI.escape(name)}.png"
+          end
         end
       end
     end

data/lib/html/pipeline/gitlab/version.rb

@@ -1,7 +1,7 @@
 module Html
   module Pipeline
     module Gitlab
-      VERSION = '0.1.2'
+      VERSION = '0.1.3'
     end
   end
 end

data/test/html/pipeline/gitlab_gemoji_filter_test.rb

@@ -1,31 +1,31 @@
 require 'test_helper'
 require 'html/pipeline/gitlab'
 
-class HTML::Pipeline::GitLabEmojiFilterTest < Minitest::Test
-  GitLabEmojiFilter = HTML::Pipeline::GitLab::GitLabEmojiFilter
+class HTML::Pipeline::GitlabEmojiFilterTest < Minitest::Test
+  GitlabEmojiFilter = HTML::Pipeline::Gitlab::GitlabEmojiFilter
 
   def test_emojify
-    filter = GitLabEmojiFilter.new('<p>:heart:</p>', {asset_root: 'https://foo.com'})
+    filter = GitlabEmojiFilter.new('<p>:heart:</p>', { asset_root: 'https://foo.com' })
     doc = filter.call
     assert_match 'https://foo.com/emoji/heart.png', doc.search('img').attr('src').value
   end
 
   def test_unsupported_emoji
     block = '<p>:sheep:</p>'
-    filter = GitLabEmojiFilter.new(block, {asset_root: 'https://foo.com'})
+    filter = GitlabEmojiFilter.new(block, { asset_root: 'https://foo.com' })
     doc = filter.call
     assert_match block, doc.to_html
   end
 
   def test_uri_encoding
-    filter = GitLabEmojiFilter.new('<p>:+1:</p>', {asset_root: 'https://foo.com'})
+    filter = GitlabEmojiFilter.new('<p>:+1:</p>', { asset_root: 'https://foo.com' })
     doc = filter.call
     assert_match 'https://foo.com/emoji/%2B1.png', doc.search('img').attr('src').value
   end
 
   def test_required_context_validation
     exception = assert_raises(ArgumentError) {
-      GitLabEmojiFilter.call("", {})
+      GitlabEmojiFilter.call("", {})
     }
     assert_match /:asset_root/, exception.message
   end

metadata

@@ -1,83 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline-gitlab
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Robert Schilling
+- Marin Jankovski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: html-pipeline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: gitlab_emoji
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1.1
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1.1
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 description: Extension filters for html-pipeline used by GitLab
@@ -87,8 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -100,7 +100,7 @@ files:
 - lib/html/pipeline/gitlab/version.rb
 - test/html/pipeline/gitlab_gemoji_filter_test.rb
 - test/test_helper.rb
-homepage: https://github.com/Razer6/html-pipeline-gitlab
+homepage: https://gitlab.com/gitlab-org/html-pipeline-gitlab
 licenses:
 - MIT
 metadata: {}
@@ -110,17 +110,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extension filters for html-pipeline used by GitLab

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
-before_install:
-  - sudo apt-get install -y libicu-dev
-install:
-  - travis_retry bundle config build.nokogiri --use-system-libraries
-  - travis_retry bundle install
-script: rake test
-notifications:
-  email: false