docwu 0.0.1 → 0.0.3

data/README.md

@@ -1,24 +1,36 @@
 # doc wu 
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses MIT-LICENSE. Docwu mains Documents Work Up!
 
 ## A markdown doc generations
 
 ## 结构
 
 ```
-workspace
+ - workspace
 
-  - assets:
-    + javascripts:
-    + stylesheets:
-    + images:
-  - sources:
-    - layouts:
-      - default.mustache
-    - pages:
-      - index.mustache
-  - posts:
-    - 
+▾ assets/
+  ▸ files/
+  ▸ images/
+  ▾ javascripts/
+      application.js
+      document_folder.js
+      document_post.js
+  ▾ stylesheets/
+      application.css
+      document_folder.css
+      document_post.css
+▸ doc/
+▾ layouts/
+  ▸ partials/
+    folder.mustache
+    post.mustache
+▾ pages/
+    index.markdown
+  .gitignore
+  config.yml
+  Gemfile
+  Gemfile.lock
+  worker*
 
 ```

data/bin/docwu

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'docwu'
+
+Docwu.start('.')

data/lib/docwu/config.rb

@@ -12,34 +12,47 @@ module Docwu
     end
   end
 
-  #
-  #  src_paths
-  #  asset_paths
-  #  layout_paths
-  #  output_path
-  #
   class Config
-    attr_reader :src_paths, :asset_paths, :layout_paths, :output_path, :data
+    # attr_reader :src_paths, :asset_paths, :layout_paths, :output_path, :data
 
-    def data= a
-      @data ||= a
+    attr_reader :routes, :params, :worker, :workspace, :docwu_env, :logger
+
+    def logger= a
+      @logger ||= (a || ::Logger.new(STDOUT))
+    end
+
+    def routes= a
+      @routes ||= a
+    end
+
+    def params= a={}
+      @params ||= a
     end
 
-    def src_paths= a
-      @src_paths ||= a
+    def worker= a
+      @worker ||= a
     end
 
-    def asset_paths= a
-      @asset_paths ||= a
+    def workspace= a
+      @workspace ||= a
     end
 
-    def layout_paths= a
-      @layout_paths ||= a
+    def docwu_env= a
+      @docwu_env ||= 'development'
     end
 
-    def output_path= a
-      @output_path ||= a
+    def topics_path
+      @topics_path ||= ("#{self.workspace}/topics")
     end
+
+    def layouts_path
+      @layouts_path ||= ("#{self.workspace}/layouts")
+    end
+
+    def deploy_path
+      @deploy_path ||= ("#{self.workspace}/_deploy")
+    end
+
   end
 end
 

data/lib/docwu/folder.rb

@@ -1,42 +1,111 @@
+# -*- encoding : utf-8 -*-
 module Docwu
   class Folder
     # 一个文件夹下面可能会有很多文件或文件夹的
-    attr_reader :posts, :folders, :parent, :path, :worker, :dir
+    attr_reader :posts, :folders, :parent, :worker, :name,
+      :dest, :path, :src, :url, :index_post, :index_dest,
+      :parents, :content_data
 
     def initialize attrs={}
-      @path = attrs[:path]
       @worker = attrs[:worker]
       @parent  = attrs[:parent]
-      @house   = attrs[:house]
 
-      @dir = attrs[:dir]
+      @parents = if @parent.nil?
+                   []
+                 else
+                   @parent.parents.dup << @parent
+                 end
+
+      @src  = attrs[:src]
+      @path = attrs[:path]
+      @url  = "/#{@path}/index.html"
+
+      @name = ::Docwu::Utils.filename(@path)
+
+      @dest = "#{self.worker.deploy_path}/#{self.path}"
+      @index_dest = "#{self.dest}/index.html"
+      # -------------------------------------
 
       @posts   = []
       @folders = []
 
-      ::Dir.glob("#{self.path}/*").each do |_path|
-        _dir = _path.sub(self.path, '')
+      ::Dir.glob("#{self.src}/*").each do |_src|
+        _name = "#{_src.sub("#{self.src}/", '')}"
+
+        if File.exists?(_src)
+          if File.file?(_src) # 如果一个文件
+            _post = ::Docwu::Post.new(:src => _src, :parent => self, :worker => self.worker, :path => "#{self.path}/#{_name}")
 
-        if File.exists?(_path)
-          if File.file?(_path) # 如果一个文件
-            @posts   << ::Docwu::Post.new(:path => _path, :parent => self, :worker => self.worker, :dir => _dir)
-          elsif File.directory?(_path) # 如果是一个文件夹
-            @folders << self.class.new(:path => _path, :parent => self, :worker => self.worker, :dir => _dir)
+            if _post.index?
+              @index_post = _post
+            else
+              @posts << _post
+            end
+          elsif File.directory?(_src) # 如果是一个文件夹
+            @folders << self.class.new(:src => _src, :parent => self, :worker => self.worker, :path => "#{self.path}/#{_name}")
           end
         end
       end
+
+      self.posts.sort! { |a, b| b.ranking <=> a.ranking }
+      self.posts.sort! { |a, b| b.datetime <=> a.datetime }
+
+      #  TODO: 是否从index文件中读取data呢?
+    end
+
+    def parent_datas
+      self.parents.map(&:to_data)
+    end
+
+    # 转为数据
+    def to_data
+      {
+        'name' => self.name,
+        'url'  => self.url,
+        'title' => self.name,
+        'folders' => self.folders.map(&:to_data),
+        'posts'   => self.posts.map(&:to_data)
+      }
+    end
+
+    def index_page_data
+      if self.has_index?
+        self.index_post.page_data
+      else
+        {}
+      end
     end
 
-    def generate space=nil
+    def generate
+      _prepare_data
+
+      # TODO: index : 需要生成首页！
+      _template = if self.has_index?
+                    self.worker.layouts[self.index_post.layout]
+                  end
+
+      _template ||= self.worker.layouts['folder']
+
+      ::Docwu::Render.generate(
+        :content_data => self.content_data,
+        :dest         => self.index_dest,
+        :template     => _template
+      )
+
       self.folders.each do |folder|
-        folder.generate space
+        folder.generate
       end
 
       self.posts.each do |post|
-        post.generate space
+        post.generate
       end
     end
 
+    # 有首页文件了
+    def has_index?
+      !!(self.index_post)
+    end
+
     def folder?
       true
     end
@@ -47,5 +116,20 @@ module Docwu
 
     private
 
+    def _prepare_data
+      @content_data = ::Docwu::Utils.hash_deep_merge(self.worker.data, {
+        'reader'   => {
+          'folder' => self.to_data,
+          'folders' => self.parent_datas
+        }
+      })
+
+      # puts ""
+      # puts ""
+      # puts ""
+      # puts ""
+      # pp @content_data
+    end
+
   end
 end

data/lib/docwu/post.rb

@@ -1,61 +1,132 @@
+# -*- encoding : utf-8 -*-
 module Docwu
   class Post
     # 一个文件夹下面可能会有很多文件或文件夹的
-    attr_reader :parent, :path, :worker, :house, :dir, :content_data
+    attr_reader :parent,
+      :worker,         # worker对象
+      :content_data,
+      :dest,           # 目标地址
+      :path,           # 访问地址
+      :src,            # 原文件地址
+      :url,            # URL 地址
+      :content_type,
+      :name,
+      :file_name,      # 文件名
+      :datetime,
+      :ranking
+
+    def parents
+      if self.parent.nil?
+        []
+      else
+        self.parent.parents.dup << self.parent
+      end
+    end
+
+    def parent_datas
+      self.parents.map(&:to_data)
+    end
 
     def initialize attrs={}
-      @path   = attrs[:path]
-      @house  = attrs[:house]
       @parent = attrs[:parent]
+
       @worker = attrs[:worker]
 
-      @dir = attrs[:dir]
+      @src = attrs[:src]
 
       _parse_content = self.parse_content
 
-      @content_data = {}
+      # 将合并来自worker的数据
+      @content_data = ::Docwu::Utils.hash_deep_merge(self.worker.data, 'page' => _parse_content[:data])  # 来自页面的数据
+
+      @content_type = @content_data['content_type'] || 'html'
+
+      _extend_name = case self.content_type
+                     when 'html'
+                       'html'
+                     else
+                       'html'
+                     end
+
+      # URL ---------------------------------
+      _filename_extless = ::Docwu::Utils.filename_extless(attrs[:path])
+
+      @path = "#{_filename_extless}.#{_extend_name}"
+      @url  = "/#{@path}"
+      @dest = "#{self.worker.deploy_path}/#{self.path}"
+
+      @file_name = ::Docwu::Utils.filename(_filename_extless)
 
-      self.content_data.merge!(_parse_content[:data])
+      @name = self.file_name
+      @datetime = self.page_data['datetime']  # 创建时间
+      @ranking  = self.page_data['ranking'].to_i  # 创建时间
+
+      # puts "post to: -----------------> desc: #{self.dest}"
+      # puts "                            src:  #{self.src}"
+      # puts "                            path: #{self.path}"
+      # puts "                            url:  #{self.url}"
+      # -------------------------------------
+    end
+
+    def template
+      self.worker.layouts[self.layout] || self.worker.layouts['post'] || self.worker.layouts['application']
+    end
+
+    # 是否是首页？
+    def index?
+      self.file_name == 'index'
     end
 
     def layout
-      self.worker.layouts[self.content_data['layout']] || self.worker.layouts['default.mustache']
+      self.page_data['layout']
+    end
+
+    def outline
+      @outline ||= self.page_data['outline'].to_s
+    end
+
+    def to_data
+      introduction_size = 32
+
+      introduction = "#{self.outline[0, introduction_size]}#{' ...' if self.outline.size > introduction_size}"
+
+      {
+        'name'  => self.name,
+        'url'   => self.url,
+        'title' => self.title,
+        'outline' => self.outline,
+        'introduction' => introduction
+      }
+    end
+
+    # 页面数据
+    def page_data
+      self.content_data['page'] ||= {}
+    end
+
+    def title
+      self.page_data['title'] || self.url
     end
 
     # 渲染
-    def generate space=nil
+    def generate
+      _prepare_data
+
       _parse_content = self.parse_content
 
       _content_text = _parse_content[:text]
 
-      _template = ::Docwu::Utils.read_file(self.layout)
-
       _path = self.path
-      _dest = self.dest(space)
-
-      puts " -> generate post: form #{_path}  to #{_dest}"
-      puts "             layout: #{self.layout}"
+      _dest = self.dest
 
       ::Docwu::Render.generate(
         :content_text => _content_text,
         :content_data => self.content_data,
         :dest         => _dest,
-        :template     => _template
+        :template     => self.template
       )
     end
 
-    def dest space
-      _dest = "#{self.worker.output_path}"
-
-      if space
-        _dest << "/#{space}"
-      end
-
-      _dest << self.dir
-
-      _dest
-    end
-
     def folder?
       false
     end
@@ -63,23 +134,34 @@ module Docwu
     def post?
       true
     end
- 
+
     # 解析正文
     def parse_content
-      _content = ::File.read(self.path)
+      _content = ::File.read(self.src)
+
+      ::Docwu::Utils.parse_marked_content(_content)
+    end
+
+    def has_folder?
+      self.parent.is_a?(::Docwu::Folder)
+    end
+
+    private
 
-      _content_text = ''
-      _content_data = {}
+    def _prepare_data
+      self.content_data['reader'] ||= {}
 
-      _parse_content = _content.to_s.split(/---+\n/)
+      _data = {
+        'folders' => self.parent_datas,
+        'post' => self.to_data
+      }
 
-      if _parse_content.size > 2 && _parse_content.first.to_s == ''
-        _content_text << _parse_content[2]
-        # 从上下文中读取配置
-        _content_data.merge!(::YAML.load(_parse_content[1]))
+      if self.has_folder?
+        (_data['folder'] ||= {}).merge!(self.parent.to_data)
       end
 
-      {:data => _content_data, :text => _content_text}
+      # 合并, datas
+      self.content_data['reader'].merge!(_data)
     end
   end
 end

data/lib/docwu/render.rb

@@ -1,3 +1,8 @@
+# -*- encoding : utf-8 -*-
+require 'redcarpet'
+require 'coderay'
+require "nokogiri"
+
 module Docwu
   class Render
     class << self
@@ -6,30 +11,62 @@ module Docwu
       end
     end
 
+    #
+    # usage:
+    #   ::Docwu::Render.generate(
+    #     :content_data => ''
+    #   )
+    # options:
+    #   - content_data
+    #   - content_text
+    #   - dest
+    #   - template
+    #
     def generate(options={})
       content_data = options[:content_data] || {}
       content_text = options[:content_text] || ''
       content_result = ''
       dest         = options[:dest]
+      template     = options[:template]
 
       # 读取标记类型
       marktype = (content_data['marktype'] || 'markdown').to_s
-      content_type = (content_data['content_type'] || 'html').to_s
+
+      # 目录
+      _catalogs = []
 
       case marktype
       when 'markdown'
         _mark_options = [:hard_wrap, :autolink, :no_intraemphasis, :fenced_code, :gh_blockcode]
 
-        content_result << ::RedcarpetCompat.new(content_text, *_mark_options).to_html
+        _html = ::RedcarpetCompat.new(content_text, *_mark_options).to_html
+
+        # 获取一个html代码的目录结果
+        _catalogs_result = ::Docwu::Utils.html_catalogable(_html)
+
+        _catalogs = _catalogs_result['catalogs']
+
+        content_result << ::Docwu::Utils.syntax_highlighter(_catalogs_result['html'])
       else
         # FIXME: no
       end
 
-      content_data['content'] = content_result
+      content_data['page'] ||= {}
+
+      # 正文
+      content_data['page']['content'] = content_result
+      content_data['page']['content_present?'] = content_result.size > 0
+
+      # 目录
+      content_data['page']['catalogs'] = _catalogs
+
+      ::Docwu::Utils.formated_hashed!(content_data)
+
+      # pp content_data
+      # puts "#{template}"
 
-      puts " --------------------> write to: #{dest}, #{content_result}"
       # 页面的内容
-      # ::Docwu::Utils.write_file dest, ::MustacheRender::Mustache.render(template, data.merge('page' => context_data))
+      ::Docwu::Utils.write_file dest, ::MustacheRender::Mustache.render(template, content_data)
     end
 
   end

data/lib/docwu/route.rb

@@ -0,0 +1,6 @@
+# -*- encoding : utf-8 -*-
+module Docwu
+  class Route
+  end
+end
+

data/lib/docwu/server.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # http://tobyho.com/2009/09/16/http-server-in-5-lines-with/
 # https://github.com/rack/rack/blob/master/lib/rack/handler/thin.rb
 # https://github.com/macournoyer/thin/blob/master/lib/thin/server.rb
@@ -10,21 +11,24 @@ module Docwu
 # 
 #     Rack::Handler::Thin.run(staticMe, :port => 8080
 
+    require 'thin'
     require 'rack'
 
-    def self.process(options={})
-      options['destination'] ||= ::Docwu.config.output_path
+    def self.process(options={}, &block)
+      options['destination'] ||= ::Docwu.config.deploy_path
       destination = options['destination']
       FileUtils.mkdir_p(destination)
 
-      options['port'] ||= 5656
-      options['host'] ||= '0.0.0.0' 
-
       staticMe = Rack::Builder.new do
         run Rack::Directory.new(destination)
       end
 
-      Rack::Handler::Thin.run(staticMe, :Port => options['port'], :Host => options['host'])
+      pp options
+
+      ::Thin::Server.start(options.delete(:Host), options.delete(:Port), staticMe, options, &block)
+
+      # Rack::Handler::Thin.run(staticMe, options)
+
       # Rack::Handler::WEBrick.run(staticMe, :Port => options['port'], :Host => options['host'])
       # Rack::Handler::Mongrel.run(staticMe, :Port => options['port'], :Host => options['host'])
     end

data/lib/docwu/topic.rb

@@ -0,0 +1,93 @@
+module Docwu
+  class Topic
+    attr_reader :worker, :dest, :path, :src, :url, :content_data, :file_name, :name, :title
+
+    def initialize attrs={}
+      @worker = attrs[:worker]
+
+      @path = attrs[:path]
+      @src = attrs[:src]
+
+      _parse_content = self.parse_content
+
+      # 将合并来自worker的数据
+      @content_data = ::Docwu::Utils.hash_deep_merge(self.worker.data, 'page' => _parse_content[:data])  # 来自页面的数据
+
+      # URL ---------------------------------
+      _filename_extless = ::Docwu::Utils.filename_extless(self.path)
+
+      @url  = "/#{@path}"
+      @dest = "#{self.worker.deploy_path}/#{self.path}"
+
+      @file_name = ::Docwu::Utils.filename(_filename_extless)
+
+      @name = self.content_data['page']['name'] || self.file_name
+
+      # -------------------------------------
+    end
+
+    # 页面数据
+    def page_data
+      self.content_data['page'] ||= {}
+    end
+
+    def title
+      self.page_data['title'] || self.url
+    end
+
+    def url
+      self.path
+    end
+
+    def to_data
+      {
+        'name'  => self.name,
+        'url'   => self.url,
+        'title' => self.title
+      }
+    end
+
+    def generate
+      _prepare_data
+
+      _parse_content = self.parse_content
+
+      _content_text = _parse_content[:text]
+
+      ::Docwu::Render.generate(
+        :content_text => _content_text,
+        :content_data => self.content_data,
+        :dest         => self.dest,
+        :template     => self.template
+      )
+    end
+
+    def layout
+      self.page_data['layout']
+    end
+
+    def template
+      self.worker.layouts[self.layout] || self.worker.layouts['topic'] || self.worker.layouts['application']
+    end
+
+    # 解析正文
+    def parse_content
+      _content = ::File.read(self.src)
+
+      ::Docwu::Utils.parse_marked_content(_content)
+    end
+
+    private
+
+    def _prepare_data
+      self.content_data['reader'] ||= {}
+
+      _data = {
+        'topic' => self.to_data
+      }
+
+      # 合并, datas
+      self.content_data['reader'].merge!(_data)
+    end
+  end
+end

data/lib/docwu/utils.rb

@@ -1,12 +1,64 @@
+# -*- encoding : utf-8 -*-
 module Docwu
   class Utils
     class << self
+      def hash_deep_merge(hash, other_hash)
+        hash.merge(other_hash) do |key, oldval, newval|
+          oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
+          newval = newval.to_hash if newval.respond_to?(:to_hash)
+          oldval.class.to_s == 'Hash' && newval.class.to_s == 'Hash' ? self.hash_deep_merge(oldval, newval) : newval
+        end
+      end
+
+      def hash_deep_merge!(hash, other_hash)
+        hash.replace(self.hash_deep_merge(hash, other_hash))
+      end
+
+      def formated_hashed! hash={}
+        hash.replace(self.formated_hashed(hash))
+      end
+
+      # 将hash中所有非hash的类型，转为hash, 以便前端调用
+      def formated_hashed hash={}
+        _res = {}
+
+        hash.each do |key, value|
+          if value.is_a?(Array)
+            _res[key] = value.map do |_val|
+              if _val.is_a?(Hash)
+                self.formated_hashed(_val)
+              else
+                {'value' => _val}
+              end
+            end
+
+            _res["#{key}_any?"] = value.any?
+            _res["#{key}_count"] = value.size
+
+          elsif value.is_a?(Hash)
+            _res[key] = self.formated_hashed(value)
+          else
+            _res[key] = value
+          end
+        end
+
+        _res
+      end
+
+      # 获取文件名
+      def filename path=''
+        path.split('/').last
+      end
+
+      def filename_extless _path=''
+        _path.chomp(File.extname(_path))
+      end
 
       def read_file path
         ::File.read(path)
       end
 
-      def write_file path, content=''
+      def write_file dst, content=''
         ::FileUtils.mkdir_p(::File.dirname(dst))
 
         file = ::File.new(dst, 'w')
@@ -20,7 +72,117 @@ module Docwu
         ::FileUtils.cp_r(src, dst)
       end
 
+      def syntax_highlighter(html)
+        doc = ::Nokogiri::HTML(html)
+
+        doc.search("//pre").each do |pre|
+          lang = pre.attr('lang')
+
+          if lang
+            _lang_class = pre.attr('class').to_s.split(' ').select {|_itm| _itm.include?('lang-') }.first
+
+            if _lang_class
+              lang = _lang_class.gsub('lang-', '')
+            end
+          end
+
+          # debugger
+          if pre_code=pre.css('code')
+            lang = pre_code.attr('class').to_s
+          end
+
+          unless lang
+            lang = :text
+          end
+
+          text = pre.text.rstrip
+
+          begin
+            pre.replace ::CodeRay.scan(text, lang).div.to_s
+          rescue Exception => error
+            # TODO: error log
+            # puts "#{__FILE__} syntax_highlighter error: \ntext => #{text} \nlang => #{lang}\n origin error:#{error}"
+          end
+        end
+
+        doc.css('body').inner_html.to_s
+      end
+
+      # 解析 mark
+      def parse_marked_content src_content=''
+        _content_text = ''
+        _content_data = {}
+
+        # 读取页面的配置
+        content_lines = src_content.split(/\n/)  # 根据换行分割
+
+        _data_lines = []
+        _text_lines = []
+
+        _data_num_a = -1
+        _data_num_b = -1
+
+        content_lines.each_with_index do |line, index|
+          if line =~ /--+/
+            if _data_num_a == -1
+              _data_num_a = index
+            elsif _data_num_b == -1
+              _data_num_b = index
+            else
+              break
+            end
+          end
+        end
+
+        if _data_num_a > -1 && _data_num_b > -1
+          # 说明有配置信息
+          _yaml = ::YAML.load(content_lines[_data_num_a + 1, _data_num_b -1].join("\n"))
+
+          if _yaml.is_a?(Hash)
+            _content_data.merge!(_yaml)
+          end
+
+          _content_text = content_lines[_data_num_b + 1, content_lines.size].join("\n")
+        else # 无页面配置信息
+          _content_text = src_content
+        end
+
+        {:data => _content_data, :text => _content_text}
+
+      end
+
+      # 获取一个html代码的目录结果
+      def html_catalogable html=''
+        doc = ::Nokogiri::HTML(html)
+
+        paths = doc.xpath('//h1|//h2|//h3|//h4|//h5|//h6')
+
+        index = 1
+
+        catalogs = paths.map do |path|
+          _name = path.name
+          _text = path.text
+
+          _anchor = "markup-#{_name}-#{index}"
+
+          index += 1
+
+          path.replace("<#{_name}><a name='#{_anchor}'></a>#{_text}</#{_name}>")
+
+          {
+            'text'   => _text,
+            'name'   => _name,
+            'anchor' => _anchor
+          }
+        end
+
+        {
+          'catalogs' => catalogs,
+          'html'     => doc.css('body').inner_html.to_s
+        }
+      end
     end
+
   end
 end
 

data/lib/docwu/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Docwu
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/docwu/worker.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+require 'date'
 module Docwu
   class Worker
 
@@ -26,95 +27,95 @@ module Docwu
     # - layouts:
     #   - application.mustache
     #
-    #  data:
-    #  src_paths
-    #  asset_paths
-    #  layout_paths
-    #  output_path
-    #
-    attr_reader :src_paths, # 源文件地址们
-      :output_path,         # 要输出的路径
-      :folders,             # 项目文件夹们
-      :asset_paths,         # assets路径
-      :layouts,             # layouts路径
-      :data                 # 数据
 
-    def initialize attrs={}
-      @data                = attrs[:data]      || Docwu.config.data               || {}
-      @src_paths           = attrs[:src_paths] || Docwu.config.src_paths
+    attr_reader :layouts, :data, :deploy_path, :folders, :topics
 
-      # 关于目录
-      @folders             = {}
-      @layouts             = {}
+    def initialize
+      @deploy_path = ::Docwu.config.deploy_path   # 部署路径
 
-      # 静态文件目录 --------------------------------------------------------
-      @asset_paths = []
+      @data = {
+        'worker' => {
+          'copyright' => {
+            'year'    => ::Date.today.year,
+            'content' => 'document world util',
+            'name'    => 'Doc WU'
+          }
+        }
+      }
 
-      (attrs[:asset_paths] || Docwu.config.asset_paths || []).each do |_path|
-        if File.exists?(_path) && File.directory?(_path)
-          @asset_paths < _path
-        end
-      end
+      ::Docwu::Utils.hash_deep_merge!(@data['worker'], ::Docwu.config.worker)
 
-      layout_paths = attrs[:layout_paths] || Docwu.config.layout_paths || []
+      self.data['page'] ||= {}
 
-      # 计算出当前所有的asset_paths
-      @src_paths.each do |_space, _path|
-        _asset_path = "#{_path}/assets"
+      self.data['reader'] ||= {}
 
-        if File.exists?(_asset_path) && File.directory?(_asset_path)
-          @asset_paths << _asset_path
-        end
+      # 关于目录
+      @folders             = []
+      @layouts             = {}
+      @topics              = []
 
-        _layout_path = "#{_path}/layouts"
+      # 布局模板
+      ::Docwu.config.routes['layouts'].each do |name, path|
+        _path = "#{::Docwu.config.layouts_path}/#{path}"
 
-        if File.exists?(_layout_path) && File.directory?(_layout_path)
-          layout_paths << _layout_path
+        if File.exists?(_path) && File.file?(_path)
+          @layouts[name] = File.read(_path)
         end
+      end
 
-        _folder_path = "#{_path}/doc"
-
-        puts " _folder_path---> #{_folder_path}"
+      #                                      原文件， 目标路径
+      ::Docwu.config.routes['topics'].each do |src, path|
+        _src_path = "#{::Docwu.config.topics_path}/#{src}"
 
-        if File.exists?(_folder_path) && File.directory?(_folder_path)
-          @folders[_space] = ::Docwu::Folder.new(:path => _folder_path, :worker => self, :dir => (_folder_path.sub(_path, '')))
+        if File.exists?(_src_path) && File.file?(_src_path)
+          @topics << ::Docwu::Topic.new(:src => _src_path, :path => path, :worker => self)
         end
       end
 
-      layout_paths.each do |_path|
-        Dir.glob("#{_path}/**/*").each do |_dir|
-          if File.exists?(_dir) && File.file?(_dir)
-            @layouts[_dir.sub("#{_path}/", '')] = _dir
-          end
+      # 计算出当前所有的 folders                源,   目标
+      ::Docwu.config.routes['folders'].each do |_src, _path|
+        _folder_src = "#{plain_path("/#{_src}")}"
+
+        if File.exists?(_folder_src) && File.directory?(_folder_src)
+          @folders << ::Docwu::Folder.new(:src => _folder_src, :worker => self, :path => _path)
         end
       end
 
-      @output_path         = attrs[:output_path]        || Docwu.config.output_path
+      # TODO: add 更多的全局数据
+
+      self.data['reader'].merge!(
+        'global'  => {
+          'folders' => self.folders_data
+        }
+      )
 
-      # puts self.output_path
-      # puts self.folders
-      # puts self.layouts
-      # puts self.asset_paths
     end
 
     # 输出: 
     #   TODO: 先生成临时目录， 然后 -> deploy
     def generate
       # 删除要输出的路径
-      FileUtils.rm_rf(self.output_path)
+      FileUtils.rm_rf(self.deploy_path)
 
       # 复制 assets 文件进去
-      self.asset_paths.each do |_path|
-        FileUtils.cp_r("#{_path}", "#{self.output_path}/")
+      FileUtils.cp_r("#{plain_path('/assets')}", "#{self.deploy_path}/")
+
+      self.folders.each do |folder|
+        folder.generate
       end
 
-      self.folders.each do |space, folder|
-        folder.generate space
+      self.topics.each do |topic|
+        topic.generate
       end
+    end
 
+    def plain_path(path)
+      "#{::Docwu.config.workspace}#{path}"
     end
 
-    private
+    def folders_data
+      self.folders.map(&:to_data)
+    end
 
   end
 end

data/lib/docwu.rb

@@ -1,23 +1,112 @@
 # -*- encoding : utf-8 -*-
 require "#{File.dirname(__FILE__)}/docwu/config"
+require "#{File.dirname(__FILE__)}/docwu/route"   # 定制页面路由器
+require "#{File.dirname(__FILE__)}/docwu/topic"
 require "#{File.dirname(__FILE__)}/docwu/utils"
 require "#{File.dirname(__FILE__)}/docwu/worker"
 require "#{File.dirname(__FILE__)}/docwu/render"
 require "#{File.dirname(__FILE__)}/docwu/folder"
 require "#{File.dirname(__FILE__)}/docwu/post"
-require "#{File.dirname(__FILE__)}/docwu/category"
 require "#{File.dirname(__FILE__)}/docwu/server"
 
-require 'redcarpet'
-require 'coderay'
+require 'pp'
 require 'yaml'
 require 'fileutils'
 require 'mustache_render'
+require 'logger'
 
 module Docwu
 
-  def self.generate
-    Docwu::Worker.new.generate
+  # 程序开始
+  def self.start(workspace)
+    _start_time = Time.now
+
+    args = ARGV
+
+    _command = args.shift
+
+    _useful_cmds = ['g', 'generate', 's', 'server', '-h', '--help']
+
+    unless _useful_cmds.include?(_command)
+      raise "command #{_command} is not available, not in (#{_useful_cmds.join('|')})"
+    end
+
+    _default_params = {
+      '-p'        => [5656],
+      '-a'        => ['0.0.0.0'],
+      '-c'        => ["#{workspace}/config.yml"],
+      'DOCWU_ENV' => ['development'],
+      '-d'        => [(args.delete('-d') == '-d')]
+    }
+
+    if ['--help', '-h'].include?(_command)
+      puts "docwu:"
+
+      _default_params.each do |_cmd, _cfg|
+        puts "    #{_cmd}, #{_cfg[1]} (default: #{_cfg[0]})"
+      end
+
+      exit
+    end
+
+    # 获取参数
+    params = Hash[args.each_slice(2).to_a]
+
+    _default_params.each do |_k, _v|
+      params[_k] = params[_k] || _v.first
+    end
+
+    params['-p'] = params['-p'].to_i
+
+    # 需要生成
+    _need_generate = ['g', 'generate', 's', 'server'].include?(_command)
+
+    # 需要开启server
+    _need_server = ['s', 'server'].include?(_command)
+
+    _config_file = params['-c']
+
+    _config = {}
+
+    if File.exists?(_config_file) && File.file?(_config_file)
+      _yml = YAML.load(File.read(_config_file))
+
+      if _yml.is_a?(Hash)
+        _config.merge!(_yml['docwu'] || {})
+      end
+    else
+      raise "#{_config_file} not exists!"
+    end
+
+    _logger = ::Logger.new(STDOUT)
+    _logger.level = ::Logger::INFO
+
+    # docwu 的配置
+    ::Docwu.configure do |config|
+      config.logger      = _logger
+      config.params      = params.freeze
+      config.routes      = (_config['routes'] || {}).freeze
+      config.worker      = (_config['worker'] || {}).freeze
+      config.workspace   = "#{workspace}".freeze
+    end
+
+    ::MustacheRender.configure do |config|
+      config.file_template_root_path = ::Docwu.config.layouts_path
+      config.logger                  = ::Docwu.config.logger
+    end
+
+    if _need_generate
+      ::Docwu::Worker.new.generate 
+
+      _logger.info("generate: success, #{Time.now - _start_time}")
+    end
+
+    if _need_server
+      ::Docwu::Server.process(
+        :Port => ::Docwu.config.params['-p'],
+        :Host => ::Docwu.config.params['-a']
+      )
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docwu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -75,27 +75,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Description of Docfive.
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Description of Doc Work UP.
 email:
 - andywang7259@gmail.com
-executables: []
+executables:
+- docwu
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/docwu/server.rb
+- lib/docwu/route.rb
 - lib/docwu/render.rb
 - lib/docwu/config.rb
 - lib/docwu/utils.rb
 - lib/docwu/version.rb
+- lib/docwu/topic.rb
 - lib/docwu/worker.rb
 - lib/docwu/post.rb
-- lib/docwu/category.rb
 - lib/docwu/folder.rb
 - lib/docwu.rb
 - lib/tasks/docwu_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.md
+- bin/docwu
 homepage: http://github.com/xiuxian123/docwu
 licenses: []
 post_install_message: 
@@ -110,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1575743025569223070
+      hash: -3240824084123490041
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,11 +138,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1575743025569223070
+      hash: -3240824084123490041
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Summary of Docfive.
+summary: Summary of Doc Work UP.
 test_files: []