ld 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c89ec7ff97e888e56b4ded299f4032294b1fe98c
-  data.tar.gz: d7c4e6ada94439a6be03cfd00f32160638d17be9
+  metadata.gz: 59674cf5f131112be70e95b3b57c2fce00762ab7
+  data.tar.gz: 251914cdc6f67afa5361fd32854cfc969a8c7166
 SHA512:
-  metadata.gz: 1493087439d5d094542e670c50791e0847bd106158fd6cbb737813f1c946faf77dd61374f4b1981e2de7f2492bd92205965b5b963a6fa74c1d8b1019dd37e2e3
-  data.tar.gz: 056a73a325c41522f549662da363be5ce3bfcaf2f8e135ff913f46371572b3e9c071ccc727aa743ac25f162b36aaae500eea8ecf2fd8e1ba98f858bda2342d67
+  metadata.gz: b54d6f6e9eaac2a4dfd773c54601e1b44ccfbf37a9e4ae0813cb647b9ad14b31dff47fc4489ce6301c8272f833eaf432e71413dba30223d54cf9bfbb6dd1742b
+  data.tar.gz: 5d0b4a91596ad7a254b32110b9a5995d4099353b73df84a012f3bbbeb6c30fe9a9b6209d791c7bac1d21c798f99ac222f0d4297ea9875f776823aa2ed22fdd42

data/README.md

@@ -8,17 +8,16 @@ Basically has the following Class.
 
 ```ruby
 module Ld
+  class File
+  end
+  class Excel
+  end
+  class Project
+  end
+  class Print
+  end
 end
 ```
-## Introduction to the
-
-  设计这个gem,我希望可以帮助大家在开发简单rails应用时,可以帮助大家完成50%以上的简单而重复的工作
-  我会提供一些类与方法,在console中使用,调用它们会生成项目结构xls文件,生成的这个xls文件中的数据,类似于一个小型文件数据库
-  然后我们可以以此为基础,查询项目中的一些信息.我想这样会有助于我们快速理解一个项目的基本结构,与重要文件在哪
-  也可以在修复bug时对bug相关文件与方法,起到快速定位的作用
-  这是我设计本gem的初衷,未来应该会持续更新这个gem,让它变得更加强大与方便
-  最终的目的是,希望这个gem可以起到快速搭建简单rails应用的作用,提升工作效率,节省时间
-  比如我们可以集成一些常用的模块到这个gem中,在搭建项目时只需要执行一条简单的命令就可以创建
 
 ## Installation
 
@@ -38,47 +37,87 @@ Or install it yourself as:
 
 ## Usage
 
-First ， into the console:
-
-    $ rails c
-
-Then, can do this:
-
+1. Ld::Excel
 ```ruby
-# 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 :file_path =>'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']
+# write excel
+Ld::Excel.create :file_path => 'config/excel_test.xls' do |excel|
+  excel.write_sheet 'abc' do |sheet|
+    sheet.set_format({color: :red, font_size: 20, font: '微软雅黑'})
     sheet.set_point 'a1'
-    sheet.set_rows [
-      [1,2,3,4,5],
-      [1,2,3,4],
-      [1,2,3],
-      [1,2],
-      [1],
-    ]
+    sheet.set_headings ['A','B','C','D']
+    sheet.set_rows([
+      ['1','2','3','4'],
+      ['2','3','4','5'],
+      ['3','4','5','6'],
+      ['4','5','6','7']
+    ])
   end
 end
-Ld::Excel.open('excel_test.xls').read('sheet1?a1:g6')
 
-# Print model, Need to change the User model to exist, to run again
-Ld::Print.p User.first(10), 'id ,name, created_at'
+# read excel
+excel = Ld::Excel.open('config/excel_test.xls')
+excel.read('abc?a1:b5')
+excel.read({sheet: 'abc', scope:'a1:b5'})
+excel.read({sheet: 'abc', scope:'a1:b5', exclude:'3'})
+excel.read({sheet: 'abc', scope:'a1:b5', exclude:'B'})
+```
+
+
+2. Ld::Project
+```ruby
+# Check the project details
+project = Ld::Project.new(Rails.root.to_s)
+
+# create excel to 'config/project_details.xls'
+
+# Check model infos
+project.to_xls('config/project_details.xls')
+project.print :user, :fields
+project.print :user, :relations
+project.print :user, :routes
+project.print :user, :controllers
+project.print :user, :views
+
+```
+
+
+3. Ld::File
+```ruby
+# read file all lines
+file = Ld::File.open('config/application.rb')
+lines = file.lines
+
+# read dir
+dir = Ld::File.open('app/models')
+files = dir.children
+
+# search dir file by file name
+files = dir.search_files(/.rb$/)
+
+# Ld::File API
+Ld::File.open path
+Ld::File.new path
+file.children
+file.brothers
+file.father
+file.lines
+file.search_files(//)
+file.search_dirs(//)
+file.name
+file.path
+file.type  # 0=file, 1=dir
+```
 
-# 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}"}
 
+4. Ld::Print
+```ruby
+users = User.first(10)
+Ld::Print.p users, 'id ,name, created_at'
 ```
 
+
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/ld/excel/excel.rb

@@ -4,65 +4,58 @@ Spreadsheet.client_encoding = 'UTF-8'
 class Ld::Excel
   attr_accessor :excel, :path
 
-  # 构造函数,如果未传path则是创建一个新的excel,   如果传了path,则打开这个excel,不过打开前会验证后缀与是否存在
   def initialize path = nil
     if path
       if path.match(/.xls$/)
         if File::exist? path
           @excel = Spreadsheet.open path
           @path = path
-          puts "打开文件:  #{path}"
         else
-          raise "文件不存在:  #{path}"
+          raise "File does not exist:  #{path}"
         end
       else
-        raise "只能打开.xls结尾的文件"
+        raise "Can only read .xls!"
       end
     else
       @excel = Spreadsheet::Workbook.new
-      puts "创建新的Excel实例"
     end
   end
 
-  # 打开一个excel
   def self.open path
     self.new path
   end
 
-  # 获取一页
   def open_sheet name
     Ld::Sheet.open @excel, name
   end
 
-  # 刷新 重读一次
   def flush
     @excel = Ld::Excel.open @path
   end
 
-  # content_url = "Sheet1?b13:m27-g.j.k.(14:18)"
-  def read address_path_full, simple = false, filter_nil = false
-    raise "缺少?, 需要在'?'左边指定sheet的名称" if !address_path_full.match(/\?/)
-    sheet_name, address_path = address_path_full.split('?')
-    @current_sheet = open_sheet sheet_name
-    arrs = @current_sheet.read address_path, simple
-    # 除去不完整数据
-    if filter_nil
-      (arrs.size - 1).downto(0) do |i|
-        arr = arrs[i]
-        if arr[0] == nil or arr[1] == nil
-          arrs.delete_at i
-        end
-      end
-    end
+  # Example: address = "Sheet1?a1:f5"
+  def read params, show_location = false
 
-    arrs
+    case params.class.to_s
+      when 'String'
+        shett_name, scope = params.split('?')
+        @current_sheet = open_sheet shett_name
+        @current_sheet.read scope, show_location
+      when 'Hash'
+        raise "Parameter error! \nnot find 'sheet'" if params[:sheet].nil?
+        raise "Parameter error! \nnot find 'scope'" if params[:scope].nil?
+        params[:location] = false if params[:location].nil?
+        @current_sheet = open_sheet params[:sheet]
+        @current_sheet.read params, params[:location]
+    end
   end
 
+
   # 保存文件
   def save path
-    puts "这个操作将会覆盖了这个文件:#{path}" if File.exist? path
+    puts "Covers a file: #{path}" if File.exist? path
     @excel.write path
-    puts "保存excel成功:#{path}"
+    puts "Excel save success!"
     self
   end
 

data/lib/ld/excel/sheet.rb

@@ -9,7 +9,7 @@ class Ld::Sheet
   end
 
   def initialize excel, name, type = 'new'
-    raise "name为 nil" if !name
+    raise "sheet name is nil" if !name
     @excel = excel
     @name = name
     case type
@@ -20,226 +20,146 @@ class Ld::Sheet
         @rows = []
       when 'open'
         @sheet = excel.worksheet name
-        raise "#{name} 不存在" if !@sheet
+        raise "sheet '#{name}' not found!" if !@sheet
     end
     @format = @sheet.default_format
   end
 
-  def read address_str, simple = false
-    map = generate_map address_str
-    arrs = read_map map, simple
-    if arrs.size == 0
-      puts "没有任何内容的区域!  #{address_str}"
-    else
-      puts "#{address_str}"
-    end
-    arrs
+  def read scope, show_location = false
+    raise "scope params is nil" if !scope
+    map = parse_scope_to_map scope
+    read_arrs map, show_location
   end
 
-  # simple 带不带坐标index数据
-  def read_map arrs, simple
-    @scope_arrs = []
-    arrs.each do |arr|
-      rows = []
-      arr.each do |a|
-        if simple
-          rows << {:index => a[0], :value => read_unit_by_xy(a[1], a[2], true)}
-        else
-          rows << read_unit_by_xy(a[1], a[2], true)
-        end
+  def parse_string_scope scope
+    hash = {}
+    scope.upcase!
+    raise "params error! \n'+' 只能有1个" if scope.split('+').size > 2
+    raise "params error! \n'-' 只能有1个" if scope.split('-').size > 2
+    if scope.include? '+'
+      hash[:scope], other = scope.split('+')
+      if other.include? '-'
+        hash[:adds], hash[:mins] = other.split('-')
+      else
+        hash[:adds] = other
+      end
+    else
+      if scope.include? '-'
+        hash[:scope], hash[:mins] = scope.split('-')
+      else
+        hash[:scope] = scope
       end
-      @scope_arrs << rows
     end
-    @scope_arrs
+    hash
   end
 
-  # 通过x,y坐标获取unit内容
-  def read_unit_by_xy x, y, parse
-    # puts "x: #{x}\ty: #{y}"
-    unit = @sheet.row(y)[x]
-    if unit.instance_of? Spreadsheet::Formula
-      if parse
-        return unit.value
+  def parse_scope_to_map scope
+    scope = parse_string_scope scope if scope.class == String
+    raise "params lack fields ':scope'!" if !scope[:scope]
+    raise "params syntax error! lack ':'" if !scope[:scope].match(/:/)
+    raise "params syntax error! ':' 只能有1个" if scope[:scope].split(':').size > 2
+    a, b = scope[:scope].split(':').map{|point| parse_point point}
+    cols = (a[:character]..b[:character]).to_a
+    rows = (a[:number]..b[:number]).to_a
+    maps_add rows, cols, scope[:adds].upcase if scope[:adds]
+    maps_min rows, cols, scope[:mins].upcase if scope[:mins]
+
+    if scope[:mins]
+      raise "mins 参数只能是 String" if scope[:mins].class != String
+    end
+    rows = rows.uniq.sort
+    cols = cols.uniq.sort
+    maps = rows.map do |row|
+      cols.map do |col|
+        col_i = ABSCISSA[col]
+        raise "不存在这个列 \n'#{col}'" if !col_i
+        {
+            location:"#{col}#{row}",
+            row:row,
+            col:col_i
+        }
       end
     end
-    return unit
+    # 调试
+    # maps.each do |arr|
+    #   puts arr.map{|a| a[:location]}.to_s
+    # end
+    maps
   end
 
-  # 用坐标解析一个excel scope
-  def generate_map address_str
-    map = {:x => [], :y => []}
-    config = parse_address address_str
-    if config[:scope]
-      if config[:scope].include? ':'
-        # map初始化
-        arr = config[:scope].split(':')
-        if config[:scope].scan(/[0-9]+/).join == ''
-          map_adds(map, ab_to(arr[0].scan(/[A-Z]+/).join, arr[1].scan(/[A-Z]+/).join))
-        elsif config[:scope].scan(/[A-Z]+/).join == ''
-          map_adds(map, ab_to(arr[0].scan(/[0-9]+/).join, arr[1].scan(/[0-9]+/).join))
-        else
-          map_adds(map, ab_to(arr[0].scan(/[0-9]+/).join, arr[1].scan(/[0-9]+/).join))
-          map_adds(map, ab_to(arr[0].scan(/[A-Z]+/).join, arr[1].scan(/[A-Z]+/).join))
-        end
-        # map 添加
-        if config[:add_str]
-          config[:add_str].split(',').each do |add|
-            if add.include? ":"
-              map_adds(map, ab_to(add.split(':')[0], add.split(':')[1]))
-            else
-              map_add map, add
-            end
-          end
-        end
-        # map 减小
-        if config[:min_str]
-          config[:min_str].split(',').each do |min|
-            if min.include? ":"
-              map_mins(map, ab_to(min.split(':')[0], min.split(':')[1]))
-            else
-              map_min map, min
-            end
-          end
-        end
+  def maps_add rows, cols, adds
+    raise "adds 参数只能是 String" if adds.class != String
+    add_arr = adds.split(',').map do |add|
+      if add.match(/:/)
+        raise "add params syntax error! \n'#{add}'" if add.split(':').size > 2
+        a, b = add.split(':')
+        (a..b).to_a
       else
-        raise "scope 没有 ':' 无法解析"
+        add
       end
-    else
-      raise "scope == nil"
     end
-    map[:x].uniq!
-    map[:y].uniq!
-    arrs = []
-    map[:y].each do |y|
-      rows = []
-      map[:x].each do |x|
-        rows << ["#{x}_#{y}", ABSCISSA[x], y.to_i - 1]
+    add_arr.flatten.each do |add|
+      if is_row? add
+        rows << add.to_i
+      else
+        cols << add.upcase
       end
-      arrs << rows
     end
-    return arrs
-  rescue
-    puts "生成map时发生错误: #{$!}"
-    puts $@
   end
 
-  def ab_to a, b
-    type = nil
-    if is_number?(a) == true and is_number?(b) == true
-      type = 'y'
-      case a.to_i <=> b.to_i
-        when 1
-          return [type, (b..a).to_a]
-        when -1
-          return [type, (a..b).to_a]
-        when 0
-          return [type, [a]]
+  def maps_min rows, cols, mins
+    raise "mins 参数只能是 String" if mins.class != String
+    min_arr = mins.split(',').map do |min|
+      if min.match(/:/)
+        raise "min params syntax error! \n'#{min}'" if min.split(':').size > 2
+        a, b = min.split(':')
+        (a..b).to_a
+      else
+        min
       end
-    elsif is_number?(a) == false and is_number?(b) == false
-      type = 'x'
-      case a <=> b
-        when 1
-          return [type, (b..a).to_a]
-        when -1
-          return [type, (a..b).to_a]
-        when 0
-          return [type, [a]]
+    end
+    min_arr.flatten.each do |min|
+      if is_row? min
+        rows.delete min.to_i
+      else
+        cols.delete min.upcase
       end
-    else
-      raise "解析excel配置范围时,':'两边必须要么都是字母,要么都是数字!"
     end
   end
 
-  def map_mins map, mins
-    case mins[0]
-      when 'x'
-        mins[1].each do |min|
-          map[:x].delete min
-        end
-      when 'y'
-        mins[1].each do |min|
-          map[:y].delete min
+  # show_location 带不带坐标index数据
+  def read_arrs map_arrs, show_location
+    map_arrs.map do |map_arr|
+      map_arr.map do |map|
+        value = read_unit_by_xy map[:col], map[:row], true
+        if show_location
+          {map[:location] => value}
+        else
+          value
         end
+      end
     end
   end
 
-  def map_min map, min
-    if is_number? min
-      map[:y].delete min
-    else
-      map[:x].delete min
-    end
-  end
-
-  def map_adds map, adds
-    case adds[0]
-      when 'x'
-        adds[1].each do |add|
-          map[:x] << add
-        end
-      when 'y'
-        adds[1].each do |add|
-          map[:y] << add
-        end
+  # 通过x,y坐标获取unit内容
+  def read_unit_by_xy x, y, parse
+    # puts "x: #{x}\ty: #{y}"
+    unit = @sheet.row(y)[x]
+    if unit.instance_of? Spreadsheet::Formula
+      if parse
+        return unit.value
+      end
     end
+    return unit
   end
 
-  def is_number? str
-    if str.to_i.to_s == str.to_s
+  def is_row? row
+    if row.to_i.to_s == row.to_s
       return true
     end
     false
   end
 
-  def map_add map, add
-    if is_number? add
-      map[:y] << add
-    else
-      map[:x] << add
-    end
-  end
-
-  # 解析范围配置
-  def parse_address address
-    hash = {}
-    if address
-      address.upcase!
-    else
-      raise "address 为 nil"
-    end
-    if address.split('+').size > 2
-      raise "'+'号只能有1个"
-    end
-    if address.split('-').size > 2
-      raise "'-'号只能有1个"
-    end
-    if address.include?('+')
-      a = address.split('+')[0]
-      b = address.split('+')[1]
-      if a.include?('-')
-        hash.store :scope, a.split('-')[0]
-        hash.store :min_str, a.split('-')[1]
-        hash.store :add_str, b
-      else
-        hash.store :scope, a
-        if b.include?('-')
-          hash.store :min_str, b.split('-')[1]
-          hash.store :add_str, b.split('-')[0]
-        else
-          hash.store :add_str, b
-        end
-      end
-    else
-      if address.include?('-')
-        hash.store :scope, address.split('-')[0]
-        hash.store :min_str, address.split('-')[1]
-      else
-        hash.store :scope, address
-      end
-    end
-    hash
-  end
-
   def self.open excel, name
     self.new excel, name, 'open'
   end
@@ -249,24 +169,30 @@ class Ld::Sheet
   end
 
   def save
-    l = parse_location @point
+    point = parse_point @point
     raise '保存sheet必须要有内容,请 set_rows' if !@rows
     raise '保存sheet必须要有name,请 set_rows' if !@name
     @rows.unshift @headings if @headings
     @sheet.default_format = @format
-    @rows.each_with_index do |row,r|
-      row.each_with_index do |data,c|
-        write_unit_by_xy(r+l[:y],c+l[:x],data)
+    @rows.each_with_index do |row, r|
+      row.each_with_index do |unit, c|
+        x = point[:number] + r
+        y = ABSCISSA[point[:character]] + c
+        write_unit_by_xy x, y, unit
       end
     end
     self
   end
 
   # 解析一个 content_url
-  def parse_location location_str
-    raise "无法解析excel坐标,坐标需要是String,不能是#{location_str.class.to_s}" if location_str and location_str.class != String
-    location_str.upcase!
-    return {:x => ABSCISSA[location_str.scan(/[A-Z]+/).join].to_i, :y => (location_str.scan(/[0-9]+/).join.to_i - 1)}
+  def parse_point point
+    raise "无法解析excel坐标,坐标需要是String,不能是#{point.class.to_s}" if point.class != String
+    point.upcase!
+    characters = point.scan(/[A-Z]+/)
+    raise "parse point error! \n'#{point}'" if characters.size != 1
+    numbers = point.scan(/[0-9]+/)
+    raise "parse point error! \n'#{point}'" if numbers.size != 1
+    {:character => characters[0], :number => numbers[0].to_i}
   end
 
   def set_rows rows
@@ -297,25 +223,6 @@ class Ld::Sheet
     @sheet.row(x)[y] = unit
   end
 
-  # 将一维数组写到表中,可写成列,也可以写成行
-  def write_arr_to_point(arr, rank = '|', point = "a1")
-    l = Ld::Excel.parse_location(point)
-    if rank == '|' or rank == 'col'
-      arr.each_with_index do |data,r|
-        # 坚写,行动列不动
-        write_unit_by_xy(l[:r]+r,l[:c],data)
-      end
-    elsif rank == '-' or rank == 'row'
-      arr.each_with_index do |data,c|
-        # 横写,列动行不动
-        write_unit_by_xy(l[:r],l[:c]+c,data)
-      end
-    else
-      raise "横写rank |  竖写rank -   无法识别#{rank}"
-    end
-    self
-  end
-
   def set_color color
     @format.font.color = color
   end

data/lib/ld/file/file.rb

@@ -3,6 +3,7 @@ class Ld::File
   attr_accessor :path, :base_name, :name, :type
 
   def initialize path
+    # raise "file is not found!\n#{path}" if !File.exist? path
     @path = path
     @name = File.basename @path
     @base_name = name.split('.')[0]
@@ -13,6 +14,14 @@ class Ld::File
     Ld::File.new path
   end
 
+  def self.open path
+    if File.exist? path
+      self.new path
+    else
+      return nil
+    end
+  end
+
   def brothers
     father.children
   end

data/lib/ld/project/project.rb

@@ -21,13 +21,14 @@ class Ld::Project
   end
 
   def print model_name, type = :relations
+    model_name = model_name.to_s
     if !@models.models.include? model_name
       puts "不存在 #{model_name}"
       return false
     end
 
     title_str = "#{model_name.camelize}(#{@table_hash[model_name]})"
-
+    type = type.to_sym
     case type
       when :fields
         fs = '字段,字段类型,描述,空约束,默认值,精度位数,limit'.split(',')
@@ -94,7 +95,7 @@ class Ld::Project
     @controllers.rows.delete_at 0
   end
 
-  def to_xls path = "#{@root.path}/project.xls"
+  def to_xls path = {:file_path => "#{@root.path}/project.xls"}
     Ld::Excel.create path do |excel|
       excel.write_sheet 'routes' do |sheet|
         sheet.set_format({color: :red, font_size: 14, font: '微软雅黑'})

data/lib/ld/version.rb

@@ -1,3 +1,3 @@
 module Ld
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

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