jekyll-blogger-generator 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7590917b93c7be32e78e3500b1a4528c23974e9c89d16727eda30e37b3676364
-  data.tar.gz: 5d8d1886a6d2a6ff929c57027b4574b6002b129fb05be00c3e0c3c17b716ee58
+  metadata.gz: 83798e7aea6d7d42a6c9c8babc2198db0b2e7380c3fa3d2acdddf3b7d07f96a4
+  data.tar.gz: d1d92ba199159059d566e525b37f8c9246e4893cd69cd127dd6e406c67b155dc
 SHA512:
-  metadata.gz: 41264182e4e1acfe7adb01610075e9d0059bc133d7eec293447de6ac75b494b7bdbbb49eb0eb8616c11b3d338e702be6576222aaf5d4358b662e33b6302c9e21
-  data.tar.gz: 67b51942ea58a1d939201651d81e4852235f178f2fab1f685fa2fb67a58ce95b6c62d40ae17a1fdaa318ef41b8378867f8026d808387bcf246c8e8ed279917c6
+  metadata.gz: 4fc421cfa034cd7eb12e838608d2c3a377b2f6ee5c99716cc6d034a06adfdc26fe62777e5297ca177c81f433dd1eea8fc9ed73b94f7d6a6c3c3f9228cbd7c1e3
+  data.tar.gz: 67c589854ca435ea521511228d5f1ee1e99544d93d03d81b65e92edf1f49182afb200d51d5a501cebd8ca7c67a4970596f1d9f9cbcdbc7bbee137661ccc5dda8

data/lib/jekyll-blogger-generator/version.rb

@@ -1,3 +1,3 @@
 module JekyllBloggerGenerator
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/jekyll/blogger_generator.rb

@@ -11,19 +11,14 @@ module Jekyll
     end
 
     def generate(site)
-      read_blog(
-        site,
-        @blogger.get_blog_by_url(blogger_config['url']),
-        blogger_config['list_post_parameters']
-      ) if blogger_config['url']
-
-      blogger_config['urls'].each do |url|
-        if url.is_a?(Hash)
-          read_blog(site, @blogger.get_blog_by_url(url['url']), url['list_post_parameters'] || blogger_config['list_post_parameters'])
-        else
-          read_blog(site, @blogger.get_blog_by_url(url), blogger_config['list_post_parameters'])
-        end
-      end if blogger_config['urls']
+      urls = [] << blogger_config['url'] << blogger_config['urls']
+
+      urls.flatten.compact.each do |url|
+        blog = @blogger.get_blog_by_url(url['url'] || url)
+
+        create_pages(site, blog, url['list_page_parameters'])
+        create_posts(site, blog, url['list_post_parameters'])
+      end
     end
 
     private
@@ -32,21 +27,46 @@ module Jekyll
         @blogger_config ||= @config['blogger'] || {}
       end
 
-      def read_blog(site, blog, list_post_parameters = {})
-        parameters = {
-          max_results: 500
-        }.merge(list_post_parameters || {}).deep_symbolize_keys
+      def create_pages(site, blog, list_page_parameters)
+        list_page_parameters = blogger_config['list_page_parameters'] if list_page_parameters.nil?
+        list_page_parameters = {} if list_page_parameters.nil?
+
+        if list_page_parameters
+          parameters = {
+          }.merge(list_page_parameters).deep_symbolize_keys
 
-        loop do
-          list_posts = @blogger.list_posts(blog.id, **parameters)
+          dir = blog.url[/^https?:\/\/([^.]+)\./, 1]
 
-          list_posts.items.each do |post|
-            doc = BloggerDocument.new(post, site: site, collection: site.posts, blog_url: blog.url)
-            doc.read
-            site.posts.docs << doc
+          @blogger.list_pages(blog.id, **parameters).items.each do |page|
+            blogger_page = PageWithoutAFile.new(site, site.source, dir, page.url[/^.+\/p\/(.+)/, 1])
+            blogger_page.content = page.content
+            blogger_page.data.merge!(page.to_h.deep_stringify_keys, source: 'Blogger')
+            blogger_page.data.delete('content')
+            site.pages << blogger_page
           end
+        end
+      end
+
+      def create_posts(site, blog, list_post_parameters)
+        list_post_parameters = blogger_config['list_post_parameters'] if list_post_parameters.nil?
+        list_post_parameters = {} if list_post_parameters.nil?
+
+        if list_post_parameters
+          parameters = {
+            max_results: 500
+          }.merge(list_post_parameters).deep_symbolize_keys
 
-          break if (parameters[:page_token] = list_posts.next_page_token).nil?
+          loop do
+            list_posts = @blogger.list_posts(blog.id, **parameters)
+
+            list_posts.items.each do |post|
+              doc = BloggerDocument.new(post, site: site, collection: site.posts, blog_url: blog.url)
+              doc.read
+              site.posts.docs << doc
+            end
+
+            break if (parameters[:page_token] = list_posts.next_page_token).nil?
+          end
         end
       end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-blogger-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - David Susco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-apis-blogger_v3