murdoc 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/murdoc

@@ -3,11 +3,15 @@ require "optparse"
 $: << "./lib/"
 require "murdoc"
 
-
+options = {}
 
 option_parser = OptionParser.new do |opts|
   opts.banner = "murdoc <input file> <output html>"  
 
+  opts.on("--[no-]syntax-highlight", "Highlight syntax using pygments") do |h|
+    options[:highlight_source] = h
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -20,5 +24,5 @@ option_parser.parse!
 if ARGV.size < 2
   puts option_parser
 else
-  Murdoc.generate_from_file(ARGV[0], ARGV[1])
+  Murdoc.generate_from_file(ARGV[0], ARGV[1], options)
 end

data/lib/murdoc.rb

@@ -10,10 +10,11 @@
 
 
 module Murdoc
-  def self.generate_from_file(input, output)
-    annotator = Annotator.from_file(input)
+  def self.generate_from_file(input, output, options = {})
+    annotator = Annotator.from_file(input, nil, options)
+    markup_dir = File.dirname(__FILE__)+ "/../markup"
     File.open(output, "w+") do |f|
-      f.puts Formatter.new("markup/template.haml").render(:paragraphs => annotator.paragraphs, :stylesheet => File.read("markup/stylesheet.css"))
+      f.puts Formatter.new("#{markup_dir}/template.haml").render(:paragraphs => annotator.paragraphs, :stylesheet => File.read("#{markup_dir}/stylesheet.css"))
     end
   end
 end

data/lib/murdoc/annotator.rb

@@ -8,18 +8,31 @@ module Murdoc
     # Attribute accessor containing the resulting paragraphs
     attr_accessor :paragraphs
 
+    # Options
+    # Available options:
+    #   `:highlight_source` -- highlights source syntax using pygments (default: true)
+    attr_accessor :options
+
+    def self.default_options
+      {
+          :highlight_source => true
+      }
+    end
+
 
     # `source` string contains annotated source code
     # `source_type` is one of supported source types (currently `[:ruby, :javascript]`)
-    def initialize(source, source_type)
+    def initialize(source, source_type, options = {})
       self.source_type = source_type
       self.source      = source
+      self.options     = self.class.default_options.merge(options)
     end
 
+
     # You may also initialize annotator from file, it will even try to detect the
     # source type from extension.
-    def self.from_file(filename, source_type = nil)
-      self.new(File.read(filename), source_type || detect_source_type_from_filename(filename))
+    def self.from_file(filename, source_type = nil, options = {})
+      self.new(File.read(filename), source_type || detect_source_type_from_filename(filename), options)
     end
 
     def source_type

data/lib/murdoc/paragraph.rb

@@ -9,12 +9,14 @@ module Murdoc
     attr_accessor :annotation
     attr_accessor :source_type
     attr_accessor :starting_line
+    attr_accessor :options
 
-    def initialize(source, annotation, starting_line = 0, source_type = nil)
+    def initialize(source, annotation, starting_line = 0, source_type = nil, options ={})
       self.source = source
       self.annotation = annotation
       self.starting_line = starting_line
       self.source_type = source_type
+      self.options = options
     end
 
     def source_type
@@ -31,7 +33,7 @@ module Murdoc
     end
 
     def formatted_source
-      @formatted_source ||= if pygments_installed?
+      @formatted_source ||= if pygments_installed? && options[:highlight_source]
         IO.popen("pygmentize -l #{source_type} -f html", "w+") do |pipe|
           pipe.puts source
           pipe.close_write

data/murdoc.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murdoc}
-  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 = ["Mark Abramov"]

data/spec/murdoc/annotator_spec.rb

@@ -11,6 +11,10 @@ describe Murdoc::Annotator do
       Murdoc::Annotator.new("# Hello", "ruby").source_type.should == "ruby"
       Murdoc::Annotator.new("# Hello", :ruby).source_type.should == "ruby"
     end
+
+    it "should set options from hash" do
+      Murdoc::Annotator.new("", "", :foo => :bar).options[:foo].should == :bar 
+    end
   end
 
   describe ".from_file" do

data/spec/murdoc/paragraph_spec.rb

@@ -17,5 +17,9 @@ describe Murdoc::Paragraph do
     it "should optionally set starting line" do
       described_class.new("", "", 666, :ruby).starting_line.should == 666
     end
+
+    it "should optionally set options" do
+      described_class.new("", "", 666, :ruby, {:foo => :bar}).options.should == {:foo => :bar}
+    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: 
 - Mark Abramov
@@ -166,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 303347797677614350
+      hash: 4042360241948241742
       segments: 
       - 0
       version: "0"