activemodel-csv_validator 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6e9cb06ee2d9328efdd099140042880c6de947675f8fbc3dc185b23d5e00e5c
-  data.tar.gz: 7f0b66a5ab3c7d84bb23fe6df2067418597da25a2aad708d816862b0a4d72bcf
+  metadata.gz: cb70efb8db9417e97271234408c30226f68d3762f6bead02ad62d32a35ab3174
+  data.tar.gz: a0f5e957d47de6f6a267df40cfeb43c42b95a68026ec66912d40aaf714babdee
 SHA512:
-  metadata.gz: d1a04a5fef137d27977093a4059a83dec3cf750ca3844fd925e40a9d6991b43e1519be0179681b25c791c88e6816b7a601637bb29528b3377fef120aa24fa2af
-  data.tar.gz: ab5c1f9e00c10631ed418428b95ac1f6e758f4821e7898554c2403c7c4fd1a00fe79972c66c95cd8600f8678615b9b38b7027d69253dbaf04ed58d450268d98e
+  metadata.gz: d3082350fdb33f663589223f7de9530bdb39d0195d5da153ec014c552cb437227330aed4324080021fb7c90363590b48dbdf1bcdb9b39e5f927d9fdeb58657db
+  data.tar.gz: 7adad3526afda27bb99ef778bfb779c6abd58b477d76c2f078c9df5199dc8f3706eafa801f88326476e7cce2686d04467fdcc71db87545cb099f621b17e8145b

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+Gemfile.lock

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+## 0.2.0
+
+- Drop support ruby@2.5
+- Fix keyword args warn
+
+## 0.1.2
+
+- Update dependency
+
+## 0.1.0
+
+- First Release

data/README.md

@@ -26,7 +26,7 @@ class CsvForm
 
   attr_accessor :file
 
-  validates :file, presence: true, csv: { max: 100, headers: %w[field1 field2 field3] }
+  validates :file, presence: true, csv: { min: 1, max: 100, headers: %w[field1 field2 field3] }
 end
 ```
 

data/activemodel-csv_validator.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.6.0'
   spec.add_dependency "activemodel", ">= 5.2.0"
   spec.add_dependency "activesupport", ">= 5.2.0"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/config/locales/en.yml

@@ -3,5 +3,6 @@ en:
     errors:
       messages:
         invalid_csv: "is not a valid CSV file"
+        min_rows: "should have more than %{max} rows"
         max_rows: "should have no more than %{max} rows"
         missing_headers: "should have %{missing_headers} columns"

data/config/locales/ja.yml

@@ -3,5 +3,6 @@ ja:
     errors:
       messages:
         invalid_csv: "のフォーマットが正しくありません。"
+        min_rows: "のデータが%{rows}件あります。%{min}件以上にしてください。"
         max_rows: "のデータが%{rows}件あります。%{max}件以下にしてください。"
         missing_headers: "には%{missing_headers}のフィールドが不足しています。"

data/lib/activemodel/csv_validator/version.rb

@@ -1,5 +1,5 @@
 module Activemodel
   module CsvValidator
-    VERSION = "0.1.0"
+    VERSION = '0.3.0'
   end
 end

data/lib/activemodel/validations/csv_validator.rb

@@ -6,11 +6,17 @@ module ActiveModel
   module Validations
     class CsvValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
+        return if value.nil?
+
         content = NKF.nkf('-w', File.read(value.path, universal_newline: true))
         rows = CSV.parse(content, headers: :first_row, converters: :integer)
 
         if options[:max].present? && rows.size > options[:max]
-          record.errors.add(attribute, :max_rows, options.slice(:max).merge(rows: rows.size))
+          record.errors.add(attribute, :max_rows, **options.slice(:max).merge(rows: rows.size))
+        end
+
+        if options[:min].present? && rows.size < options[:min]
+          record.errors.add(attribute, :min_rows, **options.slice(:min).merge(rows: rows.size))
         end
 
         if options[:headers].present?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-csv_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - aki77
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -90,9 +90,9 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -116,14 +116,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: CSV Validator for Active Model

data/Gemfile.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: .
-  specs:
-    activemodel-csv_validator (0.1.0)
-      activemodel (>= 5.2.0)
-      activesupport (>= 5.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activesupport (6.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    i18n (1.7.0)
-      concurrent-ruby (~> 1.0)
-    minitest (5.13.0)
-    rake (10.5.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel-csv_validator!
-  bundler (~> 2.0)
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.0.2