uv 0.0.7.3 → 0.0.7.4

data/lib/uv/finding_syntax_nodes.rb

@@ -9,28 +9,34 @@ module Uv
   end
 
   def Uv.find_syntaxes_by_first_line(first_line)
-    return nil if first_line = ''
+    return [] if first_line == ''
     puts "Searching syntaxes by first line..." if @debug
-    @syntaxes.values.compact.each do |syntax_node|
-      return syntax_node if syntax_node && syntax_node.firstLineMatch && syntax_node.firstLineMatch =~ first_line
+    @syntaxes.values.compact.collect do |syntax_node|
+      return [syntax_node] if syntax_node && syntax_node.firstLineMatch && syntax_node.firstLineMatch =~ first_line
     end
   end
 
   def Uv.find_syntaxes(extensions=[], first_line='', slow_search=false)
     puts "Finding syntaxes for: Extensions: [#{extensions.join(', ')}], First Line: '#{first_line.inspect}'" if @debug
     init_syntaxes if @syntaxes.empty?
-    syntaxes = []; extensions.delete(''); extensions.compact!
+    syntaxes_found = []; extensions.delete(''); extensions.compact!
     case slow_search
     when false
-       syntaxes << load_syntax(extensions.first) unless extensions.empty?
+       syntaxes_found << load_syntax(extensions.first) unless extensions.empty?
     when true
-      syntaxes += extensions.collect {|ext| find_syntaxes_by_ext(ext) }.flatten.compact
-      syntaxes += find_syntaxes_by_first_line(first_line) if syntaxes.empty?
+      syntaxes_found += extensions.collect {|ext| find_syntaxes_by_ext(ext) }.flatten.compact
+      syntaxes_found += find_syntaxes_by_first_line(first_line) if syntaxes_found.empty?
     end
-    syntaxes.compact!
-    puts "Syntaxes found: [#{syntaxes.collect(&:name).join(', ')}]" if @debug and not syntaxes.empty?
-    puts "Uv Error: No syntax match found for '#{extensions.join(', ')}', defaulting to 'plain_text' syntax" if @debug and syntaxes.empty?
-    syntaxes
+    syntaxes_found.compact!
+    syntaxes_found << default_syntax(extensions) if syntaxes_found.empty?
+    puts "Syntaxes found: [#{syntaxes_found.collect(&:name).join(', ')}]" if @debug and not syntaxes_found.empty?
+    syntaxes_found
+  end
+
+  def Uv.default_syntax(extensions)
+    puts "Uv Error: No syntax match found for '#{extensions.join(', ')}', defaulting to 'plain_text' syntax" if @debug
+    raise "Uv Error: Syntax files failed to load (No 'plain_text' parser was loaded).  Loaded syntaxes: [#{@syntaxes.keys.join(', ')}]" unless load_syntax('plain_text')
+    load_syntax('plain_text')
   end
 
 

data/lib/uv/syntaxes.rb

@@ -38,7 +38,7 @@ module Uv
     rescue => e
       puts "Error in loading syntax: #{syntax_name}.  Returning: #{@syntaxes[syntax_name].class}.  Error: #{e.message}" if @debug
     end
-    return @syntaxes[syntax_name]
+    @syntaxes[syntax_name]
   end
 
   def Uv.load_syntax_declared_file_types(syntax_node)

data/lib/uv/version.rb

@@ -1,3 +1,3 @@
 module Uv
-  VERSION = '0.0.7.3'
+  VERSION = '0.0.7.4'
 end

data/lib/uv.rb

@@ -1,4 +1,5 @@
 #encoding: ascii-8bit
+require 'uv/engine' if defined?(Rails)
 require 'fileutils'
 require 'textpow'
 require 'uv/render_processor'
@@ -6,7 +7,6 @@ require "uv/version"
 require "uv/finding_syntax_nodes"
 require "uv/syntaxes"
 require 'uv/utility'
-require 'uv/engine' if defined?(Rails)
 
 
 module Uv

data/test/test_uv.rb

@@ -11,6 +11,7 @@ class UvTest < Test::Unit::TestCase
 
   def test_parses_blank
     assert_equal %(<pre class="mac_classic"></pre>), Uv.parse('', 'xhtml', 'css')
+    assert_equal %(<pre class="mac_classic"></pre>), Uv.parse('', 'xhtml', 'bad_extension')
   end
 
   def test_init_syntaxes
@@ -22,16 +23,15 @@ class UvTest < Test::Unit::TestCase
   end
 
   def test_find_syntaxes_by_ext
-    Uv.init_syntaxes
     assert_instance_of Array, Uv.find_syntaxes_by_ext("css")
     assert_instance_of Textpow::SyntaxNode, Uv.find_syntaxes_by_ext("css").first
     assert_equal "CSS", Uv.find_syntaxes_by_ext("css").first.name
   end
 
   def test_find_syntaxes
-    assert_equal [], Uv.find_syntaxes(["not_a_syntax_ext"])
-    assert_equal [], Uv.find_syntaxes([''])
-    assert_equal [], Uv.find_syntaxes([])
+    assert_equal "Plain Text", Uv.find_syntaxes(["not_a_syntax_ext"]).first.name
+    assert_equal "Plain Text", Uv.find_syntaxes(['']).first.name
+    assert_equal "Plain Text", Uv.find_syntaxes([]).first.name
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uv
 version: !ruby/object:Gem::Version
-  version: 0.0.7.3
+  version: 0.0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spox-textpow
-  requirement: &70213148526180 !ruby/object:Gem::Requirement
+  requirement: &70183553505880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213148526180
+  version_requirements: *70183553505880
 - !ruby/object:Gem::Dependency
   name: spox-plist
-  requirement: &70213148525640 !ruby/object:Gem::Requirement
+  requirement: &70183553505340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213148525640
+  version_requirements: *70183553505340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70213148525200 !ruby/object:Gem::Requirement
+  requirement: &70183553504900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213148525200
+  version_requirements: *70183553504900
 description: Ruby powered syntax highlighting.  Ruby 1.9 port of Ultraviolet
 email:
 - spox@modspox.com
@@ -143,7 +143,7 @@ files:
 - syntax/css_experimental.syntax
 - syntax/css_zen.syntax
 - syntax/csv.syntax
-- syntax/cucumber_plain_text_feature.syntax
+- syntax/cucumber.syntax
 - syntax/cucumber_steps.syntax
 - syntax/d.syntax
 - syntax/diff.syntax
@@ -274,7 +274,7 @@ files:
 - uv.gemspec
 - vendor/assets/stylesheets/active4d.css
 - vendor/assets/stylesheets/all_hallows_eve.css
-- vendor/assets/stylesheets/all_uv_themes.css.scss
+- vendor/assets/stylesheets/all_uv_themes.css
 - vendor/assets/stylesheets/amy.css
 - vendor/assets/stylesheets/blackboard.css
 - vendor/assets/stylesheets/brilliance_black.css