jekyll-issue-mentions 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f469605292cf788e8ef582f7f274360d5e2b1aee
-  data.tar.gz: b6e23375b0f5891c8d620e568f5ce901d837052f
+  metadata.gz: 014068c1a07d6b50e0ca713430d7fd9a05ade586
+  data.tar.gz: 5a33ca964326c54e6bf0ff1c070c9748d01d49aa
 SHA512:
-  metadata.gz: 0e2bf76d5557b114b4bed00733576cbd42884403967034a366188cce8007a60fc5cd648a3138477e03bed5d264910d337ef58ec96c4baed19c1da1526016bc99
-  data.tar.gz: 02a0bafbd602684d14a5bc3c790c772c95ccbf0bbd82fe3e8897ea066d748847b4d92f25e156733863ce1f4b7fe771b4ff9ce90f2e1fd01ec188557cb1132d64
+  metadata.gz: a012d075ec6ed451efea9ee239a0be1789f0c8c996df0e91a57ff48c900cb8507ba982e0f3edeba13777e91f975bd4669b3366cbda81c6a092984096a9d4fb74
+  data.tar.gz: ff3cea62ecde9726d8eccde9d518428f72930f104b492fb9572b95f77a69bf789fc0ca599019991d8fdd23b4089ff7bc5f11179d9af9ce5263bca13fdbbc90c8

data/lib/jekyll-issue-mentions.rb

@@ -5,9 +5,11 @@ require 'issue_mention_filter'
 module Jekyll
   class IssueMentions < Jekyll::Generator
     safe true
+    attr_reader :base_url, :issueid_pattern
 
     def initialize(config = Hash.new)
-      @filter = HTML::Pipeline::IssueMentionFilter.new(nil, {:base_url => base_url(config['jekyll-issue-mentions']) })
+      validate_config!(config)
+      @filter = HTML::Pipeline::IssueMentionFilter.new(nil, base_url: base_url, issueid_pattern: issueid_pattern)
     end
 
     def generate(site)
@@ -25,22 +27,22 @@ module Jekyll
       page.html? || page.url.end_with?('/')
     end
 
-    def base_url(configs)
+  private
+    def validate_config!(configs)
+      configs = configs['jekyll-issue-mentions']
+      base_url = issueid_pattern = nil
       case configs
-      when nil, NilClass
-        raise ArgumentError.new("Your jekyll-issue-mentions config has to configured.")
       when String
-        configs.to_s
+        base_url = configs
       when Hash
-        base_url = configs['base_url']
-        if base_url.nil?
-          raise ArgumentError.new("Your jekyll-issue-mentions is missing base_url configuration.")
-        else
-          base_url
-        end
-      else
-        raise ArgumentError.new("Your jekyll-issue-mentions config has to either be a string or a hash! It's a #{configs.class} right now.")
+        base_url, issueid_pattern = configs['base_url'], configs['issueid_pattern']
+        issueid_pattern = /#{issueid_pattern}/ if issueid_pattern.is_a?(String)
       end
+      error_prefix = "jekyll-issue-mentions"
+      raise ArgumentError.new("#{error_prefix}.base_url is missing/empty") if (base_url.nil? || base_url.empty?)
+      raise ArgumentError.new("#{error_prefix}.issueid_pattern is invalid") if (!issueid_pattern.nil? && !issueid_pattern.is_a?(Regexp))
+
+      @base_url, @issueid_pattern = base_url, issueid_pattern
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-issue-mentions
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Harish Shetty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll