ld 0.2.7 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5e6b6b049c3500199fc6a575bb77171b91fcf29
-  data.tar.gz: 8af7fdc85064507fe94bd42cba74772af06edb05
+  metadata.gz: e89cf241b75524b55030d7380c492ca33997d1a0
+  data.tar.gz: 5bf0835e73ca16ac0b6c47d5caa4da5ba632677d
 SHA512:
-  metadata.gz: 60aeb848bfb455546fe23799408357a28c88f28a9b06a9d8f2caa6c5915ad2d73b68269a37145caca5ae5d6e2e46bbac6daea83012b3711e868eee3b4f460e9f
-  data.tar.gz: ea7db3ca6f3901a5dda90a2f4344ef04968cd0f9bcc3271ba1778a81641c7874f04c7ffa1fde4445b0a839e4c0cd33b70a4171f6f315ab56bd4a7fd330b89c9c
+  metadata.gz: 9b942469c6091f7d0e7fe839899446f3b07f5a3de8b16d2c2468362f2cdb9ce3ebf0b9e94b9baf1a9e453f312a066c687405197ca83d9f3f048a2ba373d5f5cd
+  data.tar.gz: e9c8834ce7d77486ef47c88d6660469b91da4f37b820095c80f231f1c2ff56002db55124f3315d6b35acbf8ff258ecc0da93422ae655544dd802b5b8a856ba40

data/lib/ld/project/controllers.rb

@@ -23,7 +23,7 @@ class Ld::Controllers
     controller = find_controller model_name.pluralize
     if controller
       controller_lines = controller.lines
-      controller_methods = controller_lines.map{|l| l.split('def ')[1] if l.match(/def /)}.compact
+      controller_methods = controller_lines.map{|l| l.split('def ')[1].chomp if l.match(/def /)}.compact
     end
     controller
   end

data/lib/ld/project/models.rb

@@ -1,9 +1,10 @@
 class Ld::Models
   attr_accessor :headings, :rows, :models
 
-  def initialize root, tables
+  def initialize root, tables, table_hash
     @root = root
     @tables = tables
+    @table_hash = table_hash
     parse
   end
 
@@ -18,18 +19,20 @@ class Ld::Models
       methods_full = lines.map{|l| l.split('def ')[1] if l.match(/def /)}.compact
       methods = methods_full.map{|method_full| method_full.split(' ')[0]}
       instance = name.camelize.constantize.new
-      data_count = 0#name.camelize.constantize.count
+      data_count = name.camelize.constantize.count
       fields = instance.attributes.keys
       relations = get_relations file.lines
       [
-          name,name.pluralize,name.camelize,data_count,lines.size,file.path,methods.size,
+          name,name.pluralize,@table_hash[name],name.camelize,data_count,lines.size,file.path,methods.size,
           methods.join(','),fields.join(','),fields.size,
           relations[:has_many].size,relations[:belongs_to].size,relations[:has_one].size,
-          relations[:has_many].join(','),relations[:belongs_to].join(','),relations[:has_one].join(',')
+          relations[:has_many].join(",\n"),
+          relations[:belongs_to].join(",\n"),
+          relations[:has_one].join(",\n")
       ]
-    }.compact.sort{|a,b| b[2] <=> a[2]} # 按 模型文件行数 排序
+    }.compact.sort{|a,b| b[0] <=> a[0]} # 按 模型文件行数 排序
     @models = @rows.map{|arr| arr[0]}.uniq
-    @headings = ['模型名','表名','类','数据数量','行数','path', '方法数',
+    @headings = ['模型名','表名','comment','类','数据数量','行数','path', '方法数',
                  '所有方法', '所有字段','字段数量',
                  'has_many个数','belongs_to个数','has_one个数',
                  'has_many','belongs_to','has_one']
@@ -38,13 +41,20 @@ class Ld::Models
   def get_relations lines
     relations = {has_many:[],belongs_to:[],has_one:[]}
     lines.each do |line|
-      arr = line.split(' ')
-      if arr[0] == 'has_many'
-        relations[:has_many] << arr[1].split(':')[1]
-      elsif arr[0] == 'belongs_to'
-        relations[:belongs_to] << arr[1].split(':')[1]
-      elsif arr[0] == 'has_one'
-        relations[:has_one] << arr[1].split(':')[1]
+    arr = line.split(' ')
+      if ['has_many','belongs_to','has_one'].include? arr[0]
+        model = arr[1].split(':')[1].split(',')[0]
+        china = @table_hash[model.singularize]
+        if !china
+          if i = arr.index('class_name:')
+            if class_name = arr[i+1]
+              class_name = class_name.split('"')[1] if class_name.match(/"/)
+              class_name = class_name.split("'")[1] if class_name.match(/'/)
+              china = @table_hash[class_name.underscore]
+            end
+          end
+        end
+        relations[arr[0].to_sym] << "#{model}(#{china})"
       end
     end
     relations

data/lib/ld/project/project.rb

@@ -2,24 +2,99 @@ class Ld::Project
 
   attr_accessor :root, :tables, :models, :controllers, :views, :routes
 
-  def initialize path = Rails.root.to_s
+  def initialize table_hash = {}, path = Rails.root.to_s
     @root = Ld::File.new path
+    @table_hash = table_hash
     parse_project
   end
 
   def parse_project
     @tables = Ld::Tables.new @root, nil
-    @models = Ld::Models.new @root, @tables
+    @models = Ld::Models.new @root, @tables, @table_hash
     @routes = Ld::Routes.new @root, @models
     @tables = Ld::Tables.new @root, @models
     @views = Ld::Views.new @root, @models
     @controllers = Ld::Controllers.new @root, @models
   end
 
+  def print model_name, type = :relations
+    if !@models.models.include? model_name
+      puts "不存在 #{model_name}"
+      return false
+    end
+
+    title_str = "#{model_name.camelize}(#{@table_hash[model_name]})"
+
+    case type
+      when :fields
+        fs = '字段,字段类型,描述,空约束,默认值,精度位数,limit'.split(',')
+        indexs = fs.map{|f| @tables.headings.index(f)}.compact
+        rows = []
+        @tables.rows.select{|a| a[0]==model_name}.each{|arr| rows << indexs.map{|i| arr[i]} }
+        puts Terminal::Table.new(
+                 :title => "#{title_str}:字段解释",
+                 :headings => fs,
+                 :rows => rows
+             )
+      when :relations
+        fs = 'has_many,belongs_to,has_one'.split(',')
+        indexs = fs.map{|f| @models.headings.index(f)}.compact
+        rows = []
+        @models.rows.select{|a| a[0]==model_name}.each{|arr|
+          rows << indexs.map{|i| arr[i]}
+        }
+        puts Terminal::Table.new(
+                 :title => "#{title_str}:关联关系",
+                 :headings => fs,
+                 :rows => rows
+             )
+      when :routes
+        fs = '控制器,action,请求类型,URI,帮助方法'.split(',')
+        indexs = fs.map{|f| @routes.headings.index(f)}.compact
+        rows = []
+        @routes.rows.select{|a| a[0]==model_name}.each{|arr| rows << indexs.map{|i| arr[i]} }
+        puts Terminal::Table.new(
+                 :title => "#{title_str}:路由",
+                 :headings => fs,
+                 :rows => rows
+             )
+      when :views
+        fs = '文件夹名,行数,文件名,path'.split(',')
+        indexs = fs.map{|f| @views.headings.index(f)}.compact
+        rows = []
+        @views.rows.select{|a| a[0]==model_name}.each{|arr| rows << indexs.map{|i| arr[i]} }
+        puts Terminal::Table.new(
+                 :title => "#{title_str}:视图",
+                 :headings => fs,
+                 :rows => rows
+             )
+      when :controllers
+        fs = 'action个数,文件行数,所有action'.split(',')
+        indexs = fs.map{|f| @controllers.headings.index(f)}.compact
+        rows = []
+        @controllers.rows.select{|a| a[0]==model_name}.each{|arr| rows << indexs.map{|i| arr[i]} }
+        puts Terminal::Table.new(
+                 :title => "#{title_str}:控制器",
+                 :headings => fs,
+                 :rows => rows
+             )
+    end
+
+    true
+  end
+
+  def delete_rows_index
+    @routes.rows.delete_at 0
+    @tables.rows.delete_at 0
+    @models.rows.delete_at 0
+    @views.rows.delete_at 0
+    @controllers.rows.delete_at 0
+  end
+
   def to_xls path = "#{@root.path}/project.xls"
     Ld::Excel.create path do |excel|
-      # sheet.set_format({color: :black, font_size: 14, font: '微软雅黑'})
       excel.write_sheet 'routes' do |sheet|
+        sheet.set_format({color: :black, font_size: 18, font: '微软雅黑'})
         sheet.set_headings @routes.headings
         sheet.set_rows @routes.rows
       end
@@ -40,10 +115,13 @@ class Ld::Project
         sheet.set_rows @controllers.rows
       end
     end
+    #delete_rows_index
   end
 
   def add_bug
 
   end
 
+
+
 end

data/lib/ld/version.rb

@@ -1,3 +1,3 @@
 module Ld
-  VERSION = "0.2.7"
+  VERSION = "0.2.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ld
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.10
 platform: ruby
 authors:
 - Liu Dong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table