breathing 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61e525b923beadee13acfa8b5dc2708b88a3d4e4add63ea910d4ee3fd67d42e4
-  data.tar.gz: 4ab65c2f8a026145dc121641922204bcd373f3ef1f379ced10b6575f1229e0a9
+  metadata.gz: 78f7bd77e2aacd87fe91b8e42eeb8dd590fac1a067c90c092a8069fa9d2a391f
+  data.tar.gz: cb6802aa877aa675fe62170d7d3fde082b1262439c33409a5a38169c90a05c8e
 SHA512:
-  metadata.gz: c41a580a29c80ffeae3318a71153a6c6004a6a5f17bd02db91ecf3dbb8687dba7dd36318f5d3abbe4c86912a4103b4592aa9f6f4da446187deee072eaf84bccb
-  data.tar.gz: 5ffc9e9e41a1fa92ed44503b2df61dd6306fb2acff8ca390fc024eaa9468a1f65953d1de3c982e7d5a6e1b18f17a950f2c76075156a7af960ff8d84323d5c124
+  metadata.gz: 1610bf010d660a7f0c1f00ed61b3235e75497220ef2b21c0f9a5c200b2c670c8495cbf905b782c7202f0236549e086296141d6e3d1b5fd1c24684d3a3af69335
+  data.tar.gz: 22d2262edfd99554875fbbaec0edac113c5e970a41f32126f7ebf18cc7b141987f9c58b1da1c02f4c1257e8f07a07e4a9a269c8876f6957bcc10cbac3767b161

data/breathing.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |s|
   s.name        = 'breathing'
-  s.version     = '0.0.8'
+  s.version     = '0.0.9'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Akira Kusumoto']
   s.email       = ['akirakusumo10@gmail.com']

data/lib/breathing/change_log.rb

@@ -18,12 +18,33 @@ module Breathing
     end
 
     def data_attributes
-      data_column_names.each.with_object("change_logs.id"         => id,
-                                         "change_logs.created_at" => created_at.to_s(:db),
-                                         "action"                 => action,
-                                         "id"                     => transaction_id) do |name, hash|
+      data_column_names.each.with_object('change_logs.id'         => id,
+                                         'change_logs.created_at' => created_at.to_s(:db),
+                                         'action'                 => action,
+                                         'id'                     => transaction_id) do |name, hash|
         hash[name] = data[name]
       end
     end
+
+    def diff
+      return nil if action != 'UPDATE'
+
+      changed_attribute_columns.each.with_object({}) do |column_name, diff_hash|
+        diff_hash[column_name] = {before_data[column_name] => after_data[column_name]}
+      end
+    end
+
+    def attributes_for_excel
+      {
+        'change_logs.id' => id,
+        'created_at'     => created_at.to_s(:db),
+        'table_name'     => table_name,
+        'action'         => action,
+        'id'             => transaction_id,
+        'diff'           => diff.to_s,
+        'before_data'    => before_data.to_s,
+        'after_data'     => after_data.to_s,
+      }
+    end
   end
 end

data/lib/breathing/excel.rb

@@ -11,42 +11,38 @@ module Breathing
     def create(id: 1, file_name: 'breathing.xlsx')
       sheet       = @workbook[0]
       table_names = Breathing::ChangeLog.where('id >= ?', id).group(:table_name).pluck(:table_name)
-      table_names.each do |table_name|
+      table_names.sort.each do |table_name|
         if sheet.sheet_name == 'Sheet1'
           sheet.sheet_name = table_name
         else
           sheet = @workbook.add_worksheet(table_name)
         end
 
-        rows          = Breathing::ChangeLog.where(table_name: table_name).where('id >= ?', id).order(:id)
-        column_widths = []
+        rows = Breathing::ChangeLog.where(table_name: table_name).where('id >= ?', id).order(:id).to_a
 
-        if first_row = rows.first
-          add_header_row(sheet, first_row, column_widths)
-        end
-        add_body_rows(sheet, rows, column_widths)
-
-        column_widths.each.with_index { |size, i| sheet.change_column_width(i, size + 2) }
+        next if rows.size.zero?
 
+        add_header_row(sheet, rows.first)
+        add_body_rows(sheet, rows)
         add_style(sheet)
       end
 
+      add_change_logs_sheet(id) if table_names.size.positive?
+
       @workbook.write(file_name)
     end
 
     private
 
-    def add_header_row(sheet, row, column_widths)
+    def add_header_row(sheet, row)
       header_color = 'ddedf3' # blue
       row.data_attributes.keys.each.with_index do |header_column, column_index|
         cell = sheet.add_cell(0, column_index, header_column)
         cell.change_fill(header_color)
-
-        column_widths << header_column.size
       end
     end
 
-    def add_body_rows(sheet, rows, column_widths)
+    def add_body_rows(sheet, rows)
       rows.each.with_index(1) do |row, row_number|
         row.data_attributes.each.with_index do |(column_name, value), column_index|
           cell = sheet.add_cell(row_number, column_index, value)
@@ -55,23 +51,42 @@ module Breathing
           elsif row.action == 'DELETE'
             cell.change_fill('d9d9d9') # color: grey
           end
-
-          column_widths[column_index] = value.to_s.size if column_widths[column_index] < value.to_s.size
         end
       end
     end
 
     def add_style(sheet)
-      sheet.sheet_data.rows.each.with_index do |row, i|
-        row.cells.each do |cell|
+      sheet.sheet_data.rows.each.with_index do |row, row_index|
+        row.cells.each.with_index do |cell, column_index|
           %i[top bottom left right].each do |direction|
             cell.change_border(direction, 'thin')
           end
+          cell.change_border(:bottom, 'double') if row_index.zero?
 
-          cell.change_border(:bottom, 'double') if i.zero?
+          cell_width = cell.value.to_s.size + 2
+          sheet.change_column_width(column_index, cell_width) if cell_width > sheet.get_column_width(column_index)
         end
       end
+
       sheet.change_row_horizontal_alignment(0, 'center')
     end
+
+    def add_change_logs_sheet(id)
+      sheet = @workbook.add_worksheet(Breathing::ChangeLog.table_name)
+
+      change_logs = Breathing::ChangeLog.where('id >= ?', id).order(:id)
+      change_logs.first.attributes_for_excel.keys.each.with_index do |header_column, column_index|
+        cell = sheet.add_cell(0, column_index, header_column)
+        cell.change_fill('ddedf3') # blue
+      end
+
+      change_logs.each.with_index(1) do |change_log, row_number|
+        change_log.attributes_for_excel.each.with_index do |(_column_name, value), column_index|
+          sheet.add_cell(row_number, column_index, value)
+        end
+      end
+
+      add_style(sheet)
+    end
   end
 end

data/lib/breathing/installer.rb

@@ -40,8 +40,8 @@ module Breathing
       ActiveRecord::Schema.define version: 0 do
         create_table table_name, if_not_exists: true do |t|
           t.datetime :created_at,     null: false, index: true
-          t.string   :action,         null: false
           t.string   :table_name,     null: false
+          t.string   :action,         null: false
           t.string   :transaction_id, null: false
           t.json     :before_data,    null: false
           t.json     :after_data,     null: false

data/spec/breathing/excel_spec.rb

@@ -23,13 +23,18 @@ describe Breathing::Excel do
     end
 
     it 'multi sheets' do
-      User.create!(name: 'a', age: 20)
+      user = User.create!(name: 'a', age: 20)
+      user.update!(age: 21)
+      user.destroy!
       Department.create!(name: 'a')
 
       Tempfile.open(['tmp', '.xlsx']) do |file|
         Breathing::Excel.new.create(file_name: file.path)
         workbook = RubyXL::Parser.parse(file.path)
-        expect(workbook.sheets.size).to eq(2)
+        expect(workbook.sheets.map(&:name)).to eq(%w[departments users change_logs])
+        change_logs_sheet = workbook.worksheets.last
+
+        expect(change_logs_sheet.sheet_data.size).to eq(Breathing::ChangeLog.count + 1)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breathing
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Akira Kusumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor