sutty-migration 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de345679f1c94e0bda19ea99e7d454924bf5aa86c0281bc6a61feab84a3a1cd
-  data.tar.gz: 5c62c2f467dafb6bc822dbe7c334280776ee173fea3a045cf90cc401030558b2
+  metadata.gz: 0dc6ffbe6f1f29803b5690efe018a561dab4e95a85dbfe395da76c6b0a63244f
+  data.tar.gz: ae4a2582cfd7742dbb870bd06da9088987e6b65328c40933a507d35ef06e8a56
 SHA512:
-  metadata.gz: f1a13ba1cb0c5e75ffc2aae11225b83cc8ee426ccc2c5b3f5e6a8ea6d52df0dee569f67cb4d1319a8f635279edf07604b05ac2ecbc3f66797b046bfe66a14495
-  data.tar.gz: 2d0fc815a65e19ff74bac83298e71f288b5daf5bd2ab141028eaec6a048e1a27903a9e804638b29cf8b6f13302077f161ff7f253d3e0d3b75b561840c59c54d6
+  metadata.gz: cd672998fd7f86b7b1f5c3992ce4d0db017d2eeacf8ca92cccbe0620016bd6bea183a933641083791b7abf14cf4a5d934d4e50589eae9d62b334ef8a403bf629
+  data.tar.gz: 6b51a2e800cb0a707cd0a36bda70a4d8aad07a33a63c0e22899be96c1e7a9e524227a735f37282d7066ef46cba2455e948cfc9346f5155df45235bf3c27852fc

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sutty-migration
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll