kirico 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bd3fdf27b6d6aebd713b76d264b08069b8fd0b7
-  data.tar.gz: 46f10fe4947ce1d71027ad9928054fec18060de4
+  metadata.gz: 28534524bcc437fdf758e1d22da04ec2466196b0
+  data.tar.gz: cf58e75afffd2437f309309a0c94c270322bbb3f
 SHA512:
-  metadata.gz: f8d773207b151e65fdf706c280687c3cdd449a95b34f44898f5dbb13637b46b5c5e05d343d3843276585fb6148094144477940b6eb96c940a9ea9b1d34f98c82
-  data.tar.gz: e50e337487c3241ef1dd453d7f37aa5cec67cbfcd8bdb3dfafe1d7d046e48bf4bed196a0401fb0fde56d2af66858a35214c9da7baebd78677bca8c13501c8eb6
+  metadata.gz: a4a204454daf43b2e2817a0f75ce67f5bdfd9fe6b08be3bea6fc3023e70c09ba8e574c4d1c6d5d299d2caaf4ec926a1fb1d51be0fe85602bf6a569ca2594265e
+  data.tar.gz: 7f46f860418f9bd7da4906d867420bee5ab507dfc3943d624985889bdb7f00d11adb627572c7792f33e039b17f897ce59103d1add80a2e9782e784581550249f

data/lib/kirico/config/locales/en.yml

@@ -1,5 +1,6 @@
 en:
   errors:
+    row_counter: "Row %{num}: "
     messages:
       invalid_charset: "has invalid character(s): %{error_chars}"
       invalid_space_divider: "must be dividied by %{space_type}"

data/lib/kirico/config/locales/ja.yml

@@ -1,5 +1,6 @@
 ja:
   errors:
+    row_counter: "%{num}行目: "
     messages:
       invalid_charset: "に利用できない文字が入力されています。%{error_chars}"
       invalid_space_divider: "は%{space_type}で区切ってください。"

data/lib/kirico/models/form.rb

@@ -40,13 +40,20 @@ module Kirico
 
     # 子のエラーを自身のエラーとして設定する
     def validate_children
-      [:fd, :company, :company_count, :records].each do |attribute|
-        records = [send(attribute)].flatten.compact
-        records.each do |rec|
-          next if rec.valid?
-          rec.errors.full_messages.each do |msg|
-            errors.add(attribute, msg)
-          end
+      [:fd, :company, :company_count].each do |attribute|
+        rec = send(attribute)
+        next if rec.nil? || rec.valid?
+        rec.errors.full_messages.each do |msg|
+          errors.add(attribute, msg)
+        end
+      end
+
+      # 2行以上存在する場合は、何行目でエラーが起きたのかを知りたい
+      records.each.with_index(1) do |rec, i|
+        next if rec.valid?
+        row = I18n.t('errors.row_counter', num: i) if records.length > 1
+        rec.errors.full_messages.each do |msg|
+          errors.add(:records, "#{row}#{msg}")
         end
       end
     end

data/lib/kirico/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kirico
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kirico
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - kakipo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport