zerofetcher 0.0.65 → 0.0.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b730da83eac72a56c95b8d6efa50cb10acce32
-  data.tar.gz: b962308ce0c5d57812ded74f9d8ed0f1a94c1f3d
+  metadata.gz: d6bd054435e240ea767588139e166b639716768e
+  data.tar.gz: 5c7fdf05c2169aa69631caf22c5a0b9e524a542e
 SHA512:
-  metadata.gz: ad55568ed7034f8dfedceed172581ad4e6631fb1d39bc2c4d26e19bc1340d0d2d9499dc4934d7f55af4a313272a147777d170eefb5094dd2043627e5e1f31f7d
-  data.tar.gz: 37162d9d6fee84a7fa9230012f4ff23371ccbdfe40ae93df15c5774a415cd2cf7a5502551bca8df0f33fe38e3b78b18add9a05435863e139e133b3b497f54294
+  metadata.gz: 13dd6ee30da416a1affb6d4c373f32ea258c132acae6ecddfc8e915bdebebcb9c5c033f5654d59e0963985b7f33401921034cdb2af1456ec1f7f4f2e0dbcccaa
+  data.tar.gz: 5e624f6124a49ebb4ef59beffb0fb93321dc06aed5e7c0d7e4cd4efb1f5c518b95df0819ff53cd35dcedc586659db8685333d61c22a5cf0c38bff85d11931c34

data/lib/code/JekyllFile.rb

@@ -2,6 +2,7 @@
 
 class JekyllFile
     @file_path
+    @base_path
     @file_exists = false
     @file_contents
     @yaml_section = ''
@@ -29,7 +30,8 @@ class JekyllFile
         else
             @file_name = file_name + '.md';
         end
-        
+
+        @base_path = path
         @file_path = path + '/'  + @file_name;
         
         @yaml_parsed = {}
@@ -43,8 +45,14 @@ class JekyllFile
                 #    }
 
                 #@content_section = '{% include pages/' + @file_data['url'] + '.md %}'
-                @content_section = '{% capture ' + @file_data['url'] + ' %}{% include pages/' + @file_data['url'] + '.md %}{% endcapture %}
-{{ ' + @file_data['url'] + ' | markdownify }}'
+
+                content_file = @file_data['url']
+                if content_file.include? "/"
+                    content_file = content_file.gsub(/\//, "_")
+                end
+
+                @content_section = '{% capture ' + content_file + ' %}{% include pages/' + content_file + '.md %}{% endcapture %}
+{{ ' + content_file + ' | markdownify }}'
             end
         end
         
@@ -147,8 +155,16 @@ class JekyllFile
         return @file_path;
     end
     
-    def saveContentFile(file_path, contents)
-        ZeroFetcher.writeFile(file_path, contents)
+    def saveContentFile(file_path, file_name, contents)
+        if file_name.include? "/"
+            file_name = file_name.gsub(/\//, "_")
+        end
+
+        #puts "Create Content File" + file_path + '/' + file_name
+
+        ZeroFetcher.writeFile(file_path + '/' + file_name, contents)
+
+        return file_path + '/' + file_name
     end
     
     def savePageFile
@@ -160,6 +176,24 @@ class JekyllFile
         if @content_section.is_a? String
             file_contents += @content_section
         end
+
+        # create folders
+        if 'page' == @file_type
+            if @file_name.include? "/"
+                parsed = @file_name.split("/")
+
+                folders = parsed.first parsed.size - 1
+
+                cur_path = @base_path
+
+                folders.each do |folder|
+                    cur_path += '/' + folder
+                    #puts "Create Dir" + cur_path
+                    FileUtils::mkdir_p cur_path
+                end
+            end
+        end
+
         File.write(@file_path, file_contents)
     end
 end

data/lib/zerofetcher.rb

@@ -98,6 +98,7 @@ ErrorDocument 404 /404/index.html'
         # Pages
         if data.key?("pages")
             pages_files_saved = Array.new
+            content_files_saved = Array.new
 
             pages_folder = jekyll_path+'/_includes/pages'
 
@@ -114,10 +115,14 @@ ErrorDocument 404 /404/index.html'
 
                 jpage = JekyllFile.new(jekyll_path, page, 'page')
 
-                jpage.saveContentFile(pages_folder+'/'+page['url']+'.md', page['content'])
+                content_file = jpage.saveContentFile(pages_folder, page['url']+'.md', page['content'])
+                content_files_saved.push( content_file )
                 jpage.savePageFile
+
                 #pages_files_saved.push(jpage.getFileName)
-                pages_files_saved.push( Pathname.new( jpage.getFileName ).basename.to_s )
+                #pages_files_saved.push( Pathname.new( jpage.getFileName ).basename.to_s )
+                pages_files_saved.push( jpage.getFileName )
+
                 self.log(" - Saved:"+jpage.getFileName)
 
                 # Add to pages array
@@ -148,17 +153,10 @@ ErrorDocument 404 /404/index.html'
             self.log("Writing File /_data/pages.json")
 
             # Clean Unused Pages
-            existing_pages_files = Dir.glob(File.join(jekyll_path, "*.md"))
-
-            existing_pages_files.each do |file|
-                file_basename = Pathname.new(file).basename.to_s
-                if 'README.md' != file_basename
-                    if !pages_files_saved.include?( file_basename )
-                        self.log(" - Deleting:"+file)
-                        FileUtils.rm(file)
-                    end
-                end
-            end
+            self.cleanUpPages( jekyll_path, pages_files_saved )
+
+            # Clean up content files
+            self.cleanUpPages( pages_folder, content_files_saved )
         end      
 
         # Variables
@@ -808,6 +806,38 @@ ErrorDocument 404 /404/index.html'
             end
         end
     end
+
+    def self.cleanUpPages( path, pages )
+        # clean up this folder
+        self.cleanUpPagesFolder( path, pages )
+
+        ignore_dirs = ['assets','node_modules','nbproject']
+        ignore_starts = ['.','_']
+        dirs = Dir.entries( path ).select {|entry| File.directory? File.join(path,entry) and !(ignore_dirs.include?(entry) || ignore_starts.include?( entry[0] )) }
+    
+        dirs.each do |dir|
+            this_dir = path + '/' + dir
+            if !File.exist?( this_dir + '/.keep' )
+                puts "Clean Dir " + dir
+                self.cleanUpPagesFolder( this_dir, pages )
+            end
+        end
+    end
+    
+    def self.cleanUpPagesFolder( path, pages )
+        existing_pages_files = Dir.glob(File.join(path, "*.md"))
+    
+        existing_pages_files.each do |file|
+            puts " - f " + file
+            file_basename = Pathname.new(file).basename.to_s
+            if 'README.md' != file_basename
+                if !pages.include?( file )
+                    self.log(" - Deleting:"+file)
+                    FileUtils.rm(file)
+                end
+            end
+        end
+    end
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zerofetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.65
+  version: 0.0.66
 platform: ruby
 authors:
 - Brian Liccardo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies: []
 description: Fetches content from zero
 email: brian@d3corp.com