sbfaulkner-kulriir 1.0.1 → 1.0.2

data/bin/kulriir

@@ -8,6 +8,7 @@ require 'kulriir'
 opts = GetoptLong.new(
   [ "--help", "-h", GetoptLong::NO_ARGUMENT ],
   [ "--numbers", "-n", GetoptLong::NO_ARGUMENT ],
+  [ "--remote", "-r", GetoptLong::NO_ARGUMENT ],
   [ "--syntaxes", "-S", GetoptLong::NO_ARGUMENT ],
   [ "--syntax", "-s", GetoptLong::REQUIRED_ARGUMENT ],
   [ "--themes", "-T", GetoptLong::NO_ARGUMENT ],
@@ -17,7 +18,7 @@ opts = GetoptLong.new(
 OPTIONS = {
   :syntax => 'plain_text',
   :theme => 'mac_classic',
-  :numbers => 'off'
+  :numbers => false
 }
 
 opts.each do |opt, arg|
@@ -27,6 +28,7 @@ opts.each do |opt, arg|
     puts "\nOptions:"
     puts "    -h, --help              Display this message."
     puts "    -n, --numbers           Include line numbers."
+    puts "    -r, --remote            Force use of remote service (when ultraviolet is installed locally)"
     puts "    -S, --syntaxes          List all supported syntaxes."
     puts "    -s, --syntax=name       The language for the code to be highlighted."
     puts "    -T, --themes            List all supported themes."
@@ -34,6 +36,8 @@ opts.each do |opt, arg|
     exit 1
   when '--numbers'
     OPTIONS[:numbers] = true
+  when '--remote'
+    OPTIONS[:remote] = true
   when '--syntaxes'
     puts Kulriir.syntaxes.join("\n")
     exit

data/kulriir.gemspec

@@ -1,7 +1,7 @@
 SPEC = Gem::Specification.new do |s| 
   # identify the gem
   s.name = "kulriir" 
-  s.version = "1.0.1" 
+  s.version = "1.0.2" 
   s.author = "S. Brent Faulkner" 
   s.email = "brentf@unwwwired.net" 
   s.homepage = "http://github.com/sbfaulkner/kulriir" 

data/lib/kulriir.rb

@@ -2,6 +2,13 @@ require 'rest_client'
 require 'rexml/document'
 
 module Kulriir
+  LOCAL_UV = begin
+    require 'uv'
+    true
+  rescue LoadError => e
+    false
+  end
+
   KULRII_HOST = 'kulrii.heroku.com'
   
   def self.included(base)
@@ -23,21 +30,39 @@ module Kulriir
   # **theme**:          theme for highlighting
   #
   def highlight(options = {})
+    force_remote = options.delete(:remote)
+
     options[:numbers] = options.delete(:line_numbers) if options.include?(:line_numbers)
     options[:syntax] = options.delete(:language) if options.include?(:language)
     
-    options[:syntax] ||= 'ruby'
-
-    RestClient.post "http://#{KULRII_HOST}/parse", options.merge(:text => self)
+    options = { :numbers => false, :syntax => 'ruby', :theme => 'mac_classic' }.merge(options)
+    
+    if LOCAL_UV && ! force_remote
+      Uv.parse(self, 'xhtml', options[:syntax], options[:numbers], options[:theme])
+    else
+      RestClient.post "http://#{KULRII_HOST}/parse", options.merge(:text => self)
+    end
   end
   
   class << self
-    def syntaxes
-      REXML::Document.new(RestClient.get("http://#{KULRII_HOST}/syntaxes")).elements.collect('syntaxes/syntax') { |e| e.text }
+    def syntaxes(options = {})
+      force_remote = options.delete(:remote)
+
+      if LOCAL_UV && ! force_remote
+        Uv.syntaxes
+      else
+        REXML::Document.new(RestClient.get("http://#{KULRII_HOST}/syntaxes")).elements.collect('syntaxes/syntax') { |e| e.text }
+      end
     end
     
-    def themes
-      REXML::Document.new(RestClient.get("http://#{KULRII_HOST}/themes")).elements.collect('themes/theme') { |e| e.text }
+    def themes(options = {})
+      force_remote = options.delete(:remote)
+
+      if LOCAL_UV && ! force_remote
+        Uv.themes
+      else
+        REXML::Document.new(RestClient.get("http://#{KULRII_HOST}/themes")).elements.collect('themes/theme') { |e| e.text }
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sbfaulkner-kulriir
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - S. Brent Faulkner