uv 0.0.7.3 → 0.0.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/uv/finding_syntax_nodes.rb +17 -11
- data/lib/uv/syntaxes.rb +1 -1
- data/lib/uv/version.rb +1 -1
- data/lib/uv.rb +1 -1
- data/test/test_uv.rb +4 -4
- metadata +9 -9
- /data/syntax/{cucumber_plain_text_feature.syntax → cucumber.syntax} +0 -0
- /data/vendor/assets/stylesheets/{all_uv_themes.css.scss → all_uv_themes.css} +0 -0
@@ -9,28 +9,34 @@ module Uv
|
|
9
9
|
end
|
10
10
|
|
11
11
|
def Uv.find_syntaxes_by_first_line(first_line)
|
12
|
-
return
|
12
|
+
return [] if first_line == ''
|
13
13
|
puts "Searching syntaxes by first line..." if @debug
|
14
|
-
@syntaxes.values.compact.
|
15
|
-
return syntax_node if syntax_node && syntax_node.firstLineMatch && syntax_node.firstLineMatch =~ first_line
|
14
|
+
@syntaxes.values.compact.collect do |syntax_node|
|
15
|
+
return [syntax_node] if syntax_node && syntax_node.firstLineMatch && syntax_node.firstLineMatch =~ first_line
|
16
16
|
end
|
17
17
|
end
|
18
18
|
|
19
19
|
def Uv.find_syntaxes(extensions=[], first_line='', slow_search=false)
|
20
20
|
puts "Finding syntaxes for: Extensions: [#{extensions.join(', ')}], First Line: '#{first_line.inspect}'" if @debug
|
21
21
|
init_syntaxes if @syntaxes.empty?
|
22
|
-
|
22
|
+
syntaxes_found = []; extensions.delete(''); extensions.compact!
|
23
23
|
case slow_search
|
24
24
|
when false
|
25
|
-
|
25
|
+
syntaxes_found << load_syntax(extensions.first) unless extensions.empty?
|
26
26
|
when true
|
27
|
-
|
28
|
-
|
27
|
+
syntaxes_found += extensions.collect {|ext| find_syntaxes_by_ext(ext) }.flatten.compact
|
28
|
+
syntaxes_found += find_syntaxes_by_first_line(first_line) if syntaxes_found.empty?
|
29
29
|
end
|
30
|
-
|
31
|
-
|
32
|
-
puts "
|
33
|
-
|
30
|
+
syntaxes_found.compact!
|
31
|
+
syntaxes_found << default_syntax(extensions) if syntaxes_found.empty?
|
32
|
+
puts "Syntaxes found: [#{syntaxes_found.collect(&:name).join(', ')}]" if @debug and not syntaxes_found.empty?
|
33
|
+
syntaxes_found
|
34
|
+
end
|
35
|
+
|
36
|
+
def Uv.default_syntax(extensions)
|
37
|
+
puts "Uv Error: No syntax match found for '#{extensions.join(', ')}', defaulting to 'plain_text' syntax" if @debug
|
38
|
+
raise "Uv Error: Syntax files failed to load (No 'plain_text' parser was loaded). Loaded syntaxes: [#{@syntaxes.keys.join(', ')}]" unless load_syntax('plain_text')
|
39
|
+
load_syntax('plain_text')
|
34
40
|
end
|
35
41
|
|
36
42
|
|
data/lib/uv/syntaxes.rb
CHANGED
@@ -38,7 +38,7 @@ module Uv
|
|
38
38
|
rescue => e
|
39
39
|
puts "Error in loading syntax: #{syntax_name}. Returning: #{@syntaxes[syntax_name].class}. Error: #{e.message}" if @debug
|
40
40
|
end
|
41
|
-
|
41
|
+
@syntaxes[syntax_name]
|
42
42
|
end
|
43
43
|
|
44
44
|
def Uv.load_syntax_declared_file_types(syntax_node)
|
data/lib/uv/version.rb
CHANGED
data/lib/uv.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
#encoding: ascii-8bit
|
2
|
+
require 'uv/engine' if defined?(Rails)
|
2
3
|
require 'fileutils'
|
3
4
|
require 'textpow'
|
4
5
|
require 'uv/render_processor'
|
@@ -6,7 +7,6 @@ require "uv/version"
|
|
6
7
|
require "uv/finding_syntax_nodes"
|
7
8
|
require "uv/syntaxes"
|
8
9
|
require 'uv/utility'
|
9
|
-
require 'uv/engine' if defined?(Rails)
|
10
10
|
|
11
11
|
|
12
12
|
module Uv
|
data/test/test_uv.rb
CHANGED
@@ -11,6 +11,7 @@ class UvTest < Test::Unit::TestCase
|
|
11
11
|
|
12
12
|
def test_parses_blank
|
13
13
|
assert_equal %(<pre class="mac_classic"></pre>), Uv.parse('', 'xhtml', 'css')
|
14
|
+
assert_equal %(<pre class="mac_classic"></pre>), Uv.parse('', 'xhtml', 'bad_extension')
|
14
15
|
end
|
15
16
|
|
16
17
|
def test_init_syntaxes
|
@@ -22,16 +23,15 @@ class UvTest < Test::Unit::TestCase
|
|
22
23
|
end
|
23
24
|
|
24
25
|
def test_find_syntaxes_by_ext
|
25
|
-
Uv.init_syntaxes
|
26
26
|
assert_instance_of Array, Uv.find_syntaxes_by_ext("css")
|
27
27
|
assert_instance_of Textpow::SyntaxNode, Uv.find_syntaxes_by_ext("css").first
|
28
28
|
assert_equal "CSS", Uv.find_syntaxes_by_ext("css").first.name
|
29
29
|
end
|
30
30
|
|
31
31
|
def test_find_syntaxes
|
32
|
-
assert_equal
|
33
|
-
assert_equal
|
34
|
-
assert_equal
|
32
|
+
assert_equal "Plain Text", Uv.find_syntaxes(["not_a_syntax_ext"]).first.name
|
33
|
+
assert_equal "Plain Text", Uv.find_syntaxes(['']).first.name
|
34
|
+
assert_equal "Plain Text", Uv.find_syntaxes([]).first.name
|
35
35
|
end
|
36
36
|
|
37
37
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: uv
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.7.
|
4
|
+
version: 0.0.7.4
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -14,7 +14,7 @@ date: 2011-10-04 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: spox-textpow
|
17
|
-
requirement: &
|
17
|
+
requirement: &70183553505880 !ruby/object:Gem::Requirement
|
18
18
|
none: false
|
19
19
|
requirements:
|
20
20
|
- - ! '>='
|
@@ -22,10 +22,10 @@ dependencies:
|
|
22
22
|
version: '0'
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
|
-
version_requirements: *
|
25
|
+
version_requirements: *70183553505880
|
26
26
|
- !ruby/object:Gem::Dependency
|
27
27
|
name: spox-plist
|
28
|
-
requirement: &
|
28
|
+
requirement: &70183553505340 !ruby/object:Gem::Requirement
|
29
29
|
none: false
|
30
30
|
requirements:
|
31
31
|
- - ! '>='
|
@@ -33,10 +33,10 @@ dependencies:
|
|
33
33
|
version: '0'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
|
-
version_requirements: *
|
36
|
+
version_requirements: *70183553505340
|
37
37
|
- !ruby/object:Gem::Dependency
|
38
38
|
name: rake
|
39
|
-
requirement: &
|
39
|
+
requirement: &70183553504900 !ruby/object:Gem::Requirement
|
40
40
|
none: false
|
41
41
|
requirements:
|
42
42
|
- - ! '>='
|
@@ -44,7 +44,7 @@ dependencies:
|
|
44
44
|
version: '0'
|
45
45
|
type: :development
|
46
46
|
prerelease: false
|
47
|
-
version_requirements: *
|
47
|
+
version_requirements: *70183553504900
|
48
48
|
description: Ruby powered syntax highlighting. Ruby 1.9 port of Ultraviolet
|
49
49
|
email:
|
50
50
|
- spox@modspox.com
|
@@ -143,7 +143,7 @@ files:
|
|
143
143
|
- syntax/css_experimental.syntax
|
144
144
|
- syntax/css_zen.syntax
|
145
145
|
- syntax/csv.syntax
|
146
|
-
- syntax/
|
146
|
+
- syntax/cucumber.syntax
|
147
147
|
- syntax/cucumber_steps.syntax
|
148
148
|
- syntax/d.syntax
|
149
149
|
- syntax/diff.syntax
|
@@ -274,7 +274,7 @@ files:
|
|
274
274
|
- uv.gemspec
|
275
275
|
- vendor/assets/stylesheets/active4d.css
|
276
276
|
- vendor/assets/stylesheets/all_hallows_eve.css
|
277
|
-
- vendor/assets/stylesheets/all_uv_themes.css
|
277
|
+
- vendor/assets/stylesheets/all_uv_themes.css
|
278
278
|
- vendor/assets/stylesheets/amy.css
|
279
279
|
- vendor/assets/stylesheets/blackboard.css
|
280
280
|
- vendor/assets/stylesheets/brilliance_black.css
|
File without changes
|
File without changes
|