master_data_tool 0.1.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f743857cb2c8d71b0382648bda8a4a528f025bd385fa0d1016ac956fbca87a27
-  data.tar.gz: f47f109a2b5224224706aa9bfc36f9805fb5dab367105b9fa0e211125b50e9e4
+  metadata.gz: e86a46f55a42684795554c0bc95b7ae735cb8c05f35a160b53c2499e2117971c
+  data.tar.gz: b76e406b2373ef43ada14c05bab2f7b79a94fd9ac37c959911dfc71470106061
 SHA512:
-  metadata.gz: 29e2f8763b3c512723b7fb1f0320e1bdec9e1e7636cad315bb55e275f54dedb2a0c7e10ecb26c97d760cf24c1a865212aed9bda5360928865db2cfad8f03c067
-  data.tar.gz: 19622b43daf9f7be96204024aa9e9ec8b42b02e401aa356af809d60b44bea2519d7944e9eb7e5c468b326821c6b803443351332860a5f5a1db761a98d6086621
+  metadata.gz: 5d9c803172e97e3b3e607ce19f770de15ccf8dc42736b557abce41d90ad112c3b8e6a3d67e2a38871b2cd683492ae610f3ddc774bdfda6f0c05ced893ea3fc06
+  data.tar.gz: fe620d8afd70d5950d2f96a84d6db18255fa5ccc2b1fcf0c583e5dad3d52057e48507ecff0aa6e0c94ee026a38e868caf1b30e11bfec48557ca4f0fd94393d63

data/Appraisals

@@ -0,0 +1,13 @@
+appraise 'rails52' do
+  gem 'rails', '~> 5.2'
+end
+
+appraise 'rails61' do
+  gem 'rails', '~> 6.1'
+end
+
+if RUBY_VERSION >= '2.7.0'
+  appraise 'rails70' do
+    gem 'rails', '~> 7.0'
+  end
+end

data/README.md

@@ -141,6 +141,41 @@ grep 'operation:import' /tmp/dry-run.txt | grep 'label:detail' | grep 'status:ne
 
 - upsert_allに移行する
 
+## Test
+
+docker-composeでMySQLを立ち上げてテストを実行する。
+
+```
+docker-compose up -d
+```
+
+以下のENVを設定すること。
+
+```
+export DB_HOST=127.0.0.1
+export DB_PORT=`docker port master_data_tool_mysql57 3306 | cut -f 2 -d ':'`
+export DB_USERNAME=root
+export DB_PASSWORD=
+```
+
+- dockerでMySQLを立ち上げるたびにポートは変わるのでDB_PORTは都度設定する
+  - direnvを使っているならば `direnv reload` すればいい
+
+```
+cd spec/dummy-rails52/
+RAILS_ENV=test bundle exec rake db:create
+RAILS_ENV=test bundle exec rake db:migrate
+```
+
+## rspec
+
+```
+bundle exec appraisal rails52 rspec
+bundle exec appraisal rails61 rspec
+bundle exec appraisal rails70 rspec
+```
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/taka0125/master_data_tool.

data/docker-compose.yml

@@ -0,0 +1,19 @@
+version: '3.9'
+
+x-mysql: &mysql
+  image: mysql:5.7
+  container_name: master_data_tool_mysql57
+  environment:
+    MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+  platform: linux/x86_64
+  ports:
+    - 127.0.0.1::3306
+  volumes:
+    - mysql:/var/lib/mysql
+
+services:
+  mysql:
+    <<: *mysql
+
+volumes:
+  mysql:

data/exe/master_data_tool

@@ -49,7 +49,12 @@ module MasterDataTool
         ignore_column_names: ignore_column_names,
         verbose: verbose
       )
-      executor.execute
+      errors = executor.execute
+      
+      return if errors.empty?
+
+      message = errors.map { |error| "table:#{error.table}\tmessage:#{error.exception.message}" }.join("\n")
+      raise message
     end
   end
 end

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails52.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rails", "~> 5.2"
+
+gemspec path: "../"

data/gemfiles/rails61.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rails", "~> 6.1"
+
+gemspec path: "../"

data/gemfiles/rails70.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rails", "~> 7.0"
+
+gemspec path: "../"

data/lib/master_data_tool/master_data.rb

@@ -1,156 +1,154 @@
 # frozen_string_literal: true
 
 module MasterDataTool
-  module Import
-    class MasterData
-      attr_reader :csv_path, :model_klass, :columns, :new_records, :updated_records, :no_change_records, :deleted_records
-      attr_reader :before_count, :after_count
-
-      def initialize(csv_path, model_klass)
-        @csv_path = csv_path
-        @model_klass = model_klass
-
-        @loaded = false
-
-        @columns = []
-        @new_records = []
-        @updated_records = []
-        @no_change_records = []
-        @deleted_records = []
-      end
+  class MasterData
+    attr_reader :csv_path, :model_klass, :columns, :new_records, :updated_records, :no_change_records, :deleted_records
+    attr_reader :before_count, :after_count
 
-      def load
-        csv = CSV.read(@csv_path, headers: true, skip_blanks: true)
-        old_records_by_id = @model_klass.all.index_by(&:id)
+    def initialize(csv_path, model_klass)
+      @csv_path = csv_path
+      @model_klass = model_klass
 
-        csv_records_by_id = build_records_from_csv(csv, old_records_by_id)
-        deleted_ids = old_records_by_id.keys - csv_records_by_id.keys
+      @loaded = false
 
-        @columns = csv.headers
+      @columns = []
+      @new_records = []
+      @updated_records = []
+      @no_change_records = []
+      @deleted_records = []
+    end
 
-        csv_records_by_id.each do |_, record|
-          if record.new_record?
-            @new_records << record
+    def load
+      csv = CSV.read(@csv_path, headers: true, skip_blanks: true)
+      old_records_by_id = @model_klass.all.index_by(&:id)
 
-            next
-          end
+      csv_records_by_id = build_records_from_csv(csv, old_records_by_id)
+      deleted_ids = old_records_by_id.keys - csv_records_by_id.keys
 
-          if record.has_changes_to_save?
-            @updated_records << record
+      @columns = csv.headers
 
-            next
-          end
+      csv_records_by_id.each do |_, record|
+        if record.new_record?
+          @new_records << record
 
-          @no_change_records << record
+          next
         end
 
-        deleted_ids.each do |id|
-          @deleted_records << old_records_by_id[id]
+        if record.has_changes_to_save?
+          @updated_records << record
+
+          next
         end
 
-        @loaded = true
+        @no_change_records << record
       end
 
-      def import_records
-        new_records + updated_records + no_change_records
+      deleted_ids.each do |id|
+        @deleted_records << old_records_by_id[id]
       end
 
-      def affected_records
-        new_records + updated_records + deleted_records
-      end
+      @loaded = true
+    end
 
-      def new_records
-        raise MasterDataTool::NotLoadedError unless @loaded
+    def import_records
+      new_records + updated_records + no_change_records
+    end
 
-        @new_records
-      end
+    def affected_records
+      new_records + updated_records + deleted_records
+    end
 
-      def updated_records
-        raise MasterDataTool::NotLoadedError unless @loaded
+    def new_records
+      raise MasterDataTool::NotLoadedError unless @loaded
 
-        @updated_records
-      end
+      @new_records
+    end
 
-      def no_change_records
-        raise MasterDataTool::NotLoadedError unless @loaded
+    def updated_records
+      raise MasterDataTool::NotLoadedError unless @loaded
 
-        @no_change_records
-      end
+      @updated_records
+    end
 
-      def deleted_records
-        raise MasterDataTool::NotLoadedError unless @loaded
+    def no_change_records
+      raise MasterDataTool::NotLoadedError unless @loaded
 
-        @deleted_records
-      end
+      @no_change_records
+    end
 
-      def loaded?
-        @loaded
-      end
+    def deleted_records
+      raise MasterDataTool::NotLoadedError unless @loaded
 
-      def affected?
-        return @affected if instance_variable_defined?(:@affected)
-        @affected = affected_records.any?
-      end
+      @deleted_records
+    end
 
-      def before_count
-        @before_count ||= updated_records.count + no_change_records.count + deleted_records.count
-      end
+    def loaded?
+      @loaded
+    end
 
-      def after_count
-        @after_count ||= updated_records.count + no_change_records.count + new_records.count
-      end
+    def affected?
+      return @affected if instance_variable_defined?(:@affected)
+      @affected = affected_records.any?
+    end
 
-      def table_name
-        @model_klass.table_name
-      end
+    def before_count
+      @before_count ||= updated_records.count + no_change_records.count + deleted_records.count
+    end
 
-      def import!(dry_run: true)
-        raise MasterDataTool::NotLoadedError unless @loaded
+    def after_count
+      @after_count ||= updated_records.count + no_change_records.count + new_records.count
+    end
 
-        MasterDataTool::Report::ImportReport.new(self).tap do |report|
-          return report if dry_run
-          return report unless affected?
+    def table_name
+      @model_klass.table_name
+    end
 
-          @model_klass.delete_all
+    def import!(dry_run: true)
+      raise MasterDataTool::NotLoadedError unless @loaded
 
-          # マスターデータ間の依存がある場合に投入順制御するのは大変なのでこのタイミングでのバリデーションはしない
-          @model_klass.import(import_records, validate: false, on_duplicate_key_update: @columns, timestamps: true)
-        end
-      end
+      MasterDataTool::Report::ImportReport.new(self).tap do |report|
+        return report if dry_run
+        return report unless affected?
 
-      def verify!(dry_run: true)
-        MasterDataTool::Report::VerifyReport.new(self).tap do |report|
-          @model_klass.all.find_each do |record|
-            valid = record.valid?
-            report.append(MasterDataTool::Report::VerifyReport.build_verify_record_report(self, record, valid))
-            next if dry_run
+        @model_klass.delete_all
 
-            raise MasterDataTool::VerifyFailed.new("[#{table_name}] id = #{record.id} is invalid") unless valid
-          end
-        end
+        # マスターデータ間の依存がある場合に投入順制御するのは大変なのでこのタイミングでのバリデーションはしない
+        @model_klass.import(import_records, validate: false, on_duplicate_key_update: @columns, timestamps: true)
       end
+    end
 
-      def print_affected_table
-        return unless loaded?
-        return unless affected?
+    def verify!(dry_run: true)
+      MasterDataTool::Report::VerifyReport.new(self).tap do |report|
+        @model_klass.all.find_each do |record|
+          valid = record.valid?
+          report.append(MasterDataTool::Report::VerifyReport.build_verify_record_report(self, record, valid))
+          next if dry_run
 
-        MasterDataTool::Report::PrintAffectedTableReport.new(self)
+          raise MasterDataTool::VerifyFailed.new("[#{table_name}] id = #{record.id} is invalid") unless valid
+        end
       end
+    end
+
+    def print_affected_table
+      return unless loaded?
+      return unless affected?
 
-      private
+      MasterDataTool::Report::PrintAffectedTableReport.new(self)
+    end
 
-      def build_records_from_csv(csv, old_records_by_id)
-        {}.tap do |records|
-          csv.each do |row|
-            id = row['id'].to_i
-            record = old_records_by_id[id] || @model_klass.new(id: id)
+    private
 
-            csv.headers.each do |key|
-              record[key.to_s] = row[key]
-            end
+    def build_records_from_csv(csv, old_records_by_id)
+      {}.tap do |records|
+        csv.each do |row|
+          id = row['id'].to_i
+          record = old_records_by_id[id] || @model_klass.new(id: id)
 
-            records[id] = record
+          csv.headers.each do |key|
+            record[key.to_s] = row[key]
           end
+
+          records[id] = record
         end
       end
     end

data/lib/master_data_tool/report/import_report.rb

@@ -7,11 +7,6 @@ module MasterDataTool
 
       attr_reader :reports
 
-      def initialize(master_data)
-        super(master_data)
-        @reports = {}
-      end
-
       def print(printer)
         reports.each do |_, report|
           if report.is_a?(Array)

data/lib/master_data_tool/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MasterDataTool
-  VERSION = "0.1.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: master_data_tool
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.2.6.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.2.6.2
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -117,12 +117,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
+- Appraisals
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - exe/master_data_tool
+- gemfiles/.bundle/config
+- gemfiles/rails52.gemfile
+- gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
 - lib/generators/master_data_tool/install/install_generator.rb
 - lib/generators/master_data_tool/install/templates/create_master_data_statuses.rb.erb
 - lib/master_data_tool.rb
@@ -141,6 +147,7 @@ files:
 - lib/master_data_tool/report/printer.rb
 - lib/master_data_tool/report/verify_report.rb
 - lib/master_data_tool/version.rb
+- log/test.log
 - sig/master_data_tool.rbs
 homepage: https://github.com/taka0125/master_data_tool
 licenses: []