jekyll-import 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03a3cb18b4503380a2ad39b5ef8807fa545dbd3732f7539ebcefdd95ec832460
-  data.tar.gz: 9146357cd5440e9d19ec28d6a94cd2dc0731debec05536e95dfde1addcfadfd3
+  metadata.gz: d3f964d35053d8b6d57507e51d0f6512da6090196fbc64d5b27707841bd911dd
+  data.tar.gz: 6473e0c7e9619af1e666c845337bff7f553ec104106bfec56f366c5623446431
 SHA512:
-  metadata.gz: 7fbd25bc7478bde73ad6acc5f56c8156ac16c036c2e6f45ee015dbd213a255394171d6d9e5f86acc53f1193c993584dd40111997ec6663101479c913eb635794
-  data.tar.gz: ffb932a6866e9b4d5256cdb78fa7d48fa95226e83a3f860b3825853cbf44a753adbba1bc49515e63f5a5925aa4a2fa829d6ac441e2fb46fa8af7d5a7ac25744b
+  metadata.gz: f549ada882d1255c0bcb35a7945b19101de4b7b2c352ae13631b452da9f3dd59fd5dc36f45a51cf815c4c15c89f04575eba7d172d222e3bc21a18c42857e2796
+  data.tar.gz: bc2dd8ed440e6df361aefcf6059a9762e9692d1726b95a4748498819626e595f7c36a7d7d09acf10fa79b22f79b344e7f89f6207f2bbdd4825db131164c16e39

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

@@ -45,7 +45,9 @@ module JekyllImport
           page = post[:page]
 
           # the publish date if the post has been published, creation date otherwise
-          date = Time.at(post[draft ? :created_at : :published_at].to_i)
+          # The database stores timestamps in milliseconds, so we need to divide by 1000
+          # to get time in seconds.
+          date = Time.at(post[draft ? :created_at : :published_at].to_i / 1000)
 
           if page
             # the filename under which the page is stored

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

@@ -73,7 +73,7 @@ module JekyllImport
           :categories     => opts.fetch("categories", true),
           :tags           => opts.fetch("tags", true),
           :extension      => opts.fetch("extension", "html"),
-          :status         => opts.fetch("status", ["PUBLISHED"]).map(&:to_sym) # :DRAFT
+          :status         => opts.fetch("status", ["PUBLISHED"]).map(&:to_sym), # :DRAFT
         }
 
         if options[:clean_entities]

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

@@ -34,7 +34,7 @@ module JekyllImport
         body = options.fetch("body", ["description"])
 
         content = ""
-        URI.parse(source).open { |s| content = s.read }
+        open(source) { |s| content = s.read }
         rss = ::RSS::Parser.parse(content, false)
 
         raise "There doesn't appear to be any RSS items at the source (#{source}) provided." unless rss

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

@@ -94,7 +94,7 @@ module JekyllImport
           :more_excerpt   => opts.fetch("more_excerpt", true),
           :more_anchor    => opts.fetch("more_anchor", true),
           :extension      => opts.fetch("extension", "html"),
-          :status         => opts.fetch("status", ["publish"]).map(&:to_sym) # :draft, :private, :revision
+          :status         => opts.fetch("status", ["publish"]).map(&:to_sym), # :draft, :private, :revision
         }
 
         if options[:clean_entities]

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

@@ -74,6 +74,16 @@ module JekyllImport
                                end
         end
 
+        def permalink
+          # Hpricot thinks "link" is a self closing tag so it puts the text of the link after the tag
+          # but sometimes it works right! I think it's the xml declaration
+          @permalink ||= begin
+            uri = text_for("link")
+            uri = @node.at("link").following[0] if uri.empty?
+            URI(uri.to_s).path
+          end
+        end
+
         def published_at
           @published_at ||= Time.parse(text_for("wp:post_date")) if published?
         end
@@ -174,6 +184,7 @@ module JekyllImport
             "tags"       => tags,
             "meta"       => metas,
             "author"     => authors[author_login],
+            "permalink"  => item.permalink,
           }
 
           begin

data/lib/jekyll-import/util.rb

@@ -32,7 +32,7 @@ module JekyllImport
           end
 
           name = "<pre wp-pre-tag-#{i}></pre>"
-          pre_tags[name] = pee_part[start..-1] + "</pre>"
+          pre_tags[name] = (pee_part[start..-1] + "</pre>").gsub('\\', '\\\\\\\\')
 
           pee += pee_part[0, start] + name
         end

data/lib/jekyll-import/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -32,14 +32,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0.pre.alpha1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0.pre.alpha1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +88,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -389,14 +409,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Import command for Jekyll (static site generator).