dasil003-tm_syntax_highlighting 1.9.0 → 2.0.0

data/README.md

@@ -1,26 +1,40 @@
 # TmSyntaxHighlighting
 
+## Important Version 2.0 Notes
+
+This fork of the original tm_syntax_highlithing gem was created for ruby 1.9 compatibility at a time when the
+`ultraviolet` gem did not support it.  This was done with the `spox-ultraviolet` fork, however this fork did not support
+ruby 1.9.3.  The original `ultraviolet` gem has since released a 1.0.0 version that *does* support 1.9.3, and ostensibly
+1.8.7 as well (though I have no plans to test that).
+
+**Important: Make sure you don't have spox-ultraviolet installed or it may supercede the regular ultraviolet and break
+Ruby 1.9.3**
+
+So the 2.0 version of this gem should have greatly improved compatibility, but note that the underlying libraries
+introduced new lang identifiers, so for instance, 'ruby' must be specified as 'source.ruby'.  If you're using this
+plugin you wall want to audit your lang strings for correctness.
+
 
 
 ## Gems, Generators and Versions
 
-TextMate theme based highlighting for Ruby 1.9.2 and Rails 3.
+TextMate theme based highlighting for Rails 3.
 
-This plugin was originally written by Arya Asemanfar.  Rails 3 generator and 1.9.2 compatibility by Gabe da Silveira.
+This plugin was originally written by Arya Asemanfar.  Rails 3 generator and 1.9.x compatibility by Gabe da Silveira.
 
-I namespaced it as dasil003-tm_syntax_highlighting to avoid interference with the original. **This version is incompatible
-with Ruby 1.8.x**
+I namespaced it as dasil003-tm_syntax_highlighting to avoid interference with the original.
 
 
 
 ## Installation
 
-You may remember the setup for this plugin being complicated.  Well that was in Ruby 1.8 land.  Ruby 1.9 has oniguruma
-built-in and thus everything becomes much less painful:
+On Ruby 1.9 you simply install the gem:
 
     $ gem install dasil003-tm_syntax_highlighting
 
-which will also install `spox-ultraviolet`, the covertly 1.9 compatible version of ultraviolet.
+On Ruby 1.8 you will need to install Oniguruma (http://www.geocities.jp/kosako3/oniguruma/).  I haven't
+actually tested this gem under Oniguruma, but `ultraviolet` claims support, so I will too.  If there is a problem in
+1.8, please feel free to submit a patch.
 
 
 
@@ -41,7 +55,7 @@ The plugin adds 2 view helper methods: `code` and `syntax_css`
 
 ### code (helper method) usage
 
-    code(some_ruby_code, :theme => "twilight", :lang => "ruby", :line_numbers => true)
+    code(some_ruby_code, :theme => "twilight", :lang => "source.ruby", :line_numbers => true)
 
 `lang` and `line_numbers` are optional. `lang` will default to plain_text and `line_numbers` will default to true.
 
@@ -52,7 +66,7 @@ Theme can be an array, and one will be chosen at random.
 You can set defaults in an initializer:
 
     # config/initializers/tm_syntax_config.rb
-    TmSyntaxHighlighting.defaults = {:theme => "sunburst", :line_numbers => true, :lang => "ruby"}
+    TmSyntaxHighlighting.defaults = {:theme => "sunburst", :line_numbers => true, :lang => "source.ruby"}
 
 Again, theme can be an array and will be chosen at random.
 

data/Rakefile

@@ -11,29 +11,3 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
-
-desc 'Generate documentation for the tm_syntax_highlighting plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'TmSyntaxHighlighting'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "dasil003-tm_syntax_highlighting"
-    gemspec.summary = "Ruby 1.9.2 / Rails 3 plugin to highlight code"
-    gemspec.description = "Uses the spox-ultraviolet gem to highlight any language that TextMate can highlight, and has a (Thor) generator to generate the relevant CSS files."
-    gemspec.email = "gabe@websaviour.com"
-    gemspec.homepage = "http://github.com/dasil003/tm_syntax_highlighting"
-    gemspec.authors = ["Arya Asemanfar", "Gabe da Silveira"]
-
-    gemspec.add_dependency('spox-ultraviolet')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end

data/lib/tm_syntax_highlighting/base.rb

@@ -3,7 +3,7 @@ module TmSyntaxHighlighting
     def code(code, options = {})
       options = TmSyntaxHighlighting.defaults.merge_with(options)
       TmSyntaxHighlighting.defaults[:current_themes] << options[:theme]
-      options[:lang] = "plain_text" unless Uv.syntaxes.include?(options[:lang])
+      options[:lang] = "text.plain" unless Uv.syntaxes.include?(options[:lang])
       Uv.parse(code, "xhtml", options[:lang], options[:line_numbers], options[:theme])
     end
 

metadata

@@ -1,87 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dasil003-tm_syntax_highlighting
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 9
-  - 0
-  version: 1.9.0
+version: !ruby/object:Gem::Version
+  version: 2.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Arya Asemanfar
 - Gabe da Silveira
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-17 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: spox-ultraviolet
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-10-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ultraviolet
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: Uses the spox-ultraviolet gem to highlight any language that TextMate can highlight, and has a (Thor) generator to generate the relevant CSS files.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Uses the Ultraviolet gem to highlight any language that TextMate can
+  highlight, and has a (Thor) generator to generate the relevant CSS files.
 email: gabe@websaviour.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- VERSION
-- dasil003-tm_syntax_highlighting.gemspec
 - lib/generators/USAGE
 - lib/generators/syntax_css_generator.rb
 - lib/tm_syntax_highlighting.rb
 - lib/tm_syntax_highlighting/base.rb
-- test/tm_syntax_highlighting_test.rb
-- tm_syntax_highlighting.gemspec
-has_rdoc: true
-homepage: http://github.com/dasil003/tm_syntax_highlighting
+homepage: http://github.com/gtd/tm_syntax_highlighting
 licenses: []
-
 post_install_message: 
-rdoc_options: []
-
-require_paths: 
+rdoc_options:
+- --charset=UTF-8
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Ruby 1.9.2 / Rails 3 plugin to highlight code
-test_files: 
-- test/tm_syntax_highlighting_test.rb
+summary: Code highlighting for ActionView 3
+test_files: []
+has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-1.9.0

data/dasil003-tm_syntax_highlighting.gemspec

@@ -1,52 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{dasil003-tm_syntax_highlighting}
-  s.version = "1.9.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Arya Asemanfar", "Gabe da Silveira"]
-  s.date = %q{2010-11-17}
-  s.description = %q{Uses the spox-ultraviolet gem to highlight any language that TextMate can highlight, and has a (Thor) generator to generate the relevant CSS files.}
-  s.email = %q{gabe@websaviour.com}
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "MIT-LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "dasil003-tm_syntax_highlighting.gemspec",
-    "lib/generators/USAGE",
-    "lib/generators/syntax_css_generator.rb",
-    "lib/tm_syntax_highlighting.rb",
-    "lib/tm_syntax_highlighting/base.rb",
-    "test/tm_syntax_highlighting_test.rb",
-    "tm_syntax_highlighting.gemspec"
-  ]
-  s.homepage = %q{http://github.com/dasil003/tm_syntax_highlighting}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Ruby 1.9.2 / Rails 3 plugin to highlight code}
-  s.test_files = [
-    "test/tm_syntax_highlighting_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<spox-ultraviolet>, [">= 0"])
-    else
-      s.add_dependency(%q<spox-ultraviolet>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<spox-ultraviolet>, [">= 0"])
-  end
-end
-

data/test/tm_syntax_highlighting_test.rb

@@ -1,21 +0,0 @@
-require 'tm_syntax_highlighting'
-require 'test/unit'
-
-class TmSyntaxHighlightingTest < Test::Unit::TestCase
-  def test_action_controller_methods_inclusion
-    assert ActionController::Base.instance_methods.include?(:reset_syntax_css_includes)
-  end
-
-  def test_action_view_methods_inclusion
-    assert ActionView::Base.instance_methods.include?(:code), ':code not included'
-    assert ActionView::Base.instance_methods.include?(:syntax_css), ':syntax_css not included'
-  end
-
-  def test_code_helper
-    @view = ActionView::Base.new
-    html = @view.code("def ruby_method(param)\n  return :foo\nend", :lang => 'ruby')
-    assert_match /span class="line-numbers"/, html, "no line number span found"
-    assert_match /span class="Keyword"/, html, "no keyword span found"
-    assert_match /span class="FunctionName"/, html, "no function name span found"
-  end
-end

data/tm_syntax_highlighting.gemspec

@@ -1,55 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{tm_syntax_highlighting}
-  s.version = "1.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Arya Asemanfar", "Gabe da Silveira"]
-  s.date = %q{2010-01-21}
-  s.description = %q{Uses the Ultraviolet gem to highlight any language that TextMate can highlight, and has a (Thor) generator to generate the relevant CSS files.}
-  s.email = %q{gabe@websaviour.com}
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "install.rb",
-     "lib/generators/USAGE",
-     "lib/generators/syntax_css_generator.rb",
-     "lib/tm_syntax_highlighting.rb",
-     "lib/tm_syntax_highlighting/base.rb",
-     "test/tm_syntax_highlighting_test.rb",
-     "tm_syntax_highlighting.gemspec",
-     "uninstall.rb"
-  ]
-  s.homepage = %q{http://github.com/dasil003/tm_syntax_highlighting}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Gem plugin for Rails 3 to highlight code}
-  s.test_files = [
-    "test/tm_syntax_highlighting_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ultraviolet>, [">= 0"])
-    else
-      s.add_dependency(%q<ultraviolet>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<ultraviolet>, [">= 0"])
-  end
-end
-