jekyll-import 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6130f83944ddf0b9014aadff407cbd2645a7fd3af8ffff14f8a07f951ca36b1d
-  data.tar.gz: f1a0359e7d7edce0dcfbca231febe10df7459cba5f2af3ad0a2cb8f63c2fc1bc
+  metadata.gz: a0dcc7e31eb1aa2846478a51d98137a9ea5531a4bf47aa053a3b413a9e6fd0e9
+  data.tar.gz: fc5cff2462128b3906d7047a2e7c6a39b3553cedfc58afc429cc6d352f055be3
 SHA512:
-  metadata.gz: 3650b1cc1cedfa296c5bb0b8db5fe172d32d8f67168554280a5674deb25a0595e5005288a3a2faefb01cbc109c994f41ee7477cd09c3947f4e3db68782b924ab
-  data.tar.gz: 3cd40ad126a4890d2dde5b84f2bef3dc6be9d4f07465a42669fe5c4e3137ac57965e32a2182ddbdc8ab1847082a166a6462e4d53675682383991f23968ba8219
+  metadata.gz: e3ad1ab0288e1ed20c7c423283bdc0eafb2871ac6db2af684fdc30026172c90042f8b3fa2bea564ff98aa183181ad40e46c6d6174927d5a3649b29f52ed8f950
+  data.tar.gz: 8d2d819c2724f4150b07f7ca0718fcd46e61deecc2579335911180163dd236711a9f6cdfaa72a59765e97ed42356426b8f2854932be18034de89de2e2952de7b

data/lib/jekyll-import/importers/blogger.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 module JekyllImport
   module Importers

data/lib/jekyll-import/importers/joomla3.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 module JekyllImport
   module Importers

data/lib/jekyll-import/importers/s9y_database.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 module JekyllImport
   module Importers

data/lib/jekyll-import/importers/tumblr.rb

@@ -1,73 +1,73 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 module JekyllImport
   module Importers
     class Tumblr < Importer
-      def self.require_deps
-        JekyllImport.require_with_fallback(%w(
-          rubygems
-          fileutils
-          open-uri
-          nokogiri
-          json
-          uri
-          time
-          jekyll
-        ))
-      end
+      class << self
+        def require_deps
+          JekyllImport.require_with_fallback(%w(
+            rubygems
+            fileutils
+            open-uri
+            nokogiri
+            json
+            uri
+            time
+            jekyll
+            reverse_markdown
+          ))
+        end
 
-      def self.specify_options(c)
-        c.option "url",            "--url URL",        "Tumblr URL"
-        c.option "format",         "--format FORMAT",  'Output format (default: "html")'
-        c.option "grab_images",    "--grab_images",    "Whether to grab images (default: false)"
-        c.option "add_highlights", "--add_highlights", "Whether to add highlights (default: false)"
-        c.option "rewrite_urls",   "--rewrite_urls",   "Whether to rewrite URLs (default: false)"
-      end
+        def specify_options(c)
+          c.option "url",            "--url URL",        "Tumblr URL"
+          c.option "format",         "--format FORMAT",  'Output format (default: "html")'
+          c.option "grab_images",    "--grab_images",    "Whether to grab images (default: false)"
+          c.option "add_highlights", "--add_highlights", "Whether to add highlights (default: false)"
+          c.option "rewrite_urls",   "--rewrite_urls",   "Whether to rewrite URLs (default: false)"
+        end
+
+        def process(options)
+          url            = options.fetch("url")
+          format         = options.fetch("format", "html")
+          grab_images    = options.fetch("grab_images", false)
+          add_highlights = options.fetch("add_highlights", false)
+          rewrite_urls   = options.fetch("rewrite_urls", false)
 
-      def self.process(options)
-        url            = options.fetch("url")
-        format         = options.fetch("format", "html")
-        grab_images    = options.fetch("grab_images", false)
-        add_highlights = options.fetch("add_highlights", false)
-        rewrite_urls   = options.fetch("rewrite_urls", false)
+          @grab_images = grab_images
+          FileUtils.mkdir_p "_posts/tumblr"
+          per_page = 50
+          posts = []
 
-        @grab_images = grab_images
-        FileUtils.mkdir_p "_posts/tumblr"
-        url += "/api/read/json/"
-        per_page = 50
-        posts = []
+          # Two passes are required so that we can rewrite URLs.
+          # First pass builds up an array of each post as a hash.
+          begin
+            current_page = (current_page || -1) + 1
+            feed_url     = api_feed_url(url, current_page, per_page)
+            Jekyll.logger.info "Fetching #{feed_url}"
 
-        # Two passes are required so that we can rewrite URLs.
-        # First pass builds up an array of each post as a hash.
-        begin
-          current_page = (current_page || -1) + 1
-          feed_url     = "#{url}?num=#{per_page}&start=#{current_page * per_page}"
-          Jekyll.logger.info "Fetching #{feed_url}"
+            feed     = URI.parse(feed_url).open
+            contents = feed.readlines.join("\n")
+            blog     = extract_json(contents)
+            Jekyll.logger.info "Page: #{current_page + 1} - Posts: #{blog["posts"].size}"
 
-          feed     = URI.parse(feed_url).open
-          contents = feed.readlines.join("\n")
-          blog     = extract_json(contents)
-          Jekyll.logger.info "Page: #{current_page + 1} - Posts: #{blog["posts"].size}"
+            batch = blog["posts"].map { |post| post_to_hash(post, format) }
 
-          batch = blog["posts"].map { |post| post_to_hash(post, format) }
+            # If we're rewriting, save the posts for later.  Otherwise, go ahead and dump these to
+            # disk now
+            if rewrite_urls
+              posts += batch
+            else
+              batch.each { |post| write_post(post, format == "md", add_highlights) }
+            end
+          end until blog["posts"].size < per_page
 
-          # If we're rewriting, save the posts for later.  Otherwise, go ahead and dump these to
-          # disk now
+          # Rewrite URLs, create redirects and write out out posts if necessary
           if rewrite_urls
-            posts += batch
-          else
-            batch.each { |post| write_post(post, format == "md", add_highlights) }
+            posts = rewrite_urls_and_redirects posts
+            posts.each { |post| write_post(post, format == "md", add_highlights) }
           end
-        end until blog["posts"].size < per_page
-
-        # Rewrite URLs, create redirects and write out out posts if necessary
-        if rewrite_urls
-          posts = rewrite_urls_and_redirects posts
-          posts.each { |post| write_post(post, format == "md", add_highlights) }
         end
-      end
 
-      class << self
         def extract_json(contents)
           beginning = contents.index("{")
           ending    = contents.rindex("}") + 1
@@ -237,9 +237,11 @@ module JekyllImport
           preserve = %w(table tr th td)
           preserve.each do |tag|
             content.gsub!(%r!<#{tag}!i, "$$#{tag}")
-            content.gsub!(%r!<\/#{tag}!i, "||#{tag}")
+            content.gsub!(%r!</#{tag}!i, "||#{tag}")
           end
-          content = Nokogiri::HTML(content.gsub("'", "''")).text
+
+          content = ReverseMarkdown.convert(content)
+
           preserve.each do |tag|
             content.gsub!("$$#{tag}", "<#{tag}")
             content.gsub!("||#{tag}", "</#{tag}")
@@ -291,6 +293,13 @@ module JekyllImport
           end
           "/#{path}"
         end
+
+        private
+
+        def api_feed_url(url, page, per_page = 50)
+          url = File.join(url, "/api/read/json/")
+          "#{url}?num=#{per_page}&start=#{page * per_page}"
+        end
       end
     end
   end

data/lib/jekyll-import/importers/typo.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 module JekyllImport
   module Importers

data/lib/jekyll-import/importers/wordpress.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 module JekyllImport
   module Importers
@@ -163,10 +163,10 @@ module JekyllImport
 
         if options[:status] && !options[:status].empty?
           status = options[:status][0]
-          +posts_query << "
+          posts_query << "
            WHERE posts.post_status = '#{status}'"
           options[:status][1..-1].each do |post_status|
-            +posts_query << " OR
+            posts_query << " OR
              posts.post_status = '#{post_status}'"
           end
         end

data/lib/jekyll-import/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllImport
-  VERSION = "0.16.0"
+  VERSION = "0.17.0"
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Tom Preston-Werner
+- Parker Moore
+- Matt Rogers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-04 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -52,6 +54,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: reverse_markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: redgreen
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +144,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -262,20 +278,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: reverse_markdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -333,7 +335,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 description: Provides the Import command for Jekyll.
-email: tom@mojombo.com
+email: maintainers@jekyllrb.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -394,9 +396,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.0
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: Import command for Jekyll (static site generator).
 test_files: []