pygments.rb 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4098ca01dc51f86056c5d9b00813932fcec3e55d
-  data.tar.gz: b1b4b997afea29463fe50d1d71f5149e038f44a9
+  metadata.gz: 95f44f119ac71a42def88c2cc6684c051d6a7bc1
+  data.tar.gz: d44710b3e2e2d6b694379a8edb394caf45d7e1ac
 SHA512:
-  metadata.gz: 6966a5a27fc61a380855b779220a4b699672e5fe5cb40d554a44b6f81cf48034db918513d1a12a410185685053cd42debbf684675706fcae19a656a811ccb61a
-  data.tar.gz: 05175fe08f110359cbbaf62a6324f4eb1e2231679af5cac40129476d55ac5588dc821e805b658976a363a243cbea48bd69b965ef862858cb878dc47b172f36c7
+  metadata.gz: 8aa00980332c0b813fb5c1bbffdcbeca857dcf306c8504a1dbd3c77e77a5b442723d3e112a5e04906706def6115dac67153ed3d0f2a5e80aaf978f0868484de8
+  data.tar.gz: fb638bccbcc5b1ddd9ea6c9ce46df79c4019f44bf342571f800f21313ef6b93f1a46c1f17c9ce120dc945ac9910b88d79b259af767dd725f2f79463f49c2d2bb

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 changelog
 ===========
 
+
+Version 1.1.0 (2016/12/24)
+-----------------------------
+
+* Support JRuby [#170](https://github.com/tmm1/pygments.rb/pull/170)
+* Make pygments.rb thread safe [#171](https://github.com/tmm1/pygments.rb/pull/171)
+
 Version 1.0.0 (2016/12/11)
 -----------------------------
 

data/circle.yml

@@ -1,7 +1,20 @@
 machine:
   ruby:
     version: 2.3.1
+  java:
+    version: oraclejdk8
+  environment:
+    JRUBY_OPTS: '--dev --debug'
+    JRUBY: jruby-9.1.6.0
+
+dependencies:
+  pre:
+    - echo rvm_autoupdate_flag=0 >> ~/.rvmrc
+    - rvm install $JRUBY
+  post:
+    - rvm-exec $JRUBY bundle install
 
 test:
   override:
+    - rvm-exec $JRUBY bundle exec rake test
     - bundle exec rake test

data/lib/pygments.rb

@@ -1,8 +1,33 @@
 require File.join(File.dirname(__FILE__), 'pygments/popen')
-
+require 'forwardable'
 
 module Pygments
-  extend Pygments::Popen
 
   autoload :Lexer, 'pygments/lexer'
+
+  class << self
+    extend Forwardable
+
+    def engine
+      Thread.current.thread_variable_get(:pygments_engine) ||
+        Thread.current.thread_variable_set(:pygments_engine, Pygments::Popen.new)
+    end
+
+    def_delegators :engine,
+      # public
+      :formatters,
+      :lexers,
+      :lexers!,
+      :filters,
+      :styles,
+      :css,
+      :lexer_name_for,
+      :highlight,
+      # not public but documented
+      :start,
+      # only for testing
+      :size_check,
+      :get_fixed_bits_from_header,
+      :add_ids
+  end
 end

data/lib/pygments/popen.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
-require 'posix/spawn'
-require 'yajl'
+require 'open3'
+require 'multi_json'
 require 'timeout'
 require 'logger'
 require 'time'
@@ -12,9 +12,12 @@ end
 # Pygments provides access to the Pygments library via a pipe and a long-running
 # Python process.
 module Pygments
-  module Popen
-    include POSIX::Spawn
-    extend self
+  class Popen
+
+    def popen4(cmd)
+      stdin, stdout, stderr, wait_thr = Open3.popen3(cmd)
+      [wait_thr[:pid], stdin, stdout, stderr]
+    end
 
     # Get things started by opening a pipe to mentos (the freshmaker), a
     # Python process that talks to the Pygments library. We'll talk back and
@@ -262,7 +265,7 @@ module Pygments
 
           kwargs.freeze
           kwargs = kwargs.merge("fd" => @out.to_i, "id" => id, "bytes" => bytesize)
-          out_header = Yajl.dump(:method => method, :args => args, :kwargs => kwargs)
+          out_header = MultiJson.dump(:method => method, :args => args, :kwargs => kwargs)
 
           # Get the size of the header itself and write that.
           bits = get_fixed_bits_from_header(out_header)
@@ -322,12 +325,12 @@ module Pygments
     def handle_header_and_return(header, id)
       if header
         header = header_to_json(header)
-        bytes = header["bytes"]
+        bytes = header[:bytes]
 
         # Read more bytes (the actual response body)
         res = @out.read(bytes.to_i)
 
-        if header["method"] == "highlight"
+        if header[:method] == "highlight"
           # Make sure we have a result back; else consider this an error.
           if res.nil?
             @log.warn "No highlight result back from mentos."
@@ -423,7 +426,7 @@ module Pygments
     # want them, text otherwise.
     def return_result(res, method)
       unless method == :lexer_name_for || method == :highlight || method == :css
-        res = Yajl.load(res, :symbolize_keys => true)
+        res = MultiJson.load(res, :symbolize_keys => true)
       end
       res = res.rstrip if res.class == String
       res
@@ -432,14 +435,14 @@ module Pygments
     # Convert a text header into JSON for easy access.
     def header_to_json(header)
       @log.info "[In header: #{header} "
-      header = Yajl.load(header)
+      header = MultiJson.load(header, :symbolize_keys => true)
 
-      if header["error"]
+      if header[:error]
         # Raise this as a Ruby exception of the MentosError class.
         # Stop so we don't leave the pipe in an inconsistent state.
         @log.error "Failed to convert header to JSON."
-        stop header["error"]
-        raise MentosError, header["error"]
+        stop header[:error]
+        raise MentosError, header[:error]
       else
         header
       end

data/lib/pygments/version.rb

@@ -1,3 +1,3 @@
 module Pygments
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/pygments.rb.gemspec

@@ -14,8 +14,7 @@ Gem::Specification.new do |s|
   s.email = ['aman@tmm1.net']
   s.license = 'MIT'
 
-  s.add_dependency 'yajl-ruby',   '~> 1.2'
-  s.add_dependency 'posix-spawn', '~> 0.3.6'
+  s.add_dependency 'multi_json', '>= 1.0.0'
   s.add_development_dependency 'rake-compiler', '~> 0.7.6'
   s.add_development_dependency 'test-unit', '~> 3.0.0'
 

data/test/test_pygments.rb

@@ -111,6 +111,17 @@ class PygmentsHighlightTest < Test::Unit::TestCase
     code = P.highlight("importr python;    wat?", :lexer => 'py')
     assert_match ">importr</span>", code
   end
+
+  def test_highlight_on_multi_threads
+    10.times.map do
+      Thread.new do
+        test_full_html_highlight
+      end
+    end.each do |thread|
+      thread.join
+    end
+  end
+
 end
 
 # Philosophically, I'm not the biggest fan of testing private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pygments.rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Aman Gupta
@@ -9,36 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: posix-spawn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement