m2m 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f65d9e01f4b4e4f27d439dc9a6fb6a91e686294
-  data.tar.gz: 57c9b168be1279c46f76e6c8499eae7c09cfac9c
+  metadata.gz: a71ff3e033f8825e1b69c2ff5207cf61e2fcac2c
+  data.tar.gz: be629fccffa18d444d7710f3c65b34b99b5310c6
 SHA512:
-  metadata.gz: 34362e8196765e446f563e9d0006f675b7efdab8567af7719f58e35ff067ce28d52e6b3221ca72b1bf100960045b6089926a9e7569a61d3ddf104fb80d6ba236
-  data.tar.gz: d500be9c8c50dc9cd9970cf114bf1ab0dba7741ab6680a4ffd104bc14a1fdddae832aad6bab7f9dfeb4757c5e0474689253fbc2028f85b86571527a2e6503a7c
+  metadata.gz: 15b1beb6df73185178b992b7e022b44e6035c3b4ecce8293d3e92c028aa25316ef12cbf39536d679dfb855c6c890a9c1504b9626eed073c51637d9d415e7c068
+  data.tar.gz: a1d726557ec291ce619cef0d278a98c8b93613204253af58d8b5bccd25c1d56748f8facada6176c3af1436d3ccd7363559b7c3175de1cc7ad0a4956d36f19ac3

data/lib/compiler.rb

@@ -2,8 +2,8 @@
 
 #使用模板转换为HTML
 
-require 'mustache'
 require 'pathname'
+require 'mustache'
 require 'fileutils'
 
 require_relative './util'

data/lib/generator.rb

@@ -140,7 +140,7 @@ class Generator
 
     #编译模板
     def compiler(filename, template_name, data)
-        data['tree'] = @store.tree
+        data['categories'] = @store.categories
         data['product'] = @util.get_product 
         data['root/relative_path'] = @util.get_relative_dot(filename)
 

data/lib/product.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module M2M
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
   NAME = "m2m"
   REPOS = "https://github.com/wvv8oo/m2m"
   HOMEPAGE = "http://m2m.wvv8oo.com/"

data/lib/store.rb

@@ -18,23 +18,22 @@ class Store
             #首页
             'home' => nil,
             #完整的分类
-            'categories' => Array.new,
+            'categories' => [],
             #所有文章列表
             'articles' => self.get_articles(files),
             #目录树
             'tree' => {
-                @children_key => Array.new
+                @children_key => []
             }
         }
 
-        self.make_tree_index
-        self.make_categories
+        self.make_tree
         self.sort @data['tree']
     end
 
     #获取所有的分类
     def categories
-        @data['categories']
+        return @data['categories']
     end
 
     #获取
@@ -69,46 +68,137 @@ class Store
         result
     end
 
-    #生成分类的列表
-    def make_categories
-
-    end
-
-    #创建树状结构的索引
-    def make_tree_index
+    #创建树状结构的索引, 以及分类
+    def make_tree
         this = self
         @data['articles'].each{ |key, article|
             dir = File::dirname(article['relative_path'])
             relative_path_md5 = article['relative_path_md5']
-            this.mount_node_to_tree dir, relative_path_md5
+            this.mount_node_to_index dir, relative_path_md5
+            this.mount_node_to_categories dir, relative_path_md5
         }
     end
 
-    #挂到节点上, 如果不在则创建
-    def mount_node_to_tree(path, relative_path_md5)
-        node = @data['tree']
+    #当前的路径挂到正确的路径上
+    def mount_node_to_tree(root, url, children_key, callback)
+        #根目录下的， 直接挂上去
+        return callback.call root, nil, 0, 0 if url == '.'
+
+        node = root
+        #将路径分成段， 如果没存在这个节点， 则创建
+        index = 1
+        segments = url.split('/')
+        segments.each{ |segment|
+            node = callback.call node, segment, index, segments.length
+            index = index + 1
+        }
+    end
 
-        if path == '.'
-            node[@children_key].push relative_path_md5
-            return
-        end
+    #将节点挂到索引上
+    def mount_node_to_index(url, relative_path_md5)
+        key = @children_key
+        #回调的处理
+        callback = lambda { |node, segment, index, total|
+            #根节点， 直接插入到items中
+            if segment == nil
+                node[@children_key].push relative_path_md5
+                return node
+            end
 
-        path.split('/').each{ |segment|
+            #如果没有找到， 则创建新的节点
             current_node = node[segment]
             if not current_node
                 current_node = Hash.new()
-                current_node[@children_key] = Array.new
+                current_node[key] = Array.new
                 node[segment] = current_node
             end
 
-            node = current_node
-            node[@children_key].push relative_path_md5
+            current_node[key].push relative_path_md5
+            return current_node
+        }
+
+        self.mount_node_to_tree @data['tree'], url, @children_key, callback
+    end
+
+    #将节点挂到分类下
+    def mount_node_to_categories(url, relative_path_md5)
+        #回调的处理
+        callback = lambda { |parent, segment, index, total|
+            if segment != nil
+                node = self.get_categories_node_children parent, segment
+                #还不是最后一个节点
+                return node if index < total
+            else
+                node = parent
+            end
+
+            #获取文章的信息
+            article = @data['articles'][relative_path_md5]
+            meta = article['meta']
+
+            #分类中的文章
+            item = {
+                'title' => meta['title'],
+                'relative_url' => article['relative_url']
+            }
 
-            #所有的子级，都要向root插入数据
-            @data['tree'][@children_key].push relative_path_md5
+            if segment == nil
+                node.push item
+                return node
+            end
+
+            #还没有这个键
+            node[@children_key] = [] if node[@children_key] == nil
+            node[@children_key].push item
+            return node
         }
+
+        self.mount_node_to_tree @data['categories'], url, @children_key, callback
+    end    
+
+    #从数组的分类中，获取节点， 如果节点不存在， 则创建一个
+    def get_categories_node_children(parent, segment)
+        parent.each { | current |
+            return current if current['title'] == segment
+        }
+
+        #如果没有找到， 则创建一个
+        node = {
+            'title' => segment,
+            @children_key => []
+        }
+
+        parent.push node
+        node
     end
 
+    #挂到节点上, 如果不在则创建
+    # def mount_node_to_tree(path, relative_path_md5)
+    #     node = @data['tree']
+
+
+    #     #根目录下的
+    #     if path == '.'
+    #         node[@children_key].push relative_path_md5
+    #         return
+    #     end
+
+    #     path.split('/').each{ |segment|
+    #         current_node = node[segment]
+    #         if not current_node
+    #             current_node = Hash.new()
+    #             current_node[@children_key] = Array.new
+    #             node[segment] = current_node
+    #         end
+
+    #         node = current_node
+    #         node[@children_key].push relative_path_md5
+
+    #         #所有的子级，都要向root插入数据
+    #         @data['tree'][@children_key].push relative_path_md5
+    #     }
+    # end
+
 
     #给所有的文件夹排序
     def sort(node)