jekyll-theme-open-project-helpers 1.0.0.rc5 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 905882f12a5d505fb7535d96b7f1c8b52a174200
-  data.tar.gz: 8c6f12cd854586c181b74a9a469d3812ba958e68
+  metadata.gz: 6b0cb77746966548999e685bca5a80c37c5486a2
+  data.tar.gz: 3e56cf45ea5251b49f9540e7b2ec11df6244da06
 SHA512:
-  metadata.gz: 3cc3e706e19a520699df1f965bcd863c48bde072e8a899eb2ef11f307c10a0748d836a8e2c2b347c4095968c8206e7efe8ed1c50c0b83c827273e096af5bdbef
-  data.tar.gz: cae265cbaf51cb2b398fa845afe0fbcd24ca331678acbbc5c5fcd0b38bdd06b06631ddf1dfb5507bc9341478c67bf41a0486e226ae174afb108b573e77f043f2
+  metadata.gz: deffc10af730eb1a94c77c2a1eb8a13ddda05322fbc60ac526b5600432b640756c86c435e027b6bdca2d4c7ea5974bed7a76421ebcc5d48948c3dbf8cd640597
+  data.tar.gz: 62f7e67d05891a63872d5ce4a3da7aa8e7ed6df0ebfbb51b1696cf05c8baf0f795cb16c46e9d53d589578bd31d7171873c244d61dd937ee2627780b5dc9ebaa1

data/jekyll-theme-open-project-helpers.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'jekyll-theme-open-project-helpers'
-  s.version       = '1.0.0.rc5'
+  s.version       = '1.0.1'
   s.authors       = ['Ribose Inc.']
   s.email         = ['open.source@ribose.com']
 

data/lib/jekyll-theme-open-project-helpers/blog_index.rb

@@ -1,19 +1,20 @@
 module Jekyll
   module OpenProjectHelpers
 
-    # Below passes an array of posts of open hub blog
-    # and from each individual project blog, combined and sorted by date,
-    # to open hub blog index page.
     #
-    # (It also does some processing on the posts.)
-
-    class BlogIndexGenerator < Jekyll::Generator
+    # Adds a variable holding the array of posts of open hub blog
+    # and from each individual project blog, combined and sorted by date.
+    #
+    # It also does some processing on the posts
+    # as required by the Open Project theme.
+    #
+    class CombinedPostArrayGenerator < Generator
       safe true
 
       def generate(site)
         site_posts = site.posts.docs
 
-        if Jekyll::OpenProjectHelpers::is_hub(site)
+        if site.config['is_hub']
           # Get documents representing projects
           projects = site.collections['projects'].docs.select do |item|
             pieces = item.url.split('/')
@@ -53,8 +54,9 @@ module Jekyll
           post
         end
 
-        blog_index = site.site_payload["site"]["pages"].detect { |page| page.url == '/blog/' }
-        blog_index.data['posts_combined'] = posts_combined
+        # Make combined blog post array available site-wide
+        site.config['posts_combined'] = posts_combined
+        site.config['num_posts_combined'] = posts_combined.size
       end
     end
 

data/lib/jekyll-theme-open-project-helpers/filterable_index.rb

@@ -43,7 +43,7 @@ module Jekyll
       safe true
 
       def generate(site)
-        if Jekyll::OpenProjectHelpers::is_hub(site)
+        if site.config['is_hub']
           INDEXES.each do |index_name, params|
             items = site.collections['projects'].docs.select { |item| params[:item_test].call(item) }
 
@@ -85,18 +85,26 @@ module Jekyll
       safe true
 
       def generate(site)
+        site.config['num_featured_software'] = 3
+        site.config['num_featured_specs'] = 3
+        site.config['num_featured_posts'] = 3
 
         INDEXES.each do |index_name, params|
-          if Jekyll::OpenProjectHelpers::is_hub(site)
-            items = site.collections['projects'].docs.select { |item| params[:item_test].call(item) }
+          if site.config['is_hub']
+            collection_name = 'projects'
           else
-            items = site.collections[index_name].docs.select { |item| params[:item_test].call(item) }
+            collection_name = index_name
           end
 
-          page = site.site_payload["site"]["pages"].detect { |p| p.url == "/#{index_name}/" }
-          page.data['items'] = items
-        end
+          if site.collections.key? collection_name
+            # Filters items from given collection_name through item_test function
+            items = site.collections[collection_name].docs.select { |item| params[:item_test].call(item) }
 
+            # Makes items available in templates via e.g. site.all_specs, site.all_software
+            site.config["all_#{index_name}"] = items
+            site.config["num_all_#{index_name}"] = items.size
+          end
+        end
       end
     end
 

data/lib/jekyll-theme-open-project-helpers/project_data_reader.rb

@@ -11,7 +11,7 @@ module Jekyll
         return unless File.directory?(dir) && !@entry_filter.symlink?(dir)
 
         entries = Dir.chdir(dir) do
-          Dir["*.{md,markdown,html,svg,png}"] + Dir["*"].select { |fn| File.directory?(fn) }
+          Dir["*.{adoc,md,markdown,html,svg,png}"] + Dir["*"].select { |fn| File.directory?(fn) }
         end
 
         entries.each do |entry|
@@ -22,7 +22,7 @@ module Jekyll
 
           elsif nested or (File.basename(entry, '.*') != 'index')
             ext = File.extname(path)
-            if ['.md', '.markdown', '.html'].include? ext
+            if ['.adoc', '.md', '.markdown', '.html'].include? ext
               doc = Jekyll::Document.new(path, :site => @site, :collection => collection)
               doc.read
               collection.docs << doc
@@ -50,7 +50,7 @@ module Jekyll
 
       def read
         super
-        if Jekyll::OpenProjectHelpers::is_hub(@site)
+        if @site.config['is_hub']
           fetch_and_read_projects
         else
           fetch_and_read_docs_for_items('software')
@@ -111,6 +111,8 @@ module Jekyll
         # collection_name would be either software, specs, or (for hub site) projects
         # index_collection_name would be either software or specs
 
+        return unless @site.collections.key?(collection_name)
+
         index_collection_name = index_collection_name or collection_name
 
         entry_points = @site.collections[collection_name].docs.select do |doc|

data/lib/jekyll-theme-open-project-helpers/site_type.rb

@@ -1,19 +1,25 @@
 module Jekyll
   module OpenProjectHelpers
 
-    def self.is_hub(site)
+    #
+    # Infers from available content whether the site is a hub
+    # or individual project site, and adds site-wide config variable
+    # accessible as {{ site.is_hub }} in Liquid.
+    #
+    class SiteTypeVariableGenerator < Generator
+      def generate(site)
+        site.config['is_hub'] = false
 
-      # If there’re projects defined, we assume it is indeed
-      # a Jekyll Open Project hub site.
-      if site.collections.key? 'projects'
-        if site.collections['projects'] != nil
-          if site.collections['projects'].docs.length > 0
-            return true
+        # If there’re projects defined, we assume it is indeed
+        # a Jekyll Open Project hub site.
+        if site.collections.key? 'projects'
+          if site.collections['projects'] != nil
+            if site.collections['projects'].docs.length > 0
+              site.config['is_hub'] = true
+            end
           end
         end
       end
-
-      return false
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-open-project-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc5
+  version: 1.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -97,9 +97,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14.1