middleman-syntax 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a45717c68c5251ef83aeaae803378ce95dbcf4f
-  data.tar.gz: a671567f6cd311b77b7461cd39849ac21d8be6a7
+  metadata.gz: aaea147a35d96f79a1262dedd8cedf4f23e922b5
+  data.tar.gz: 3fa14ae2cfc06539e836fb4811b399fef247bfbc
 SHA512:
-  metadata.gz: 444d66ce7c7e589cc7b9615e9c0983e1589470d11dcf7c1e790aac8d0b9a5ccd884dbdafa777b7da9c91568fb65ef87b57e8c6a56da2d1a5be506735637377f5
-  data.tar.gz: aee00d72c73b307aebc08b4a840d71e4b2ca2f027b082993178520016a9d2c63d74d47f0091cdf224699cbe6b8018fa23b4e18de83275745c42206331815049f
+  metadata.gz: 6077c385b77b2c272b4be65f0b5038101bdc89bf2360ec0c26b8f9ec084062ca783a6eb33f77a53b2d9e4181b18b0179a48940650a6c25bf97665d3b1256df19
+  data.tar.gz: bf1524cd553efb103bb8b2f7b9c51f0637c671f72629b82834eb47f30b7c41cd7a59619c433b1a634b66c7ac600c38529207dfefc9627dd2cf50b0cbea9e85f6

data/.travis.yml

@@ -1,10 +1,14 @@
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
+  - 2.1.0
   - jruby-19mode
-  
+
+# Bug in jRuby w/ Rouge: https://github.com/jruby/jruby/issues/1392
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+
 script: "bundle exec rake test"
 
-env: TEST=true TRAVIS=true
+env: TEST=true

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+2.0.0 (master)
+-----
+
+* Update to a new-style Middleman extension, dropping compatibility with Middleman versions older than 3.2.x.
+* Setting the :css_class option will no longer prevent the language tag from being added as a class as well.
+* Rouge lexer options should now be set via the :lexer_options option.
+* It is now possible to override options when calling the `code` helper by passing them as the second argument.
+* Using the `code` helper from Slim templates no longer escapes the output.
+* Added a `:code` filter for Haml as a more whitespace-friendly alternative to the `code` helper.
+
 1.2.1
 -----
 

data/CONTRIBUTING.md

@@ -0,0 +1,44 @@
+# Contributing
+In the spirit of [free software][free-sw], **everyone** is encouraged to help
+improve this project.
+
+[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
+
+Here are some ways *you* can contribute:
+
+* by using alpha, beta, and prerelease versions
+* by reporting bugs
+* by suggesting new features
+* by writing or editing documentation
+* by writing specifications
+* by writing code (**no patch is too small**: fix typos, add comments, clean up
+  inconsistent whitespace)
+* by refactoring code
+* by closing [issues][]
+* by reviewing patches
+
+[issues]: https://github.com/middleman/middleman-syntax/issues
+
+## Submitting an Issue
+We use the [GitHub issue tracker][issues] to track bugs and features. Before
+submitting a bug report or feature request, check to make sure it hasn't
+already been submitted. When submitting a bug report, please include a [Gist][]
+that includes a stack trace and any details that may be necessary to reproduce
+the bug, including your gem version, Ruby version, and operating system.
+Ideally, a bug report should include a pull request with failing specs.
+
+[gist]: https://gist.github.com/
+
+## Submitting a Pull Request
+1. [Fork the repository.][fork]
+2. [Create a topic branch.][branch]
+3. Add specs for your unimplemented feature or bug fix.
+4. Run `bundle exec rake test`. If your specs pass, return to step 3.
+5. Implement your feature or bug fix.
+6. Run `bundle exec rake test`. If your specs fail, return to step 5.
+7. Add, commit, and push your changes.
+8. [Submit a pull request.][pr]
+
+[fork]: http://help.github.com/fork-a-repo/
+[branch]: http://learn.github.com/p/branching.html
+[pr]: http://help.github.com/send-pull-requests/

data/Gemfile

@@ -1,23 +1,25 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-git "git://github.com/middleman/middleman.git" do
-  gem "middleman-core"
-end
+gem "middleman", :github => "middleman/middleman", :branch => 'v3-stable'
 
-# Specify your gem's dependencies in middleman-blog.gemspec
+# Specify your gem's dependencies in middleman-syntax.gemspec
 gemspec
 
-gem 'padrino-helpers'
-gem 'kramdown'
+gem "rake",     "~> 10.0.3", :require => false
+gem "yard",     "~> 0.8.0", :require => false
+
+# Test tools
+gem "cucumber", "~> 1.3.1"
+gem "fivemat"
+gem "aruba",    "~> 0.5.1"
+gem "rspec",    "~> 2.12"
 
 platforms :ruby do
-  gem 'redcarpet'
+  gem "redcarpet"
 end
 
-gem "rake",     "~> 0.9.2"
-gem "rdoc",     "~> 3.9"
-gem "yard",     "~> 0.8.0"
-gem "cucumber", "~> 1.2.0"
-gem "fivemat"
-gem "aruba",    "~> 0.4.11"
-gem "rspec",    "~> 2.7"
+gem "kramdown"
+gem "slim"
+
+# Code Quality
+gem "cane", :platforms => [:mri_19, :mri_20], :require => false

data/LICENSE.md

@@ -0,0 +1,20 @@
+Copyright (c) 2012-2013 Benjamin Hollis
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,32 +1,40 @@
-# middleman-syntax
+# Middleman-Syntax
 
-middleman-syntax is an extension for the [Middleman](http://middlemanapp.com) static site generator that adds syntax highlighting via [Rouge](https://github.com/jayferd/rouge).
+`middleman-syntax` is an extension for the [Middleman] static site generator that adds syntax highlighting via [Rouge](https://github.com/jayferd/rouge).
+
+[![Gem Version](https://badge.fury.io/rb/middleman-syntax.png)][gem]
+[![Build Status](https://travis-ci.org/middleman/middleman-syntax.png)][travis]
+[![Dependency Status](https://gemnasium.com/middleman/middleman-syntax.png?travis)][gemnasium]
+[![Code Quality](https://codeclimate.com/github/middleman/middleman-syntax.png)][codeclimate]
+
+## Installation
 
-# Install
 If you're just getting started, install the `middleman` gem and generate a new project:
 
-```
+```bash
 gem install middleman
 middleman init MY_PROJECT
 ```
 
-If you already have a Middleman project:
-Add `middleman-syntax` to your `Gemfile`, run `bundle install`, then open your `config.rb` and add:
+If you already have a Middleman project: Add `gem "middleman-syntax"` to your `Gemfile` and run `bundle install`.
 
-```
+**This plugin will not work on Ruby 1.8!** Rouge requires 1.9+, so we do too.
+
+## Configuration
+
+```ruby
 activate :syntax
 ```
 
 You can also pass options to Rouge:
 
+```ruby
+activate :syntax, :line_numbers => true
 ```
-activate :syntax,
-         :linenos => 'inline',
-         :anchorlinenos => true,
-         :linenostart => 2
-```
 
-# Helper
+The full set of options can be seen on your preview server's `/__middleman/config/` page.
+
+## Helper
 
 The extension adds a new `code` helper to Middleman that you can use from your templates:
 
@@ -40,7 +48,7 @@ end
 
 That'll produce syntax-highlighted HTML wrapped in `<pre class="highlight ruby">`.
 
-# CSS
+## CSS
 
 On a default (i.e. unstyled) Middleman project, it will appear as if `middleman-syntax` isn't working, since obviously no CSS has been applied to color your code. You can use any Pygments-compatible stylesheet to style your code.
 
@@ -50,9 +58,9 @@ You can also let Rouge generate some CSS for you by creating a new stylesheet wi
 <%= Rouge::Themes::ThankfulEyes.render(:scope => '.highlight') %>
 ```
 
-Rouge has `ThankfulEyes`, `Colorful`, `Base16`, `Solarized` (like Octopress), and `Monokai` themes.
+Rouge has `ThankfulEyes`, `Colorful`, `Github`, `Base16`, `Base16::Solarized` (like Octopress), `Base16::Monokai`, and `Monokai` themes.
 
-# Markdown
+## Markdown
 
 The extension also makes code blocks in Markdown produce highlighted code. Make sure you're using RedCarpet or Kramdown as your Markdown engine (in `config.rb`):
 
@@ -60,7 +68,7 @@ The extension also makes code blocks in Markdown produce highlighted code. Make
 set :markdown_engine, :redcarpet
 set :markdown, :fenced_code_blocks => true, :smartypants => true
 
-# OR
+## OR
 
 set :markdown_engine, :kramdown
 ```
@@ -85,10 +93,69 @@ end
 ~~~
 </pre>
 
-# Bug Reports
+## Haml
+
+When using Haml, a `:code` filter is exposed for outputting highlighted code. Because Haml filters don't allow arguments, you must use a special comment to indicate the language of the code to be highlighted (or let Rouge guess):
+
+```haml
+#example
+  :code
+    # lang: ruby
+
+    def foo
+      puts 'bar'
+    end
+```
+
+With the special `# lang: <language tag>` comment on the first line, the `:code` filter is just like calling the `code` helper, but without the indentation problems that Haml might otherwise have. However, if you prefer, you can use the `code` helper along with the `:preserve` filter, as explained below.
+
+## Indentation Problems
+
+Some templating languages, like Haml, will indent your HTML for you,
+which will mess up code formatted in `<pre>` tags. When
+using Haml, either use the `:code` filter (recommended), use the
+[`:preserve`](http://haml.info/docs/yardoc/file.REFERENCE.html#preserve-filter)
+filter, or add `set :haml, { ugly: true }` in your `config.rb` to turn off
+Haml's automatic indentation.
+
+Example of using `:preserve`:
+
+```haml
+- code('ruby') do
+  :preserve
+    def foo
+      puts 'bar'
+    end
+```
+
+## Community
+
+The official community forum is available at: http://forum.middlemanapp.com
+
+## Bug Reports
+
+Github Issues are used for managing bug reports and feature requests. If you run into issues, please search the issues and submit new problems: https://github.com/middleman/middleman-syntax/issues
+
+The best way to get quick responses to your issues and swift fixes to your bugs is to submit detailed bug reports, include test cases and respond to developer questions in a timely manner. Even better, if you know Ruby, you can submit [Pull Requests](https://help.github.com/articles/using-pull-requests) containing Cucumber Features which describe how your feature should work or exploit the bug you are submitting.
+
+## How to Run Cucumber Tests
+
+1. Checkout Repository: `git clone https://github.com/middleman/middleman-syntax.git`
+2. Install Bundler: `gem install bundler`
+3. Run `bundle install` inside the project root to install the gem dependencies.
+4. Run test cases: `bundle exec rake test`
+
+## Donate
+
+[Click here to lend your support to Middleman](https://spacebox.io/s/4dXbHBorC3)
 
-GitHub Issues are used for managing bug reports and feature requests. If you run into issues, please search the issues and submit new problems:
+## License
 
-https://github.com/middleman/middleman-syntax/issues
+Copyright (c) 2012-2013 Benjamin Hollis. MIT Licensed, see [LICENSE] for details.
 
-The best way to get quick responses to your issues and swift fixes to your bugs is to submit detailed bug reports, include test cases and respond to developer questions in a timely manner. Even better, if you know Ruby, you can submit Pull Requests containing Cucumber Features which describe how your feature should work or exploit the bug you are submitting.
+[middleman]: http://middlemanapp.com
+[gem]: https://rubygems.org/gems/middleman-syntax
+[travis]: http://travis-ci.org/middleman/middleman-syntax
+[gemnasium]: https://gemnasium.com/middleman/middleman-syntax
+[codeclimate]: https://codeclimate.com/github/middleman/middleman-syntax
+[LICENSE]: https://github.com/middleman/middleman-syntax/blob/master/LICENSE.md

data/Rakefile

@@ -5,7 +5,7 @@ require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
   exempt_tags = ""
-  exempt_tags << "--tags ~@nojava" if RUBY_PLATFORM == "java"
+  exempt_tags << "--tags ~@nojava " if RUBY_PLATFORM == "java"
   t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
 end
 
@@ -13,6 +13,19 @@ require 'rake/clean'
 
 task :test => ["cucumber"]
 
+begin
+  require 'cane/rake_task'
+
+  desc "Run cane to check quality metrics"
+  Cane::RakeTask.new(:quality) do |cane|
+    cane.no_style = true
+    cane.no_doc = true
+    cane.abc_glob = "lib/middleman-syntax/**/*.rb"
+  end
+rescue LoadError
+  # warn "cane not available, quality task not provided."
+end
+
 desc "Build HTML documentation"
 task :doc do
   sh 'bundle exec yard'

data/features/haml_filter.feature

@@ -0,0 +1,13 @@
+Feature: Haml :code filter.
+
+  Scenario: Filter works and preserved indentation
+    Given a fixture app "test-app"
+    And a file named "config.rb" with:
+      """
+      set :haml, { :ugly => false }
+      activate :syntax
+      """
+    Given the Server is running at "test-app"
+    When I go to "/code_haml_filter.html"
+    Then I should see '<span class="k">def</span>'
+    Then I should see '<pre class="highlight plaintext">This is some code'

data/features/helper.feature

@@ -4,4 +4,16 @@ Feature: Syntax highlighting with the "code" helper method
     Given the Server is running at "test-app"
     When I go to "/code_html.html"
     Then I should see '<span class="k">def</span>'
-    Then I should see '<pre class="highlight text">This is some code'
+    Then I should see '<pre class="highlight plaintext">This is some code'
+
+  Scenario: Works from Haml
+    Given the Server is running at "test-app"
+    When I go to "/code_haml.html"
+    Then I should see '<span class="k">def</span>'
+    Then I should see '<pre class="highlight plaintext">This is some code'
+
+  Scenario: Works from Slim
+    Given the Server is running at "test-app"
+    When I go to "/code_slim.html"
+    Then I should see '<span class="k">def</span>'
+    Then I should see '<pre class="highlight plaintext">This is some code'

data/features/markdown.feature

@@ -1,10 +1,16 @@
 Feature: Code blocks in markdown get highlighted
 
   Scenario: Works with Kramdown
+    Given a fixture app "test-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :kramdown
+      activate :syntax
+      """
     Given the Server is running at "test-app"
     When I go to "/code.html"
     Then I should see '<span class="k">def</span>'
-    Then I should see '<pre class="highlight text">This is some code'
+    Then I should see '<pre class="highlight plaintext">This is some code'
 
   @nojava
   Scenario: Works with RedCarpet
@@ -18,5 +24,5 @@ Feature: Code blocks in markdown get highlighted
     Given the Server is running at "test-app"
     When I go to "/code.html"
     Then I should see '<span class="k">def</span>'
-    Then I should see '<pre class="highlight text">This is some code'
-    
+    Then I should see '<pre class="highlight plaintext">This is some code'
+    

data/fixtures/test-app/source/code_haml.html.haml

@@ -0,0 +1,12 @@
+%h1 Ruby
+
+- code('ruby') do
+  :preserve
+    def foo(bar)
+      puts "baz"
+    end
+
+%h1 Whatever
+
+- code do
+  This is some code

data/fixtures/test-app/source/code_haml_filter.html.haml

@@ -0,0 +1,12 @@
+%h1 Ruby
+
+:code
+  # lang: ruby
+  def foo(bar)
+    puts "baz"
+  end
+
+%h1 Whatever
+
+:code
+  This is some code

data/fixtures/test-app/source/code_slim.html.slim

@@ -0,0 +1,13 @@
+h1 Ruby
+
+- code('ruby') do
+  |
+    def foo(bar)
+      puts "baz"
+    end
+
+h1 Whatever
+
+- code
+  |
+    This is some code

data/lib/middleman-syntax.rb

@@ -1,7 +1,7 @@
 require "middleman-core"
 require "middleman-syntax/version"
-  
+
 ::Middleman::Extensions.register(:syntax) do
   require "middleman-syntax/extension"
-  ::Middleman::Syntax
+  ::Middleman::Syntax::SyntaxExtension
 end

data/lib/middleman-syntax/extension.rb

@@ -1,87 +1,113 @@
+require 'rouge'
+
 module Middleman
   module Syntax
-    class << self
+    class SyntaxExtension < Extension
+      option :css_class, 'highlight', 'Class name applied to the syntax-highlighted output.'
+      option :line_numbers, false, 'Generate line numbers.'
+      option :inline_theme, nil, 'A Rouge::CSSTheme that will be used to highlight the output with inline styles instead of using CSS classes.'
+      option :wrap, true, 'Wrap the highlighted content in a container (<pre> or <div>, depending on whether :line_numbers is on).'
+      option :lexer_options, {}, 'Options for the Rouge lexers.'
 
-      def options
-        @@options
-      end
+      def after_configuration
+        Middleman::Syntax::Highlighter.options = options
 
-      def registered(app, options_hash={})
-        require 'rouge'
-
-        @@options = options_hash
-        yield @@options if block_given?
-
-        app.send :include, Helper
-
-        app.after_configuration do
-          if markdown_engine == :redcarpet
-            require 'middleman-core/renderers/redcarpet'
-            Middleman::Renderers::MiddlemanRedcarpetHTML.send :include, MarkdownCodeRenderer
-          elsif markdown_engine == :kramdown
-            require 'kramdown'
-            Kramdown::Converter::Html.class_eval do
-              def convert_codeblock(el, indent)
-                attr = el.attr.dup
-                language = extract_code_language!(attr)
-                Middleman::Syntax::Highlighter.highlight(el.value, language)
-              end
+        if app.config[:markdown_engine] == :redcarpet
+          require 'middleman-core/renderers/redcarpet'
+          Middleman::Renderers::MiddlemanRedcarpetHTML.send :include, RedcarpetCodeRenderer
+        elsif app.config[:markdown_engine] == :kramdown
+          require 'kramdown'
+          Kramdown::Converter::Html.class_eval do
+            def convert_codeblock(el, indent)
+              attr = el.attr.dup
+              language = extract_code_language!(attr)
+              Middleman::Syntax::Highlighter.highlight(el.value, language)
             end
           end
         end
       end
-      alias :included :registered
-    end
 
-    module Highlighter
-      # A helper module for highlighting code
-      def self.highlight(code, language)
-        opts = ::Middleman::Syntax.options.dup
-        lexer = Rouge::Lexer.find_fancy(language, code) || Rouge::Lexers::Text
-        formatter = Rouge::Formatters::HTML.new(opts.reverse_merge({ :css_class => "highlight #{lexer.tag}" }))
-        formatter.format(lexer.lex(code, opts))
-      end
-    end
+      helpers do
+        # Output highlighted code. Use like:
+        #
+        #    <% code('ruby') do %>
+        #      my code
+        #    <% end %>
+        #
+        # To produce the following structure:
+        #
+        #    <div class="highlight">
+        #      <pre>#{your code}
+        #      </pre>
+        #    </div>
+        #
+        # @param [String] language the Rouge lexer to use
+        # @param [Hash] Options to pass to the Rouge formatter & lexer, overriding global options set by :highlighter_options.
+        def code(language=nil, options={}, &block)
+          raise 'The code helper requires a block to be provided.' unless block_given?
 
-    module Helper
-
-      # Output highlighted code. Use like:
-      #
-      #    <% code('ruby') do %>
-      #      my code
-      #    <% end %>
-      #
-      # To produce the following structure:
-      #
-      #    <div class="highlight">
-      #      <pre>#{your code}
-      #      </pre>
-      #    </div>
-      #
-      # @param [String] language the Pygments lexer to use
-      def code(language=nil, &block)
-        # Save current buffer for later
-        @_out_buf, _buf_was = "", @_out_buf
-
-        begin
-          content = if block_given?
-            capture_html(&block)
-          else
-            ""
+          # Save current buffer for later
+          @_out_buf, _buf_was = "", @_out_buf
+
+          begin
+            content = capture_html(&block)
+          ensure
+            # Reset stored buffer
+            @_out_buf = _buf_was
           end
-        ensure
-          # Reset stored buffer
-          @_out_buf = _buf_was
-        end
+          content = content.encode(Encoding::UTF_8)
 
-        concat_content Middleman::Syntax::Highlighter.highlight(content, language)
+          concat_content Middleman::Syntax::Highlighter.highlight(content, language).html_safe
+        end
       end
     end
 
-    module MarkdownCodeRenderer
+    # A mixin for the Redcarpet Markdown renderer that will highlight
+    # code.
+    module RedcarpetCodeRenderer
       def block_code(code, language)
         Middleman::Syntax::Highlighter.highlight(code, language)
       end
     end
+
+    module Highlighter
+      mattr_accessor :options
+
+      # A helper module for highlighting code
+      def self.highlight(code, language=nil, opts={})
+        lexer = Rouge::Lexer.find_fancy(language, code) || Rouge::Lexers::PlainText
+
+        highlighter_options = options.to_h.merge(opts)
+        highlighter_options[:css_class] = [ highlighter_options[:css_class], lexer.tag ].join(' ')
+        lexer_options = highlighter_options.delete(:lexer_options)
+
+        formatter = Rouge::Formatters::HTML.new(highlighter_options)
+        formatter.format(lexer.lex(code, options.lexer_options))
+      end
+    end
+  end
+end
+
+# If Haml is around, define a :code filter that can be used to more conveniently output highlighted code.
+if defined? Haml
+  module Haml
+    module Filters
+      module Code
+        include Base
+
+        def render(code)
+          code = code.encode(Encoding::UTF_8)
+
+          # Allow language to be specified via a special comment like:
+          #  # lang: ruby
+          if code.lines.first =~ /\A\s*#\s*lang:\s*(\w+)$/
+            language = $1
+            code = code.lines.to_a[1..-1].join # Strip first line
+          end
+
+          Middleman::Syntax::Highlighter.highlight(code, language)
+        end
+      end
+    end
   end
 end

data/lib/middleman-syntax/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Syntax
-    VERSION = "1.2.1"
+    VERSION = "2.0.0"
   end
 end

data/middleman-syntax.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path(File.join("..", "lib", "middleman-syntax", "version"), __FILE__)
+$:.push File.expand_path("../lib", __FILE__)
+require "middleman-syntax/version"
 
 Gem::Specification.new do |s|
-  s.name        = "middleman-syntax"
-  s.version     = Middleman::Syntax::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ben Hollis"]
-  s.email       = ["ben@benhollis.net"]
-  s.homepage    = "https://github.com/middleman/middleman-syntax"
-  s.summary     = %q{Syntax-highlighting helpers for Middleman}
-  s.description = %q{Syntax-highlighting helpers for Middleman}
-
-  s.files         = `git ls-files -z`.split("\0")
-  s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
+  s.name = "middleman-syntax"
+  s.version = Middleman::Syntax::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.authors = ["Ben Hollis"]
+  s.email = ["ben@benhollis.net"]
+  s.homepage = "https://github.com/middleman/middleman-syntax"
+  s.summary = %q{Code syntax highlighting plugin via rouge for Middleman}
+  s.description = %q{Code syntax highlighting plugin via rouge for Middleman}
+  s.license = "MIT"
+  s.files = `git ls-files -z`.split("\0")
+  s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
-
-  s.add_runtime_dependency("middleman-core", "~> 3.0")
-  s.add_runtime_dependency("rouge", "~> 0.3.0")
+  s.add_runtime_dependency("middleman-core", ["~> 3.2"])
+  s.add_runtime_dependency("rouge", ["~> 1.0"])
 end

metadata

@@ -1,70 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: middleman-syntax
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben Hollis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
-description: Syntax-highlighting helpers for Middleman
+        version: '1.0'
+description: Code syntax highlighting plugin via rouge for Middleman
 email:
 - ben@benhollis.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
+- LICENSE.md
 - README.md
 - Rakefile
+- features/haml_filter.feature
 - features/helper.feature
 - features/markdown.feature
 - features/support/env.rb
 - fixtures/test-app/config.rb
 - fixtures/test-app/source/code.html.markdown
+- fixtures/test-app/source/code_haml.html.haml
+- fixtures/test-app/source/code_haml_filter.html.haml
 - fixtures/test-app/source/code_html.html.erb
+- fixtures/test-app/source/code_slim.html.slim
 - lib/middleman-syntax.rb
 - lib/middleman-syntax/extension.rb
-- lib/middleman-syntax/helper.rb
 - lib/middleman-syntax/middleman_extension.rb
 - lib/middleman-syntax/version.rb
 - middleman-syntax.gemspec
 homepage: https://github.com/middleman/middleman-syntax
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -72,25 +78,29 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
-summary: Syntax-highlighting helpers for Middleman
+summary: Code syntax highlighting plugin via rouge for Middleman
 test_files:
+- features/haml_filter.feature
 - features/helper.feature
 - features/markdown.feature
 - features/support/env.rb
 - fixtures/test-app/config.rb
 - fixtures/test-app/source/code.html.markdown
+- fixtures/test-app/source/code_haml.html.haml
+- fixtures/test-app/source/code_haml_filter.html.haml
 - fixtures/test-app/source/code_html.html.erb
+- fixtures/test-app/source/code_slim.html.slim
 has_rdoc: