almost-happy 0.3.0 → 0.4.0

data/almost-happy.gemspec

@@ -5,44 +5,42 @@
 
 Gem::Specification.new do |s|
   s.name = %q{almost-happy}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-07-18}
+  s.date = %q{2010-12-11}
   s.description = %q{Helpers, convertors etc for Rails 3 to make page / post models for simple cases simple}
   s.email = %q{sutto@sutto.net}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "almost-happy.gemspec",
-     "lib/almost-happy.rb",
-     "lib/almost_happy.rb",
-     "lib/almost_happy/active_record_mixin.rb",
-     "lib/almost_happy/convertable.rb",
-     "lib/almost_happy/convertor.rb",
-     "lib/almost_happy/format_validator.rb",
-     "lib/almost_happy/publishable.rb",
-     "lib/almost_happy/scopeable.rb",
-     "lib/vendor/albino.rb",
-     "test/helper.rb",
-     "test/test_almost-happy.rb"
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "almost-happy.gemspec",
+    "lib/almost-happy.rb",
+    "lib/almost_happy.rb",
+    "lib/almost_happy/active_record_mixin.rb",
+    "lib/almost_happy/convertable.rb",
+    "lib/almost_happy/convertor.rb",
+    "lib/almost_happy/format_validator.rb",
+    "lib/almost_happy/publishable.rb",
+    "lib/almost_happy/scopeable.rb",
+    "lib/vendor/albino.rb",
+    "test/helper.rb",
+    "test/test_almost-happy.rb"
   ]
   s.homepage = %q{http://github.com/Sutto/almost-happy}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple tools for AR + Rails 3 to help make managing your content easy}
   s.test_files = [
     "test/helper.rb",
-     "test/test_almost-happy.rb"
+    "test/test_almost-happy.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/almost_happy.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext/class/attribute'
 require 'active_support/concern'
 
 module AlmostHappy
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 
   extend ActiveSupport::Autoload
 

data/lib/almost_happy/convertor.rb

@@ -7,6 +7,10 @@ require File.expand_path('../vendor/albino', File.dirname(__FILE__))
 module AlmostHappy
   class Convertor
     
+    def self.use_web_api!
+      Albino.use_web_api = true
+    end
+    
     class Renderer < Struct.new(:name, :options, :renderer)
 
       def [](key)

data/lib/vendor/albino.rb

@@ -42,9 +42,16 @@
 #         GitHub // http://github.com
 #
 require 'open4'
+require 'net/http'
+require 'uri'
+require 'tempfile'
 
 class Albino
-  @@bin = Rails.env.development? ? 'pygmentize' : '/usr/bin/pygmentize'
+  @@bin = (defined?(Rails.env) && Rails.env.development?) ? 'pygmentize' : '/usr/bin/pygmentize'
+  
+  @@use_web_api = false
+  
+  WEB_API_ROOT = URI.parse('http://pygments.appspot.com/')
 
   def self.highlight_code(html)
     doc = Nokogiri::HTML(html)
@@ -65,6 +72,14 @@ class Albino
   def self.bin=(path)
     @@bin = path
   end
+  
+  def self.use_web_api?
+    @@use_web_api
+  end
+  
+  def self.use_web_api=(value)
+    @@use_web_api = !!value
+  end
 
   def self.colorize(*args)
     new(*args).colorize
@@ -73,6 +88,7 @@ class Albino
   def initialize(target, lexer = :text, format = :html)
     @target  = File.exists?(target) ? File.read(target) : target rescue target
     @options = { :l => lexer, :f => format }
+    @web_options = {'lang' => lexer.to_s}
   end
 
   def execute(command)
@@ -84,9 +100,18 @@ class Albino
   ensure
     tmp.unlink if tmp
   end
+  
+  def highlight_via_api
+    request = Net::HTTP.post_form(WEB_API_ROOT, @web_options.merge('code' => @target))
+    request.body
+  end
 
   def colorize(options = {})
-    execute @@bin + convert_options(options)
+    if self.class.use_web_api?
+      highlight_via_api
+    else
+      execute @@bin + convert_options(options)
+    end
   end
   alias_method :to_s, :colorize
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: almost-happy
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-18 00:00:00 +08:00
+date: 2010-12-11 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,7 +116,6 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.md
 - Rakefile
@@ -137,8 +136,8 @@ homepage: http://github.com/Sutto/almost-happy
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC