codemerger 0.2.1 → 0.3.2

data/.gitignore

@@ -4,3 +4,5 @@ pkg/*
 .redcar/*
 *.swo
 *.swp
+output/*
+coverage/*

data/.rvmrc

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="ruby-1.9.2-p180"
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+
+  if [[ -s ".rvm/hooks/after_use" ]]
+  then
+    . ".rvm/hooks/after_use"
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  if ! rvm --create use  "$environment_id"
+  then
+    echo "Failed to create RVM environment ''."
+  fi
+fi
+
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+# filename=".gems"
+# if [[ -s "$filename" ]] ; then
+#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# fi
+

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
-
+gem 'rake'
 # Specify your gem's dependencies in codemerger.gemspec
 gemspec

data/Gemfile.lock

@@ -1,19 +1,27 @@
 PATH
   remote: .
   specs:
-    codemerger (0.0.1)
-      maruku
+    codemerger (0.3.2)
+      albino (= 1.3.3)
+      redcarpet (= 2.0.0b3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
-    syntax (1.0.0)
+    albino (1.3.3)
+      posix-spawn (>= 0.3.6)
+    posix-spawn (0.3.6)
+    rake (0.9.2)
+    redcarpet (2.0.0b3)
+    simplecov (0.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.4)
 
 PLATFORMS
+  ruby
   x86-mingw32
 
 DEPENDENCIES
   codemerger!
-  maruku
+  rake
+  simplecov

data/README.markdown

@@ -1,53 +1,53 @@
-This gem is used to help writing technical posts for wordpress.
-
-To use this GEM I usually create a new directory for the post or post group project, then I create a Gemfile like this:
-
+This gem is used to help writing technical posts for wordpress.
+
+To use this GEM I usually create a new directory for the post or post group project, then I create a Gemfile like this:
+
         source "http://rubygems.org"
         group :rake do
           gem "codemerger", "0.1.0", :require => "codemerger/rake_tasks"
         end
-
-After that I create a Rakefile like this:
-
+
+After that I create a Rakefile like this:
+
         require "rubygems"
         require "bundler/setup"
         Bundler.require :rake
 
-Then just start creating the post file in the root directory, the project supports .html or .markdown files for the posts.
-Inside this file, when I want to include a source sample, I create another file for the sample, and then I include it into the main post file with a code like this:
-
-        {{full/path/to/the/file.rb}}
-
-When the post is ready I run teh rake task:
-
-        rake codemerger:merge
-
-After that, the file I was writting is processed, a new file is created into the output directory and the sample source files are included with a code like this:
-
-        <b>{{full/path/to/the/file.rb}}</b>
-        <pre line="1" lang="ruby">
-          ruby code
-        </pre>
-
-This snippet is then copied and pasted to a post into my wordpress blog, and the code gets colored using the plugin wp-syntax, and the output can be turned into PDF with the plugin wp-mpdf.
-
-Today this gem supports source files in the following languages:
-
-* Ruby (including Rakefile and Gemfile)
-* Java
-* YAML
-* HTML
-* XML
-* Scala
-* CSS
-* Javascript
-* Bash
-* Batch
-
-All other files are configured as "text".
-
-For the next steps I'm planning to write more automated tests, refactor the language support code out, today it is a switch statement to convert from a file extension to a name supported by wp-syntax/Geshi and add support for templates and direct conversion of the source samples to colored HTML.
-
-All these changes are simple, but besides the automated tests, I do not need any of the other right now, if you think they will be usefull for you, send me a message, file an enhancement request or fork, implement and send me a pull request.
-
+Then just start creating the post file in the root directory, the project supports .html or .markdown files for the posts.
+Inside this file, when I want to include a source sample, I create another file for the sample, and then I include it into the main post file with a code like this:
+
+        {{full/path/to/the/file.rb}}
+
+When the post is ready I run teh rake task:
+
+        rake codemerger:merge
+
+After that, the file I was writting is processed, a new file is created into the output directory and the sample source files are included with a code like this:
+
+        <b>{{full/path/to/the/file.rb}}</b>
+        <pre line="1" lang="ruby">
+          ruby code
+        </pre>
+
+This snippet is then copied and pasted to a post into my wordpress blog, and the code gets colored using the plugin wp-syntax, and the output can be turned into PDF with the plugin wp-mpdf.
+
+Today this gem supports source files in the following languages:
+
+* Ruby (including Rakefile and Gemfile)
+* Java
+* YAML
+* HTML
+* XML
+* Scala
+* CSS
+* Javascript
+* Bash
+* Batch
+
+All other files are configured as "text".
+
+For the next steps I'm planning to write more automated tests, refactor the language support code out, today it is a switch statement to convert from a file extension to a name supported by wp-syntax/Geshi and add support for templates and direct conversion of the source samples to colored HTML.
+
+All these changes are simple, but besides the automated tests, I do not need any of the other right now, if you think they will be usefull for you, send me a message, file an enhancement request or fork, implement and send me a pull request.
+
 Any testing or comments will be of great value, today, I think only I'm using this GEM.

data/Rakefile

@@ -1,5 +1,9 @@
+require 'simplecov'
 require 'bundler'
-task :fake do
-  
-end
+require 'rake/testtask'
+SimpleCov.start
+require 'codemerger'
 Bundler::GemHelper.install_tasks :name => 'codemerger'
+Rake::TestTask.new do |t|
+  t.pattern = "test/*_spec.rb"
+end

data/codemerger.gemspec

@@ -11,25 +11,27 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/urubatan/codemerger"
   s.summary     = %q{Used to create blog posts and tecnical articles that need code samples, the code samples will be taken from the actual source code file instead of a copy paste approach}
   s.description = %q{This gem is used to help writing technical posts for wordpress.
-  The output is copied and pasted to a post into my wordpress blog, and the code gets colored using the plugin wp-syntax, and the output can be turned into PDF with the plugin wp-mpdf.
-
-Today this gem supports source files in the following languages:
-
-* Ruby (including Rakefile and Gemfile)
-* Java
-* YAML
-* HTML
-* XML
-* Scala
-* CSS
-* Javascript
-* Bash
-* Batch
-
+  The output is copied and pasted to a post into my wordpress blog, and the code gets colored using the plugin wp-syntax, and the output can be turned into PDF with the plugin wp-mpdf.
+
+Today this gem supports source files in the following languages:
+
+* Ruby (including Rakefile and Gemfile)
+* Java
+* YAML
+* HTML
+* XML
+* Scala
+* CSS
+* Javascript
+* Bash
+* Batch
+
 All other files are configured as "text".}
 
   s.rubyforge_project = "codemerger"
-  s.add_dependency 'maruku'
+  s.add_dependency 'redcarpet', '2.0.0b3'
+  s.add_dependency "albino", "1.3.3"
+  s.add_development_dependency 'simplecov'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/codemerger.rb

@@ -1,3 +1,2 @@
-module Codemerger
-  # Your code goes here...
-end
+require 'codemerger/version'
+require 'codemerger/merger'

data/lib/codemerger/merger.rb

@@ -0,0 +1,126 @@
+require 'fileutils'
+require 'redcarpet'
+require 'albino'
+
+module Codemerger
+  class HTMLwithAlbino < Redcarpet::Render::HTML
+    include Redcarpet::Render::SmartyPants
+    def code(code, language)
+      if language
+        Albino.new(code, language).colorize({O:"linenos=table,encoding=utf-8"})
+      else
+        %Q{<pre><code>#{code}</code></pre>}
+      end
+    end
+    def block_html(raw_html)
+      @markdown ||= Redcarpet::Markdown.new(HTMLwithAlbino.new,
+                                            :autolink => true, :space_after_headers => true, :superscript => true,
+                                            :fenced_code_blocks => true, :tables => true, :no_intra_emphasis => true)
+      m,tag,attrs,content = *(raw_html.match(/<([a-z]+)(.*?)>(.*)<\/\1>/m))
+      result = @markdown.render(content)
+      %Q{<#{tag}#{attrs}>
+         #{result}
+        </#{tag}>
+      }
+    end
+    def block_code(code, language)
+      if language
+        Albino.new(code, language).colorize({O:"linenos=table,encoding=utf-8"})
+      else
+        %Q{<pre><code>#{code}</code></pre>}
+      end
+    end
+  end
+  class Merger
+    attr_reader :markdown
+    def initialize(dir_name)
+      @dir_name = dir_name
+    end
+    def clean_dirs
+      FileUtils.rm_rf 'output'
+      FileUtils.mkdir_p 'output'
+      FileUtils.mkdir_p "output/#{@dir_name}" if @dir_name != '.'
+    end
+    def get_language_str(ext)
+      case ext
+      when ".yml"; "yaml"
+      when ".xml"; "xml"
+      when ".html"; "xml"
+      when ".rb"; "ruby"
+      when ".java"; "java"
+      when ".scala"; "scala"
+      when ".erb"; "erb"
+      when ".xsl"; "xslt"
+      when ".css"; "css"
+      when ".scss"; "scss"
+      when ".coffee"; "coffeescript"
+      when ".js"; "javascript"
+      when ".sh"; "bash"
+      when ".bat"; "batch"
+      when ".xhtml"; "xml"
+      when nil; "ruby"
+      else; "text"
+      end
+    end
+    def sanitize(fname)
+      fname.gsub(/.*?:/, "")
+    end
+    def read_contents(fname)
+      if fname =~ /.+:/
+        `git cat-file blob #{fname}`
+      else
+        IO.readlines(fname).join('')
+      end
+    end
+    def build_html_merged_file_content(f_name)
+      ext = f_name[/(\.[a-zA-Z]+)/]
+      lang_str = get_language_str(ext)
+      %Q{
+      <b>#{sanitize(f_name)}</b>
+      <pre line="1" lang="#{lang_str}">
+      #{read_contents(f_name)}
+      </pre>
+      }
+    end
+    def build_md_merged_file_content(f_name)
+      ext = f_name[/(\.[a-zA-Z]+)/]
+      lang_str = get_language_str(ext)
+      %Q{_#{sanitize(f_name)}_
+
+```#{lang_str}
+#{read_contents(f_name)}
+```
+      }
+    end
+    def process_files
+      in_files = Dir.glob("#{@dir_name}/*.{markdown,md,html}")
+      in_files.sort.each do |file|
+        in_lines = IO.readlines(file).join('')
+        is_markdown = (file =~ /markdown$/) || (file =~ /md$/)
+        out_fname = file[/^.*\./]
+        out_f    = File.new("output/#{out_fname}html", 'w')
+        if is_markdown
+          in_lines.gsub!(/(\{\{[\/a-zA-Z0-9:_]+(?>\.[a-z:_A-Z0-9]{2,}){0,3}\}\})/) do |f_name_match|
+            puts "Merging #{f_name_match}"
+            f_name = f_name_match[2..-3]
+            build_md_merged_file_content(f_name)
+          end
+          out_f << processMarkdown(in_lines)
+        else
+          out_f << in_lines.gsub(/(\{\{[\/a-zA-Z0-9_]+(?>\.[a-zA-Z0-9]{2,}){0,3}\}\})/) do |f_name_match|
+            puts "Merging #{f_name_match}"
+            f_name = f_name_match[2..-3]
+            build_html_merged_file_content(f_name)
+          end
+        end
+      end
+    end
+    def processMarkdown(text)
+      @markdown ||= Redcarpet::Markdown.new(HTMLwithAlbino.new,
+                                            :autolink => true, :space_after_headers => true, :superscript => true,
+                                            :fenced_code_blocks => true, :tables => true, :no_intra_emphasis => true)
+      result = @markdown.render(text)
+      result
+    end
+  end
+end

data/lib/codemerger/rake_tasks.rb

@@ -1,43 +1,9 @@
+require 'codemerger'
 namespace "codemerger" do
   desc "Merge all the markdown files and the source files to create the output/post.html file"
   task :merge do
-    require 'fileutils'
-    FileUtils.rm_rf 'output'
-    FileUtils.mkdir_p 'output'
-    in_files = Dir.glob("*.{markdown,html}")
-    in_files.sort.each do |file|
-      in_lines = IO.readlines(file).join('')
-      in_lines = Maruku.new(in_lines).to_html if file =~ /markdown$/
-      out_fname = file[/^.*\./]
-      out_f    = File.new("output/#{out_fname}html", 'w')
-      out_f << in_lines.gsub(/(\{\{[\/a-zA-Z0-9_]+(?>\.[a-zA-Z0-9]{2,}){0,3}\}\})/) do |f_name_match|
-        f_name = f_name_match[2..-3]
-        ext = f_name[/(\.[a-zA-Z]+)/]
-        lang_str = case ext
-        when ".yml"; "lang=\"yaml\""
-        when ".xml"; "lang=\"xml\""
-        when ".html"; "lang=\"xml\""
-        when ".rb"; "lang=\"ruby\""
-        when ".java"; "lang=\"java\""
-        when ".scala"; "lang=\"scala\""
-        when ".erb"; "lang=\"ruby\""
-        when ".xsl"; "lang=\"xml\""
-        when ".css"; "lang=\"css\""
-        when ".js"; "lang=\"javascript\""
-        when ".sh"; "lang=\"bash\""
-        when ".bat"; "lang=\"batch\""
-        when ".xhtml"; "lang=\"xml\""
-        when nil; "lang=\"ruby\""
-        else; "lang=\"text\""
-        end
-        
-        <<_EOF_
-<b>#{f_name}</b>
-<pre line="1" #{lang_str}>
-#{IO.readlines(f_name).join('')}
-</pre>
-_EOF_
-        end
-    end
+    @merger = Codemerger::Merger.new '.'
+    @merger.clean_dirs
+    @merger.process_files
   end
 end

data/lib/codemerger/version.rb

@@ -1,3 +1,3 @@
 module Codemerger
-  VERSION = "0.2.1"
+  VERSION = "0.3.2"
 end

data/test/merger_spec.rb

@@ -0,0 +1,53 @@
+require 'minitest/autorun'
+require 'codemerger'
+
+describe Codemerger::Merger do
+  def setup
+    @merger = Codemerger::Merger.new 'test'
+  end
+  it "should return the correct language string" do
+        @merger.get_language_str(".yml").must_equal "yaml"
+        @merger.get_language_str(".xml").must_equal "xml"
+        @merger.get_language_str(".html").must_equal "xml"
+        @merger.get_language_str(".rb").must_equal "ruby"
+        @merger.get_language_str(".java").must_equal "java"
+        @merger.get_language_str(".scala").must_equal "scala"
+        @merger.get_language_str(".erb").must_equal "erb"
+        @merger.get_language_str(".xsl").must_equal "xslt"
+        @merger.get_language_str(".css").must_equal "css"
+        @merger.get_language_str(".js").must_equal "javascript"
+        @merger.get_language_str(".sh").must_equal "bash"
+        @merger.get_language_str(".bat").must_equal "batch"
+        @merger.get_language_str(".xhtml").must_equal "xml"
+        @merger.get_language_str(nil).must_equal "ruby"
+        @merger.get_language_str("niaaa").must_equal  "text"
+        @merger.get_language_str(".coffee").must_equal  "coffeescript"
+        @merger.get_language_str(".scss").must_equal  "scss"
+  end
+  it "should delete and re-create the output directory" do
+    FileUtils.mkdir_p 'output'
+    out_f = File.new("output/temp.txt", 'w')
+    out_f << "content"
+    out_f.close
+    @merger.clean_dirs
+    File.exists?("output/temp.txt").must_equal false
+  end
+  it "should return the correctly formated output for an embedded file" do
+    expected = %Q{
+      <b>test/sample.rb</b>
+      <pre line="1" lang="ruby">
+      def sample
+  println "sample"
+end
+      </pre>
+      }
+    actual = @merger.build_html_merged_file_content('test/sample.rb')
+    expected.must_equal actual
+  end
+  it "should process HTML and Markdown files" do
+    @merger.process_files
+    File.exists?("output/test/test.html").must_equal true
+    File.exists?("output/test/test2.html").must_equal true
+    puts File.new("output/test/test2.html").read
+  end
+end

data/test/sample.rb

@@ -0,0 +1,3 @@
+def sample
+  println "sample"
+end

data/test/test.html

@@ -0,0 +1 @@
+{{test/sample.rb}}

data/test/test2.markdown

@@ -0,0 +1,9 @@
+{{test/sample.rb}}
+
+````ruby
+def a(b)
+  puts b
+end
+````
+
+Bloco colorido?

data/test/version_spec.rb

@@ -0,0 +1,8 @@
+require 'minitest/autorun'
+require 'codemerger/version'
+
+describe Codemerger do
+  it "should return the correct version number" do
+    "0.2.2".must_equal Codemerger::VERSION
+  end
+end

metadata

@@ -1,28 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: codemerger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: !!null 
+  version: 0.3.2
+  prerelease: 
 platform: ruby
 authors:
 - Rodrigo Urubatan
-autorequire: !!null 
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-20 00:00:00.000000000 -03:00
-default_executable: !!null 
+date: 2011-10-10 00:00:00.000000000 -03:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: &19950852 !ruby/object:Gem::Requirement
+  name: redcarpet
+  requirement: &2157414700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.0.0b3
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157414700
+- !ruby/object:Gem::Dependency
+  name: albino
+  requirement: &2157413920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157413920
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &2157413100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *19950852
+  version_requirements: *2157413100
 description: ! "This gem is used to help writing technical posts for wordpress.\n
   \ The output is copied and pasted to a post into my wordpress blog, and the code
   gets colored using the plugin wp-syntax, and the output can be turned into PDF with
@@ -38,18 +60,25 @@ files:
 - .Gemfile.swp
 - .codemerger.gemspec.swp
 - .gitignore
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - README.markdown
 - Rakefile
 - codemerger.gemspec
 - lib/codemerger.rb
+- lib/codemerger/merger.rb
 - lib/codemerger/rake_tasks.rb
 - lib/codemerger/version.rb
+- test/merger_spec.rb
+- test/sample.rb
+- test/test.html
+- test/test2.markdown
+- test/version_spec.rb
 has_rdoc: true
 homepage: https://github.com/urubatan/codemerger
 licenses: []
-post_install_message: !!null 
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -59,18 +88,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2316311512102027505
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2316311512102027505
 requirements: []
 rubyforge_project: codemerger
-rubygems_version: 1.5.0
-signing_key: !!null 
+rubygems_version: 1.6.2
+signing_key: 
 specification_version: 3
 summary: Used to create blog posts and tecnical articles that need code samples, the
   code samples will be taken from the actual source code file instead of a copy paste
   approach
-test_files: []
+test_files:
+- test/merger_spec.rb
+- test/sample.rb
+- test/test.html
+- test/test2.markdown
+- test/version_spec.rb