highlight 1.1.3 → 1.1.4

data/HISTORY.md

@@ -1,9 +1,16 @@
+v1.1.2
+------
+
+* first gem version
+
 v1.1.3
 ------
 
-* fixed file permissions
+* added new supported language NASM
 
-v1.1.2
+v1.1.4
 ------
 
-* first gem version
+* switched to new web API
+* cleaned up internals
+* fixed Rails 3 generator

data/README.md

@@ -6,7 +6,7 @@ wrapper around the popular [http://pygments.org](http://pygments.org) highlighte
 written in Python and supports an impressive number of languages.
 
 If pygments is installed on the machine and in the `PATH`, that binary is used, otherwise
-the plugin falls back to the web API at [http://pygments.appspot.com/](http://pygments.appspot.com/),
+the plugin falls back to the web API at [http://pygments.simplabs.com/](http://pygments.simplabs.com/),
 created by Trevor Turk.
 
 See the API docs at [http://rdoc.info/projects/simplabs/highlight](http://rdoc.info/projects/simplabs/highlight).
@@ -108,7 +108,7 @@ your application's `public/stylesheets` directory via
 
 for Rails 2.x or via
 
-    rails generate highlight_styles
+    ./script/rails generate highlight_styles
 
 for Rails 3.
 
@@ -128,5 +128,3 @@ Acknowledgements
 ----------------
 
 The actual highlighting is done by Pygments ([http://pygments.org](http://pygments.org)).
-
-The pygments web API at [http://pygments.appspot.com/](http://pygments.appspot.com/) was created by Trevor Turk.

data/generators/highlight_styles_generator/highlight_styles_generator.rb

@@ -4,10 +4,12 @@ if Rails::VERSION::MAJOR >= 3
 
     include Rails::Generators::Actions
 
+    source_root File.expand_path('../templates', __FILE__)
+
     def create_stylesheet_file
       empty_directory('public/stylesheets')
       copy_file(
-        File.join(File.dirname(__FILE__), 'templates', 'highlight.css'),
+        'highlight.css',
         'public/stylesheets/highlight.css'
       )
       readme(File.join(File.dirname(__FILE__), 'templates', 'NOTES'))

data/lib/simplabs/highlight.rb

@@ -13,7 +13,7 @@ module Simplabs
   # highlighter that's written in Python and supports an impressive
   # number of languages. If pygments is installed on the machine and in
   # the +PATH+, that binary is used, otherwise the plugin falls back
-  # to the web API at (http://pygments.appspot.com/), created by Trevor
+  # to the web API at (http://pygments.simplabs.com/), created by Trevor
   # Turk.
   #
   # <b>Supported Languages</b>
@@ -95,7 +95,7 @@ module Simplabs
       :yaml          => ['yaml', 'yml']
     }
 
-    WEB_API_URL = 'http://pygments.appspot.com/'
+    WEB_API_URL = 'http://pygments.simplabs.com/'
 
     # Highlights the passed +code+ with the appropriate rules
     # according to the specified +language+.

data/spec/boot.rb

@@ -1,14 +1,6 @@
 plugin_root = File.join(File.dirname(__FILE__), '..')
 
-$:.unshift "#{plugin_root}/lib"
-
-Bundler.require
+require 'activesupport'
 require 'initializer'
 
-RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
-Rails::Initializer.run(:set_load_path)
-Rails::Initializer.run(:set_autoload_paths)
-
 require File.join(File.dirname(__FILE__), '/../rails/init.rb')
-
-FileUtils.mkdir_p(File.join(File.dirname(__FILE__), 'log'))

data/spec/lib/highlight_spec.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Simplabs::Highlight do
 
-  before do
-    @code = <<-EOC
+  let(:code) do
+    <<-EOC
 class Test
   def method test
   end
@@ -13,12 +13,12 @@ EOC
 
   describe '#highlight' do
 
-    share_examples_for 'the highlight method' do
+    shared_examples 'the highlight method' do
 
       describe 'when the language is not supported' do
 
         it 'should only escape HTML in the passed code' do
-          Simplabs::Highlight.highlight(:unsupported, @code).should == CGI.escapeHTML(@code)
+          expect(Simplabs::Highlight.highlight(:unsupported, code)).to eq(CGI.escapeHTML(code))
         end
 
       end
@@ -26,7 +26,9 @@ EOC
       describe 'when the language is supported' do
 
         it 'should correctly highlight source code passed as parameter' do
-          Simplabs::Highlight.highlight(:ruby, @code).should == %Q(<span class="k">class</span> <span class="nc">Test</span>\n  <span class="k">def</span> <span class="nf">method</span> <span class="nb">test</span>\n  <span class="k">end</span>\n<span class="k">end</span>)
+          expect(Simplabs::Highlight.highlight(:ruby, code)).to eq(
+            %Q(<span class="k">class</span> <span class="nc">Test</span>\n  <span class="k">def</span> <span class="nf">method</span> <span class="nb">test</span>\n  <span class="k">end</span>\n<span class="k">end</span>)
+          )
         end
 
       end
@@ -39,14 +41,14 @@ EOC
         Simplabs::Highlight.use_web_api = false
       end
 
-      it_should_behave_like 'the highlight method'
+      it_behaves_like 'the highlight method'
 
       it 'should initialize a Simplabs::PygmentsWrapper.highlight with the language and code' do
-        wrapper = Simplabs::Highlight::PygmentsWrapper.new(@code, :ruby)
+        wrapper = Simplabs::Highlight::PygmentsWrapper.new(code, :ruby)
 
-        Simplabs::Highlight::PygmentsWrapper.should_receive(:new).once.with(@code, :ruby).and_return(wrapper)
+        Simplabs::Highlight::PygmentsWrapper.should_receive(:new).once.with(code, :ruby).and_return(wrapper)
 
-        Simplabs::Highlight.highlight(:ruby, @code)
+        Simplabs::Highlight.highlight(:ruby, code)
       end
 
     end
@@ -57,7 +59,7 @@ EOC
         Simplabs::Highlight.use_web_api = true
       end
 
-      it_should_behave_like 'the highlight method'
+      it_behaves_like 'the highlight method'
 
     end
 
@@ -68,7 +70,7 @@ EOC
     describe 'for an unsupported language' do
 
       it 'should return false' do
-        Simplabs::Highlight.send(:get_language_sym, 'unsupported language').should == false
+        expect(Simplabs::Highlight.send(:get_language_sym, 'unsupported language')).to be_false
       end
 
     end
@@ -76,11 +78,11 @@ EOC
     describe 'for a supported language' do
 
       it 'should return the respective symbol when the languages was given as String' do
-        Simplabs::Highlight.send(:get_language_sym, 'ruby').should == :ruby
+        expect(Simplabs::Highlight.send(:get_language_sym, 'ruby')).to eq(:ruby)
       end
 
       it 'should return the respective symbol when the languages was given as Symbol' do
-        Simplabs::Highlight.send(:get_language_sym, :rb).should == :ruby
+        expect(Simplabs::Highlight.send(:get_language_sym, :rb)).to eq(:ruby)
       end
 
     end

data/spec/lib/pygments_wrapper_spec.rb

@@ -1,21 +1,23 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Simplabs::Highlight::PygmentsWrapper do
 
-  before do
+  let(:wrapper) do
     code = <<-EOC
 class Test
   def method test
   end
 end
 EOC
-    @wrapper = Simplabs::Highlight::PygmentsWrapper.new(code, :ruby)
+    Simplabs::Highlight::PygmentsWrapper.new(code, :ruby)
   end
 
   describe '#highlight' do
 
     it 'should correctly highlight source code passed as parameter' do
-      @wrapper.highlight.should == %Q(<span class="k">class</span> <span class="nc">Test</span>\n  <span class="k">def</span> <span class="nf">method</span> <span class="nb">test</span>\n  <span class="k">end</span>\n<span class="k">end</span>)
+      expect(wrapper.highlight).to eq(
+        %Q(<span class="k">class</span> <span class="nc">Test</span>\n  <span class="k">def</span> <span class="nf">method</span> <span class="nb">test</span>\n  <span class="k">end</span>\n<span class="k">end</span>)
+      )
     end
 
   end

data/spec/lib/view_methods_spec.rb

@@ -1,21 +1,19 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Simplabs::Highlight::ViewMethods do
 
   include Simplabs::Highlight::ViewMethods
 
-  before do
-    @ruby_code = 'class Test; end'
-  end
+  let(:code) { 'class Test; end' }
 
   describe '#highlight_code' do
 
     describe 'when invoked with a language and a string' do
 
       it 'should highlight the code' do
-        Simplabs::Highlight.should_receive(:highlight).once.with(:ruby, @ruby_code)
+        Simplabs::Highlight.should_receive(:highlight).once.with(:ruby, code)
 
-        highlight_code(:ruby, @ruby_code)
+        highlight_code(:ruby, code)
       end
 
     end
@@ -23,10 +21,10 @@ describe Simplabs::Highlight::ViewMethods do
     describe 'when invoked with a language and a block' do
 
       it 'should highlight the code' do
-        Simplabs::Highlight.should_receive(:highlight).once.with(:ruby, @ruby_code)
+        Simplabs::Highlight.should_receive(:highlight).once.with(:ruby, code)
 
         highlight_code(:ruby) do
-          @ruby_code
+          code
         end
       end
 
@@ -35,7 +33,7 @@ describe Simplabs::Highlight::ViewMethods do
     describe 'when invoked with both a string and a block' do
 
       it 'should raise an ArgumentError' do
-        lambda { highlight_code(:ruby, @ruby_code) { @ruby_code } }.should raise_error(ArgumentError)
+        expect { highlight_code(:ruby, code) { code } }.to raise_error(ArgumentError)
       end
 
     end
@@ -43,7 +41,7 @@ describe Simplabs::Highlight::ViewMethods do
     describe 'when invoked with neither a string nor a block' do
 
       it 'should raise an ArgumentError' do
-        lambda { highlight_code(:ruby) }.should raise_error(ArgumentError)
+        expect { highlight_code(:ruby) }.to raise_error(ArgumentError)
       end
 
     end

metadata

@@ -1,51 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: highlight
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.1.4
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 3
-  version: 1.1.3
 platform: ruby
-authors: 
+authors:
 - Marco Otte-Witte
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-05-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70334546100500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id001
-description: Highlight highlights code in more than 20 languages. It uses the Pygments syntax highlighter and adds a simple Ruby API over it. It also provides helpers for use in your Ruby on Rails views.
+  prerelease: false
+  version_requirements: *70334546100500
+description: Highlight highlights code in more than 20 languages. It uses the Pygments
+  syntax highlighter and adds a simple Ruby API over it. It also provides helpers
+  for use in your Ruby on Rails views.
 email: info@simplabs.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - HISTORY.md
-- Rakefile
-- MIT-LICENSE
+- LICENSE
 - generators/highlight_styles_generator/highlight_styles_generator.rb
 - generators/highlight_styles_generator/templates/highlight.css
 - generators/highlight_styles_generator/templates/NOTES
@@ -58,39 +45,29 @@ files:
 - spec/lib/pygments_wrapper_spec.rb
 - spec/lib/view_methods_spec.rb
 - spec/spec_helper.rb
-- spec/spec.opts
 homepage: http://github.com/simplabs/highlight
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 2
 summary: Syntax Higlighting plugin for Ruby on Rails
 test_files: []
-
+has_rdoc: false

data/Rakefile

@@ -1,30 +0,0 @@
-require 'rubygems'
-require 'bundler'
- 
-Bundler.setup
-Bundler.require
- 
-require 'spec/rake/spectask'
-require 'simplabs/excellent/rake'
- 
-desc 'Default: run specs.'
-task :default => :spec
-
-desc 'Run the specs'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.rcov_opts  << '--exclude "gems/*,spec/*,init.rb"'
-  t.rcov       = true
-  t.rcov_dir   = 'doc/coverage'
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-desc 'Generate The Highlight documentation'
-YARD::Rake::YardocTask.new(:doc) do |t|
-  t.files   = ['lib/**/*.rb']
-  t.options = ['--no-private', '--title', 'Highlight Documentation']
-end
-
-desc 'Analyse the Highlight source with Excellent.'
-Simplabs::Excellent::Rake::ExcellentTask.new(:excellent) do |t|
-  t.paths = ['lib']
-end

data/spec/spec.opts

@@ -1,4 +0,0 @@
---colour
---format specdoc
---loadby mtime
---reverse