jackb 0.0.5 → 0.0.6.beta

data/.rvmrc

@@ -0,0 +1,3 @@
+rvm use 1.8.7@jackb
+rvm_gemset_create_on_use_flag=1
+rvm gemset use jacbk

data/Gemfile

@@ -2,7 +2,6 @@ source "http://rubygems.org"
 
 gem 'rdiscount'
 gem 'open4'
-gem 'albino'
 
 gem 'activesupport', '3.0.0.beta4'
 gem 'i18n'
@@ -10,6 +9,10 @@ gem 'tzinfo'
 
 gem 'jeweler'
 
+group :development do
+  gem 'albino'
+end
+
 group :test do
   gem 'test-unit', '1.2.3'
   gem 'rspec'

data/Gemfile.lock

@@ -0,0 +1,39 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.0.beta4)
+    albino (1.0)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    hoe (2.6.1)
+      rake (>= 0.8.7)
+      rubyforge (>= 2.0.4)
+    i18n (0.4.1)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    open4 (1.0.1)
+    rake (0.8.7)
+    rdiscount (1.6.5)
+    rspec (1.3.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
+    tzinfo (0.3.22)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (= 3.0.0.beta4)
+  albino
+  i18n
+  jeweler
+  open4
+  rdiscount
+  rspec
+  test-unit (= 1.2.3)
+  tzinfo

data/Rakefile

@@ -31,8 +31,7 @@ begin
     
     gemspec.add_dependency('rdiscount', '>= 1.6.3.2')
     gemspec.add_dependency('open4', '>= 1.0.1')
-    gemspec.add_dependency('albino', '>= 1.0')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
-end
+end

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6.beta

data/jackb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jackb}
-  s.version = "0.0.5"
+  s.version = "0.0.6.beta"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Damien MATHIEU"]
-  s.date = %q{2010-06-19}
+  s.date = %q{2010-08-17}
   s.description = %q{Takes some content and parses it depending of the format your specify (HTML or Markdown)}
   s.email = %q{42@dmathieu.com}
   s.extra_rdoc_files = [
@@ -17,7 +17,9 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     ".rvmrc",
      "Gemfile",
+     "Gemfile.lock",
      "README.md",
      "Rakefile",
      "VERSION",
@@ -35,13 +37,13 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dmathieu/jackb}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Is your content in HTML or Markdown ?}
   s.test_files = [
-    "spec/lib/highlight_spec.rb",
-     "spec/lib/html_spec.rb",
-     "spec/lib/jackb_spec.rb",
+    "spec/lib/jackb_spec.rb",
      "spec/lib/markdown_spec.rb",
+     "spec/lib/html_spec.rb",
+     "spec/lib/highlight_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -49,19 +51,16 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rdiscount>, [">= 1.6.3.2"])
       s.add_runtime_dependency(%q<open4>, [">= 1.0.1"])
-      s.add_runtime_dependency(%q<albino>, [">= 1.0"])
     else
       s.add_dependency(%q<rdiscount>, [">= 1.6.3.2"])
       s.add_dependency(%q<open4>, [">= 1.0.1"])
-      s.add_dependency(%q<albino>, [">= 1.0"])
     end
   else
     s.add_dependency(%q<rdiscount>, [">= 1.6.3.2"])
     s.add_dependency(%q<open4>, [">= 1.0.1"])
-    s.add_dependency(%q<albino>, [">= 1.0"])
   end
 end
 

data/lib/jackb/highlight.rb

@@ -1,4 +1,5 @@
-require 'albino'
+require 'net/http'
+require 'uri'
 
 module Jackb
   
@@ -9,7 +10,11 @@ module Jackb
   
     def render(content)
       content.gsub(highlight_regex) do |s|
-        Albino.new(unescape($2), extract_lang($1))
+        code, lang = unescape($2), extract_lang($1)
+        Net::HTTP.post_form(
+          URI.parse('http://pygments.appspot.com/'),
+          {:lang => lang, :code => code}
+        ).body
       end
     end
   
@@ -30,4 +35,4 @@ module Jackb
       /<pre><code([^<>]*)>(.*?)<\/code><\/pre>/im
     end
   end
-end
+end

data/spec/lib/highlight_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Jackb::Highlight do
   describe 'code highlighting' do
     it 'should highlight the code' do
-      Jackb::Highlight.render('<pre><code><%= "test" %></code></pre>').should eql(Albino.new('<%= "test" %>', :ruby).to_s)
+      Jackb::Highlight.render('<pre><code><%= "test" %></code></pre>').should eql(Albino.new('<%= "test" %>', :ruby).to_s + "\n")
     end
     
     it 'should highlight the code in an other language' do
-      Jackb::Highlight.render('<pre><code language="python"><%= "test" %></code></pre>').should eql(Albino.new('<%= "test" %>', :python).to_s)
+      Jackb::Highlight.render('<pre><code language="python"><%= "test" %></code></pre>').should eql(Albino.new('<%= "test" %>', :python).to_s + "\n")
     end
     
     describe 'unescape' do
@@ -33,4 +33,4 @@ describe Jackb::Highlight do
       end
     end
   end
-end
+end

data/spec/lib/html_spec.rb

@@ -8,16 +8,16 @@ describe Jackb::Html do
   end
   
   it 'should highlight the code' do
-    Jackb::Html.new('[code language="ruby"]<%= "test" %>[/code]').render.should eql(Albino.new('<%= "test" %>', :ruby).to_s)
+    Jackb::Html.new('[code language="ruby"]<%= "test" %>[/code]').render.should eql(Albino.new('<%= "test" %>', :ruby).to_s + "\n")
   end
   
   it 'should highlight multiple codes' do
     Jackb::Html.new('Some Text. [code language="ruby"]<%= "test" %>[/code]; some other text. [code language="python"]<%= "testing" %>[/code]').
-      render.should eql("Some Text. #{Albino.new('<%= "test" %>', :ruby).to_s}; some other text. #{Albino.new('<%= "testing" %>', :python).to_s}")
+      render.should eql("Some Text. #{Albino.new('<%= "test" %>', :ruby).to_s}\n; some other text. #{Albino.new('<%= "testing" %>', :python).to_s}\n")
   end
   
   it 'should highlight multiple codes with new lines' do
     Jackb::Html.new("Some Text. [code language='ruby']<%= 'test' %>\n\n<%= 'second' %>[/code]; some other text. [code language='python']<%= 'testing' %>[/code]").
-      render.should eql("Some Text. #{Albino.new("<%= 'test' %>\n\n<%= 'second' %>", :ruby).to_s}; some other text. #{Albino.new("<%= 'testing' %>", :python).to_s}")
+      render.should eql("Some Text. #{Albino.new("<%= 'test' %>\n\n<%= 'second' %>", :ruby).to_s}\n; some other text. #{Albino.new("<%= 'testing' %>", :python).to_s}\n")
   end
-end
+end

data/spec/lib/markdown_spec.rb

@@ -9,6 +9,6 @@ describe Jackb::Markdown do
   
   it 'should highlight the code' do
     Jackb::Markdown.new("Hey!\n\n    <%= \"test\" %>").render.
-    should eql("<p>Hey!</p>\n\n#{Albino.new('<%= "test" %>', :ruby).to_s}\n")
+    should eql("<p>Hey!</p>\n\n#{Albino.new('<%= "test" %>', :ruby).to_s}\n\n")
   end
-end
+end

data/spec/spec_helper.rb

@@ -6,4 +6,10 @@ rescue LoadError
   Bundler.setup
 end
 
-require 'lib/jackb'
+#
+# We're using Albino only for the tests
+# In order to avoid calling pygments.appspot every time
+# It's not required to launch the app
+require 'albino'
+
+require 'lib/jackb'

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: jackb
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 31098201
+  prerelease: true
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  - beta
+  version: 0.0.6.beta
 platform: ruby
 authors: 
 - Damien MATHIEU
@@ -14,14 +16,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-19 00:00:00 +02:00
+date: 2010-08-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 103
         segments: 
         - 1
         - 6
@@ -30,13 +35,15 @@ dependencies:
         version: 1.6.3.2
   name: rdiscount
   requirement: *id001
-  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -44,20 +51,6 @@ dependencies:
         version: 1.0.1
   name: open4
   requirement: *id002
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  name: albino
-  requirement: *id003
-  prerelease: false
   type: :runtime
 description: Takes some content and parses it depending of the format your specify (HTML or Markdown)
 email: 42@dmathieu.com
@@ -69,7 +62,9 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- .rvmrc
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - VERSION
@@ -93,29 +88,35 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Is your content in HTML or Markdown ?
 test_files: 
-- spec/lib/highlight_spec.rb
-- spec/lib/html_spec.rb
 - spec/lib/jackb_spec.rb
 - spec/lib/markdown_spec.rb
+- spec/lib/html_spec.rb
+- spec/lib/highlight_spec.rb
 - spec/spec_helper.rb