jekyll-pug 1.0.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 789f02d4a0ae2b503cffc2f301973b7693bc3bf0
-  data.tar.gz: ea04627a3582d8f227013a70048eb19408f14685
+  metadata.gz: 2545440203a83d292340950b7a17ddaa30dfe9c2
+  data.tar.gz: 51717567bb516056ebb2e9af0f4a327df5fed2dd
 SHA512:
-  metadata.gz: 2067d674cb6801d6eb4b3944c570db65b08649bc7cb3b09cdebf023e3eb3352bf3a89b85aac381c5989ae7be582354ae2c0c2be7e40ea6aa899696bc05a2d734
-  data.tar.gz: a76dcd86d7463c2aa844da19fce441e1a65ca4bdca253fdc89cb411237204ab64704c631d428a0176d41cb259375a44244177a9c748fa64e59741a581d36e341
+  metadata.gz: c021d09c76298635aac255ed90e7f65a330ae60698189322a4256d8e7d1181ec261668bc31f399071efc9a0b2128df1c741174b7546cd394ce71561d86c0f82d
+  data.tar.gz: 9d72b78f4732811ca97f52811a5bf180b0ad219955d0653ab45cbca14e1245b9907e641b52f024b7f934deff84a9f741992b1c5fbe4dd97364a13a31d8d31d69

data/lib/jekyll-pug.rb

@@ -3,10 +3,10 @@ require "jekyll-pug/pug-renderer"
 require "jekyll-pug/include-tag"
 
 # Enable/Disable Minfify based on the user's config file.
-jekyllConfig = Jekyll.configuration({})
+$jekyllConfig = Jekyll.configuration({})
 
-if jekyllConfig['jekyll-pug']
-  if jekyllConfig['jekyll-pug']['minify']
+if $jekyllConfig['jekyll-pug']
+  if $jekyllConfig['jekyll-pug']['minify']
     # Minify is enabled - pretty disabled
     Pug.config.pretty = false
   else
@@ -19,8 +19,8 @@ else
 end
 
 config_source = ""
-if jekyllConfig['source']
-  config_source = jekyllConfig['source']
+if $jekyllConfig['source']
+  config_source = $jekyllConfig['source']
 end
 
 $JEKYLLPUG_PROJECT_SOURCE = File.join(config_source, '_includes/.')

data/lib/jekyll-pug/pug-renderer.rb

@@ -1,41 +1,149 @@
-# This is where the magic happens
+# # # # # # # # # # # #
+# Jekyll-Pug-Renderer #
+# # # # # # # # # # # # 
+
+# Simple function= to print data if debug is true.
+
+$jekyll_pug_curFile = ""
+
+def jp(string)
+    if $jekyllConfig['jekyll-pug']
+        if $jekyllConfig['jekyll-pug']['debug']
+            puts "[Jekyll-Pug] " + $jekyll_pug_curFile.to_s + " " + string.to_s
+        end
+    end
+end
+
+def create_cache_and_compile(content, cached_file)
+    userSource = $JEKYLLPUG_PROJECT_SOURCE
+    pug_raw = content
+    content = Pug.compile(content, {"filename"=>userSource})
+    ::File.write(cached_file, pug_raw)
+    ::File.write(cached_file+".html", content)
+    return content
+end
+
+def create_cache(content, cached_file)
+    ::File.write(cached_file, content)
+end
+
 module Jekyll
-  class LiquidRenderer
-    File.class_eval do
-      def parse(content)        
-        measure_time do
-            if @filename =~ /\.pug$/
-                userSource = $JEKYLLPUG_PROJECT_SOURCE
-                content = Pug.compile(content, {"filename"=>userSource})
+    class LiquidRenderer
+        File.class_eval do
+            def parse(content)
+                if @filename =~ /\.pug$/
+                    filename_regex = /[a-zA-Z1-9\s\~\-\.\_\%\#\&\*\{\}\:\?\+\|\<\>\"\']+.pug/
+
+                    $jekyll_pug_curFile = @filename.match(filename_regex)
+                    jp("Processing Pug file.")                    
+
+                    # Creating Cache Variables
+                    cache_dir = ".pug-cache/"
+                    cached_file = cache_dir + @filename
+                    cached_file_dir = cached_file.sub(filename_regex, '')
+
+                    # Creating cache directory neccesary (if needed)
+                    FileUtils.mkdir_p(cached_file_dir) unless ::File.exists?(cached_file_dir)
+
+                    # If cached pug file exists
+                    if ::File.file?(cached_file)
+                        jp("Cached file exists! Attempting to use it...")
+                        cached_file_content = ::File.read(cached_file)
+
+                        pugIncludeChange = false
+                        # Check if Pug includes have changed.
+                        # If Pug includes changed, we must recompile
+
+                        # Loop through Pug includes to determine if any had been modified
+                        includes_in_file = content.scan(/^\s+include\s[a-zA-Z1-9\/\_\-\.]+/)
+                        for i in includes_in_file do
+                        	# Remove spaces/tabs in front of code
+                        	include_file = i.sub(/^\s+/, '')
+                        	# Remove include statement to be left with filename
+                        	include_file = include_file.sub(/include\s/, '')
+                        	# If no extension provided, add one
+                        	if include_file.scan(/.pug/).length == 0
+                        		include_file = include_file + ".pug"
+                        	end
+                        	jp("Checking the include " + include_file)
+                        	# Make the include file into an exact path into the user's project
+                        	include_file = $JEKYLLPUG_PROJECT_SOURCE + "/" + include_file
+                        	jp("The include file is " + include_file)
+                        	# Create the cached location of the include file and its path
+                        	include_cache_file = ".pug-cache/" + include_file
+                        	include_cache_file_dir = include_cache_file.sub(filename_regex, '')
+                        	# Make a cache folder for this include if not already created
+                        	FileUtils.mkdir_p(include_cache_file_dir) unless ::File.exists?(include_cache_file_dir)
+
+                        	# Read the file of the include
+                        	include_content = ::File.read(include_file)
+
+                        	# If cached version of include exists
+                        	if ::File.file?(include_cache_file)
+                        		jp("Cached file of include exists. Checking if modified...")
+                        		cached_include_content = ::File.read(include_cache_file)
+                        		if include_content == cached_include_content
+                        			jp("The include is identical to the cache. Not recompiling")
+                        		else
+                        			jp("There has been a change in an include")
+                        			pugIncludeChange = true
+                        		end
+                        	else
+                        		jp("Creating cache file for include...")
+                        		pugIncludeChange = true
+                        		create_cache(include_content, include_cache_file)
+                        	end
+                        end
+
+                        # If files are identical
+                        if content == cached_file_content and not pugIncludeChange
+                            jp("Cached file is identical and includes haven't changed. Using Cached file")
+                            # If there is a cached HTML file availible
+                            cached_html_filename = cached_file + ".html"
+                            if ::File.file?(cached_html_filename)
+                                content = ::File.read(cached_html_filename)
+                            else
+                                jp("Odd. The HTML cached file does not exist. Can't use cache right now. Creating it instead.")
+                                content = create_cache_and_compile(content, cached_file)
+                            end
+                        # If not identical (There has been a change)
+                        else
+                            jp("There has been a change since last cache. Re-Caching...")
+                            content = create_cache_and_compile(content, cached_file)
+                        end
+                    else
+                        jp("No cached file availible. Creating one...")
+                        content = create_cache_and_compile(content, cached_file)
+                    end
+
+                end
+                if content.lines.first =~ /^$/
+                content = content.sub(/^$\n/, "")
+                end     
+                measure_time do
+                    @template = Liquid::Template.parse(content, :line_numbers => true)
+                end
             end
-            # if content.lines.first =~ /^$/
-            # content = content.sub(/^$\n/, "")
-            # end
-            @template = Liquid::Template.parse(content, :line_numbers => true)
         end
-
-        self
-      end
     end
-  end
 end
 
 # This section ensures that Pug files are compiled as HTML.
 module Jekyll
-  class PugConverter < Converter
-      safe true
-      priority :low
-
-      def matches(ext)
-          ext =~ /^\.pug$/i
-      end
-
-      def output_ext(ext)
-          ".html"
-      end
-
-      def convert(content)
-          return content
-      end
-  end
+    class PugConverter < Converter
+            safe true
+            priority :low
+
+            def matches(ext)
+                    ext =~ /^\.pug$/i
+            end
+
+            def output_ext(ext)
+                    ".html"
+            end
+
+            def convert(content)
+                    return content
+            end
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-pug
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Doug Beney