markdpwn 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a02924fcbf44d0b6a7088936b9831ae938c4b0f7
-  data.tar.gz: 9db2492d3ff285829dda65ef8f8deaae27266c5b
+  metadata.gz: bd0760f301c1f04764fa36933f65e871f4354b15
+  data.tar.gz: 1ce5c6592af9b4579169b87ac3499e48c36190fa
 SHA512:
-  metadata.gz: 7b056b0cd4c5d3c168136efa20d0b3b630caa382e499215a61f123e66d2e8328e9894c3f2841c16da54484d7e3ec935923a177096241435e390cd142012b549a
-  data.tar.gz: 917bd2383243e2d86c20e8de689e5e1f1899cf744ec70682b574f0d95be6d5437d105162acb085eea0d3a4d590cb091147d6dc484a127765025fdaef1a0162e9
+  metadata.gz: 56831c5fe4f3f0fa831d61e97252c16d4a0a29df1264d840f6a9805a787524c06aa56fa13f57bca8627fa1efa1028e33dc37c9cb2f09aedc4621fbefeb3a18dd
+  data.tar.gz: d6956d86912f10726a124c92ac7b773e2b54844df47ab3be2977b5b4e52a0ec05a457d7731b5f4371868368c165c669965322f7f2f256ff84c5b3d4b1b4b6046

data/Gemfile

@@ -1,22 +1,22 @@
 source 'https://rubygems.org'
 
 # Code formatting.
-gem 'pygments.rb', '>= 0.5.2'
+gem 'pygments.rb', '>= 1.1.2'
 
 # Github formatting.
-gem 'asciidoctor', '>= 0.1.4'
-gem 'github-markup', '>= 1.2.1', require: 'github/markup'
-gem 'redcarpet', '>= 3.1.2'
-gem 'RedCloth', '>= 4.2.9'
+gem 'asciidoctor', '>= 1.5.5'
+gem 'github-markup', '>= 1.6.0', require: 'github/markup'
+gem 'redcarpet', '>= 3.4.0'
+gem 'RedCloth', '>= 4.3.2'
 #gem 'rdoc', '~> 3.12'
-gem 'org-ruby', '>= 0.9.7'
+gem 'org-ruby', '>= 0.9.12'
 gem 'creole', '>= 0.5.0'
-gem 'wikicloth', '>= 0.8.1'
+gem 'wikicloth', '>= 0.8.3'
 
 group :development do
-  gem 'minitest', '>= 4.7.3'
-  gem 'yard', '>= 0.8.7.4'
+  gem 'minitest', '>= 5.4.1'
+  gem 'yard', '>= 0.9.9'
   gem 'bundler', '>= 1.3.5'
-  gem 'jeweler', '>= 2.0.1'
-  gem 'simplecov', '>= 0', platform: :mri
+  gem 'jeweler', '>= 2.3.5'
+  gem 'simplecov', '>= 0.14.1', platform: :mri
 end

data/Gemfile.lock

@@ -1,20 +1,20 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    addressable (2.3.6)
-    asciidoctor (0.1.4)
-    builder (3.2.2)
+    RedCloth (4.3.2)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    asciidoctor (1.5.5)
+    builder (3.2.3)
     creole (0.5.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.1.5)
     expression_parser (0.9.0)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.7)
-    github-markup (1.2.1)
-      posix-spawn (~> 0.3.8)
+    git (1.3.0)
+    github-markup (1.6.0)
     github_api (0.11.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.1)
@@ -23,72 +23,83 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.0)
       oauth2
-    hashie (3.1.0)
-    highline (1.6.21)
-    jeweler (2.0.1)
+    hashie (3.5.5)
+    highline (1.7.8)
+    htmlentities (4.3.4)
+    jeweler (2.3.5)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.0.0)
-    mini_portile (0.6.0)
-    minitest (5.3.5)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
+      semver2
+    json (2.1.0)
+    jwt (1.5.6)
+    mini_portile2 (2.1.0)
+    minitest (5.10.2)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.3.1)
+      faraday (>= 0.8, < 0.12)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    org-ruby (0.9.7)
+      rack (>= 1.2, < 3)
+    org-ruby (0.9.12)
       rubypants (~> 0.2)
-    posix-spawn (0.3.8)
-    pygments.rb (0.6.0)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    redcarpet (3.1.2)
-    rinku (1.7.3)
-    rubypants (0.2.0)
-    simplecov (0.8.2)
+    psych (2.2.4)
+    public_suffix (2.0.5)
+    pygments.rb (1.1.2)
+      multi_json (>= 1.0.0)
+    rack (2.0.2)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    redcarpet (3.4.0)
+    rubypants (0.6.0)
+    semver2 (3.4.2)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    thread_safe (0.3.4)
-    wikicloth (0.8.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    thread_safe (0.3.6)
+    twitter-text (1.14.5)
+      unf (~> 0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.4)
+    wikicloth (0.8.3)
       builder
       expression_parser
-      rinku
-    yajl-ruby (1.1.0)
-    yard (0.8.7.4)
+      htmlentities
+      nokogiri
+      twitter-text
+    yard (0.9.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth (>= 4.2.9)
-  asciidoctor (>= 0.1.4)
+  RedCloth (>= 4.3.2)
+  asciidoctor (>= 1.5.5)
   bundler (>= 1.3.5)
   creole (>= 0.5.0)
-  github-markup (>= 1.2.1)
-  jeweler (>= 2.0.1)
-  minitest (>= 4.7.3)
-  org-ruby (>= 0.9.7)
-  pygments.rb (>= 0.5.2)
-  redcarpet (>= 3.1.2)
-  simplecov
-  wikicloth (>= 0.8.1)
-  yard (>= 0.8.7.4)
+  github-markup (>= 1.6.0)
+  jeweler (>= 2.3.5)
+  minitest (>= 5.4.1)
+  org-ruby (>= 0.9.12)
+  pygments.rb (>= 1.1.2)
+  redcarpet (>= 3.4.0)
+  simplecov (>= 0.14.1)
+  wikicloth (>= 0.8.3)
+  yard (>= 0.9.9)
+
+BUNDLED WITH
+   1.14.4

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/markdpwn/code.rb

@@ -28,8 +28,8 @@ module Code
   #
   def self.pygment(code, options = {})
     lexer = pygments_lexer options
-    pygments_args = { :formatter => 'html',
-        :options => { :encoding => 'utf-8', :nowrap => true } }
+    pygments_args = { formatter: 'html',
+        options: { encoding: 'utf-8', nowrap: true } }
     pygments_args[:lexer] = lexer if lexer
     Pygments.highlight code, pygments_args
   end
@@ -44,7 +44,7 @@ module Code
   def self.pygments_lexer(options = {})
     if language = options[:language]
       lexer = begin
-        Pygments.lexer_name_for :lexer => language
+        Pygments.lexer_name_for lexer: language
       rescue IOError
         nil
       end
@@ -53,7 +53,7 @@ module Code
 
     if mime_type = options[:mime_type]
       lexer = begin
-        Pygments.lexer_name_for :mimetype => mime_type
+        Pygments.lexer_name_for mimetype: mime_type
       rescue IOError
         nil
       end
@@ -62,7 +62,7 @@ module Code
 
     if file_name = options[:file_name]
       lexer = begin
-        Pygments.lexer_name_for :filename => file_name
+        Pygments.lexer_name_for filename: file_name
       rescue IOError
         nil
       end

data/lib/markdpwn/docs.rb

@@ -21,10 +21,10 @@ module Docs
   # @return [String] the GitHub::Markup output, or nil if the file cannot be
   #     rendered by GitHub::Markup
   def self.gh_markup(text, options = {})
-    # NOTE: the MIME type is specified in the API so clients won't need to 
+    # NOTE: the MIME type is specified in the API so clients won't need to
     #       change if/when MIME-based detection is added
     file_name = options[:file_name]
-    if file_name && GitHub::Markup.can_render?(file_name)
+    if file_name && GitHub::Markup.can_render?(file_name, text)
       GitHub::Markup.render file_name, text
     else
       nil

data/lib/markdpwn/dpwn.rb

@@ -13,19 +13,19 @@ module Dpwn
   # @param [Hash] options rendering options (currently ignored)
   # @return [String] a HTML fragment containing the formatted text
   def self.render(text, options = {})
-    renderer = Markdpwn::RedCarpetRenderer.new 
+    renderer = Markdpwn::RedCarpetRenderer.new
     md = Redcarpet::Markdown.new renderer,
-      :autolink => true,
-      :no_intra_emphasis => true,
-      :tables => true,
-      :fenced_code_blocks => true,
-      :strikethrough => true,
-      :space_after_headers => true
+        autolink: true,
+        no_intra_emphasis: true,
+        tables: true,
+        fenced_code_blocks: true,
+        strikethrough: true,
+        space_after_headers: true
     md.render text
   end
-  
+
   # Checks if some file should be formatted using Markdpwn.
-  # @param [Hash] options file properties considered in the decision process  
+  # @param [Hash] options file properties considered in the decision process
   # @option options [String] :mime_type the MIME type of the code file; e-mail
   #     attachments and git blobs have MIME types
   # @option options [String] :file_name the name of the file containing the

data/lib/markdpwn/red_carpet_renderer.rb

@@ -1,20 +1,20 @@
 module Markdpwn
-  
+
 # RedCarpet HTML renderer, augmented to parse code blocks.
 # @private
 class RedCarpetRenderer < Redcarpet::Render::HTML
-  DEFAULT_OPTIONS = { 
-    :filter_html => true,
-    :no_styles => true,
-    :safe_links_only => true
-  }.freeze 
-  
+  DEFAULT_OPTIONS = {
+    filter_html: true,
+    no_styles: true,
+    safe_links_only: true
+  }.freeze
+
   def initialize(options = {})
     super DEFAULT_OPTIONS.merge options
   end
-  
+
   def block_code(code, language)
-    Markdpwn::Code.render code, :language => language
+    Markdpwn::Code.render code, language: language
   end
 end  # class MarkdDpwn::RedCarpetRenderer
 

data/markdpwn.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: markdpwn 0.2.0 ruby lib
+# stub: markdpwn 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "markdpwn"
-  s.version = "0.2.0"
+  s.name = "markdpwn".freeze
+  s.version = "0.3.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Victor Costan"]
-  s.date = "2014-07-03"
-  s.description = "HTML-formats text documents such as Markdown, textile, and source code"
-  s.email = "victor@costan.us"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Victor Costan".freeze]
+  s.date = "2017-05-15"
+  s.description = "HTML-formats text documents such as Markdown, textile, and source code".freeze
+  s.email = "victor@costan.us".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -49,57 +49,57 @@ Gem::Specification.new do |s|
     "test/markdpwn/dpwn_test.rb",
     "test/markdpwn_test.rb"
   ]
-  s.homepage = "http://github.com/pwnall/markdpwn"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.3.0"
-  s.summary = "HTML-formats text documents such as Markdown, textile, and source code"
+  s.homepage = "http://github.com/pwnall/markdpwn".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.10".freeze
+  s.summary = "HTML-formats text documents such as Markdown, textile, and source code".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<pygments.rb>, [">= 0.5.2"])
-      s.add_runtime_dependency(%q<asciidoctor>, [">= 0.1.4"])
-      s.add_runtime_dependency(%q<github-markup>, [">= 1.2.1"])
-      s.add_runtime_dependency(%q<redcarpet>, [">= 3.1.2"])
-      s.add_runtime_dependency(%q<RedCloth>, [">= 4.2.9"])
-      s.add_runtime_dependency(%q<org-ruby>, [">= 0.9.7"])
-      s.add_runtime_dependency(%q<creole>, [">= 0.5.0"])
-      s.add_runtime_dependency(%q<wikicloth>, [">= 0.8.1"])
-      s.add_development_dependency(%q<minitest>, [">= 4.7.3"])
-      s.add_development_dependency(%q<yard>, [">= 0.8.7.4"])
-      s.add_development_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_development_dependency(%q<jeweler>, [">= 2.0.1"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_runtime_dependency(%q<pygments.rb>.freeze, [">= 1.1.2"])
+      s.add_runtime_dependency(%q<asciidoctor>.freeze, [">= 1.5.5"])
+      s.add_runtime_dependency(%q<github-markup>.freeze, [">= 1.6.0"])
+      s.add_runtime_dependency(%q<redcarpet>.freeze, [">= 3.4.0"])
+      s.add_runtime_dependency(%q<RedCloth>.freeze, [">= 4.3.2"])
+      s.add_runtime_dependency(%q<org-ruby>.freeze, [">= 0.9.12"])
+      s.add_runtime_dependency(%q<creole>.freeze, [">= 0.5.0"])
+      s.add_runtime_dependency(%q<wikicloth>.freeze, [">= 0.8.3"])
+      s.add_development_dependency(%q<minitest>.freeze, [">= 5.4.1"])
+      s.add_development_dependency(%q<yard>.freeze, [">= 0.9.9"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 1.3.5"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 2.3.5"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0.14.1"])
     else
-      s.add_dependency(%q<pygments.rb>, [">= 0.5.2"])
-      s.add_dependency(%q<asciidoctor>, [">= 0.1.4"])
-      s.add_dependency(%q<github-markup>, [">= 1.2.1"])
-      s.add_dependency(%q<redcarpet>, [">= 3.1.2"])
-      s.add_dependency(%q<RedCloth>, [">= 4.2.9"])
-      s.add_dependency(%q<org-ruby>, [">= 0.9.7"])
-      s.add_dependency(%q<creole>, [">= 0.5.0"])
-      s.add_dependency(%q<wikicloth>, [">= 0.8.1"])
-      s.add_dependency(%q<minitest>, [">= 4.7.3"])
-      s.add_dependency(%q<yard>, [">= 0.8.7.4"])
-      s.add_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_dependency(%q<jeweler>, [">= 2.0.1"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<pygments.rb>.freeze, [">= 1.1.2"])
+      s.add_dependency(%q<asciidoctor>.freeze, [">= 1.5.5"])
+      s.add_dependency(%q<github-markup>.freeze, [">= 1.6.0"])
+      s.add_dependency(%q<redcarpet>.freeze, [">= 3.4.0"])
+      s.add_dependency(%q<RedCloth>.freeze, [">= 4.3.2"])
+      s.add_dependency(%q<org-ruby>.freeze, [">= 0.9.12"])
+      s.add_dependency(%q<creole>.freeze, [">= 0.5.0"])
+      s.add_dependency(%q<wikicloth>.freeze, [">= 0.8.3"])
+      s.add_dependency(%q<minitest>.freeze, [">= 5.4.1"])
+      s.add_dependency(%q<yard>.freeze, [">= 0.9.9"])
+      s.add_dependency(%q<bundler>.freeze, [">= 1.3.5"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 2.3.5"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0.14.1"])
     end
   else
-    s.add_dependency(%q<pygments.rb>, [">= 0.5.2"])
-    s.add_dependency(%q<asciidoctor>, [">= 0.1.4"])
-    s.add_dependency(%q<github-markup>, [">= 1.2.1"])
-    s.add_dependency(%q<redcarpet>, [">= 3.1.2"])
-    s.add_dependency(%q<RedCloth>, [">= 4.2.9"])
-    s.add_dependency(%q<org-ruby>, [">= 0.9.7"])
-    s.add_dependency(%q<creole>, [">= 0.5.0"])
-    s.add_dependency(%q<wikicloth>, [">= 0.8.1"])
-    s.add_dependency(%q<minitest>, [">= 4.7.3"])
-    s.add_dependency(%q<yard>, [">= 0.8.7.4"])
-    s.add_dependency(%q<bundler>, [">= 1.3.5"])
-    s.add_dependency(%q<jeweler>, [">= 2.0.1"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<pygments.rb>.freeze, [">= 1.1.2"])
+    s.add_dependency(%q<asciidoctor>.freeze, [">= 1.5.5"])
+    s.add_dependency(%q<github-markup>.freeze, [">= 1.6.0"])
+    s.add_dependency(%q<redcarpet>.freeze, [">= 3.4.0"])
+    s.add_dependency(%q<RedCloth>.freeze, [">= 4.3.2"])
+    s.add_dependency(%q<org-ruby>.freeze, [">= 0.9.12"])
+    s.add_dependency(%q<creole>.freeze, [">= 0.5.0"])
+    s.add_dependency(%q<wikicloth>.freeze, [">= 0.8.3"])
+    s.add_dependency(%q<minitest>.freeze, [">= 5.4.1"])
+    s.add_dependency(%q<yard>.freeze, [">= 0.9.9"])
+    s.add_dependency(%q<bundler>.freeze, [">= 1.3.5"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 2.3.5"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0.14.1"])
   end
 end
 

data/test/markdpwn/code_test.rb

@@ -5,99 +5,94 @@ describe Markdpwn::Code do
     describe 'with view.html.erb' do
       let :result do
         Markdpwn::Code.render code_fixture('view.html.erb'),
-                              :file_name => 'view.html.erb'
+                              file_name: 'view.html.erb'
       end
-      
+
       it 'is wrapped in a <div> with the markdpwn-parsed-code class' do
-        result.must_match /\A<div class="markdpwn-parsed-code">.*<\/div>\Z/m
+        result.must_match(/\A<div class="markdpwn-parsed-code">.*<\/div>\Z/m)
       end
-      
+
       it 'includes a parsed <h1> tag' do
-        result.must_match '<span class="nt">&lt;h1&gt;</span>'
+        result.must_match '<span class="nt">h1</span>'
       end
-      
+
       it 'includes a parsed :partial symbol' do
         result.must_match '<span class="ss">:partial</span>'
       end
     end
   end
-  
+
   describe '#pygment return value' do
     describe 'with ruby code' do
       let :result do
-        Markdpwn::Code.pygment ":symbol => 'string'", :language => 'ruby' 
+        Markdpwn::Code.pygment ":symbol => 'string'", language: 'ruby'
       end
-      
+
       it 'includes a parsed symbol' do
         result.must_match '<span class="ss">:symbol</span>'
       end
-      
+
       it 'does not contain a <div>' do
         result.wont_match '<div'
       end
-      
+
       it 'does not contain a <pre>' do
         result.wont_match '<pre'
       end
     end
-    
+
     describe 'with view.html.erb' do
       let :result do
         Markdpwn::Code.pygment code_fixture('view.html.erb'),
-                               :file_name => 'view.html.erb' 
+                               file_name: 'view.html.erb'
       end
-      
+
       it 'includes a parsed <h1> tag' do
-        result.must_match '<span class="nt">&lt;h1&gt;</span>'
+        result.must_match '<span class="nt">h1</span>'
       end
-      
+
       it 'includes a parsed :partial symbol' do
         result.must_match '<span class="ss">:partial</span>'
       end
     end
   end
-  
+
   describe '#pygments_lexer' do
     describe 'with :mime_type' do
       it 'returns rb for text/x-ruby' do
-        Markdpwn::Code.pygments_lexer(:mime_type => 'text/x-ruby').
-            must_equal 'rb'
+        Markdpwn::Code.pygments_lexer(mime_type: 'text/x-ruby').must_equal 'rb'
       end
 
       it 'returns nil for application/random-mime' do
-        Markdpwn::Code.pygments_lexer(:mime_type => 'application/random-mime').
-            must_equal nil
+        Markdpwn::Code.pygments_lexer(mime_type: 'application/random-mime').
+            must_be_nil
       end
     end
-    
+
     describe 'with :file_name' do
       it 'returns rb for x.rb' do
-        Markdpwn::Code.pygments_lexer(:file_name => 'x.rb').
-            must_equal 'rb'
+        Markdpwn::Code.pygments_lexer(file_name: 'x.rb').must_equal 'rb'
       end
 
       it 'returns nil for x.random-ext' do
-        Markdpwn::Code.pygments_lexer(:file_name => 'x.random-ext').
-            must_equal nil
+        Markdpwn::Code.pygments_lexer(file_name: 'x.random-ext').must_be_nil
       end
     end
-    
+
     describe 'with :language' do
       it 'returns rb for ruby' do
-        Markdpwn::Code.pygments_lexer(:language => 'ruby').
-            must_equal 'rb'
+        Markdpwn::Code.pygments_lexer(language: 'ruby').must_equal 'rb'
       end
 
       it 'returns nil for random-lang' do
-        Markdpwn::Code.pygments_lexer(:language => 'random-lang').
-            must_equal nil
+        Markdpwn::Code.pygments_lexer(language: 'random-lang').must_be_nil
       end
     end
-    
+
     describe 'with :code' do
-      it 'returns html+erb or xml+erb for view.html.erb' do
-        Markdpwn::Code.pygments_lexer(:code => code_fixture('view.html.erb')).
-            must_match /^(ht|x)ml\+erb$/
+      it 'returns rhtml, html+erb or html+ruby view.html.erb' do
+        %w(rhtml html+erb html+ruby).must_include(
+            Markdpwn::Code.pygments_lexer(code: code_fixture('view.html.erb')))
       end
     end
   end

data/test/markdpwn/docs_test.rb

@@ -10,33 +10,33 @@ describe Markdpwn::Docs do
           Markdpwn::Docs.gh_markup code_fixture("readme#{ext}"),
               :file_name => "readme#{ext}"
         end
-        
+
         it 'includes a heading' do
-          result.must_match /<h2[^>]*>.*List.*<\/h2>/m
+          result.must_match(/<h2[^>]*>.*List.*<\/h2>/m)
         end
-        
+
         it 'includes a list item' do
-          result.must_match /<li>.*Eggs.*<\/li>/m
+          result.must_match(/<li>.*Eggs.*<\/li>/m)
         end
-        
+
         it 'is not wrapped in a <div>' do
-          result.wont_match '<pre'
+          result.wont_match '<div'
         end
-  
+
         it 'does not contain a <pre>' do
           result.wont_match '<pre'
         end
       end
-    end      
-    
+    end
+
     describe 'with view.html.erb' do
       let :result do
         Markdpwn::Docs.gh_markup code_fixture('view.html.erb'),
-                                 :file_name => 'view.html.erb' 
+                                 :file_name => 'view.html.erb'
       end
-      
+
       it 'is nil' do
-        result.must_equal nil
+        result.must_be_nil
       end
     end
   end

data/test/markdpwn/dpwn_test.rb

@@ -6,15 +6,15 @@ describe Markdpwn::Dpwn do
       let :result do
         Markdpwn::Dpwn.render code_fixture("readme.md")
       end
-      
+
       it 'includes a heading' do
-        result.must_match /<h2[^>]*>.*List.*<\/h2>/m
+        result.must_match(/<h2[^>]*>.*List.*<\/h2>/m)
       end
-      
+
       it 'includes a list item' do
-        result.must_match /<li>.*Eggs.*<\/li>/m
+        result.must_match(/<li>.*Eggs.*<\/li>/m)
       end
-      
+
       it 'includes a parsed symbol' do
         result.must_match '<span class="ss">:symbol</span>'
       end

data/test/markdpwn_test.rb

@@ -6,7 +6,7 @@ describe Markdpwn do
       let :result do
         Markdpwn.markup code_fixture("readme.md"), :file_name => 'readme.md'
       end
-      
+
       it 'includes a parsed <h1> tag' do
         result.must_match '<span class="nt">&lt;h1&gt;</span>'
       end
@@ -15,21 +15,21 @@ describe Markdpwn do
         result.must_match '<span class="ss">:partial</span>'
       end
     end
-    
+
     describe "with the readme.textile fixture" do
       let :result do
         Markdpwn.markup code_fixture("readme.textile"),
                         :file_name => 'readme.textile'
       end
-      
+
       it 'includes a heading' do
-        result.must_match /<h2[^>]*>.*List.*<\/h2>/m
+        result.must_match(/<h2[^>]*>.*List.*<\/h2>/m)
       end
-      
+
       it 'includes a list item' do
-        result.must_match /<li>.*Eggs.*<\/li>/m
+        result.must_match(/<li>.*Eggs.*<\/li>/m)
       end
-      
+
       it 'is not wrapped in a <div>' do
         result.wont_match '<pre'
       end
@@ -40,15 +40,15 @@ describe Markdpwn do
         Markdpwn.markup code_fixture("view.html.erb"),
                         :file_name => 'view.html.erb'
       end
-      
+
       it 'is wrapped in a <div> with the markdpwn-parsed-code class' do
-        result.must_match /\A<div class="markdpwn-parsed-code">.*<\/div>\Z/m
+        result.must_match(/\A<div class="markdpwn-parsed-code">.*<\/div>\Z/m)
       end
-      
+
       it 'includes a parsed <h1> tag' do
-        result.must_match '<span class="nt">&lt;h1&gt;</span>'
+        result.must_match '<span class="nt">h1</span>'
       end
-      
+
       it 'includes a parsed :partial symbol' do
         result.must_match '<span class="ss">:partial</span>'
       end
@@ -60,7 +60,7 @@ describe Markdpwn do
       let :result do
         Markdpwn.markdpwn code_fixture("readme.md")
       end
-      
+
       it 'includes a parsed <h1> tag' do
         result.must_match '<span class="nt">&lt;h1&gt;</span>'
       end

metadata

@@ -1,197 +1,197 @@
 --- !ruby/object:Gem::Specification
 name: markdpwn
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Victor Costan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 1.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 4.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 4.3.2
 - !ruby/object:Gem::Dependency
   name: org-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.9.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: creole
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: wikicloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 5.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 5.4.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7.4
+        version: 0.9.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7.4
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.1
 description: HTML-formats text documents such as Markdown, textile, and source code
 email: victor@costan.us
 executables: []
@@ -200,8 +200,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
 files:
-- .document
-- .project
+- ".document"
+- ".project"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -239,17 +239,17 @@ 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.3.0
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: HTML-formats text documents such as Markdown, textile, and source code