octopress-pygments 1.2.1 → 1.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWY3YTkyYWNlMjgzMDE0YzFkZjBjY2U0ZGUyMjAwMGUxMDVhYWQ4Zg==
+    YTUwM2Q0N2ExNDAwNzE4OGQzYzUzNjQ5ZmRhMWY5MWQ2YzkzZWY4Ng==
   data.tar.gz: !binary |-
-    NzIyOGNkMjUxYzQzN2EyNDgzYjhjZDExNTdlODM1OTVhMDg4ZmY0Nw==
+    NjcwZjkwMzQ5ZjU1NDAzZjVkN2QxY2ZlZThlNzFlNmVkZmY3YjAwNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWE0Yzc2YjQ2ZTVkYzYyMzE0NjE2OWI5NjYwNWZhYmU1MDQ2YTFhOGM2ZjVk
-    OTZiNmNjODAyZTdkNjNmOTQ1M2JmOTJlMDcwZjM1YmQ4MWNmM2Q1NjZhYjIz
-    MGFmZmJlZTU1NzRkZWQyNTQ1NGQwMGM1YjAxOTgyNWI4MjJjMDA=
+    ODU4NGZiZmVmZTk3ZTA0ZmFlYmFjNTI1NDFiYzY0MzcxY2VhZTU0ZTdiZTVl
+    NDU1ODU3YWI2NzBjOWExOGRmYzcxOGEzMTYzOTM4YjljYmVkNDA1NmJkOGU4
+    ZGNmMWExMWI1MWNmMDg2OTg3ZjA3NmQ5YjVkMjE5ZDZkN2RhOGQ=
   data.tar.gz: !binary |-
-    NGY4OWQxOTUzOTI1ZWQ5MDBjNzcyYTdmYTY1M2M0ODgzMzVhNDUxODNiMGQ0
-    MjFkNjRiZDA5OThmN2VhNDY2MjcxMzIyNTRkMjZjNmI4MTk2ZjFkOTI4NzYy
-    OWQwZjA2ZjMwYzY1Y2Q4NjdmMjUwM2JmZWQ2MzQwNWFhNmZmMjc=
+    MGY4ODEwMmVhN2EzOWNhNDAyMTZhMDdiZWEwODAwYmM1MTk3NmZiMmYxMjcx
+    YTYxNDgzZGYzOTg0NDg1NzI3ODYyMGI1ZTQzZTAzODBkMTM2OTYyMjQ2OWIw
+    ZDAxZjU2ZGM5YzIwMDM3NDZmOTc2MjA5YWU2ZTE4N2QzYzMxZDI=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.2
+  - 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
 

data/lib/octopress-pygments.rb

@@ -17,6 +17,10 @@ module Octopress
       Renderer.new(code, options).highlight
     end
 
+    def self.read_cache(code, options={})
+      Cache.read_cache(code, options)
+    end
+
     def self.parse_markup(input, defaults={})
       OptionsParser.new(input).parse_markup(defaults)
     end

data/lib/octopress-pygments/cache.rb

@@ -4,25 +4,24 @@ module Octopress
       PYGMENTS_CACHE_DIR = '.pygments-cache'
 
       class << self
-        def fetch_from_cache(code, options)
-          path  = options[:cache_path] || get_cache_path(PYGMENTS_CACHE_DIR, options[:lang], options.to_s + code)
-          cache = read_cache(path)
+        def read_cache(code, options)
+          cache_label = options[:cache_label] || options[:lang] || ''
+          path = get_cache_path(PYGMENTS_CACHE_DIR, cache_label, options.to_s + code)
+          File.exist?(path) ? File.read(path) : nil unless path.nil?
         end
 
         def write_to_cache(contents, options)
           FileUtils.mkdir_p(PYGMENTS_CACHE_DIR) unless File.directory?(PYGMENTS_CACHE_DIR)
-          path = options[:cache_path] || get_cache_path(PYGMENTS_CACHE_DIR, options[:lang], options.to_s + contents)
+          cache_label = options[:cache_label] || options[:lang] || ''
+          path = get_cache_path(PYGMENTS_CACHE_DIR, cache_label, options.to_s + contents)
           File.open(path, 'w') do |f|
             f.print(contents)
           end
         end
 
-        def read_cache(path)
-          File.exist?(path) ? File.read(path) : nil unless path.nil?
-        end
-
-        def get_cache_path(dir, name, str)
-          File.join(dir, "#{name}-#{Digest::MD5.hexdigest(str)}.html")
+        def get_cache_path(dir, label, str)
+          label += '-' unless label === ''
+          File.join(dir, "#{label}#{Digest::MD5.hexdigest(str)}.html")
         end
       end
     end

data/lib/octopress-pygments/renderer.rb

@@ -13,8 +13,9 @@ module Octopress
 
       def highlight
         @options[:title] ||= ' ' if @options[:url]
-        cache = Cache.fetch_from_cache(code, @options)
-        unless cache
+        if cache = Cache.read_cache(code, @options)
+          cache
+        else
           if @lang == 'plain'
             rendered_code = code.to_s.gsub('<','&lt;')
           else
@@ -24,8 +25,8 @@ module Octopress
           title = captionize(@options[:title], @options[:url], @options[:link_text]) if @options[:title]
           rendered_code = "<figure class='code'>#{title}#{rendered_code}</figure>"
           Cache.write_to_cache(rendered_code, @options) unless @options[:no_cache]
+          rendered_code
         end
-        cache || rendered_code
       end
 
       def determine_lang(lang)

data/lib/octopress-pygments/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Pygments
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-pygments
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pygments.rb