pygments.rb 0.3.0 → 0.3.1

data/lib/pygments/mentos.py

@@ -66,7 +66,8 @@ class Mentos(object):
             - 'lexer' ("python")
             - 'mimetype' ("text/x-ruby")
             - 'filename' ("yeaaah.py")
-            - 'code' ("import derp" etc)
+
+        The code argument should be a string, such as "import derp".
 
         The code guessing method is not especially great. It is advised that
         clients pass in a literal lexer name whenever possible, which provides
@@ -101,7 +102,7 @@ class Mentos(object):
             return lexers.guess_lexer(code, **inputs)
 
         else:
-            _write_error("No lexer")
+            return None
 
 
     def highlight_text(self, code, lexer, formatter_name, args, kwargs):
@@ -186,7 +187,7 @@ class Mentos(object):
                     _write_error("No lexer")
 
             else:
-                _write_error("No lexer")
+                _write_error("Invalid method " + method)
 
             return res
 
@@ -294,7 +295,7 @@ class Mentos(object):
                 text = sys.stdin.read(_bytes)
 
                 # Sanity check the return.
-                if method == 'highlight':
+                if _bytes:
                     start_id, end_id = self._get_ids(text)
                     text = self._check_and_return_text(text, start_id, end_id)
 

data/lib/pygments/popen.rb

@@ -158,7 +158,13 @@ module Pygments
         opts = {}
       end
 
-      mentos(:lexer_name_for, args, opts)
+      if args.last.is_a?(String)
+        code = args.pop
+      else
+        code = nil
+      end
+
+      mentos(:lexer_name_for, args, opts, code)
     end
 
     # Public: Highlight code.
@@ -274,7 +280,7 @@ module Pygments
           if not (start_id == id and end_id == id)
             @log.error "[#{Time.now.iso8601}] ID's did not match. Aborting."
             stop "ID's did not match. Aborting."
-            raise MentosError, "ID's did not match. Aborting. " + res.to_s
+            raise MentosError, "ID's did not match. Aborting."
           else
             # We're good. Remove the padding
             res = res[10..-11]
@@ -329,9 +335,9 @@ module Pygments
 
         # Sanity check the size
         if not size_check(size)
-          @log.error "[#{Time.now.iso8601}] Size returned from Mentos invalid."
-          stop "Size returned from Mentos invalid."
-          raise MentosError, "Size returned from Mentos invalid."
+          @log.error "[#{Time.now.iso8601}] Size returned from mentos.py invalid."
+          stop "Size returned from mentos.py invalid."
+          raise MentosError, "Size returned from mentos.py invalid."
         end
 
         # Read the amount of bytes we should be expecting. We first

data/lib/pygments/version.rb

@@ -1,3 +1,3 @@
 module Pygments
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/test/test_pygments.rb

@@ -171,6 +171,10 @@ class PygmentsLexerTest < Test::Unit::TestCase
     assert_equal 'rb', P.lexer_name_for(RUBY_CODE, :filename => 'test.rb')
   end
 
+  def test_lexer_by_content
+    assert_equal 'rb', P.lexer_name_for(RUBY_CODE)
+  end
+
   def test_lexer_by_nothing
     assert_raise MentosError do
       P.lexer_name_for(:invalid => true)

metadata

@@ -1,81 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pygments.rb
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Aman Gupta
 - Ted Nyman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: posix-spawn
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: posix-spawn
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 3
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.3.6
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 7
-        - 6
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.7.6
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.6
 description: pygments.rb exposes the pygments syntax highlighter to Ruby
-email: 
+email:
 - aman@tmm1.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -474,36 +465,26 @@ files:
 - vendor/simplejson/simplejson/tool.py
 homepage: http://github.com/tmm1/pygments.rb
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: pygments wrapper for ruby
 test_files: []
-