markdpwn 0.1.3 → 0.1.4

data/Gemfile

@@ -1,22 +1,22 @@
 source :rubygems
 
 # Code formatting.
-gem 'pygments.rb', '>= 0.2.11'
+gem 'pygments.rb', '>= 0.2.13'
 
 # Github formatting.
-gem 'github-markup', '>= 0.7.2', :require => 'github/markup'
+gem 'github-markup', '>= 0.7.4', :require => 'github/markup'
 gem 'redcarpet', '>= 2.1.1'
 gem 'RedCloth', '>= 4.2.9'
 gem 'rdoc', '>= 3.12'
-gem 'org-ruby', '>= 0.6.2'
+gem 'org-ruby', '>= 0.7.1'
 gem 'creole', '>= 0.4.2'
-gem 'wikicloth', '>= 0.7.1'
+gem 'wikicloth', '>= 0.8.0'
 
 group :development do
-  gem 'minitest', '>= 2.11'
-  gem 'yard', '>= 0.7'
-  gem 'bundler', '>= 1.0.22'
-  gem 'jeweler', '>= 1.8.3'
+  gem 'minitest', '>= 3.4.0'
+  gem 'yard', '>= 0.8'
+  gem 'bundler', '>= 1.2.0'
+  gem 'jeweler', '>= 1.8.4'
   gem 'rcov', '>= 0', :platform => :mri_18
   gem 'simplecov', '>= 0', :platform => :mri_19
 end

data/Gemfile.lock

@@ -3,23 +3,23 @@ GEM
   specs:
     RedCloth (4.2.9)
     blankslate (2.1.2.4)
-    builder (3.0.0)
+    builder (3.1.0)
     creole (0.4.2)
     expression_parser (0.9.0)
     ffi (1.0.11)
     git (1.2.5)
-    github-markup (0.7.2)
-    jeweler (1.8.3)
+    github-markup (0.7.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.6.6)
-    minitest (2.12.1)
-    multi_json (1.2.0)
-    org-ruby (0.6.2)
+    json (1.7.5)
+    minitest (3.4.0)
+    multi_json (1.3.6)
+    org-ruby (0.7.1)
       rubypants (>= 0.2.0)
-    pygments.rb (0.2.11)
+    pygments.rb (0.2.13)
       rubypython (~> 0.5.3)
     rake (0.9.2.2)
     rcov (1.0.0)
@@ -30,30 +30,30 @@ GEM
     rubypython (0.5.3)
       blankslate (>= 2.1.2.3)
       ffi (~> 1.0.7)
-    simplecov (0.6.1)
+    simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     wikicloth (0.8.0)
       builder
       expression_parser
-    yard (0.7.5)
+    yard (0.8.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   RedCloth (>= 4.2.9)
-  bundler (>= 1.0.22)
+  bundler (>= 1.2.0)
   creole (>= 0.4.2)
-  github-markup (>= 0.7.2)
-  jeweler (>= 1.8.3)
-  minitest (>= 2.11)
-  org-ruby (>= 0.6.2)
-  pygments.rb (>= 0.2.11)
+  github-markup (>= 0.7.4)
+  jeweler (>= 1.8.4)
+  minitest (>= 3.4.0)
+  org-ruby (>= 0.7.1)
+  pygments.rb (>= 0.2.13)
   rcov
   rdoc (>= 3.12)
   redcarpet (>= 2.1.1)
   simplecov
-  wikicloth (>= 0.7.1)
-  yard (>= 0.7)
+  wikicloth (>= 0.8.0)
+  yard (>= 0.8)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/markdpwn/code.rb

@@ -13,8 +13,8 @@ module Code
   # @option options [String] :file_name the name of the file containing the
   #     piece of code; meaningful for files in version control repositories,
   #     e-mail attachments, and code fetched from links
-  # @option options [String] :language the name of the code's language; GFM code
-  #     blocks can include a language name
+  # @option options [String] :language the name of the code's language; GFM
+  #     code blocks can include a language name
   # @return [String] a HTML fragment containing the formatted code
   def self.render(code, options = {})
     [
@@ -23,15 +23,17 @@ module Code
       "</div>"
     ].join ''
   end
-  
+
   # The raw Pygments output for parsing some code.
   #
   def self.pygment(code, options = {})
     lexer = pygments_lexer options
-    Pygments.highlight code, :lexer => lexer, :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
-  
+
   # The name of the Python lexer that is most suitable for some code.
   #
   # @param [Hash] options code properties that help choose the formatter
@@ -48,7 +50,7 @@ module Code
       end
       return lexer if lexer
     end
-    
+
     if mime_type = options[:mime_type]
       lexer = begin
         Pygments.lexer_name_for :mimetype => mime_type
@@ -57,7 +59,7 @@ module Code
       end
       return lexer if lexer
     end
-    
+
     if file_name = options[:file_name]
       lexer = begin
         Pygments.lexer_name_for :filename => file_name
@@ -66,7 +68,7 @@ module Code
       end
       return lexer if lexer
     end
-    
+
     if code = options[:code]
       lexer = begin
         Pygments.lexer_name_for code
@@ -75,7 +77,7 @@ module Code
       end
       return lexer if lexer
     end
-    
+
     nil
   end
 end  # namespace Markdpwn::Code

data/markdpwn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "markdpwn"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = "2012-04-15"
+  s.date = "2012-09-06"
   s.description = "HTML-formats text documents such as Markdown, textile, and source code"
   s.email = "victor@costan.us"
   s.extra_rdoc_files = [
@@ -50,56 +50,56 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/pwnall/markdpwn"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.22"
+  s.rubygems_version = "1.8.24"
   s.summary = "HTML-formats text documents such as Markdown, textile, and source code"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<pygments.rb>, [">= 0.2.11"])
-      s.add_runtime_dependency(%q<github-markup>, [">= 0.7.2"])
+      s.add_runtime_dependency(%q<pygments.rb>, [">= 0.2.13"])
+      s.add_runtime_dependency(%q<github-markup>, [">= 0.7.4"])
       s.add_runtime_dependency(%q<redcarpet>, [">= 2.1.1"])
       s.add_runtime_dependency(%q<RedCloth>, [">= 4.2.9"])
       s.add_runtime_dependency(%q<rdoc>, [">= 3.12"])
-      s.add_runtime_dependency(%q<org-ruby>, [">= 0.6.2"])
+      s.add_runtime_dependency(%q<org-ruby>, [">= 0.7.1"])
       s.add_runtime_dependency(%q<creole>, [">= 0.4.2"])
-      s.add_runtime_dependency(%q<wikicloth>, [">= 0.7.1"])
-      s.add_development_dependency(%q<minitest>, [">= 2.11"])
-      s.add_development_dependency(%q<yard>, [">= 0.7"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.22"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
+      s.add_runtime_dependency(%q<wikicloth>, [">= 0.8.0"])
+      s.add_development_dependency(%q<minitest>, [">= 3.4.0"])
+      s.add_development_dependency(%q<yard>, [">= 0.8"])
+      s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<pygments.rb>, [">= 0.2.11"])
-      s.add_dependency(%q<github-markup>, [">= 0.7.2"])
+      s.add_dependency(%q<pygments.rb>, [">= 0.2.13"])
+      s.add_dependency(%q<github-markup>, [">= 0.7.4"])
       s.add_dependency(%q<redcarpet>, [">= 2.1.1"])
       s.add_dependency(%q<RedCloth>, [">= 4.2.9"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
-      s.add_dependency(%q<org-ruby>, [">= 0.6.2"])
+      s.add_dependency(%q<org-ruby>, [">= 0.7.1"])
       s.add_dependency(%q<creole>, [">= 0.4.2"])
-      s.add_dependency(%q<wikicloth>, [">= 0.7.1"])
-      s.add_dependency(%q<minitest>, [">= 2.11"])
-      s.add_dependency(%q<yard>, [">= 0.7"])
-      s.add_dependency(%q<bundler>, [">= 1.0.22"])
-      s.add_dependency(%q<jeweler>, [">= 1.8.3"])
+      s.add_dependency(%q<wikicloth>, [">= 0.8.0"])
+      s.add_dependency(%q<minitest>, [">= 3.4.0"])
+      s.add_dependency(%q<yard>, [">= 0.8"])
+      s.add_dependency(%q<bundler>, [">= 1.2.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<pygments.rb>, [">= 0.2.11"])
-    s.add_dependency(%q<github-markup>, [">= 0.7.2"])
+    s.add_dependency(%q<pygments.rb>, [">= 0.2.13"])
+    s.add_dependency(%q<github-markup>, [">= 0.7.4"])
     s.add_dependency(%q<redcarpet>, [">= 2.1.1"])
     s.add_dependency(%q<RedCloth>, [">= 4.2.9"])
     s.add_dependency(%q<rdoc>, [">= 3.12"])
-    s.add_dependency(%q<org-ruby>, [">= 0.6.2"])
+    s.add_dependency(%q<org-ruby>, [">= 0.7.1"])
     s.add_dependency(%q<creole>, [">= 0.4.2"])
-    s.add_dependency(%q<wikicloth>, [">= 0.7.1"])
-    s.add_dependency(%q<minitest>, [">= 2.11"])
-    s.add_dependency(%q<yard>, [">= 0.7"])
-    s.add_dependency(%q<bundler>, [">= 1.0.22"])
-    s.add_dependency(%q<jeweler>, [">= 1.8.3"])
+    s.add_dependency(%q<wikicloth>, [">= 0.8.0"])
+    s.add_dependency(%q<minitest>, [">= 3.4.0"])
+    s.add_dependency(%q<yard>, [">= 0.8"])
+    s.add_dependency(%q<bundler>, [">= 1.2.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdpwn
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pygments.rb
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.13
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: creole
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.22
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.22
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: rcov
   requirement: !ruby/object:Gem::Requirement
@@ -287,7 +287,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2821084060881153957
+      hash: -4265765567859591802
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -296,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: HTML-formats text documents such as Markdown, textile, and source code