zerofetcher 0.0.69 → 0.0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e34cbe85abbef517791d4de2954e547dfcc075641adf59412dfad913e4a4bafd
-  data.tar.gz: 14703ace7cf47331eb0c6ab31ec17b31e5735e707f7fcffcbf2cf5c441bbfc9d
+  metadata.gz: e7796a17dde977bed46a80f39c5986fb00190d85939d1c515bd7d2e695d3eaa0
+  data.tar.gz: 78d69597cd3beb99c042f85f8d50671c81526642a878133f8a3bb5ba9eac833e
 SHA512:
-  metadata.gz: 05c772ad18ac9b002f73e7027a2f138fb283db7f49d48f83e648cfdad7a4a8ed0ecf06a98f09956d2cf081c25a01e35bbb1927c8f8f9d95c6f987556ced9e77a
-  data.tar.gz: eb6ed071f3e7ccf027a5471dc57d471247ec5607f08d8704b9b397f0b997f25b6eb8321d4611506233bb374d3777ae015efa85c35b1187f30017cf94e118cc46
+  metadata.gz: 9227d081977c39ef8b98c3a813cc759a3942526020a311de359fc373659279d23bb5c6fcb3e49fd25f61ba11abba75f04d3d2d6a2d34b189f552d52b6a9cd119
+  data.tar.gz: d4e57a1500d17adfc838abef73f69ad01c4a39733059c73b40b6a7a818eac2f415effcd226f6aa5ad22435acf1762d1dc0a9c5b8a9b3c0bf4b87f94d75a39b77

data/lib/code/JekyllFile.rb

@@ -16,6 +16,7 @@ class JekyllFile
     
     def initialize(path, data, file_type, file_name = nil)
         @content_keys = ['content']
+        @ignore_keys = ['layout']
         
         @file_data = data;
         @file_type = file_type
@@ -57,7 +58,8 @@ class JekyllFile
         end
         
         # set layout
-        if !@yaml_parsed.key?('layout') || 'page' == @file_type
+        if @file_data.key?('layout') || !@yaml_parsed.key?('layout')
+            puts "Getting layout for " + @file_data['name']
             @yaml_parsed['layout'] = getPageLayout
         end
         
@@ -78,7 +80,7 @@ class JekyllFile
             else
                 # add file data
                 @file_data.each do |key, value|
-                    if !@content_keys.include?(key)
+                    if !@content_keys.include?(key) &&! @ignore_keys.include?(key)
                         @yaml_parsed[key] = value
                     end
                 end
@@ -95,22 +97,21 @@ class JekyllFile
     end
     
     def getPageLayout
-        case @file_type
-            when 'page'
-                if @file_data['layout']
-                    layout = File.basename(@file_data['layout'],File.extname(@file_data['layout']))
-                else
+        if @file_data['layout']
+            layout = File.basename(@file_data['layout'],File.extname(@file_data['layout']))
+        else
+            case @file_type
+                when 'page'
                     if 'index' == @file_data['url']
                         layout = 'home'
                     else
                         layout = 'page'
                     end
-                end
-            else
-                layout = 'post'
+                else
+                    layout = 'post'
+            end
         end
-        
-        #puts "Layout:" + layout
+        puts "Layout:" + layout
         
         return layout
     end

data/lib/zerofetcher.rb

@@ -316,6 +316,10 @@ ErrorDocument 404 /404/index.html'
                 
                     self.log('Saving Event File ' + gallery['slug']+'.md')
 
+                    if data['site'].key?('gallery_detail_layout') && data['site']['gallery_detail_layout'] != ""
+                        gallery['layout'] = data['site']['gallery_detail_layout']
+                    end
+
                     jfile = JekyllFile.new(gallery_collection_path, gallery, 'collection', gallery['slug'])
                     jfile.savePageFile
 
@@ -365,6 +369,10 @@ ErrorDocument 404 /404/index.html'
                                 event_data[ key ] = value
                             end
 
+                            if data['site'].key?('calendar_detail_layout') && data['site']['calendar_detail_layout'] != ""
+                                event_data['layout'] = data['site']['calendar_detail_layout']
+                            end
+
                             self.log('Saving Event File ' + event_data['slug']+'-'+event_date['date']+'.md')
 
                             jfile = JekyllFile.new(event_collection_path, event_data, 'collection', event_data['slug']+'-'+event_date['date'])
@@ -650,12 +658,12 @@ ErrorDocument 404 /404/index.html'
                 self.log('Writing File /_data/'+collection_type+'.json')
                 
             end
-
-            # Add Collections to _config.tml
-            config['collections'] = collection_config
-            self.writeFile( jekyll_path+"/_config.yml", config.to_yaml )
-            self.log('Writing File /_config.yml')
         end
+
+        # Add Collections to _config.tml
+        config['collections'] = collection_config
+        self.writeFile( jekyll_path+"/_config.yml", config.to_yaml )
+        self.log('Writing File /_config.yml')
         
         @@logger.close
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zerofetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.69
+  version: 0.0.70
 platform: ruby
 authors:
 - Brian Liccardo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies: []
 description: Fetches content from zero
 email: brian@d3corp.com