jekyll-pandoc 1.0.2 → 2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 543b9ab8f11090e8ac4d86f23e4d7f8a1db442e0
-  data.tar.gz: 6139635263bd00f9c0246f5034043a1e006866cd
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGYyN2FhN2M4MmU2M2Y2MTE3NDU3MzQ5MDcwMTgxOTE5ZDgwMzFjYg==
+  data.tar.gz: !binary |-
+    MDhlZGM1NDMzZTQzOGU2NWVhM2U0ODM5ZGJhNmRjZmFiOTc1M2I5MQ==
 SHA512:
-  metadata.gz: 2bbef77085ca60c6015ea14b283205686b8ccbb8c2f10fa7dd717f2408531f933458a326f680a6f2fc22750e0d5a40e24921d99d107af20629b2a944e7a8ccca
-  data.tar.gz: 5135775440b5721b07f443832840a0d6ae3d3fa1d4b9451482db56de38aeb080fd8fcb18d840e55d397f92e37deb2b7b1e646f1139e916e8faf4fdacf500f347
+  metadata.gz: !binary |-
+    ZjliNzZkMDJiMjQ4ODM2OWY5NzJlNzcwMTAwNjY0MTU1NDA2MzZmM2I5NDM3
+    MTUwNmVhZDA2ODkwZmQ4NjYxMmFlZDE4YTRlZjgxMjdmOTZmZTczM2Y2ODM5
+    YjZkM2VhZjFiM2ZlYTA3OTg3YjQzMGJhMDQzYjI4MmY0MjY5N2M=
+  data.tar.gz: !binary |-
+    ODEyMmMwZjIzMTYwNDQ3NjY1MzAwMzU5ZDg2Zjc3ZTNiZTJjNjU0YmE2NmIy
+    NGUwZTFhNWJlODJlMDlhYzc0MTEzYTIxYmI1MThmZGVhNDI2OTJmYTg5OWI0
+    NmIxZTk3NjZhM2NlOGU5NDFmNzhiMjM2NmYxMmJjODMyZjFkMjg=

data/lib/jekyll-pandoc.rb

@@ -1,2 +1,32 @@
-require File.expand_path("../jekyll/converters/markdown.rb", __FILE__)
-require 'jekyll/converters/markdown/pandoc_parser'
+module Jekyll
+  module Converters
+    class Markdown::Pandoc
+      DEFAULT_EXTENSIONS = []
+      DEFAULT_FORMAT = 'html5'
+
+      def initialize(config)
+        Jekyll::External.require_with_graceful_fail "pandoc-ruby"
+
+        @config = config
+      end
+
+      def convert(content)
+        extensions = config_option('extensions', DEFAULT_EXTENSIONS)
+        format = config_option('format', DEFAULT_FORMAT)
+
+        content = PandocRuby.new(content, *extensions).send("to_#{format}")
+        raise Erros::FatalException, "Conversion returned empty string" unless content.length > 0
+        content
+      end
+
+      def config_option(key, default=nil)
+        if @config['pandoc']
+          @config.fetch('pandoc', {}).fetch(key, default)
+        else
+          default
+        end
+      end
+
+    end
+  end
+end

data/lib/jekyll-pandoc/version.rb

@@ -1,3 +1,3 @@
 module JekyllPandoc
-  VERSION = "1.0.2"
+  VERSION = "2.0"
 end

metadata

@@ -1,113 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-pandoc
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: '2.0'
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
+        version: '3.1'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
+        version: '3.1'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: pandoc-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
+        version: '2.0'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
+        version: '2.0'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.8
 description: A Jekyll markdown converter that uses Pandoc (via the pandoc-ruby gem).
-email: martin.fenner@datacite.org
+email: mfenner@datacite.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-pandoc.rb
 - lib/jekyll-pandoc/version.rb
-- lib/jekyll/converters/markdown.rb
-- lib/jekyll/converters/markdown/pandoc_parser.rb
 homepage: https://github.com/mfenner/jekyll-pandoc
 licenses:
 - MIT
@@ -118,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Jekyll Pandoc markdown converter

data/lib/jekyll/converters/markdown.rb

@@ -1,34 +0,0 @@
-# monkey patch Jekyll Markdown setup method for compatibility
-module Jekyll
-  module Converters
-    class Markdown
-
-      PARSERS = { 'redcarpet' => RedcarpetParser,
-                  'kramdown' => KramdownParser,
-                  'rdiscount' => RDiscountParser }
-
-      def setup
-        return if @setup
-        @parser = parser(@config['markdown']).new(@config)
-        @setup = true
-      rescue NameError
-        Jekyll.logger.error "Invalid Markdown Processor:", "#{@config['markdown']}"
-        Jekyll.logger.error "", "Valid options are [ #{PARSERS.keys.join(" | ")} ]"
-        raise Jekyll::Errors::FatalException, "Invalid Markdown Processor: #{@config['markdown']}"
-      end
-
-      private
-
-      def parser(name)
-        if PARSERS.keys.include?(name.downcase)
-          PARSERS[name.downcase]
-        elsif name =~ /[^A-Za-z0-9]/
-          InvalidParser
-        else
-          eval "#{name.capitalize}Parser"
-        end
-      end
-
-    end
-  end
-end

data/lib/jekyll/converters/markdown/pandoc_parser.rb

@@ -1,38 +0,0 @@
-module Jekyll
-  module Converters
-    class Markdown
-      class PandocParser
-
-        DEFAULT_EXTENSIONS = []
-        DEFAULT_FORMAT = 'html5'
-
-        def initialize(config)
-          require 'pandoc-ruby'
-          @config = config
-        rescue LoadError
-          STDERR.puts 'You are missing a library required for Pandoc. Please run:'
-          STDERR.puts ' $ [sudo] gem install pandoc-ruby'
-          raise Errors::FatalException, "Missing dependency: pandoc-ruby"
-        end
-
-        def convert(content)
-          extensions = config_option('extensions', DEFAULT_EXTENSIONS)
-          format = config_option('format', DEFAULT_FORMAT)
-
-          content = PandocRuby.new(content, *extensions).send("to_#{format}")
-          raise Erros::FatalException, "Conversion returned empty string" unless content.length > 0
-          content
-        end
-
-        def config_option(key, default=nil)
-          if @config['pandoc']
-            @config['pandoc'].fetch(key, default)
-          else
-            default
-          end
-        end
-
-      end
-    end
-  end
-end