jekyll-import 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5377b9f9f9a8fa28a027521a9b561644437fb66d
-  data.tar.gz: 0428619e8d2b42b1f4f1952f2ec6dc0af826e323
+  metadata.gz: 855c5e36be4360af072339df9731c697be2d2fc7
+  data.tar.gz: f3cdbed992f885c71821ce3c2e97497ef6e7253b
 SHA512:
-  metadata.gz: 8387badef6af7bf3242b2dd102e1a47af5fef6e9d80f03b6c4fa684338c330681e66287b358a860872d32d24a55cd3c3312c9c4fb56f4474b25b8e58db1ba155
-  data.tar.gz: f7a4320db20712464ff92753d50d7b3057a04cdfbc9f6e56a2cefcb0e1c37958352546e0124097173294a6965ad7b4402b39d9d7f28927f01b3ac4f10e23e212
+  metadata.gz: 284cb23924967d43155a095931c95cee8548e29a12cca3c1feef5d77debdae194dacfcb6a9de939ac933869592053d242086ffb6d392ea1701a73027fff98758
+  data.tar.gz: 8c1e96ca71c5b83ac2df39d424351d287c910cc431ca85f2ed5c7b0d9d27bc34ca291413a785e9ef778a6ecd156c4f86f92def3d8370782500c172dde7e6c6a2

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

@@ -204,15 +204,26 @@ module JekyllImport
           if (@in_entry_elem.nil? || ! @in_entry_elem.has_key?(:meta) || ! @in_entry_elem[:meta].has_key?(:kind))
             nil
           elsif @in_entry_elem[:meta][:kind] == 'post'
+            timestamp = Time.parse(@in_entry_elem[:meta][:published]).strftime('%Y-%m-%d')
             if @in_entry_elem[:meta][:original_url]
               original_uri = URI.parse(@in_entry_elem[:meta][:original_url])
               original_path = original_uri.path.to_s
               filename = "%s-%s" %
-                [Time.parse(@in_entry_elem[:meta][:published]).strftime('%Y-%m-%d'),
+                [timestamp,
                  File.basename(original_path, File.extname(original_path))]
 
               @original_url_base = "#{original_uri.scheme}://#{original_uri.host}"
-            else
+            elsif @in_entry_elem[:meta][:draft]
+              # Drafts don't have published urls
+              name = @in_entry_elem[:meta][:title]
+              if name.nil?
+                filename = timestamp
+              else
+                filename = "%s-%s" %
+                  [timestamp,
+                   CGI.escape(name.downcase).tr('+','-')]
+              end
+            else 
               raise 'Original URL is missing'
             end
         
@@ -226,7 +237,7 @@ module JekyllImport
             header['modified_time'] = @in_entry_elem[:meta][:updated] if @in_entry_elem[:meta][:updated] && @in_entry_elem[:meta][:updated] != @in_entry_elem[:meta][:published]
             header['thumbnail'] = @in_entry_elem[:meta][:thumbnail] if @in_entry_elem[:meta][:thumbnail]
             header['blogger_id'] = @in_entry_elem[:meta][:id] if @leave_blogger_info
-            header['blogger_orig_url'] = @in_entry_elem[:meta][:original_url] if @leave_blogger_info
+            header['blogger_orig_url'] = @in_entry_elem[:meta][:original_url] if @leave_blogger_info && @in_entry_elem[:meta][:original_url]
         
             body = @in_entry_elem[:body]
 

data/lib/jekyll-import/version.rb

@@ -1,3 +1,3 @@
 module JekyllImport
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-import
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll