sutty-migration 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de345679f1c94e0bda19ea99e7d454924bf5aa86c0281bc6a61feab84a3a1cd
-  data.tar.gz: 5c62c2f467dafb6bc822dbe7c334280776ee173fea3a045cf90cc401030558b2
+  metadata.gz: c1f1e56381a9e282ccff520293e16f0e8db930dc2f42d677a9e0d009f2d94e09
+  data.tar.gz: 52ea0428940d4cd225fdbb7fc94fc110a6a6c070fe9e760027f4435f6eb92e22
 SHA512:
-  metadata.gz: f1a13ba1cb0c5e75ffc2aae11225b83cc8ee426ccc2c5b3f5e6a8ea6d52df0dee569f67cb4d1319a8f635279edf07604b05ac2ecbc3f66797b046bfe66a14495
-  data.tar.gz: 2d0fc815a65e19ff74bac83298e71f288b5daf5bd2ab141028eaec6a048e1a27903a9e804638b29cf8b6f13302077f161ff7f253d3e0d3b75b561840c59c54d6
+  metadata.gz: 78b02124119406fa7357c7c2abf22e36dfab4297d2d8a6c7ed78c3ac438a0812da6f36e34f1ae332ef5282d8f5844e3090eb3e98e76cf40cdd3c4b6f25dafa6f
+  data.tar.gz: e5749eeca2cec6462e73e8a8acd288685a8aaa2fc7c841cc2f3824af5d97faac2f6ae6fe359ebdfc5ebdcfc8257c682c07ef10f7e0b18896f139fb77dbca5e82

data/lib/sutty_migration/jekyll/document_creator.rb

@@ -24,14 +24,15 @@ module SuttyMigration
               collection = site.collections[collection] if collection.is_a? String
               slug = ::Jekyll::Utils.slugify(title, mode: 'latin') if slug.blank?
               basename = "#{date.strftime('%F')}-#{slug}.markdown"
-              path = File.join(collection.directory, basename)
+              path = File.join(collection.relative_directory, basename)
 
               raise DocumentExists, "#{path} already exists" if File.exist? path
 
-              ::Jekyll::Document.new(path, site: site, collection: collection).tap do |document|
-                collection.docs << document
-                document.data['title'] = title
-              end
+              indexed_documents_by_relative_path(site)[path] =
+                ::Jekyll::Document.new(path, site: site, collection: collection).tap do |document|
+                  collection.docs << document
+                  document.data['title'] = title
+                end
             end
 
             # Finds a document by its relative path or creates it if it

data/lib/sutty_migration/wordpress.rb

@@ -229,8 +229,8 @@ module SuttyMigration
           #{', f.front_matter as front_matter' if with_meta}
           #{', t.terms as terms' if with_meta}
         from #{prefix}posts as p
-        #{"left join (#{meta_query}) as f on f.post_id = p.ID" if with_meta}
-        #{"left join (#{terms_query}) as t on t.post_id = p.ID" if with_meta}
+        #{"left join (#{meta_query(layout: layout)}) as f on f.post_id = p.ID" if with_meta}
+        #{"left join (#{terms_query(layout: layout)}) as t on t.post_id = p.ID" if with_meta}
         #{"where p.post_type = '#{layout}'" if layout}
         group by p.ID
       EOQ
@@ -240,7 +240,7 @@ module SuttyMigration
     # converted to arrays
     #
     # @return [String]
-    def meta_query
+    def meta_query(layout: nil)
       <<~EOQ
         select
           post_id,
@@ -253,6 +253,7 @@ module SuttyMigration
           from #{prefix}postmeta
           group by post_id, meta_key
         )
+        #{"where post_id in (select ID from #{prefix}posts where post_type = '#{layout}')" if layout}
         group by post_id
       EOQ
     end
@@ -261,7 +262,7 @@ module SuttyMigration
     #
     # @param :layout [String] Layout name
     # @return [String]
-    def terms_query
+    def terms_query(layout: nil)
       <<~EOQ
         select
           post_id,
@@ -274,7 +275,8 @@ module SuttyMigration
           from #{prefix}term_relationships as r
           left join #{prefix}term_taxonomy as tt on tt.term_taxonomy_id = r.term_taxonomy_id
           left join #{prefix}terms as t on t.term_id = tt.term_id
-          group by r.object_id)
+          #{"where r.object_id in (select ID from #{prefix}posts where post_type = '#{layout}')" if layout}
+          group by r.object_id, tt.taxonomy)
         group by post_id
       EOQ
     end

data/lib/sutty_migration/wordpress_xml/attachment.rb

@@ -20,7 +20,7 @@ module SuttyMigration
       #
       # @return [String]
       def dest
-        @dest ||= URI(attachment_url).path.sub(%r{\A/}, '')
+        @dest ||= CGI.unescape(URI(attachment_url).path.sub(%r{\A/}, ''))
       end
 
       # Metadata, with file information as a Hash
@@ -40,7 +40,7 @@ module SuttyMigration
       def download(progress: true)
         return true if File.exist? dest
 
-        ::Jekyll.logger.info "Downloading #{dest}"
+        ::Jekyll.logger.info 'Downloading:', dest
 
         FileUtils.mkdir_p File.dirname(dest)
 

data/lib/sutty_migration/wordpress_xml/post.rb

@@ -9,6 +9,8 @@ module SuttyMigration
     class Post
       attr_reader :wordpress, :item
 
+      SLASH = '/'
+
       # @param :wordpress [SuttyMigration::WordpressXml]
       # @param :item [Nokogiri::XML::Element]
       def initialize(wordpress:, item:)
@@ -17,7 +19,7 @@ module SuttyMigration
       end
 
       def inspect
-        "#<SuttyMigration::WordpressXml::Post title=\"#{title}\">"
+        "#<#{self.class.name} title=\"#{title}\">"
       end
 
       # Post ID
@@ -31,7 +33,16 @@ module SuttyMigration
       #
       # @return [String]
       def permalink
-        @permalink ||= attribute_value('link').sub(wordpress.url, '')
+        @permalink ||=
+          begin
+            p = attribute_value('link').sub(wordpress.url, '')
+
+            if !p.end_with?(SLASH) && File.extname(p).empty?
+              p << SLASH
+            end
+
+            p.squeeze(SLASH)
+          end
       end
 
       # Title
@@ -52,7 +63,7 @@ module SuttyMigration
       #
       # @return [String]
       def slug
-        @slug ||= attribute_value('post_name')
+        @slug ||= attribute_value('post_name').tr(SLASH, '-').squeeze('-').sub(/\A-+/, '').sub(/-+\z/, '')
       end
 
       # Publication date.
@@ -70,9 +81,12 @@ module SuttyMigration
 
       # Modification date.
       #
-      # @return [Time]
+      # @return [Time, nil]
       def last_modified_at
-        @last_modified_at ||= ::Jekyll::Utils.parse_date attribute_value('post_modified_gmt')
+        @last_modified_at ||=
+          if (date = attribute_value('post_modified_gmt'))
+            ::Jekyll::Utils.parse_date(date)
+          end
       end
 
       # Content as HTML, with site URL removed.
@@ -105,7 +119,7 @@ module SuttyMigration
         @tags ||= item.css('category').select do |c|
           c[:domain] == 'post_tag'
         end.map do |c|
-          wordpress.tags[c[:nicename]]
+          wordpress.tags[c[:nicename]] || { id: 0, title: c.text.strip, slug: c[:nicename] }
         end
       end
 
@@ -116,7 +130,7 @@ module SuttyMigration
         @categories ||= item.css('category').select do |c|
           c[:domain] == 'category'
         end.map do |c|
-          wordpress.categories[c[:nicename]]
+          wordpress.categories[c[:nicename]] || { id: 0, title: c.text.strip, slug: c[:nicename], parent: nil }
         end
       end
 
@@ -162,9 +176,9 @@ module SuttyMigration
 
       # Get a value from the attribute
       #
-      # @return [String]
+      # @return [String, nil]
       def attribute_value(key)
-        item.at_css(key).text
+        item.at_css(key)&.text
       end
     end
   end

data/lib/sutty_migration/wordpress_xml.rb

@@ -86,7 +86,7 @@ module SuttyMigration
             slug: attribute_value(category, 'category_nicename')
           }
         }
-      end.reduce(&:merge)
+      end.reduce(&:merge) || {}
     end
 
     # Tags with attributes, indexed by slug
@@ -101,7 +101,7 @@ module SuttyMigration
             slug: attribute_value(tag, 'tag_slug')
           }
         }
-      end.reduce(&:merge)
+      end.reduce(&:merge) || {}
     end
 
     # Posts, indexed by ID
@@ -146,9 +146,9 @@ module SuttyMigration
     #
     # @param [Nokogiri::XML::Element]
     # @param [String]
-    # @return [String]
+    # @return [String,nil]
     def attribute_value(element, attribute)
-      element.at_css(attribute).text
+      element.at_css(attribute)&.text
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sutty-migration
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2025-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Jekyll data migration for Sutty