octopress-pygments 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzYxMGQ3ZWMxMzg3OGQxY2MyMWMzMDQ1YmQ0OTk1ZTU0MmFlNDkxMA==
+  data.tar.gz: !binary |-
+    MzQxMjhkMTE4NWVlNzYyMWYyMzgzOWViNDFjNzYxYjVhODAyZmQwYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NDUwMTY2ZWZjMzA0NDZlMDNjNDEzZDRlNTZhZDgwZTdiNDUzZmU2OWUxNzY1
+    M2QyM2E2MjIyMGViODFjODI5N2E0YjUwYWRlOWI0YzllMGRmYWI5NzdjNWNk
+    ZmI1Njc5ZDU2NDVkZTIzZDkzZTc0NGY2YWEwZjI3M2Y2MWI4NDg=
+  data.tar.gz: !binary |-
+    YWMwYzRhZDIyZWIyMWE1MGRmY2ExOWM2NzBjNGM0NmE4NWFjMzFhZDA3M2I5
+    NDllNTNiNGE3NWI5OTQ1NjA0MmEzM2Q3MjJjZWQ3ODQ0NWE0YWQwMzI5Njcw
+    MmZkYjAwODgxMTAzMTIzYTVhN2NlOWM4ZTA0NjliZTk0MTM0MGI=

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.pygments-cache

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+## 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
+
+## 1.1.0
+  - Boring bug fixes
+
+## 1.0.0
+  - Initial release

data/README.md

@@ -1,4 +1,6 @@
-# Octopress::Pygments
+# Octopress Pygments
+
+[![Build Status](https://travis-ci.org/octopress/octopress-pygments.png)](https://travis-ci.org/octopress/octopress-pygments)
 
 TODO: Write a gem description
 

data/lib/octopress-pygments/renderer.rb

@@ -6,36 +6,38 @@ module Octopress
       def initialize(code, options = {})
         @code    = code
         @options = options
-        @lang    = determine_lang
+        @aliases = @options[:aliases]
+        @aliases = (@aliases ? stringify_keys(@aliases) : {})
+        @lang    = determine_lang(@options[:lang])
       end
 
       def highlight
         @options[:title] ||= ' ' if @options[:url]
-        cache = Cache.fetch_from_cache(code, options)
+        cache = Cache.fetch_from_cache(code, @options)
         unless cache
           if @lang == 'plain'
             rendered_code = code.to_s.gsub('<','&lt;')
           else
-            rendered_code = render_pygments(code, options[:lang]).match(/<pre>(.+)<\/pre>/m)[1].gsub(/ *$/, '') #strip out divs <div class="highlight">
+            rendered_code = render_pygments(code, @lang).match(/<pre>(.+)<\/pre>/m)[1].gsub(/ *$/, '') #strip out divs <div class="highlight">
           end
-          rendered_code = tableize_code(rendered_code, options[:lang], {linenos: options[:linenos], start: options[:start], marks: options[:marks]})
-          title = captionize(options[:title], options[:url], options[:link_text]) if options[:title]
+          rendered_code = tableize_code(rendered_code, @lang, {linenos: @options[:linenos], start: @options[:start], marks: @options[:marks]})
+          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]
+          Cache.write_to_cache(rendered_code, @options) unless @options[:no_cache]
         end
         cache || rendered_code
       end
 
-      def determine_lang
-        lang = options[:lang]
-        lang = 'ruby' if lang == 'ru'
-        lang = 'objc' if lang == 'm'
-        lang = 'perl' if lang == 'pl'
-        lang = 'yaml' if lang == 'yml'
-        lang = 'coffeescript' if lang == 'coffee'
-        lang = 'csharp' if lang == 'cs'
-        lang = 'plain' if lang == '' or lang.nil? or !lang
-        options[:lang] = lang
+      def determine_lang(lang)
+        if lang == '' or lang.nil? or !lang
+          lang = 'plain'
+        elsif ::Pygments::Lexer.find lang 
+          lang
+        elsif !@aliases[lang].nil? and ::Pygments::Lexer.find @aliases[lang]
+          @aliases[lang]
+        else
+          'plain'
+        end
       end
 
       def render_pygments(code, lang)
@@ -106,6 +108,23 @@ module Octopress
         code.gsub(/{{/, '&#x7b;&#x7b;')
           .gsub(/{%/, '&#x7b;&#x25;')
       end
+
+      private
+
+      def stringify_keys(hash)
+        hash.inject({}){|result, (key, value)|
+          new_key = case key
+                    when String then key.to_s
+                    else key
+                    end
+        new_value = case value
+                    when Hash then stringify_keys(value)
+                    else value
+                    end
+        result[new_key] = new_value
+        result
+        }
+      end
     end
   end
 end

data/lib/octopress-pygments/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Pygments
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/spec/pygments_spec.rb

@@ -110,7 +110,7 @@ EOF
 
     context "with a language" do
       it "returns the right HTML for a given set of code" do
-        expect(described_class.highlight(code, { lang: 'ruby' })).to eql(expected_output_lang_ruby.chop)
+        expect(described_class.highlight(code, { lang: 'abc', aliases: {'abc'=>'ruby'} })).to eql(expected_output_lang_ruby.chop)
       end
     end
   end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: octopress-pygments
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -85,6 +76,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -101,26 +93,25 @@ files:
 homepage: https://github.com/octopress/octopress-pygments
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Octopress's core plugin for rendering nice code blocks
 test_files: []