ld 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d537a523fd57cca3f98c2662fc9ac9a208b7522b
-  data.tar.gz: 492bba9c5d819c7e58a063f0bc791679c2a6e873
+  metadata.gz: c5e6b6b049c3500199fc6a575bb77171b91fcf29
+  data.tar.gz: 8af7fdc85064507fe94bd42cba74772af06edb05
 SHA512:
-  metadata.gz: 3044f77a5e29d12d8b4aee5e3af93ac79bfa74f8d906749181116e1dfac1dfed264522b55ef055990297bc0a8b539ca3e3bff191324a53ffa749fffce3662df2
-  data.tar.gz: 6c326e0433bde9e60f55c2259871549eb39c8f9de1e1b4c22d246f0900462ffe79d4281b0c02a7edb89aa83ce504f08c52c690f2006663ee4c2f8ad59c209f3e
+  metadata.gz: 60aeb848bfb455546fe23799408357a28c88f28a9b06a9d8f2caa6c5915ad2d73b68269a37145caca5ae5d6e2e46bbac6daea83012b3711e868eee3b4f460e9f
+  data.tar.gz: ea7db3ca6f3901a5dda90a2f4344ef04968cd0f9bcc3271ba1778a81641c7874f04c7ffa1fde4445b0a839e4c0cd33b70a4171f6f315ab56bd4a7fd330b89c9c

data/README.md

@@ -8,25 +8,6 @@ Basically has the following Class.
 
 ```ruby
 module Ld
-  class Excel
-  end
-  class Sheets
-  end
-
-  class File
-  end
-  class Files
-  end
-
-  class Print
-  end
-
-  module Project
-    class Structure
-    end
-    class Parse
-    end
-  end
 end
 ```
 ## Introduction to the
@@ -64,29 +45,37 @@ First ， into the console:
 Then, can do this:
 
 ```ruby
-# Print model, Need to change the User model to exist, to run again
-Ld::Table.p User.all, 'id , created_at'
+# Project details to /project.xls 查看项目详情,会生成xls文件,在: /project.xls
+Ld::Project.new.to_xls
+
+# Read xls
+Ld::Excel.open('project.xls').read('models?a1:j100-f,h,i')
+Ld::Excel.open('project.xls').read('tables?a1:i300')
 
 # Create xls, Need to change the file path to your own, and then run
-Ld::Excel.create '/Users/liudong/Desktop/excel_test.xls' do |excel|
+Ld::Excel.create 'excel_test.xls' do |excel|
   excel.write_sheet 'sheet1' do |sheet|
     sheet.set_format({color: :red, font_size: 11, font: '宋体'})
     sheet.set_headings ['title1','title2','title3']
     sheet.set_point 'a1'
-    (1..10).to_a.each do |i|
-      sheet.add_row i.times.map{|j| j}
-    end
+    sheet.set_rows [
+      [1,2,3,4,5],
+      [1,2,3,4],
+      [1,2,3],
+      [1,2],
+      [1],
+    ]
   end
 end
+Ld::Excel.open('excel_test.xls').read('sheet1?a1:g6')
 
-# Read xls
-Ld::Excel.open('/Users/liudong/Desktop/excel_test.xls').read('sheet1?a1:e10')
-
-# Read Dir
-Ld::File.open_dir('dir_path').children.each{|f| puts f.path}
+# Print model, Need to change the User model to exist, to run again
+Ld::Print.p User.first(10), 'id ,name, created_at'
 
-# Project Structure details to /project.xls 查看项目详情,会生成xls文件,在: /project.xls
-Ld::Project::Structure.new(Ld::File.new(Rails.root.to_s)).generate
+# Read dir or file
+Ld::File.new('Gemfile').lines.each{|l| puts l}
+Ld::File.new('app').models.children.each{|f| puts f.name}
+Ld::File.new('app').views.search_files(/.html/).each{|f| puts "#{f.father.name} : #{f.name}"}
 
 ```
 

data/lib/ld/project/models.rb

@@ -18,13 +18,36 @@ 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 = name.camelize.constantize.count
+      data_count = 0#name.camelize.constantize.count
       fields = instance.attributes.keys
-      [name,name.pluralize,name.camelize,data_count,lines.size,file.path,methods.size,methods.join(','),fields.join(','),fields.size]
+      relations = get_relations file.lines
+      [
+          name,name.pluralize,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(',')
+      ]
     }.compact.sort{|a,b| b[2] <=> a[2]} # 按 模型文件行数 排序
     @models = @rows.map{|arr| arr[0]}.uniq
-    @headings = ['模型名','表名','类','数据数量','行数','path', '方法数','所有方法', '所有字段','字段数量']
+    @headings = ['模型名','表名','类','数据数量','行数','path', '方法数',
+                 '所有方法', '所有字段','字段数量',
+                 'has_many个数','belongs_to个数','has_one个数',
+                 'has_many','belongs_to','has_one']
   end
 
+  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]
+      end
+    end
+    relations
+  end
 
 end

data/lib/ld/project/project.rb

@@ -4,19 +4,19 @@ class Ld::Project
 
   def initialize path = Rails.root.to_s
     @root = Ld::File.new path
+    parse_project
   end
 
   def parse_project
-    @routes = Ld::Routes.new @root
     @tables = Ld::Tables.new @root, nil
     @models = Ld::Models.new @root, @tables
+    @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 to_xls path = "#{@root.path}/project.xls"
-    parse_project
     Ld::Excel.create path do |excel|
       # sheet.set_format({color: :black, font_size: 14, font: '微软雅黑'})
       excel.write_sheet 'routes' do |sheet|
@@ -42,10 +42,8 @@ class Ld::Project
     end
   end
 
+  def add_bug
 
-  def camelize name
-    name.camelize
   end
 
-
 end

data/lib/ld/project/routes.rb

@@ -2,29 +2,30 @@ class Ld::Routes
 
   attr_accessor :headings, :rows
 
-  def initialize root
+  def initialize root, models
     @root = root
+    @models = models
     parse
   end
   
   def parse
-    system "rake routes > #{@root.path}/routes.txt"
-    rows = @root.find('routes.txt').lines.map{|line|
+    system "rake routes > #{@root.path}/routes.txt" if !File.exist? "#{@root.path}/routes.txt"
+    @rows = @root.find('routes.txt').lines.map{|line|
       arr = line.split(' ')
       arr.unshift(nil) if arr.size == 3
       arr
-    }
-               .delete_if{|arr| arr.size >= 5 or arr.size <= 2  }
-               .map{|row|
+    }.delete_if{|arr| arr.size >= 5 or arr.size <= 2  }.map{|row|
       controller, action = row[3].split('#')
+      controller_name = controller.split('/').last
+      if @models
+        @model_name = @models.models.include?(controller_name.singularize) ? controller_name.singularize : nil
+      end
       type        = row[1]
       help_method = row[0]
       uri         = row[2]
-      #
-      [controller, action, type, uri, help_method]
-    }
-    File.delete("#{@root.path}/routes.txt") if File.exist? "#{@root.path}/routes.txt"
-    @headings = ['控制器', 'action', '请求类型','URI','帮助方法']
-    @rows = rows
+      [@model_name,controller_name, action, type, uri, help_method]
+    }.sort{|a,b| a[1] <=> b[1]}
+    #File.delete("#{@root.path}/routes.txt") if File.exist? "#{@root.path}/routes.txt"
+    @headings = ['所属模型','控制器', 'action', '请求类型','URI','帮助方法']
   end
 end

data/lib/ld/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ld
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Liu Dong