qdoc 0.0.99 → 0.0.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2871f3190e6d0d7ad6027ba85b3fa39c6a5f50fd
-  data.tar.gz: b119accf55edb08edac75fe2b990fe4ad33bdc54
+  metadata.gz: fe5c078a524d167080cd6013333699a913de53e9
+  data.tar.gz: d8bff42f94d15ff24c1ee044cb829e505577ca47
 SHA512:
-  metadata.gz: b4fd64d2e838a4d8a13b6eba0d1c6b76928ac39366af2d1846b867c1c1d9892ae491a7bbd6f61f3785ac53c32dc8129aacd2864a38e142159e06acf4f629bb9d
-  data.tar.gz: cb6e241718e1c2604a35626074b14e7128c77f26df9c21e0d3061f413fb36bc171b10a9762db0ffd5ae1b2b48649acb5cb3f96fa2ab8b0b6e6058ea3a2265f29
+  metadata.gz: 29fd92cd26ca50e7143ac2feadcc26d99986bda76e63f499726a3baa6e161e7b5ad4eb7e21068d9e26019e3ab9c8f5e9775168d0a0ed1eb92421c5533cebb2f4
+  data.tar.gz: 18e666d83e437d3a67ff6342c79e21e24c4708a1cd90f977a2280d61cd5ab3f72b6f69fffba0687ab0d12ffb9f07fb57c05542ec2a64552b3df8bf8bfab5185d

data/lib/qdoc.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby --
 require 'redcarpet'
-require 'kramdown'
 require 'fileutils'
 require 'nokogiri'
-#require 'pry'
+require 'hawaiian'
 
 class QDoc
 
@@ -78,11 +77,11 @@ class QDoc
     end
     case doc[:extension]
     when "md"
-      return highlight_firewalls fix_hawaiian Kramdown::Document.new( contents ).to_html
+      return highlight_firewalls @redcarpet.render( Hawaiian.encode_html contents )
     when "rc"
-      return highlight_firewalls @redcarpet.render( fix_hawaiian contents )
+      return highlight_firewalls @redcarpet.render( Hawaiian.encode_html contents )
     when "txt"
-      return highlight_firewalls @redcarpet.render( fix_hawaiian contents )
+      return highlight_firewalls @redcarpet.render( Hawaiian.encode_html contents )
     when "html"
       return contents
     else
@@ -94,10 +93,6 @@ class QDoc
     FileUtils.cp( File.dirname(__FILE__) + "/bootstrap.min.css", "#{@out_dir}/bootstrap.min.css" )
   end
 
-  def fix_hawaiian( text )
-    text.gsub("ʻ", "‘").gsub("ā", "ā").gsub("ē","ē").gsub("ī", "ī").gsub("ō","ō").gsub("ū", "ū").gsub("Ā", "Ā").gsub("Ē","Ē").gsub("Ī", "Ī").gsub("Ō", "Ō").gsub("Ū", "Ū")
-  end
-  
   def highlight_firewalls( text )
     text.gsub(/object-group( network| service){0,1} (\S+)/, '<span style="color:green">object-group\1</span> <span style="color:red">\2</span>')
   end
@@ -159,12 +154,7 @@ class QDoc
   end
   
   def create_nav( content )
-    # nav = '<div id="navbar" class="bs-sidebar affix" role="complementary">' + "\n"
-    # value = "<ul class='nav'>"
-    # headers = Hash.new
     doc = Nokogiri::HTML content
-    # headers[:level1] = doc.xpath('//h1') # Nokogiri::XML::NodeSet
-    #headers = doc.xpath('/html/body/*[self::h1 or self::h2 or self::h3]') # Nokogiri::XML::NodeSet
     headers = doc.xpath('/html/body/*[self::h1 or self::h2]') # Nokogiri::XML::NodeSet
     if !headers.empty?
       nav = headers.map { |h|
@@ -177,41 +167,7 @@ class QDoc
     else
 	    nav = ""
     end
-    '<div id="navbar" class="bs-sidebar affix" role="complementary">' + Kramdown::Document.new( nav ).to_html.gsub("<ul>","<ul class='nav'>") + '</div>'
-    #####
-    # Manual List
-    ####
-#    if !headers.empty?
-#	    level = 0
-#	    headers.map { |h|
-#		    h_level = h.name[1].to_i
-#		    "</ul>" if level > h_level
-#		    "<ul class='nav'>" if level < h_level
-#	    }
-#    end
-    # level = 0
-    # headers.each do |h|
-    #       binding.pry
-    #       current_level = h.name[1].to_i
-    #   if level > current_level
-    #         level = current_level
-    #         value += "  " * level + "</li></ul>\n"
-    #   elsif level < current_level
-    #         value += "  " * level + "<ul class='nav bs-sidenav'>\n" if current_level == 1
-    #         value += "  " * level + "<ul class='nav bs'>\n" if current_level > 1
-    #         level = current_level
-    #   elsif level == current_level
-    #         value += "</li>\n"
-    #   end
-    #   value += "  " * level + "<li><a href='#" + h.attributes['id'].value + "'>" + h.content  + "</a>\n" if ! h.attributes.empty?
-    # end
-    # value += "</li>\n"
-    # while level > 1
-    #       value += "  " * level + "</ul></li>\n"
-    #       level -= 1
-    # end
-    # value += "</ul></div>"
-    # value
+    '<div id="navbar" class="bs-sidebar affix" role="complementary">' + @redcarpet.render( nav ).gsub("<ul>","<ul class='nav'>") + '</div>'
   end
 
   def write_file( filename, content )

metadata

@@ -1,70 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: qdoc
 version: !ruby/object:Gem::Version
-  version: 0.0.99
+  version: 0.0.100
 platform: ruby
 authors:
 - Patrick Sereno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: hawaiian
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Allows you to create quick documents from textile or markdown into an
-  html format.  Rev 0.1 will be released when documentation is up to par.
+  html format.  Rev 0.1 will be released when documentation and tests are up to par.
 email: patrick@6orbits.com
 executables:
 - qdoc
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/qdoc.rb
-- lib/bootstrap.min.css
 - bin/qdoc
+- lib/bootstrap.min.css
+- lib/qdoc.rb
 homepage: http://6orbits.com/gems/qdoc
-licenses: []
+licenses:
+- GPLv3
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -72,17 +91,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A quick doc converter