html-pipeline-gitlab 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c84b06ddf12420f2ccdb9d2eb4e8704f6f4f5745
-  data.tar.gz: c5ad5e05767490da93d8a840698c3f1f29c9cb8a
+  metadata.gz: fd6c8995b16ac5d93311facb210ebc6fa9ed74d4
+  data.tar.gz: 147ef4e54054d3b43c8abb925f67d5b6a4a7daa3
 SHA512:
-  metadata.gz: f86ed1f0880c9dc13d7fafc6e4a28afd803443d0676a19e7aeb0bc7178bcc5b3397f4476df95cdd63bbb79bf47b5b7c8f5c22d39f67175b77003e448d91eb63e
-  data.tar.gz: c3230cf3e24f63dc94688c6e365bed5647ce00e6a83a3094457ecf2c0e21c7548d20eb6240ad295758801a0761dee8b82abcc1febc10cb397aa38395c590e952
+  metadata.gz: 67df9b88434db7d8bd48485a75d9c4463d0b47bc7d53d4fc0542bba8fb99b98ad89443cc7d18b67090ae767a0d0daee8f197f25088acfcc159e596a6c5144a61
+  data.tar.gz: a06130d7bacda0f227e47f6cac432798ef7ebb7f2470223e929f848a46e48b5d73c26d9d5f0483a49e0279865a042fca146f13c9cecb1de830e3c171afd0488d

data/README.md

@@ -3,7 +3,7 @@
 This gem implements various filters for [html-pipeline](https://github.com/jch/html-pipeline)
  used by [GitLab](https://about.gitlab.com).
 
-[![Build Status](https://semaphoreapp.com/api/v1/projects/b9b808be-6c72-4e76-ae62-79b3a25a022a/243365/badge.png)](https://semaphoreapp.com/razer6/html-pipeline-gitlab)
+[![build status](https://gitlab-ce.githost.io/projects/5/status.png?ref=master)](https://gitlab-ce.githost.io/projects/5?ref=master)
 
 ## Installation
 

data/html-pipeline-gitlab.gemspec

@@ -20,8 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'pry', '~> 0.9'
 
   spec.add_runtime_dependency 'html-pipeline', '~> 1.11.0'
   spec.add_runtime_dependency 'gitlab_emoji', '~> 0.0.1'
   spec.add_runtime_dependency 'sanitize', '~> 2.1'
+  spec.add_runtime_dependency 'actionpack', '~> 4'
 end

data/lib/html/pipeline/gitlab.rb

@@ -10,11 +10,13 @@ module HTML
       # Custom filter implementations
       autoload :GitlabEmojiFilter, 'html/pipeline/gitlab/gitlab_emoji_filter'
 
-      # Most used markdown pipeline in GitLab. Performs emoji replacement.
-      MarkdownPipeline = HTML::Pipeline.new [
-        SanitizationFilter,
-        GitlabEmojiFilter
-      ]
+      def initialize(filters)
+        @filters = filters.flatten.freeze
+      end
+
+      def pipeline
+        HTML::Pipeline.new @filters
+      end
     end
   end
 end

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

@@ -1,17 +1,12 @@
 require 'cgi'
 require 'gitlab_emoji'
 require 'html/pipeline/filter'
+require 'action_controller'
 
 module HTML
   class Pipeline
     class Gitlab
       # HTML filter that replaces :emoji: with images.
-      #
-      # Context:
-      #   :asset_root (required) - base url to link to emoji sprite
-      #   :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
         def call
           search_text_nodes(doc).each do |node|
@@ -28,7 +23,6 @@ module HTML
         # Implementation of validate hook.
         # Errors should raise exceptions or use an existing validator.
         def validate
-          needs :asset_root
         end
 
         # Replace :emoji: with corresponding images.
@@ -45,18 +39,14 @@ module HTML
           end
         end
 
-        # The base url to link emoji sprites
-        #
-        # Raises ArgumentError if context option has not been provided.
-        # Returns the context's asset_root.
-        def asset_root
-          context[:asset_root]
-        end
-
         private
 
         def emoji_url(name)
-          ActionController::Base.helpers.url_to_image("emoji/#{emoji_filename(name)}")
+          url_to_image("emoji/#{emoji_filename(name)}")
+        end
+
+        def url_to_image(image)
+          ActionController::Base.helpers.url_to_image(image)
         end
 
         # Build a regexp that matches all valid :emoji: names.

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

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

data/test/html/pipeline/gitlab_gemoji_filter_test.rb

@@ -4,29 +4,26 @@ require 'html/pipeline/gitlab'
 class HTML::Pipeline::GitlabEmojiFilterTest < Minitest::Test
   GitlabEmojiFilter = HTML::Pipeline::Gitlab::GitlabEmojiFilter
 
+  def setup
+    ActionController::Base.asset_host = 'https://foo.com'
+  end
+
   def test_emojify
-    filter = GitlabEmojiFilter.new('<p>:heart:</p>', { asset_root: 'https://foo.com' })
+    filter = GitlabEmojiFilter.new('<p>:heart:</p>')
     doc = filter.call
-    assert_match 'https://foo.com/emoji/heart.png', doc.search('img').attr('src').value
+    assert_match 'https://foo.com/images/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)
     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>')
     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("", {})
-    }
-    assert_match /:asset_root/, exception.message
+    assert_match 'https://foo.com/images/emoji/+1.png', doc.search('img').attr('src').value
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline-gitlab
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Robert Schilling
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: html-pipeline
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +95,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Extension filters for html-pipeline used by GitLab
 email:
 - schilling.ro@gmail.com