double_doc 1.0.10 → 1.1.0

data/lib/double_doc/html_generator.rb

@@ -23,14 +23,26 @@ module DoubleDoc
       generated_files = [@output_directory + File.basename(@stylesheet)]
 
       @sources.each do |src|
-        path = File.basename(src).sub(/\.md$/, '.html')
+        from_markdown = src.to_s =~ /\.md$/
+        if from_markdown
+          path = File.basename(src).sub(/\.md$/, '.html')
+        else
+          path = File.basename(src)
+        end
+
         dst = @output_directory + path
         puts "#{src} -> #{dst}"
         FileUtils.mkdir_p(File.dirname(dst))
-        File.open(dst, 'w') do |out|
-          markdown = self.class.convert_links_to_html!(File.new(src).read)
 
+        if from_markdown
+          markdown = self.class.convert_links_to_html!(File.new(src).read)
           body = @html_renderer.render(markdown)
+        else
+          body = File.new(src).read
+        end
+
+        File.open(dst, 'w') do |out|
+
           html = template.result(
             :title         => @title,
             :body          => body,

data/lib/double_doc/task.rb

@@ -64,9 +64,17 @@ module DoubleDoc
         sources.each do |src|
           dst = md_dst + File.basename(src)
           puts "#{src} -> #{dst}"
+
+          if src.to_s =~ /\.md$/
+            body = import_handler.resolve_imports(File.new(src))
+          else
+            body = File.new(src).read
+          end
+
           File.open(dst, 'w') do |out|
-            out.write(import_handler.resolve_imports(File.new(src)))
+            out.write(body)
           end
+
           generated_md_files << dst
         end
 

data/lib/double_doc/version.rb

@@ -1,4 +1,4 @@
 ## ## DoubleDoc 1.0
 module DoubleDoc
-  VERSION = "1.0.10"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,90 +1,118 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: double_doc
-version: !ruby/object:Gem::Version
-  version: 1.0.10
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - Mick Staugaard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: guard
-  requirement: &70232471213320 !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70232471213320
-- !ruby/object:Gem::Dependency
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &70232471212880 !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70232471212880
-- !ruby/object:Gem::Dependency
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70232471212440 !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70232471212440
-- !ruby/object:Gem::Dependency
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   name: erubis
-  requirement: &70232471212020 !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70232471212020
-- !ruby/object:Gem::Dependency
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   name: redcarpet
-  requirement: &70232471211520 !ruby/object:Gem::Requirement
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
   type: :runtime
   prerelease: false
-  version_requirements: *70232471211520
-- !ruby/object:Gem::Dependency
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   name: pygments.rb
-  requirement: &70232471211020 !ruby/object:Gem::Requirement
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
   type: :runtime
   prerelease: false
-  version_requirements: *70232471211020
-description: A simple framework for writing and generating beautiful documentation
-  for your code
-email:
+  requirement: *id006
+description: A simple framework for writing and generating beautiful documentation for your code
+email: 
 - mick@staugaard.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/double_doc/doc_extractor.rb
 - lib/double_doc/html_generator.rb
 - lib/double_doc/html_renderer.rb
@@ -102,30 +130,38 @@ files:
 - test/test_helper.rb
 homepage: http://staugaard.github.com/double_doc
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Documentation right where you want it
-test_files:
+test_files: 
 - test/doc_extractor_test.rb
 - test/html_generator_test.rb
 - test/test_helper.rb
-has_rdoc: