zerofetcher 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77e770c33abf3303f04e63c9e4f17b2576214634
-  data.tar.gz: 13ae94733a226868d58b81bbeee50708c2919de6
+  metadata.gz: b2397f0029eb9fe03e645701d73e8c9ddce02b25
+  data.tar.gz: 34e374c9e2501b5d8683313cd7a3301b2414d6a2
 SHA512:
-  metadata.gz: 27f5c4a348fccc2ae4fdfbcb63811b3159dd1df7e30a753212fcaf9be5db8ea36d92b6e0488c8a842761b5b4ce044e4947f68c0e4d848336785eba99ab31c0b3
-  data.tar.gz: f211ce8065b814873212e1ecd32b97f0c8aeba9e758e6ed2e7739920467ea2db56fc40b8f7c945e286eb354c408da834339d0b5669ca985255cc54c282f92fab
+  metadata.gz: 1692ce637e1dfc48e349fc5347e0382cf79818f892560c1f7a8757f77281700cea8c3810e2ee93b5cb4c43db1e72448fc136ea73e88cc40960cb278228c32dcb
+  data.tar.gz: 023ee3b5072234232facd95d57a098692e71910b8bffa457f8fabfb06630f2d791296060c02c72d0447a057f8c7e7465ac1f97f5468774e71c3e5f8684ad94f5

data/lib/code/JekyllFile.rb

@@ -56,6 +56,9 @@ class JekyllFile
                 end
                 
                 @yaml_parsed['title'] = title
+                if @file_data['image']
+                    @yaml_parsed['image'] = 'images/pages/' + @file_data['image']
+                end
             else
                 # add file data
                 @file_data.each do |key, value|

data/lib/zerofetcher.rb

@@ -26,7 +26,7 @@ class ZeroFetcher
         FileUtils::mkdir_p jekyll_path+'/_posts'
         FileUtils::mkdir_p jekyll_path+'/assets'
         FileUtils::mkdir_p jekyll_path+'/assets/images'
-        FileUtils::mkdir_p jekyll_path+'/assets/images/posts'
+        FileUtils::mkdir_p jekyll_path+'/assets/images/pages'
         FileUtils::mkdir_p jekyll_path+'/assets/files'
         FileUtils::mkdir_p jekyll_path+'/_includes'
         FileUtils::mkdir_p jekyll_path+'/_includes/pages'
@@ -50,11 +50,15 @@ class ZeroFetcher
         end_point = config['fetcher']['end_point']
         site_id = config['fetcher']['site_id'].to_s
 
+        # Load data from API
         data = self.loadDataFromApi(end_point, config['fetcher']['api_key'], site_id)
+        
+        # Create empty collection hash
+        collection_config = {};
 
         # Site Info
         if data.key?("site")
-            File.write(jekyll_path+'/_data/site.json', data['site'].to_json)
+            File.write(jekyll_path+'/_data/site.json', JSON.pretty_generate(data['site']))
             self.log('Writing File /_data/site.json')
         end
 
@@ -84,17 +88,26 @@ class ZeroFetcher
                 self.log(" - Saved:"+jpage.getFileName)
 
                 # Add to pages array
-                pages.push({
+                page_info = {
                     'name' => page['name'],
                     'slug' => page['slug'],
                     'url' => page['url'],
                     'meta_title' => (page['meta_title']) ? page['meta_title'] : page['name'],
                     'meta_description' => page['meta_description'],
                     'short_description' => page['short_description'],
-                })
+                }
+                if page['image']
+                    page_info['image'] = 'images/pages/' + page['image']
+                end
+                pages.push(page_info)
+                
+                # save image
+                if page['image']
+                    self.getAndSaveFile(end_point + '/media/images/pages/'+site_id+'/' + page['image'], jekyll_path+'/assets/images/pages/' + page['image'])
+                end
             end
 
-            File.write(jekyll_path+'/_data/pages.json', pages.to_json)
+            File.write(jekyll_path+'/_data/pages.json', JSON.pretty_generate(pages))
             self.log("Writing File /_data/pages.json")
 
             # Clean Unused Pages
@@ -113,7 +126,7 @@ class ZeroFetcher
 
         # Variables
         if data.key?("variables")
-            File.write(jekyll_path+'/_data/vars.json', data['variables'].to_json)
+            File.write(jekyll_path+'/_data/vars.json', JSON.pretty_generate(data['variables']))
             self.log("Writing File /_data/vars.json")
         end
 
@@ -141,6 +154,8 @@ class ZeroFetcher
 
         # Post files
         if data.key?("posts")
+            FileUtils::mkdir_p jekyll_path+'/assets/images/posts'
+            
             puts "Posts - " + data['posts'].length.to_s
             data['posts'].each do |post|
                 jpost = JekyllPost.new(jekyll_path+'/_posts', post)
@@ -163,7 +178,7 @@ class ZeroFetcher
             self.log("Galleries - " + data['galleries'].length.to_s)
 
             # Save Json Data
-            File.write(jekyll_path+'/_data/galleries.json', data['galleries'].to_json)
+            File.write(jekyll_path+'/_data/galleries.json', JSON.pretty_generate(data['galleries']))
             self.log('Writing file /_data/galleries.json')
 
             # Save Photos
@@ -188,7 +203,7 @@ class ZeroFetcher
             self.log("Calendar - " + data['calendar'].length.to_s)
 
             # Save Json Data
-            File.write(jekyll_path+'/_data/calendar.json', data['calendar'].to_json)
+            File.write(jekyll_path+'/_data/calendar.json', JSON.pretty_generate(data['calendar']))
             self.log('Writing File /_data/calendar.json')
 
             # Save Photos / Files
@@ -204,26 +219,48 @@ class ZeroFetcher
                 end
             end
         end
-
-
+        
+        # Menus  (as json data and images)
+        if data.key?("menus")
+            # Save Json Data
+            #File.write(jekyll_path+'/_data/menus.json', data['menus'].to_json)
+            File.write(jekyll_path+'/_data/menus.json', JSON.pretty_generate(data['menus']))
+            
+            self.log('Writing File /_data/menus.json')
+            
+            # Save Images
+            FileUtils::mkdir_p jekyll_path+'/assets/images/menus'
+            FileUtils::mkdir_p jekyll_path+'/assets/images/menus/items'
+            
+            data['menus'].each do |menu|
+                menu['items'].each do |item|
+                    if item['image']
+                        image_path = jekyll_path+'/assets/images/menus/items/'+menu['id']
+                        FileUtils::mkdir_p image_path
+                        
+                        src_image = end_point + '/media/images/menu_items/'+menu['id']+'/' + item['image']
+                        
+                        self.getAndSaveFile(src_image, image_path+'/' + item['image'])                                                
+                    end 
+                end
+            end
+        end
+        
         # Custom Collections
         if data.key?("collections")
-            # Create empty collection hash
-            collection_config = {};
-
             data['collections'].each do |collection_type,collection_data|
                 puts "Collection - " + collection_type + ' - ' + collection_data.length.to_s
                 self.log("Collection - " + collection_type + ' - ' + collection_data.length.to_s)
 
                 # Save Json Data
-                File.write(jekyll_path+'/_data/'+collection_type+'.json', collection_data['data'].to_json)
+                File.write(jekyll_path+'/_data/'+collection_type+'.json', JSON.pretty_generate(collection_data['data']))
                 self.log('Writing File /_data/'+collection_type+'.json')
 
                 # Loop through the collection data
                 case collection_data['settings']['type']
                     when 'collection'
                         # Add to collection hash
-                        collection_config[ collection_type ] = ['output' => true];
+                        collection_config[ collection_type ] = {'output' => true}
                         
                         # Directory Check
                         collection_path = jekyll_path+'/_' + collection_type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zerofetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Brian Liccardo