jekyll-ultraviolet 0.0.1 → 0.0.2

data/jekyll-ultraviolet.gemspec

@@ -13,4 +13,8 @@ Gem::Specification.new do |gem|
   gem.name          = "jekyll-ultraviolet"
   gem.require_paths = ["lib"]
   gem.version       = Jekyll::Ultraviolet::VERSION
+
+  gem.add_dependency "liquid"
+  gem.add_dependency "spox-ultraviolet"
+  gem.add_development_dependency "rspec", "~> 2.6.0"
 end

data/lib/jekyll/ultraviolet.rb

@@ -1,30 +1,40 @@
-require 'uv'
+require "uv"
+require "liquid"
+# Psych can't parse some of the syntax/theme files
+YAML::ENGINE.yamler = "syck"
 
 module Jekyll
   module Ultraviolet
-    class << self; attr_accessor :theme; end
-    
-    def self.initialize
-      @theme = "twilight"
-    end
-    
+    class << self; attr_accessor :theme end
+
     class Block < Liquid::Block
       include Liquid::StandardFilters
-      
+
       def initialize(tag, lang, tokens)
         super
-        @lang = (lang.strip unless lang.empty?) || "ruby"
+        @theme = "twilight"
+        @lang  = lang.strip rescue "ruby"
       end
-      
+
       def render(context)
         output = []
         output << context["pygments_prefix"]
-        output << Uv.parse(super.join, "xhtml", @lang, false, Ultraviolet.theme)
+        output << Uv.parse(remove_leading_spaces(super.join), "xhtml", @lang, false, theme)
         output << context["pygments_suffix"]
         output.join
       rescue LoadError
         raise "Ultraviolet not installed."
       end
+
+      def remove_leading_spaces(text)
+        padding = text.match(/\n?(\s+)/)[1]
+        return text if padding == "\n"
+        text.each_line.map { |l| l.gsub(/^#{padding}/, "") }.join
+      end
+
+      def theme
+        Jekyll::Ultraviolet.theme || @theme
+      end
     end
   end
 end

data/lib/jekyll/ultraviolet/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Ultraviolet
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + "/../lib/jekyll/ultraviolet"
+require File.dirname(__FILE__) + "/support/highlighting"

data/spec/support/highlighting.rb

@@ -0,0 +1,43 @@
+module HighlighedTextHelpers
+  def text
+    <<-TEXT
+This is a code example:
+{% uv ruby %}
+  def awesome
+    puts "AWESOME"
+  end
+{% enduv %}
+And other stuff.
+    TEXT
+  end
+
+  def expected
+    <<-TEXT
+This is a code example:
+<pre class="twilight">
+<span class="Keyword">def</span> <span class="Entity">awesome</span>
+  puts <span class="String"><span class="String">&quot;</span>AWESOME<span class="String">&quot;</span></span>
+<span class="Keyword">end</span>
+</pre>
+And other stuff.
+    TEXT
+  end
+
+  def text_python
+    <<-TEXT
+This is Python:
+{% uv python %}
+  len(0)
+{% enduv %}
+    TEXT
+  end
+
+  def expected_python
+    <<-TEXT
+This is Python:
+<pre class="twilight">
+<span class="SupportFunction">len</span>(<span class="Constant">0</span>)
+</pre>
+    TEXT
+  end
+end

data/spec/ultraviolet_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe Jekyll::Ultraviolet do
+  include HighlighedTextHelpers
+
+  before do
+    Jekyll::Ultraviolet.theme = nil
+  end
+
+  def rendered(source)
+    Liquid::Template.parse(source).render
+  end
+
+  it "parses uv blocks into syntax highlighted code" do
+    rendered(text).should == expected
+  end
+
+  it "allow indenting within {% uv %} but proportionately remove it in output" do
+    rendered(text).split("\n")[2].should =~ /^[^\s]+/
+  end
+
+  it "allows the theme to be set" do
+    Jekyll::Ultraviolet.theme = "amy"
+    rendered(text).should =~ /<pre class="amy">/
+  end
+
+  it "supports specifying a language" do
+    rendered(text_python).should == expected_python
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ultraviolet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-20 00:00:00.000000000Z
-dependencies: []
+date: 2011-10-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: &70367021988580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70367021988580
+- !ruby/object:Gem::Dependency
+  name: spox-ultraviolet
+  requirement: &70367021979020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70367021979020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70367021978240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *70367021978240
 description: Ultraviolet syntax highlighting in Jekyll
 email:
 - me@mattenoble.com
@@ -24,6 +57,9 @@ files:
 - jekyll-ultraviolet.gemspec
 - lib/jekyll/ultraviolet.rb
 - lib/jekyll/ultraviolet/version.rb
+- spec/spec_helper.rb
+- spec/support/highlighting.rb
+- spec/ultraviolet_spec.rb
 homepage: 
 licenses: []
 post_install_message: 
@@ -44,8 +80,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ultraviolet syntax highlighting in Jekyll
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/support/highlighting.rb
+- spec/ultraviolet_spec.rb