makeup 0.3.0 → 0.4.0

data/.gitignore

@@ -0,0 +1,2 @@
+coverage
+test/reports

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+  - 1.8.7
+  - ree

data/Gemfile

@@ -1,3 +1,7 @@
 source "http://rubygems.org"
 
 gemspec
+
+gem "ci_reporter"
+gem "rcov", :platforms => :ruby_18
+gem "simplecov", :platforms => :ruby_19

data/Gemfile.lock

@@ -1,30 +1,51 @@
 PATH
   remote: .
   specs:
-    makeup (0.3.0)
+    makeup (0.4.0)
+      github-linguist (~> 2.8)
       github-markup (~> 0.7)
       htmlentities (~> 4.3)
-      pygments.rb (~> 0.2)
+      pygments.rb (~> 0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    github-markup (0.7.4)
+    builder (3.2.2)
+    charlock_holmes (0.6.9.4)
+    ci_reporter (1.9.0)
+      builder (>= 2.1.2)
+    escape_utils (0.3.2)
+    github-linguist (2.8.5)
+      charlock_holmes (~> 0.6.6)
+      escape_utils (~> 0.3.1)
+      mime-types (~> 1.19)
+      pygments.rb (~> 0.4.2)
+    github-markup (0.7.5)
     htmlentities (4.3.1)
+    mime-types (1.23)
     minitest (2.12.1)
+    multi_json (1.7.7)
     posix-spawn (0.3.6)
-    pygments.rb (0.3.2)
+    pygments.rb (0.4.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rake (0.9.2.2)
+    rcov (1.0.0)
     redcarpet (2.2.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  ci_reporter
   makeup!
   minitest (~> 2.0)
   rake (~> 0.9)
+  rcov
   redcarpet (= 2.2.0)
+  simplecov

data/Rakefile

@@ -1,10 +1,21 @@
 require "rake/testtask"
+require "ci/reporter/rake/minitest"
 require "bundler/gem_tasks"
 
 Rake::TestTask.new("test") do |test|
+  test.libs << "lib"
   test.libs << "test"
   test.pattern = "test/**/*_test.rb"
   test.verbose = true
 end
 
+if RUBY_VERSION < "1.9"
+  require "rcov/rcovtask"
+  Rcov::RcovTask.new do |t|
+    t.libs << "test"
+    t.test_files = FileList["test/**/*_test.rb"]
+    t.rcov_opts += %w{--exclude gems,ruby/1.}
+  end
+end
+
 task :default => :test

data/Readme.md

@@ -1,5 +1,9 @@
 # Makeup
 
+<a href="http://travis-ci.org/cjohansen/makeup" class="travis">
+  <img src="https://secure.travis-ci.org/cjohansen/makeup.png">
+</a>
+
 Makeup provides markup rendering and syntax highlighting in one glorious
 package. It can also syntax highlight "fenced code blocks" in markdown files.
 

data/lib/makeup.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
 # --
 # The MIT License (MIT)
+# Christian Johansen
 #
-# Copyright (C) 2012 Gitorious AS
+# Copyright (C) 2013 Gitorious AS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,9 +23,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #++
-require "makeup/markup"
+require "makeup/version"
+require "makeup/syntax_highlighter"
 require "makeup/syntax_highlighter"
-
-module Makeup
-  VERSION = "0.3.0"
-end

data/lib/makeup/syntax_highlighter.rb

@@ -24,6 +24,7 @@
 #++
 require "pygments"
 require "htmlentities"
+require "linguist"
 
 module Makeup
   CodeBlock = Struct.new(:lexer, :code)
@@ -36,43 +37,21 @@ module Makeup
     def highlight(path, code, options = {})
       options[:lexer] ||= lexer(path, code)
       lexer = Pygments::Lexer.find(options[:lexer])
-      CodeBlock.new(lexer && lexer.aliases.first,
-                    Pygments.highlight(code, highlight_options(options)))
+      code = lexer.nil? ? code : Pygments.highlight(code, highlight_options(options))
+      CodeBlock.new(lexer && lexer.aliases.first, code)
     rescue MentosError => e
       # "MentosError" is what Pyments.rb raises when an unknown lexer is
       # attempted used
       CodeBlock.new(nil, @entities.encode(code))
     end
 
-    def lexer(path, code = nil)
-      self.class.lexer(path.split(".").pop, code)
+    def lexer(path, code = nil, mode = nil)
+      self.class.lexer(path, code, mode)
     end
 
-    def self.lexer(suffix, code = nil)
-      return @@lexer_aliases[suffix] if @@lexer_aliases[suffix]
-      lexer = Pygments::Lexer.find_by_extname(".#{suffix}")
-      return lexer.aliases.first || lexer.name if lexer
-      shebang_language(shebang(code)) || suffix
-    end
-
-    def self.shebang(code)
-      first_line = (code || "").split("\n")[0]
-      first_line =~ /^#!/ ? first_line : nil
-    end
-
-    def self.shebang_language(shebang)
-      shebang = @@lexer_shebangs.find { |s| (shebang || "") =~ s[:pattern] }
-      shebang && shebang[:lexer]
-    end
-
-    def self.add_lexer_alias(extension, lexer)
-      @@lexer_aliases ||= {}
-      @@lexer_aliases[extension] = lexer
-    end
-
-    def self.add_lexer_shebang(pattern, lexer)
-      @@lexer_shebangs ||= []
-      @@lexer_shebangs << { :pattern => pattern, :lexer => lexer }
+    def self.lexer(path, code = nil, mode = nil)
+      lexer = Linguist::Language.detect(path, code, mode)
+      lexer && (lexer.aliases.first || lexer.name)
     end
 
     private
@@ -84,11 +63,3 @@ module Makeup
     end
   end
 end
-
-Makeup::SyntaxHighlighter.add_lexer_alias("txt", "text")
-Makeup::SyntaxHighlighter.add_lexer_alias("ru", "rb")
-Makeup::SyntaxHighlighter.add_lexer_alias("Rakefile", "rb")
-Makeup::SyntaxHighlighter.add_lexer_alias("Gemfile", "rb")
-Makeup::SyntaxHighlighter.add_lexer_alias("Gemfile.lock", "yaml")
-
-Makeup::SyntaxHighlighter.add_lexer_shebang(/\bruby\b/, "rb")

data/lib/makeup/version.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+# --
+# The MIT License (MIT)
+#
+# Copyright (C) 2013 Gitorious AS
+#
+# 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.
+#++
+
+module Makeup
+  VERSION = "0.4.0"
+end

data/makeup.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 dir = File.expand_path(File.dirname(__FILE__))
-require File.join(dir, "lib", "makeup")
+require File.join(dir, "lib", "makeup/version.rb")
 
 Gem::Specification.new do |s|
   s.name        = "makeup"
@@ -17,7 +17,8 @@ markdown files.
 
   s.rubyforge_project = "makeup"
 
-  s.add_dependency "pygments.rb", "~>0.2"
+  s.add_dependency "pygments.rb", "~>0.4"
+  s.add_dependency "github-linguist", "~>2.8"
   s.add_dependency "github-markup", "~> 0.7"
   s.add_dependency "htmlentities", "~> 4.3"
 

data/test/makeup/markup_test.rb

@@ -63,7 +63,7 @@ describe Makeup::Markup do
       assert_equal 2, html.scan(/common-lisp/).length
     end
   end
-  
+
   describe "#render" do
     it "should detect end of code blocks properly" do
       html = @renderer.render("file.md", <<-MD)
@@ -87,7 +87,7 @@ class Bonjour
 end
 ```
       MD
-      
+
       assert_equal 2, html.scan(/rb/).length
     end
   end

data/test/makeup/syntax_highlighter_test.rb

@@ -62,14 +62,6 @@ describe Makeup::SyntaxHighlighter do
       assert_match "Hey<span class=\"nt\">&lt;/h1&gt;</span>", html
     end
 
-    it "highlights file with custom suffix" do
-      Makeup::SyntaxHighlighter.add_lexer_alias("derp", "rb")
-      html = highlight("file.derp", "class File")
-
-      assert_match "<span class=\"k\">class</span>", html
-      assert_match "<span class=\"nc\">File</span>", html
-    end
-
     it "skips highlighting if lexer is missing" do
       html = highlight("file.trololol", "Yeah yeah yeah")
 
@@ -79,30 +71,7 @@ describe Makeup::SyntaxHighlighter do
 
   describe "#lexer" do
     it "uses known suffix" do
-      assert_equal "rb", @highlighter.lexer("file.rb")
-    end
-
-    it "uses registered suffix" do
-      Makeup::SyntaxHighlighter.add_lexer_alias("blarg", "blarg")
-      assert_equal "blarg", @highlighter.lexer("file.blarg")
-    end
-
-    it "uses registered lexer" do
-      Makeup::SyntaxHighlighter.add_lexer_alias("bg", "blarg")
-      assert_equal "blarg", @highlighter.lexer("file.bg")
-    end
-
-    it "uses known shebang" do
-      assert_equal "rb", @highlighter.lexer("some-binary", "#!/usr/bin/env ruby\n")
-    end
-
-    it "uses registered shebang" do
-      Makeup::SyntaxHighlighter.add_lexer_shebang(/\bnode\b/, "js")
-      assert_equal "js", @highlighter.lexer("some-binary", "#!/usr/bin/env node\n")
-    end
-
-    it "uses filename for unknown lexer" do
-      assert_equal "some-binary", @highlighter.lexer("some-binary", "class Person\nend")
+      assert_equal "ruby", @highlighter.lexer("file.rb")
     end
   end
 end

data/test/test_helper.rb

@@ -22,6 +22,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #++
+if RUBY_VERSION > "1.9"
+  require "simplecov"
+  SimpleCov.start
+end
+
 require "bundler/setup"
 require "minitest/autorun"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makeup
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2013-07-15 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'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: github-linguist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +137,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -129,6 +147,7 @@ files:
 - lib/makeup/code_block_parser.rb
 - lib/makeup/markup.rb
 - lib/makeup/syntax_highlighter.rb
+- lib/makeup/version.rb
 - makeup.gemspec
 - test/makeup/markup_test.rb
 - test/makeup/syntax_highlighter_test.rb
@@ -153,8 +172,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: makeup
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Pretty markup
 test_files: []
+has_rdoc: