visionmedia-lightr 0.0.6 → 0.0.7

data/lib/lightr/grammars/ruby.rb

@@ -4,8 +4,9 @@
 # TODO: have common ragel include
 # TODO: % literals (refactor with mirroring / escaping)
 # TODO: callback or wrap handlers ... dont re-write for each grammar like the lamdas below
+# TODO: fix globals and boundaries
 
-# line 63 "ext/ruby.rl"
+# line 64 "ext/ruby.rl"
 
 
 module Lightr
@@ -17,7 +18,7 @@ module Lightr
       @data = data
 
       
-# line 21 "lib/lightr/grammars/ruby.rb"
+# line 22 "lib/lightr/grammars/ruby.rb"
 class << self
 	attr_accessor :_ruby_trans_keys
 	private :_ruby_trans_keys, :_ruby_trans_keys=
@@ -5736,9 +5737,9 @@ class << self
 end
 self.ruby_en_main = 530;
 
-# line 74 "ext/ruby.rl"
+# line 75 "ext/ruby.rl"
       
-# line 5742 "lib/lightr/grammars/ruby.rb"
+# line 5743 "lib/lightr/grammars/ruby.rb"
 begin
 	p ||= 0
 	pe ||= data.length
@@ -5747,12 +5748,12 @@ begin
 	te = nil
 	act = 0
 end
-# line 75 "ext/ruby.rl"
+# line 76 "ext/ruby.rl"
       wrap = lambda { |range, *types| @output << %(<span class="#{ types.join(' ') }">#{ escape(@data[range]) }</span>) }
       node = lambda { |*types| wrap[ts..te-1, *types] }
       buffer = lambda { @output << @data[ts..te-1] }
       
-# line 5756 "lib/lightr/grammars/ruby.rb"
+# line 5757 "lib/lightr/grammars/ruby.rb"
 begin
 	testEof = false
 	_slen, _trans, _keys, _inds, _acts, _nacts = nil
@@ -5777,7 +5778,7 @@ begin
 ts = p
 		end
 # line 1 "ext/ruby.rl"
-# line 5781 "lib/lightr/grammars/ruby.rb"
+# line 5782 "lib/lightr/grammars/ruby.rb"
 	end
 	_keys = cs << 1
 	_inds = _ruby_index_offsets[cs]
@@ -5802,159 +5803,159 @@ te = p+1
 		end
 # line 1 "ext/ruby.rl"
 	when 6 then
-# line 44 "ext/ruby.rl"
+# line 45 "ext/ruby.rl"
 		begin
 te = p+1
  begin  node[:comment]              end
 		end
-# line 44 "ext/ruby.rl"
-	when 4 then
 # line 45 "ext/ruby.rl"
+	when 4 then
+# line 46 "ext/ruby.rl"
 		begin
 te = p+1
  begin  node[:string]               end
 		end
-# line 45 "ext/ruby.rl"
-	when 8 then
 # line 46 "ext/ruby.rl"
+	when 8 then
+# line 47 "ext/ruby.rl"
 		begin
 te = p+1
  begin  node[:string, :array]       end
 		end
-# line 46 "ext/ruby.rl"
+# line 47 "ext/ruby.rl"
 	when 11 then
-# line 48 "ext/ruby.rl"
+# line 49 "ext/ruby.rl"
 		begin
 te = p+1
  begin  node[:string, :symbol]      end
 		end
-# line 48 "ext/ruby.rl"
-	when 9 then
 # line 49 "ext/ruby.rl"
+	when 9 then
+# line 50 "ext/ruby.rl"
 		begin
 te = p+1
  begin  node[:shell]                end
 		end
-# line 49 "ext/ruby.rl"
+# line 50 "ext/ruby.rl"
 	when 14 then
-# line 53 "ext/ruby.rl"
+# line 54 "ext/ruby.rl"
 		begin
 te = p+1
  begin  node[:self]                 end
 		end
-# line 53 "ext/ruby.rl"
-	when 2 then
 # line 54 "ext/ruby.rl"
+	when 2 then
+# line 55 "ext/ruby.rl"
 		begin
 te = p+1
  begin  wrap[ts+1..te-2, :keyword]  end
 		end
-# line 54 "ext/ruby.rl"
+# line 55 "ext/ruby.rl"
 	when 15 then
-# line 56 "ext/ruby.rl"
+# line 57 "ext/ruby.rl"
 		begin
 te = p+1
  begin  node[:params]               end
 		end
-# line 56 "ext/ruby.rl"
+# line 57 "ext/ruby.rl"
 	when 19 then
-# line 60 "ext/ruby.rl"
+# line 61 "ext/ruby.rl"
 		begin
 te = p+1
  begin  buffer[]                    end
 		end
-# line 60 "ext/ruby.rl"
+# line 61 "ext/ruby.rl"
 	when 22 then
-# line 47 "ext/ruby.rl"
+# line 48 "ext/ruby.rl"
 		begin
 te = p
 p = p - 1; begin  node[:regexp]               end
 		end
-# line 47 "ext/ruby.rl"
-	when 26 then
 # line 48 "ext/ruby.rl"
+	when 26 then
+# line 49 "ext/ruby.rl"
 		begin
 te = p
 p = p - 1; begin  node[:string, :symbol]      end
 		end
-# line 48 "ext/ruby.rl"
+# line 49 "ext/ruby.rl"
 	when 23 then
-# line 50 "ext/ruby.rl"
+# line 51 "ext/ruby.rl"
 		begin
 te = p
 p = p - 1; begin  node[:number, :int]         end
 		end
-# line 50 "ext/ruby.rl"
-	when 25 then
 # line 51 "ext/ruby.rl"
+	when 25 then
+# line 52 "ext/ruby.rl"
 		begin
 te = p
 p = p - 1; begin  node[:number, :float]       end
 		end
-# line 51 "ext/ruby.rl"
-	when 24 then
 # line 52 "ext/ruby.rl"
+	when 24 then
+# line 53 "ext/ruby.rl"
 		begin
 te = p
 p = p - 1; begin  node[:number, :range]       end
 		end
-# line 52 "ext/ruby.rl"
+# line 53 "ext/ruby.rl"
 	when 21 then
-# line 54 "ext/ruby.rl"
+# line 55 "ext/ruby.rl"
 		begin
 te = p
 p = p - 1; begin  wrap[ts+1..te-2, :keyword]  end
 		end
-# line 54 "ext/ruby.rl"
-	when 29 then
 # line 55 "ext/ruby.rl"
+	when 29 then
+# line 56 "ext/ruby.rl"
 		begin
 te = p
 p = p - 1; begin  node[:constant]             end
 		end
-# line 55 "ext/ruby.rl"
+# line 56 "ext/ruby.rl"
 	when 27 then
-# line 57 "ext/ruby.rl"
+# line 58 "ext/ruby.rl"
 		begin
 te = p
 p = p - 1; begin  node[:variable, :class]     end
 		end
-# line 57 "ext/ruby.rl"
-	when 28 then
 # line 58 "ext/ruby.rl"
+	when 28 then
+# line 59 "ext/ruby.rl"
 		begin
 te = p
 p = p - 1; begin  node[:variable, :instance]  end
 		end
-# line 58 "ext/ruby.rl"
+# line 59 "ext/ruby.rl"
 	when 20 then
-# line 60 "ext/ruby.rl"
+# line 61 "ext/ruby.rl"
 		begin
 te = p
 p = p - 1; begin  buffer[]                    end
 		end
-# line 60 "ext/ruby.rl"
+# line 61 "ext/ruby.rl"
 	when 10 then
-# line 50 "ext/ruby.rl"
+# line 51 "ext/ruby.rl"
 		begin
  begin p = ((te))-1; end
  begin  node[:number, :int]         end
 		end
-# line 50 "ext/ruby.rl"
+# line 51 "ext/ruby.rl"
 	when 12 then
-# line 55 "ext/ruby.rl"
+# line 56 "ext/ruby.rl"
 		begin
  begin p = ((te))-1; end
  begin  node[:constant]             end
 		end
-# line 55 "ext/ruby.rl"
+# line 56 "ext/ruby.rl"
 	when 1 then
-# line 60 "ext/ruby.rl"
+# line 61 "ext/ruby.rl"
 		begin
  begin p = ((te))-1; end
  begin  buffer[]                    end
 		end
-# line 60 "ext/ruby.rl"
+# line 61 "ext/ruby.rl"
 	when 3 then
 # line 1 "ext/ruby.rl"
 		begin
@@ -5977,31 +5978,31 @@ end
 te = p+1
 		end
 # line 1 "ext/ruby.rl"
-# line 54 "ext/ruby.rl"
+# line 55 "ext/ruby.rl"
 		begin
 act = 11;		end
-# line 54 "ext/ruby.rl"
+# line 55 "ext/ruby.rl"
 	when 7 then
 # line 1 "ext/ruby.rl"
 		begin
 te = p+1
 		end
 # line 1 "ext/ruby.rl"
-# line 59 "ext/ruby.rl"
+# line 60 "ext/ruby.rl"
 		begin
 act = 16;		end
-# line 59 "ext/ruby.rl"
+# line 60 "ext/ruby.rl"
 	when 18 then
 # line 1 "ext/ruby.rl"
 		begin
 te = p+1
 		end
 # line 1 "ext/ruby.rl"
-# line 60 "ext/ruby.rl"
+# line 61 "ext/ruby.rl"
 		begin
 act = 17;		end
-# line 60 "ext/ruby.rl"
-# line 6005 "lib/lightr/grammars/ruby.rb"
+# line 61 "ext/ruby.rl"
+# line 6006 "lib/lightr/grammars/ruby.rb"
 	end
 	end
 	end
@@ -6012,7 +6013,7 @@ act = 17;		end
 		begin
 ts = nil;		end
 # line 1 "ext/ruby.rl"
-# line 6016 "lib/lightr/grammars/ruby.rb"
+# line 6017 "lib/lightr/grammars/ruby.rb"
 	end
 
 	p += 1
@@ -6036,7 +6037,7 @@ ts = nil;		end
 	end
 end
 	end
-# line 79 "ext/ruby.rl"
+# line 80 "ext/ruby.rl"
     
       output
     end

data/lib/lightr/version.rb

@@ -1,4 +1,4 @@
 
 module Lightr
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lightr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lightr}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]

data/spec/grammars/javascript_spec.rb

@@ -47,16 +47,7 @@ describe Lightr::JavaScript do
         
     it "constructors as constants" do
       parse('FooBar').should highlight(:constant, 'FooBar')
-      parse('FOOBAR').should highlight(:constant, 'FOOBAR')
-    end
-        
-    %w( if else break default case continue do delete true false class enum const final 
-    for function instanceof new null return throw try typeof var void with while finally in ).
-    each do |keyword|
-      it "#{keyword.strip} as a keyword" do
-        parse("\n#{keyword.strip} foo").should highlight(:keyword, keyword.strip)
-        parse("(#{keyword.strip})").should highlight(:keyword, keyword.strip)
-      end
+      parse('foo = FOOBAR').should highlight(:constant, 'FOOBAR')
     end
     
   end

data/spec/grammars/ruby_spec.rb

@@ -153,15 +153,6 @@ describe Lightr::Ruby do
       ruby.should include('class="string symbol">:foo')
       ruby.should include('class="keyword">__END__</span><span class="comment"')
     end
-        
-    %w( if else elsif unless retry super then true while until class module def end in alias 
-    BEGIN END begin break defined do nil not or and redo rescue return yield ).
-    each do |keyword|
-      it "#{keyword.strip} as a keyword" do
-        parse("\n#{keyword.strip} foo").should highlight(:keyword, keyword.strip)
-        parse("(#{keyword.strip})").should highlight(:keyword, keyword.strip)
-      end
-    end
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-lightr
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - TJ Holowaychuk