zerofetcher 0.0.39 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9068074c8aad3a824a4d5f0caf4d5926b128d5e
-  data.tar.gz: 456590310a7c5dd40211f7347ae53ba8c66701d4
+  metadata.gz: 8ad98b66ac1d0daa89686aefd7caf814e535a907
+  data.tar.gz: 228c46b0b6c65d863a4b65c3b08f1a38a87be9b9
 SHA512:
-  metadata.gz: ba4e983df16ca15c3da6bc84aeba2b9b9c6685adf98087a088df794d77e532a224ab4fb2291e1ae90a33622f1a5f045bbff85576240a43624bfe51fd78d28fef
-  data.tar.gz: cd3f6505e8185715723e0cbe52f80674a036f1c5f0374a83ab62fb86499312f3f30a026ca7f231d5ee807225a870e64a8a883c8502d7afa30d37d91bc5efe74b
+  metadata.gz: bf16694aeea22492508fd1247034f373b2b1abafe990d03e5439c23ec539d7a4b3329b6829594a1c89dbb0ab5d037e7458f52ec72de1eac7edee37b96492399f
+  data.tar.gz: d2058f6ed22db446e672a63fd0f7090e115141b8eb839110858e53d1cad4befda68805d5995f7d7c1b45b5c855bb3be660213b0a74759b61302402adeaa81884

data/lib/code/JekyllFile.rb

@@ -95,7 +95,7 @@ class JekyllFile
                 layout = 'post'
         end
         
-        puts "Layout:" + layout
+        #puts "Layout:" + layout
         
         return layout
     end

data/lib/code/JekyllPost.rb

@@ -27,6 +27,10 @@ class JekyllPost
             'categories' => post['categories'],
         }
         
+        if post.key?("taxonomy")
+            @yaml_parsed['taxonomy'] = post['taxonomy']
+        end
+        
         if post['image']
             @yaml_parsed['image'] = 'images/posts/' + post['image']['original']
         end

data/lib/zerofetcher.rb

@@ -15,6 +15,7 @@ class ZeroFetcher
     @@logger
     @@jekyll_path
     @@image_variants
+    @@end_point
     
     def self.run        
         # Paths
@@ -37,6 +38,7 @@ class ZeroFetcher
         FileUtils::mkdir_p jekyll_path+'/assets/images'
         FileUtils::mkdir_p jekyll_path+'/assets/images/pages'
         FileUtils::mkdir_p jekyll_path+'/assets/files'
+        FileUtils::mkdir_p jekyll_path+'/assets/images/tax-images'
         FileUtils::mkdir_p jekyll_path+'/_includes'
         FileUtils::mkdir_p jekyll_path+'/_includes/pages'
         FileUtils::mkdir_p jekyll_path+'/_includes/content_blocks'
@@ -57,6 +59,7 @@ class ZeroFetcher
         end
 
         end_point = config['fetcher']['end_point']
+        @@end_point = end_point 
         site_id = config['fetcher']['site_id'].to_s
 
         # Load data from API
@@ -103,7 +106,7 @@ ErrorDocument 404 /404/index.html'
 
             # Loop through each page
             data['pages'].each do |page|
-                puts page['name']
+                puts ' - ' + page['name']
                 self.log(' - ' + page['name'])
 
                 jpage = JekyllFile.new(jekyll_path, page, 'page')
@@ -172,6 +175,17 @@ ErrorDocument 404 /404/index.html'
             end
         end
         
+        # Taxonomy
+        if data.key?("taxonomy")
+            data['taxonomy'].each do |taxonomy_data_type|
+                taxonomy_data_type['taxonomies'].each do |taxonomy|
+                    if '1' == taxonomy['enable_images']
+                       FileUtils::mkdir_p jekyll_path+'/assets/images/tax-images/' + taxonomy['id'] 
+                    end
+                end
+            end
+        end
+        
         # Nav Menus
         if data.key?("nav_menus")
             puts 'Nav menus - ' + data['nav_menus'].length.to_s
@@ -196,6 +210,9 @@ ErrorDocument 404 /404/index.html'
             data['posts'].each do |post|
                 self.log('Saving Post File ' + post['date']+'-'+post['slug']+'.md')
                 
+                # Do Tax
+                self.taxonomyImages(post)
+                
                 # save image
                 if post['image']
                     post['image'] = self.getAndSaveImages(end_point + '/media/images/posts/'+site_id+'/' + post['image'], jekyll_path+'/assets/images/posts/' + post['image'])
@@ -308,6 +325,8 @@ ErrorDocument 404 /404/index.html'
             
             # Download Files
             data['downloads'].each do |download|
+                self.taxonomyImages(download)
+                
                 download_path = jekyll_path+'/assets/files/downloads'
                 
                 src_file = end_point + '/media/files/downloads/' + site_id + '/' + download['file']
@@ -344,7 +363,9 @@ ErrorDocument 404 /404/index.html'
                 row_data.delete('id')
                 id_key = 'property_id'
                 row_data[ id_key ] = row['id']
-              
+                
+                # process taxonomies
+                self.taxonomyImages(data['properties']['data'][pidx])
               
                 # Save Images
                 if row.key?("galleries")
@@ -356,7 +377,6 @@ ErrorDocument 404 /404/index.html'
                         if gallery.key?("images")                            
                             # save images
                             gallery['images'].each_with_index do |image,idx|
-                                
                                 src_image = end_point + '/media/images/properties/'+row['id']+'/' + image['image']
                                 
                                 data['properties']['data'][pidx]['galleries'][gidx]['images'][idx]['image'] = self.getAndSaveImages(src_image, image_path+'/' + image['image'])
@@ -526,6 +546,26 @@ ErrorDocument 404 /404/index.html'
         @@logger.close
     end
     
+    def self.taxonomyImages(row)
+        if row.key?("taxonomy")
+            ##puts ' - Found taxonomy key ['+row['id']+']'
+            row['taxonomy'].each_with_index do |tax_row,idx|
+                if tax_row.key?("image")
+                    if tax_row["image"]
+                        ##puts ' - ' + idx.to_s + ' saving tax image'
+                        ##puts ' - - ['+tax_row["image"]+']'
+                        image_path = @@jekyll_path+'/assets/images/tax-images/' + tax_row['taxonomy_id'] 
+                        src_image = @@end_point + '/media/images/taxonomies/' + tax_row['taxonomy_id'] + '/' + tax_row["image"]
+                        
+                        row['taxonomy'][idx]['image'] = self.getAndSaveImages(src_image, image_path + '/' + tax_row["image"])
+                    end
+                end
+            end
+        end
+        
+        #return row
+    end
+    
     def self.log(data)
         @@logger.debug { data }
     end
@@ -584,10 +624,12 @@ ErrorDocument 404 /404/index.html'
         images = {
             'original' => File.basename( dest )
         }
-      
+              
         # Save Original
-        if self.getAndSaveFile(source, dest)
-            self.optimizeImage(dest)
+        if !File.file?( dest )
+            if self.getAndSaveFile( source, dest )
+                self.optimizeImage( dest )
+            end
         end
         
         # Save Variants
@@ -596,8 +638,10 @@ ErrorDocument 404 /404/index.html'
                 v_source = self.getImageVariantSource(source, variant)
                 v_dest = self.getImageVariantDestination(dest, variant)
                 
-                if self.getAndSaveFile( v_source, v_dest )
-                    self.optimizeImage( v_dest )
+                if !File.file?( v_dest )
+                    if self.getAndSaveFile( v_source, v_dest )
+                        self.optimizeImage( v_dest )
+                    end
                 end
                 
                 images[ variant['key'] ] = File.basename( v_dest )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zerofetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors:
 - Brian Liccardo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optimizer