almost-happy 0.1.0 → 0.1.1

data/almost-happy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{almost-happy}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "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"
   ]

data/lib/almost_happy/active_record_mixin.rb

@@ -11,7 +11,7 @@ module AlmostHappy
         self.convertable_fields += fields
         # Define accessors for each field.
         fields.each do |field|
-          define_method(:"#{field}_as_html") { send(field).to_s.html_safe }
+          define_method(:"#{field}_as_html") { send(:"rendered_#{field}").to_s.html_safe }
         end
         validate_convertable_format if options.fetch(:validate, true)
       end

data/lib/almost_happy/convertor.rb

@@ -1,3 +1,9 @@
+require 'nokogiri'
+require 'RedCloth'
+require 'rdiscount'
+
+require File.expand_path('../vendor/albino', File.dirname(__FILE__))
+
 module AlmostHappy
   class Convertor
     
@@ -79,7 +85,7 @@ module AlmostHappy
     end
 
     add_renderer :markdown, :filters => [:smart, :autolink] do |raw|
-      html = RDiscount.new(raw, *ContentRenderer[:markdown].fetch(:filters, [])).to_html
+      html = RDiscount.new(raw, *Convertor[:markdown].fetch(:filters, [])).to_html
       html.gsub!(/^(?:<p>)?@@@(?:<\/p>)?$/, '</div>')
       html.gsub!(/^(?:<p>)?@@@\s*([\w\+]+)(?:<\/p>)?$/, '<div class="code" rel="\1">')
       Albino.highlight_code(html)

data/lib/almost_happy.rb

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

data/lib/vendor/albino.rb

@@ -0,0 +1,98 @@
+##
+# Wrapper for the Pygments command line tool, pygmentize.
+#
+# Pygments: http://pygments.org/
+#
+# Assumes pygmentize is in the path.  If not, set its location
+# with Albino.bin = '/path/to/pygmentize'
+#
+# Use like so:
+#
+#   @syntaxer = Albino.new('/some/file.rb', :ruby)
+#   puts @syntaxer.colorize
+#
+# This'll print out an HTMLized, Ruby-highlighted version
+# of '/some/file.rb'.
+#
+# To use another formatter, pass it as the third argument:
+#
+#   @syntaxer = Albino.new('/some/file.rb', :ruby, :bbcode)
+#   puts @syntaxer.colorize
+#
+# You can also use the #colorize class method:
+#
+#   puts Albino.colorize('/some/file.rb', :ruby)
+#
+# Another also: you get a #to_s, for somewhat nicer use in Rails views.
+#
+#   ... helper file ...
+#   def highlight(text)
+#     Albino.new(text, :ruby)
+#   end
+#
+#   ... view file ...
+#   <%= highlight text %>
+#
+# The default lexer is 'text'.  You need to specify a lexer yourself;
+# because we are using STDIN there is no auto-detect.
+#
+# To see all lexers and formatters available, run `pygmentize -L`.
+#
+# Chris Wanstrath // chris@ozmm.org 
+#         GitHub // http://github.com
+#
+require 'open4'
+
+class Albino
+  @@bin = Rails.env.development? ? 'pygmentize' : '/usr/bin/pygmentize'
+
+  def self.highlight_code(html)
+    doc = Nokogiri::HTML(html)
+    doc.search('div.code').each do |div|
+      lexer = div['rel'] || :ruby
+      lexted_text = Albino.new(div.text, lexer).to_s
+      highlighted = Nokogiri::HTML(lexted_text).at('div')
+      klasses = highlighted['class'].split(/\s+/)
+      klasses << lexer
+      klasses << 'code'
+      klasses << 'highlight'
+      highlighted['class'] = klasses.join(' ')
+      div.replace highlighted
+    end
+    doc.search('body > *').to_html
+  end
+
+  def self.bin=(path)
+    @@bin = path
+  end
+
+  def self.colorize(*args)
+    new(*args).colorize
+  end
+
+  def initialize(target, lexer = :text, format = :html)
+    @target  = File.exists?(target) ? File.read(target) : target rescue target
+    @options = { :l => lexer, :f => format }
+  end
+
+  def execute(command)
+    tmp = Tempfile.new("albino")
+    tmp.write @target
+    tmp.close
+    command = [command, tmp.path].join(" ")
+    %x(#{command}).strip
+  ensure
+    tmp.unlink if tmp
+  end
+
+  def colorize(options = {})
+    execute @@bin + convert_options(options)
+  end
+  alias_method :to_s, :colorize
+
+  def convert_options(options = {})
+    @options.merge(options).inject('') do |string, (flag, value)|
+      string + " -#{flag} #{value}"
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -104,6 +104,7 @@ files:
 - 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
 has_rdoc: true