jekyll-paginate-v2-redux 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e88db220e5671a3f8cddef1bd274604f2c820770
-  data.tar.gz: d351e77a4462f20e73896566d079184ef68959a8
+  metadata.gz: 1696927d80a45c43019640122649af4c6701ea83
+  data.tar.gz: ecdc51c83ff48eed6f4d216170d43b88c13294bc
 SHA512:
-  metadata.gz: 8a56f26979c65680f7e806dffb9c841be3bda0e01c1aa500768fc7a04e5fb689e6676b08e9f39e0d897d88f3107b6c5f53a913ae51867d90fa7f76bf3ce3e066
-  data.tar.gz: 70890d0e3b08084f947c0307368432fb71ac652d408a1b72080bd3c54391ab423a7e007eabaa8e82714853dbed77ed839e399b141c56e3f5cdf0cbdc235c7f74
+  metadata.gz: 1c3f339a72e7728dd62bd5bca01d27f32f957fc0751d46457f19ea7947371c358b226e8444c15537d02e005f13fff1e54757813a0a3115118db03111e42c554a
+  data.tar.gz: 9086568e9d6895479a09e19314721a776dbf29543e484dbc1ef780b8637d237a8bcc58d180a7a1df95c0de6e396e8fc1beb54c1894969f343b7bdf9480a0f028

data/lib/jekyll-paginate-v2-redux/generator/paginationModel.rb

@@ -53,14 +53,19 @@ module Jekyll
 
               # Request all documents in all collections that the user has requested 
               all_posts = self.get_docs_in_collections(template_config['collection'])
-              if template.data['pagination']['exclude_category']
+
+              exclude_category = self.array_from_config_string template.data['pagination']['exclude_category']
+              exclude_category_global = self.array_from_config_string default_config['exclude_category']
+              exclude_category = exclude_category.concat(exclude_category_global)
+
+              if exclude_category
                 all_posts = all_posts.select { |post|
                   categories = post.data['categories']
                   if categories.is_a?(String)
                     categories = categories.split(/;|,|\s/)
                   end
-                  exclude_category = template.data['pagination']['exclude_category']
-                  !categories.include? template.data['pagination']['exclude_category']
+                  exclude_category = exclude_category
+                  !(categories.any? { |i| exclude_category.include? i })
                 }
               end
 
@@ -85,6 +90,13 @@ module Jekyll
         return templates.size.to_i
       end # function run
 
+      def array_from_config_string(config_string)
+        if config_string and config_string.is_a?(String)
+          config_string.split(/;|,|\s/)
+        else
+          []
+        end
+      end
       #
       # This function is here to retain the old compatability logic with the jekyll-paginate gem
       # no changes should be made to this function and it should be retired and deleted after 2018-01-01

data/lib/jekyll-paginate-v2-redux/version.rb

@@ -1,8 +1,8 @@
 module Jekyll
   module PaginateV2
-    VERSION = "1.7.7"
+    VERSION = "1.7.8"
     # When modifying remember to issue a new tag command in git before committing, then push the new tag
-    #   git tag -a v1.7.7 -m "Gem v1.7.7"
+    #   git tag -a v1.7.8 -m "Gem v1.7.8"
     #   git push origin --tags
     # Yanking a published Gem
     #   gem yank jekyll-paginate-v2 -v VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-paginate-v2-redux
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - Sverrir Sigmundarson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll