uv 0.0.7.0 → 0.0.7.1

data/lib/uv.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'textpow'
 require 'uv/render_processor'
 require "uv/version"
+require "uv/finding_syntaxes"
 require 'uv/utility'
 require 'uv/engine' if defined?(Rails)
 
@@ -25,27 +26,6 @@ module Uv
     result << File.join(File.dirname(__FILE__), ".." )
   end
 
-  # Returns the Textpow::SyntaxNode for this syntax;
-  # @raise ArgumentError if no syntax is found
-  # Ex: syntax_node_for('ruby') => Textpow::SyntaxNode.load('ruby.syntax')
-  def self.syntax_node_for(syntax)
-    if syntax == '' or syntax.nil?
-      puts "No syntax supplied, defaulting to 'plain_text' syntax"
-      syntax = "plain_text"
-    end
-    if !@syntaxes.key?(syntax)
-      filename = File.join(@syntax_path, "#{syntax}.syntax")
-      @syntaxes[syntax] = if File.exist?(filename)
-        Textpow::SyntaxNode.load(filename)
-      else
-        false
-      end
-    end
-    if !@syntaxes[syntax]
-      raise ArgumentError, "Syntax not found.  No #{syntax}.syntax file in #{@syntax_path}"
-    end
-    @syntaxes[syntax]
-  end
 
   # Copies files from the [ruby-uv/render/<arg1>/files/] to the <arg2> output directory
   def Uv.copy_files output, output_dir
@@ -69,46 +49,22 @@ module Uv
     end
   end
 
-  # Guesses the correct syntax based on the input files fileType.
-  # If the FileType doesnt containt a valid syntax name, each syntax
-  # has it's first line matched againts the the file's first line
-  def Uv.syntax_for_file file_name
-    init_syntaxes unless @syntaxes
-    first_line = ""
-    File.open( file_name, 'r' ) { |f|
-      while (first_line = f.readline).strip.size == 0; end
-    }
-    result = []
-    @syntaxes.each do |key, value|
-      assigned = false
-      if value.fileTypes
-        value.fileTypes.each do |t|
-          if t == File.basename( file_name ) || t == File.extname( file_name )[1..-1]
-            result << [key, value]
-            assigned = true
-            break
-          end
-        end
-      end
-      unless assigned
-        if value.firstLineMatch && value.firstLineMatch =~ first_line
-          result << [key, value]
-        end
-      end
-    end
-    result
-  end
-
   # Parses <arg1> text using RenderProcessor.load(Textpow::SyntaxNode.parse(text)), returns the vailid <output>
   def Uv.parse text, output = "xhtml", syntax_name = nil, line_numbers = false, render_style = nil, headers = false
     RenderProcessor.load(output, render_style, line_numbers, headers) do |processor|
-      syntax_node_for(syntax_name).parse(text, processor)
+      find_syntaxes([syntax_name], get_first_line(text)).parse(text, processor)
     end.string
   end
 
+  def Uv.get_first_line(text)
+    first_break = text.index(/[\n\r]/) || text.length - 1
+    text[0..first_break].strip
+  end
+
   # Parses <arg1> text with Textpow::DebugProcessor, using the given syntax
   def Uv.debug text, syntax_name
     syntax_node_for(syntax_name).parse(text, Textpow::DebugProcessor.new)
   end
 
+
 end

data/lib/uv/finding_syntaxes.rb

@@ -0,0 +1,91 @@
+module Uv
+
+  def Uv.find_syntaxes_by_ext(ext)
+    syntaxes = []
+    if !@syntaxes.key?(ext)
+      @syntaxes.each do |syntax_name, syntax_node|
+        syntaxes << syntax_node if syntax_node.fileTypes && syntax_node.fileTypes.include?(ext)
+      end
+      filename = File.join(@syntax_path, "#{ext}.syntax")
+      syntaxes << Textpow::SyntaxNode.load(filename) if File.exist?(filename)
+    else
+      syntaxes << @syntaxes[ext]
+    end
+    syntaxes
+  end
+
+  def Uv.find_syntaxes_by_first_line(first_line)
+    syntaxes = []
+    @syntaxes.each do |syntax_name, syntax_node|
+      syntaxes << syntax_node if syntax_node.firstLineMatch && syntax_node.firstLineMatch =~ first_line
+    end
+    syntaxes
+  end
+
+  def Uv.find_syntaxes(extensions=[], first_line='')
+    init_syntaxes unless @syntaxes
+    syntaxes = []
+    extensions.each do |ext|
+      syntaxes << find_syntaxes_by_ext(ext)
+    end
+    syntaxes << find_syntaxes_by_first_line(first_line)
+    syntaxes
+  end
+
+
+  # Returns the Textpow::SyntaxNode for this syntax;
+  # @raise ArgumentError if no syntax is found
+  # Ex: syntax_node_for('ruby') => Textpow::SyntaxNode.load('ruby.syntax')
+  def self.syntax_node_for(syntax)
+    if !@syntaxes.key?(syntax)
+      filename = File.join(@syntax_path, "#{syntax}.syntax")
+      @syntaxes[syntax] = if File.exist?(filename)
+        Textpow::SyntaxNode.load(filename)
+      else
+        false
+      end
+    end
+    if !@syntaxes[syntax]
+      if syntax == '' or syntax.nil?
+        puts "No syntax supplied, defaulting to 'plain_text' syntax"
+        syntax = "plain_text"
+      else
+        raise ArgumentError, "Syntax not found.  No #{syntax}.syntax file in #{@syntax_path}"
+      end
+    end
+    @syntaxes[syntax]
+  end
+
+
+
+  # Guesses the correct syntax based on the input files fileType.
+  # If the FileType doesnt containt a valid syntax name, each syntax
+  # has it's first line matched againts the the file's first line
+  def Uv.syntax_for_file file_name
+    init_syntaxes unless @syntaxes
+    first_line = ""
+    File.open( file_name, 'r' ) { |f|
+      while (first_line = f.readline).strip.size == 0; end
+    }
+    result = []
+    @syntaxes.each do |key, value|
+      assigned = false
+      if value.fileTypes
+        value.fileTypes.each do |t|
+          if t == File.basename( file_name ) || t == File.extname( file_name )[1..-1]
+            result << [key, value]
+            assigned = true
+            break
+          end
+        end
+      end
+      unless assigned
+        if value.firstLineMatch && value.firstLineMatch =~ first_line
+          result << [key, value]
+        end
+      end
+    end
+    result
+  end
+
+end

data/lib/uv/version.rb

@@ -1,3 +1,3 @@
 module Uv
-  VERSION = '0.0.7.0'
+  VERSION = '0.0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uv
 version: !ruby/object:Gem::Version
-  version: 0.0.7.0
+  version: 0.0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000 Z
+date: 2011-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spox-textpow
-  requirement: &70143552391360 !ruby/object:Gem::Requirement
+  requirement: &70263484525880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143552391360
+  version_requirements: *70263484525880
 - !ruby/object:Gem::Dependency
   name: spox-plist
-  requirement: &70143552409540 !ruby/object:Gem::Requirement
+  requirement: &70263484525340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143552409540
+  version_requirements: *70263484525340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70143552409120 !ruby/object:Gem::Requirement
+  requirement: &70263484524900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143552409120
+  version_requirements: *70263484524900
 description: Ruby powered syntax highlighting.  Ruby 1.9 port of Ultraviolet
 email:
 - spox@modspox.com
@@ -65,6 +65,7 @@ files:
 - bin/uv
 - lib/uv.rb
 - lib/uv/engine.rb
+- lib/uv/finding_syntaxes.rb
 - lib/uv/render_processor.rb
 - lib/uv/utility.rb
 - lib/uv/version.rb
@@ -312,9 +313,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1639761505872700738
 requirements: []
 rubyforge_project: uv
 rubygems_version: 1.8.10