zerofetcher 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07f69907316db9502c48570a9af8709c04bc8cbf
-  data.tar.gz: d11a4225908538c7c4d1fe04ef2a7b9debdcde21
+  metadata.gz: ea6e02068bab92b4f4fc2763436be55a5b420a4b
+  data.tar.gz: 3db0a481047c4b6e6e3897e44c27c45995648912
 SHA512:
-  metadata.gz: e07822f820e27c378574936981c630539a718aea5b4f137f2acfe226003ea8513344aeeba115f6a41c906bf7c6b4f1c00ce8cba9efbb6d224637d343e94bc848
-  data.tar.gz: 6cbc24f801d986b209f5d59000d8598196965bc28ddfafe26cc240adc5a640dc4ffecfc0ef32a0c51a09b93541dbbacf0734ac4003f12a4f1c738fa118e6afb1
+  metadata.gz: 45db955853b9b213e6d828b977d93ff26d96769d3b85f47071e94fbe27be990fcaf5a68e47b40f46a43a356855af3a7da43627395c4ee485d8cb3bbdcf6ef99c
+  data.tar.gz: db5106b61400829c639ac69cd77578834d6d490bc52fc5fa1f368024d42ccdac0a54ee5e36d8e5b83df9fbf18eeaa45f77bff5820ac90a32e805f1fca843f46c

data/lib/zerofetcher.rb

@@ -47,8 +47,9 @@ class ZeroFetcher
         end
 
         end_point = config['fetcher']['end_point']
+        site_id = config['fetcher']['site_id'].to_s
 
-        data = self.loadDataFromApi(end_point, config['fetcher']['api_key'], config['fetcher']['site_id'])
+        data = self.loadDataFromApi(end_point, config['fetcher']['api_key'], site_id)
 
         # Site Info
         if data.key?("site")
@@ -102,7 +103,7 @@ class ZeroFetcher
                 file_basename = Pathname.new(file).basename.to_s
                 if 'README.md' != file_basename
                     if !pages_files_saved.include?( file_basename )
-                        self.log(" - Deleting:"+jfile)
+                        self.log(" - Deleting:"+file)
                         FileUtils.rm(file)
                     end
                 end
@@ -188,11 +189,11 @@ class ZeroFetcher
             if data['calendar'].key?("events")
                 data['calendar']['events'].each do |event|
                     if event['image']
-                        self.getAndSaveFile(end_point + '/media/images/calendar/' + event['image'], jekyll_path+'/assets/images/calendar/' + event['image'])
+                        self.getAndSaveFile(end_point + '/media/images/calendar/'+site_id+'/' + event['image'], jekyll_path+'/assets/images/calendar/' + event['image'])
                     end
 
                     if event['file']
-                        self.getAndSaveFile(end_point + '/media/files/calendar/' + event['file'], jekyll_path+'/assets/files/calendar/' + event['file'])
+                        self.getAndSaveFile(end_point + '/media/files/calendar/'+site_id+'/' + event['file'], jekyll_path+'/assets/files/calendar/' + event['file'])
                     end
                 end
             end
@@ -208,32 +209,67 @@ class ZeroFetcher
                 puts "Collection - " + collection_type + ' - ' + collection_data.length.to_s
                 self.log("Collection - " + collection_type + ' - ' + collection_data.length.to_s)
 
-                # Add to collection hash
-                collection_config[ collection_type ] = ['output' => true];
-
                 # Save Json Data
-                File.write(jekyll_path+'/_data/'+collection_type+'.json', collection_data.to_json)
+                File.write(jekyll_path+'/_data/'+collection_type+'.json', collection_data['data'].to_json)
                 self.log('Writing File /_data/'+collection_type+'.json')
 
-                # Directory Check
-                collection_path = jekyll_path+'/_' + collection_type
-                FileUtils::mkdir_p collection_path
-
-                # Create files saved array
-                files_saved = Array.new
-
                 # Loop through the collection data
-                collection_data.each do |row|
-                    jfile = JekyllFile.new(collection_path, row, 'collection')
-                    jfile.savePageFile
-
-                    files_saved.push( Pathname.new( jfile.getFileName ).basename.to_s )
-
-                    self.log('Saving Collection File ' + file.getFileName)
+                case collection_data['settings']['type']
+                    when 'collection'
+                        # Add to collection hash
+                        collection_config[ collection_type ] = ['output' => true];
+                        
+                        # Directory Check
+                        collection_path = jekyll_path+'/_' + collection_type
+                        FileUtils::mkdir_p collection_path
+        
+                        # Create files saved array
+                        files_saved = Array.new
+                        
+                        # Save Individual Collection Files
+                        collection_data['data'].each do |row|
+                            jfile = JekyllFile.new(collection_path, row, 'collection')
+                            jfile.savePageFile
+        
+                            files_saved.push( Pathname.new( jfile.getFileName ).basename.to_s )
+        
+                            self.log('Saving Collection File ' + jfile.getFileName)
+                        end
+        
+                        # Clean up unused collection files
+                        self.cleanUpFolder(collection_path, files_saved)
+                end
+                
+                # Save Images / Files
+                collection_data['data'].each do |row|
+                    collection_data['fields'].each do |fld_key,fld_info|
+                        row.each do |key,val|
+                            #puts 'Row ['+key+']:['+val.to_s+']'
+                            if fld_key == key
+                                puts 'Row ['+key+']:['+val.to_s+'] type['+fld_info['type']+']'
+                                case fld_info['type']
+                                    when 'image'
+                                        # Directory Check
+                                        image_path = jekyll_path+'/assets/images/'+collection_type
+                                        FileUtils::mkdir_p image_path
+                                        src_image = end_point + '/media/images/'+collection_type+'/'+site_id+'/' + val
+                        
+                                        #puts 'Found Image ['+src_image+'] for collection ['+collection_type+']'
+                                        
+                                        self.getAndSaveFile(src_image, image_path+'/' + val)
+                                    when 'file'
+                                        # Directory Check
+                                        file_path = jekyll_path+'/assets/files/'+collection_type
+                                        FileUtils::mkdir_p file_path
+                                        
+                                        src_file = end_point + '/media/files/'+collection_type+'/'+site_id+'/' + val
+                                        
+                                        self.getAndSaveFile(src_file, file_path+'/' + val)
+                                end
+                            end
+                        end
+                    end
                 end
-
-                # Clean up unused collection files
-                self.cleanUpFolder(collection_path, files_saved)
             end
 
             # Add Collections to _config.tml
@@ -271,8 +307,12 @@ class ZeroFetcher
           self.log('Get/Save ' + dest)
           uri = URI.encode(source)
           
-          open(dest, 'wb') do |file|
-              file << open(uri).read
+          begin
+              open(dest, 'wb') do |file|
+                  file << open(uri).read
+              end
+          rescue OpenURI::HTTPError => ex
+              self.log('source ['+source+'] Could not be opened to save')
           end
        end
     end

metadata

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