cg 0.0.1 → 0.0.2

data/README.rdoc

@@ -44,6 +44,17 @@ cg is A Ruby based HTML "contents generator".
     $ cg convert markdown_file
 
 
+== Tips
+
+1. After save hook for Vim
+
+    $ vi .vimrc
+    autocmd BufWritePost *.mkd :silent !cg convert %
+
+
+2. After save hoook for Emacs
+
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/cg.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cg}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomohiro, TAIRA"]
-  s.date = %q{2010-04-26}
+  s.date = %q{2010-04-27}
   s.default_executable = %q{cg}
   s.description = %q{cg is A Ruby based contents generator}
   s.email = %q{tomohiro.t+github@gmail.com}
@@ -52,8 +52,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{HTML Contents Generator}
   s.test_files = [
-    "spec/cg_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+     "spec/cg_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/cg/convert.rb

@@ -14,7 +14,11 @@ module CG
 
     def initialize(source)
       @source = source || ARGV.first
-      @site_base_path = File.expand_path(File.dirname(@source)).gsub('markdown', '')
+
+      @root = File.expand_path(File.dirname(@source)).gsub('markdown', '')
+      @domain = @root.split('/').last
+
+      @templates_dir = templates_dir
     end
 
     def self.start!(source = nil)
@@ -23,15 +27,13 @@ module CG
 
     def start
       dir_path, html_name = gen_output_path(@source)
-
-      template = load_template
-      @article = article_rendering(load_markdown(@source))
-      @relative = relative_path(dir_path)
-
       mkdir_p dir_path
 
       open(File.join(dir_path, html_name), 'w') do |f|
-        f.write page_build(template)
+        @article = article_rendering(load_markdown(@source))
+        @relative = relative_path(dir_path)
+
+        f.write page_build(load_template)
       end
     end
 
@@ -39,45 +41,53 @@ module CG
       markdown_base = File.dirname(source)
       expand_path = source.gsub(/-|\+/, '/')
 
-      dir_path = File.expand_path("#{@site_base_path}/#{File.dirname(expand_path).gsub(markdown_base, '')}")
+      dir_path = File.expand_path("#{@root}/#{File.dirname(expand_path).gsub(markdown_base, '')}")
       html_name = File.basename(expand_path).gsub('.mkd', '.html')
 
       [dir_path, html_name]
     end
 
     def relative_path(dir_path)
-      point = dir_path.gsub(@site_base_path, '').split('/').count
+      point = dir_path.gsub(@root, '').split('/').count
       '../' * point
     end
 
     def load_template(template_name = 'html.rb')
-      Tilt::ErubisTemplate.new do
-        File.read("#{@site_base_path}/templates/#{template_name}")
-      end
+      Tilt::ErubisTemplate.new { File.read("#{@templates_dir}/#{template_name}") }
     end
 
     def load_markdown(source)
       Tilt::RDiscountTemplate.new { File.read(source) }
     end
 
+    def templates_dir
+      if File.directory? "#{@root}/templates"
+        "#{@root}/templates"
+      else
+        File.expand_path('../../skel/templates', File.dirname(__FILE__))
+      end
+    end
+
     def article_rendering(markdown)
-      @disqus_subdomain = @site_base_path.split('/').last.gsub('.', '-')
-      @disqus = disqus_template
+      @disqus = comment_rendering
 
       article = Tilt::ErubisTemplate.new { markdown.render }
       article.render(self)
     end
 
-    def page_build(page)
-      @title = [(Nokogiri::HTML(@article)/'h2').text, (Nokogiri::HTML(@article)/'h1').text].join(' - ')
+    def comment_rendering
+      return unless File.exist? "#{@templates_dir}/disqus.rb"
 
-      page.render(self)
+      @disqus_subdomain = @domain.gsub('.', '-')
+
+      comment = Tilt::ErubisTemplate.new { File.read("#{@templates_dir}/disqus.rb") }
+      comment.render(self)
     end
 
-    def disqus_template
-      return unless File.exist? "#{@site_base_path}/templates/disqus.rb"
-      disqus = Tilt::ErubisTemplate.new { File.read("#{@site_base_path}/templates/disqus.rb") }
-      disqus.render(self)
+    def page_build(page)
+      @title = [(Nokogiri::HTML(@article)/'h1').text, @domain].join(' - ')
+
+      page.render(self)
     end
   end
 end

data/skel/styles/cg.css

@@ -1,5 +1,4 @@
 @charset 'utf-8';
-/* 自由に編集可 */
 
 body {
     font-family: Times, 'Times New Roman', 'メイリオ', 'FreeSerif', serif;
@@ -21,27 +20,32 @@ h1, h3, h5 {
     font-family: Times, 'Times New Roman', 'メイリオ', 'FreeSerif', sans-serif;
 }
 
-h2 {
-    font-family: Helvetica, Verdana, 'メイリオ', 'FreeSans', sans-serif;
+header {
+    margin-top: 30px; 
 }
-
-h1 {
-    margin: 30px 0 40px 0;
-    padding: 2px 30px;
-    width: 30px;
+header h1 a {
+    padding: 5px 20px;
     background-color: #000;
     color: #fff;
     -moz-border-radius: 12px;
     -webkit-border-radius: 12px;
     font-size: 240%;
+
+}
+
+article h1 {
+    margin: 50px 0px 30px;
+    border-bottom: double solid #000;
+    text-align: center;
+    font-size: 200%;
 }
 
 h2 {
     margin: 20px 0;
-    margin-top: 60px;
-    font-size: 165%;
-    line-height: 150%;
+    font-size: 150%;
+    line-height: 130%;
     border-bottom: 2px solid #000;
+    font-family: Helvetica, Verdana, 'メイリオ', 'FreeSans', sans-serif;
 }
 
 h3 {
@@ -140,9 +144,11 @@ blockquote {
 }
 
 blockquote p {
-    margin-left: 20px;
+    padding-left: 10px;
     line-height: 2em;
     text-align: left;
+    border-left: 5px solid #ddd;
+    background-color: #fff;
 }
 
 blockquote pre {

data/skel/templates/html.rb

@@ -12,6 +12,10 @@
         <title><%= @title %></title>
     </head>
     <body>
+        <header>
+          <h1><a href="http://<%= @domain %>"><%= @domain %></a></h1>
+        </header>
+
         <nav>
             <ul>
                 <li><a href="index.html">Index</a></li>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tomohiro, TAIRA
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 +09:00
+date: 2010-04-27 00:00:00 +09:00
 default_executable: cg
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,5 +154,5 @@ signing_key:
 specification_version: 3
 summary: HTML Contents Generator
 test_files: 
-- spec/cg_spec.rb
 - spec/spec_helper.rb
+- spec/cg_spec.rb