ultraviolet 1.0.0 → 1.0.1

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "_pages"]
 	path = _pages
-	url = git@github.com:grosser/ultraviolet.git
+	url = https://github.com/grosser/ultraviolet.git

data/.travis.yml

@@ -0,0 +1,6 @@
+before_install:
+  - sudo apt-get install -y libonig-dev
+rvm:
+  - ree
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -1,10 +1,9 @@
-source :rubygems
+source "https://rubygems.org"
 
-gem 'oniguruma', :platform => :ruby_18
-gem 'textpow', '>=1.3'
+gemspec
 
-group :dev do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rack'
-end
+gem 'oniguruma', :platform => :ruby_18
+gem 'bump'
+gem 'rake'
+gem 'rspec'
+gem 'rack'

data/Gemfile.lock

@@ -1,6 +1,13 @@
+PATH
+  remote: .
+  specs:
+    ultraviolet (1.0.1)
+      textpow (>= 1.3.0)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    bump (0.4.1)
     diff-lcs (1.1.3)
     oniguruma (1.1.0)
     plist (3.1.0)
@@ -14,15 +21,16 @@ GEM
     rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.2)
-    textpow (1.3.0)
+    textpow (1.3.1)
       plist (>= 3.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bump
   oniguruma
   rack
   rake
   rspec
-  textpow (>= 1.3)
+  ultraviolet!

data/Rakefile

@@ -1,22 +1,7 @@
+require "bundler/setup"
 require "bundler/gem_tasks"
+require "bump/tasks"
 
 task :default do
   sh "rspec spec/"
 end
-
-# extracted from https://github.com/grosser/project_template
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/uv/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
-end

data/Readme.md

@@ -87,3 +87,4 @@ Original author [Dizan Vasquez](https://github.com/dichodaemon).
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>
 License: MIT<br/>
+[![Build Status](https://secure.travis-ci.org/grosser/ultraviolet.png)](http://travis-ci.org/grosser/ultraviolet)

data/lib/uv.rb

@@ -7,25 +7,24 @@ require "uv/version"
 
 module Uv
   class << self
-    attr_accessor :render_path, :theme_path, :syntax_path, :default_style, :syntaxes
+    attr_accessor :render_path, :theme_path, :syntax_path, :default_style
   end
 
   self.syntax_path   = Textpow.syntax_path
   self.render_path   = File.join(File.dirname(__FILE__), '..', 'render')
   self.theme_path    = File.join(render_path, 'xhtml', 'files', 'css')
   self.default_style = 'mac_classic'
-  self.syntaxes      = {}
-  
+
   def self.path
     result = []
     result << File.join(File.dirname(__FILE__), ".." )
   end
 
   def self.syntax_node_for(syntax)
-    if @syntaxes.key?(syntax)
-      @syntaxes[syntax]
+    if syntax_nodes.key?(syntax)
+      syntax_nodes[syntax]
     else
-      @syntaxes[syntax] = Textpow.syntax(syntax) || raise(ArgumentError, "No syntax found for #{syntax}")
+      syntax_nodes[syntax] = Textpow.syntax(syntax) || raise(ArgumentError, "No syntax found for #{syntax}")
     end
   end
 
@@ -37,11 +36,16 @@ module Uv
   end
 
   def self.syntaxes
-    Dir.glob( File.join(@syntax_path, '*.syntax') ).collect do |f| 
+    Dir.glob( File.join(@syntax_path, '*.syntax') ).collect do |f|
       File.basename(f, '.syntax')
     end
   end
 
+  def self.syntax_nodes
+    @syntax_nodes ||= Hash[syntaxes.map { |name| [name, Textpow.syntax(name)] }]
+  end
+  private_class_method :syntax_nodes
+
   def self.themes
     Dir.glob( File.join(@theme_path, '*.css') ).collect do |f| 
       File.basename(f, '.css')
@@ -49,18 +53,15 @@ module Uv
   end
 
   def self.syntax_for_file(file_name)
-    init_syntaxes unless @syntaxes
-
     # get first non-empty line
     first_line = ""
     File.open( file_name, 'r' ) { |f|
       while (first_line = f.readline).strip.size == 0; end
     }
 
-
     # find syntax by file-extension
     result = []
-    @syntaxes.each do |key, syntax|
+    syntax_nodes.each do |key, syntax|
       assigned = false
       if syntax.fileTypes
         syntax.fileTypes.each do |t|

data/lib/uv/version.rb

@@ -1,3 +1,3 @@
 module Uv
-  Version = "1.0.0"
+  Version = "1.0.1"
 end

data/spec/ultraviolet_spec.rb

@@ -1,13 +1,18 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
+require "stringio"
 
 describe Uv do
-  # all 2 legacy tests ...
   it "parses blank" do
     Uv.parse('', 'xhtml', 'css').should == %(<pre class="mac_classic"></pre>)
   end
 
   it "debugs" do
-    STDERR.stub!(:puts) # silence
     Uv.debug('', 'css').is_a?(Textpow::DebugProcessor).should == true
   end
+
+  describe ".syntax_for_file" do
+    it "finds a syntax" do
+      Uv.syntax_for_file("lib/uv.rb").map(&:first).should == ["source.ruby"]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultraviolet
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textpow
@@ -41,6 +41,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitmodules
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -134,16 +135,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2407517066391602406
+      hash: 2810095283243012001
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2810095283243012001
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ultraviolet syntax highlighting gem for Ruby18 and Ruby19