sbfaulkner-pygmalion 0.9.2 → 0.9.3

data/lib/pygmalion.rb

@@ -1,17 +1,17 @@
 require 'net/http'
-require 'uri'
+require 'cgi'
 require 'active_support'
 
 module Pygmalion
-  PYGMENTS_HOST = 'pygments.com'
+  PYGMALION_HOST = 'pygments.com'
   
-  JSON_PATH = "/json/"
-  PUSH_PATH = "/push_chunk/"
+  PYGMALION_JSON_PATH = "/json/"
+  PYGMALION_PUSH_PATH = "/push_chunk/"
 
-  CHUNK_SIZE = 4000
-  CHUNK_REGEX = Regexp.new(".{1,#{CHUNK_SIZE}}", Regexp::MULTILINE)
+  PYGMALION_CHUNK_SIZE = 4000
+  PYGMALION_CHUNK_REGEX = Regexp.new(".{1,#{PYGMALION_CHUNK_SIZE}}", Regexp::MULTILINE)
   
-  DEFAULT_OPTIONS = {
+  PYGMALION_DEFAULTS = {
     :css => 'n',
     :id => 'pygmalion',
     :linenos => 'off'
@@ -28,8 +28,8 @@ module Pygmalion
     def pygments_query(parameters = {}, code = nil, chunkid = nil)
       parameters[:code] = code
       parameters[:chunkid] = chunkid if chunkid
-      parameters = parameters.collect { |k,v| "#{k}=#{URI.escape(v.to_s)}" }.join('&')
-      query = [ chunkid ? PUSH_PATH : JSON_PATH ]
+      parameters = parameters.collect { |k,v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
+      query = [ chunkid ? PYGMALION_PUSH_PATH : PYGMALION_JSON_PATH ]
       query << parameters unless parameters.empty?
       query.join('?')
     end
@@ -49,20 +49,20 @@ module Pygmalion
     language = options.delete(:language)
 
     # merge provided options into the defaults
-    options = DEFAULT_OPTIONS.merge(options)
+    options = PYGMALION_DEFAULTS.merge(options)
 
     # translate the aforementioned options
     options[:linenos] = line_numbers ? 'on' : 'off'
     options[:type] = language
     
-    res = Net::HTTP::start(PYGMENTS_HOST) do |http|
-      if self.size <= CHUNK_SIZE
+    res = Net::HTTP::start(PYGMALION_HOST) do |http|
+      if self.size <= PYGMALION_CHUNK_SIZE
         # if code is small enough, use a single request
         http.get self.class.pygments_query(options, self)
       else
         # otherwise break into chunks and push to the server
         headers = {}
-        self.scan(CHUNK_REGEX).each_with_index do |chunk, chunkid|
+        self.scan(PYGMALION_CHUNK_REGEX).each_with_index do |chunk, chunkid|
           # TODO: try threads for potential speedup with multiple simultaneous requests if this proves too slow
           response = http.get self.class.pygments_query(options, chunk, chunkid), headers
           # the server uses a cookie-based session to deal with chunked requests
@@ -73,7 +73,7 @@ module Pygmalion
       end
     end
     
-    ActiveSupport::JSON.decode(res.body[/\{.*\}/])['output']
+    ActiveSupport::JSON.decode(res.body[/\{.*\}/m])['output']
   end
 end
 

data/pygmalion.gemspec

@@ -1,14 +1,14 @@
 SPEC = Gem::Specification.new do |s| 
   # identify the gem
   s.name = "pygmalion" 
-  s.version = "0.9.2" 
+  s.version = "0.9.3" 
   s.author = "S. Brent Faulkner" 
   s.email = "brentf@unwwwired.net" 
   s.homepage = "http://www.unwwwired.net" 
   # platform of choice
   s.platform = Gem::Platform::RUBY 
   # description of gem
-  s.summary = "A ruby implementation of an interactive SQL command-line for ODBC data sources" 
+  s.summary = "Syntax highlighting using the pygments.com \"web service\"" 
   s.files = %w(bin/pygmalion lib/pygmalion.rb MIT-LICENSE Rakefile README.markdown pygmalion.gemspec)
   s.require_path = "lib" 
   s.autorequire = "pygmalion" 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sbfaulkner-pygmalion
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - S. Brent Faulkner
@@ -61,6 +61,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A ruby implementation of an interactive SQL command-line for ODBC data sources
+summary: Syntax highlighting using the pygments.com "web service"
 test_files: []