octopress-code-highlighter 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4164dd0c2e141d03bee935546f650601d2c0e5cb
-  data.tar.gz: a83c9099f0d9dd79ea224d86afcff2abeddd32e9
+  metadata.gz: c6e9892e2d81b5eb3511df94f71f76a1df7890c2
+  data.tar.gz: ce7e0c23bf5ccf87692c2359258e795e71d8864d
 SHA512:
-  metadata.gz: 1fe0c512294344643b66ef52113fdc17b1ce6626542f3957dc343a064be574babbbfbe73a46a19652815612d9cef8c6c5eedbf07ea2fdb2959a5366fdf1975c5
-  data.tar.gz: 488ba51111b20a62d1c9b4869b2101f67ae46995e61a3f13488b34391dfb2f2012fe819c2090511b00849da4004a2526d9563c261a76c0c71ef3c855679f5ee6
+  metadata.gz: 865e32859e2e7bc1cd36b74993e37d64ed5fc49fca1dfb9159da6aec1c054ca6374f6f91ecd3968466c0d3e7a3c5ead761d09e615c1cfbf54cc99530c43350cf
+  data.tar.gz: 9b16907de093ec56ef18c8c98ef0a98f3ed71f42075bff49d77b12c9067cc94ef00e467b5b0a92475013243e23892e4ccdb2c984c5457b233c0b731e61eb83d5

data/CHANGELOG.md

@@ -1,78 +1,83 @@
 # Changelog
 
+## 4.2.3 - 2015-05-18
+- New: Now works with Jekyll 3 and Jekyll Hooks.
+- Fix: Cache reads and writes do not trigger Jekyll watcher.
+- Fix: Cache fingerprinting improvement.
+
 ## 4.2.3 - 2014-07-08
-  - Fixed: Code ranges now work on ruby 1.9.3
+- Fixed: Code ranges now work on ruby 1.9.3
   
 ## 4.2.2 - 2014-07-07
-  - Fixed: Closing spans aren't wrapped to a newline.
+- Fixed: Closing spans aren't wrapped to a newline.
   
 ## 4.2.1 - 2014-06-29
-  - Improved support for new Pygments.rb.
+- Improved support for new Pygments.rb.
 
 ## 4.2.0 - 2014-06-28
-  - New: Add classnames on code figure: `class:"example classnames"`.
+- New: Add classnames on code figure: `class:"example classnames"`.
 
 ## 4.1.0 - 2014-06-27
-  - Added support for setting PHP's startinline option (now defaults to true).
+- Added support for setting PHP's startinline option (now defaults to true).
 
 ## 4.0.3 - 2014-06-26
-  - Fixed: Improved escaping characters for Liquid.
+- Fixed: Improved escaping characters for Liquid.
 
 ## 4.0.2
-  - Fixed: end of range now works properly.
+- Fixed: end of range now works properly.
 
 ## 4.0.1
-  - Changed `get_range` method to `select_lines` which returns a code partial when `start`, `end` or `range` options are defined.
+- Changed `get_range` method to `select_lines` which returns a code partial when `start`, `end` or `range` options are defined.
 
 ## 4.0.0
-  - Removed stylesheets. Now use gem octopress-solarized for stylesheets.
-  - Removed dependency on Octopress Ink.
+- Removed stylesheets. Now use gem octopress-solarized for stylesheets.
+- Removed dependency on Octopress Ink.
 
 ## 3.1.0
-  - Updated stylesheets to be Sass 3.3 compatible.
+- Updated stylesheets to be Sass 3.3 compatible.
 
 ## 3.0.1
-  - Changed name of cache dir to .code-highlighter-cache.
+- Changed name of cache dir to .code-highlighter-cache.
 
 ## 3.0.0
-  - Changed name to octopress-code-highlighter.
-  - Now supporting both Pygments.rb and Rouge for highlighting.
+- Changed name to octopress-code-highlighter.
+- Now supporting both Pygments.rb and Rouge for highlighting.
 
 ## 2.0.1
-  - Updated Octopress Ink version, added a simple demo project.
+- Updated Octopress Ink version, added a simple demo project.
 
 ## 2.0.1
-  - Updated Octopress Ink version, added a simple demo project.
+- Updated Octopress Ink version, added a simple demo project.
 
 ## 2.0.0
-  - Added support for Octopress Ink
+- Added support for Octopress Ink
 
 ## 1.3.1
-  - Fixed: line numbers now start at 1 instead of zero.
-  - Changed: `escape` option defaults to false.
+- Fixed: line numbers now start at 1 instead of zero.
+- Changed: `escape` option defaults to false.
 
 ## 1.3.0
-  - Added `escape` option which wraps code in {% raw %} tags to escape liquid. Defaults to true.
+- Added `escape` option which wraps code in {% raw %} tags to escape liquid. Defaults to true.
 
 ## 1.2.3
-  - Fixed: figcaptions now work when specifying a title.
+- Fixed: figcaptions now work when specifying a title.
 
 ## 1.2.2
-  - Now you can call Pygments.read_cache directly.
-  - Added an option to specify a label on cache files.
-  - Simplified caching methods.
+- Now you can call Pygments.read_cache directly.
+- Added an option to specify a label on cache files.
+- Simplified caching methods.
 
 ## 1.2.1
-  - Fix: No longer overwriting options with `nil` in parse_markup
+- Fix: No longer overwriting options with `nil` in parse_markup
 
 ## 1.2.0
-  - Added method for users to specify lexer aliases
-  - Removed default aliases:
-    - ru, yml, coffee - now handled by Pygments correctly
-    - pl, m - match multiple languages, enforcing an alias is inappropriate
+- Added method for users to specify lexer aliases
+- Removed default aliases:
+  - ru, yml, coffee - now handled by Pygments correctly
+  - pl, m - match multiple languages, enforcing an alias is inappropriate
 
 ## 1.1.0
-  - Boring bug fixes
+- Boring bug fixes
 
 ## 1.0.0
-  - Initial release
+- Initial release

data/lib/octopress-code-highlighter.rb

@@ -7,9 +7,13 @@ require 'colorator'
 begin require 'octopress'
 rescue LoadError; end
 
+require 'octopress-code-highlighter/hooks'
+
 begin require 'octopress-ink'
 rescue LoadError; end
 
+require 'octopress-code-highlighter/cache'
+
 module Octopress
   module CodeHighlighter
     DEFAULTS = {
@@ -19,7 +23,8 @@ module Octopress
       start: 1
     }
 
-    autoload :Cache,         'octopress-code-highlighter/cache'
+    CODE_CACHE_DIR = '.code-highlighter-cache'
+
     autoload :OptionsParser, 'octopress-code-highlighter/options_parser'
     autoload :Renderer,      'octopress-code-highlighter/renderer'
 
@@ -67,4 +72,3 @@ module Octopress
     end
   end
 end
-

data/lib/octopress-code-highlighter/cache.rb

@@ -1,30 +1,51 @@
+require 'find'
+
 module Octopress
   module CodeHighlighter
-    class Cache
-      CODE_CACHE_DIR = '.code-highlighter-cache'
-
-      class << self
-        def read_cache(code, options)
-          cache_label = options[:cache_label] || options[:lang] || ''
-          path = get_cache_path(CODE_CACHE_DIR, cache_label, options.to_s + code)
-          File.exist?(path) ? File.read(path) : nil unless path.nil?
-        end
+    module Cache
+      extend self
+
+      @cached_files = []
+      @write_cache = {}
+
+      def read_cache(code, options)
+        cache_label = options[:cache_label] || options[:lang] || ''
+        path = get_cache_path(CODE_CACHE_DIR, cache_label, options.to_s + code)
+        @cached_files << path
+        File.exist?(path) ? File.read(path) : nil unless path.nil?
+      end
+
+      def write_to_cache(contents, code, options)
+        FileUtils.mkdir_p(CODE_CACHE_DIR) unless File.directory?(CODE_CACHE_DIR)
+        cache_label = options[:cache_label] || options[:lang] || ''
+        path = get_cache_path(CODE_CACHE_DIR, cache_label, options.to_s + code)
+        @write_cache[path] = contents
+      end
 
-        def write_to_cache(contents, options)
-          FileUtils.mkdir_p(CODE_CACHE_DIR) unless File.directory?(CODE_CACHE_DIR)
-          cache_label = options[:cache_label] || options[:lang] || ''
-          path = get_cache_path(CODE_CACHE_DIR, cache_label, options.to_s + contents)
+      def get_cache_path(dir, label, str)
+        label += '-' unless label === ''
+        File.join(dir, ".#{label}#{Digest::MD5.hexdigest(str)}.html")
+      end
+
+      def write
+        @write_cache.each do |path, contents|
+          @cached_files << path
           File.open(path, 'w') do |f|
             f.print(contents)
           end
         end
+        @write_cache = {}
+      end
 
-        def get_cache_path(dir, label, str)
-          label += '-' unless label === ''
-          File.join(dir, "#{label}#{Digest::MD5.hexdigest(str)}.html")
+      def clean
+        remove = Find.find(CODE_CACHE_DIR).to_a.reject do |file|
+          @cached_files.include?(file) || File.directory?(file)
         end
+
+        @cached_files = []
+
+        FileUtils.rm remove
       end
     end
   end
 end
-

data/lib/octopress-code-highlighter/hooks.rb

@@ -0,0 +1,18 @@
+module Octopress
+  module CodeHighlighter
+    if defined?(Jekyll::Hooks)
+      Jekyll::Hooks.register :site, :post_write do |site|
+        Octopress::CodeHighlighter::Cache.write
+        Octopress::CodeHighlighter::Cache.clean
+      end
+    else
+      require 'octopress-hooks'
+      class SiteHook < Octopress::Hooks::Site
+        def post_write(site)
+          Octopress::CodeHighlighter::Cache.write
+          Octopress::CodeHighlighter::Cache.clean
+        end
+      end
+    end
+  end
+end

data/lib/octopress-code-highlighter/renderer.rb

@@ -51,7 +51,7 @@ module Octopress
           end
           rendered_code = "<figure class='#{classnames}'>#{caption}#{rendered_code}</figure>"
           rendered_code = "{% raw %}#{rendered_code}{% endraw %}" if options[:escape]
-          Cache.write_to_cache(rendered_code, options) unless options[:no_cache]
+          Cache.write_to_cache(rendered_code, code, options) unless options[:no_cache]
           rendered_code
         end
       end

data/lib/octopress-code-highlighter/version.rb

@@ -1,6 +1,6 @@
 module Octopress
   module CodeHighlighter
-    VERSION = "4.2.3"
+    VERSION = "4.2.4"
   end
 end
 

data/octopress-code-highlighter.gemspec

@@ -8,14 +8,13 @@ Gem::Specification.new do |gem|
   gem.version       = Octopress::CodeHighlighter::VERSION
   gem.authors       = ["Brandon Mathis"]
   gem.email         = ["brandon@imathis.com"]
-  gem.description   = %q{Octopress's core plugin for rendering nice code blocks}
   gem.summary       = %q{Octopress's core plugin for rendering nice code blocks}
   gem.homepage      = "https://github.com/octopress/code-highlighter"
   gem.license       = "MIT"
 
   gem.add_runtime_dependency 'colorator', '~> 0.1'
+  gem.add_runtime_dependency 'octopress-hooks'
 
-  gem.add_development_dependency 'pry-debugger'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rouge', '~> 1.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-code-highlighter
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator
@@ -25,13 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: octopress-hooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: Octopress's core plugin for rendering nice code blocks
+description: 
 email:
 - brandon@imathis.com
 executables: []
@@ -97,6 +97,7 @@ files:
 - Rakefile
 - lib/octopress-code-highlighter.rb
 - lib/octopress-code-highlighter/cache.rb
+- lib/octopress-code-highlighter/hooks.rb
 - lib/octopress-code-highlighter/options_parser.rb
 - lib/octopress-code-highlighter/renderer.rb
 - lib/octopress-code-highlighter/version.rb
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Octopress's core plugin for rendering nice code blocks