activemodel-csv_validator 0.1.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54fb95b435cca7028c60d4d3b5f504b505c9aa7f319186b67c046cc0f73dd661
-  data.tar.gz: 2db441729fcd5d45534ebdfe64de47ad7cfb0f8faeff08d61af1263e9470d0c3
+  metadata.gz: 8fd12e527341af3f693fe8e8212c684751c8e45fcb4de9d3069ee3a482df0445
+  data.tar.gz: 8533c6126319e1a956c9f5f4d9e84e00ad6e991e884ceca6b2d6a65c5d1f845a
 SHA512:
-  metadata.gz: 88c3e60bf3797839d34f2f4aa65973c0d9df66a73b76988b55988899063bd4a4a452f82c1f589bfee8e78e643f87a344af6367e38bc9a68df2de9c050a39e4dc
-  data.tar.gz: b222343748c62a20e7dbcf3fbc1b3ee240de25420270b054cdab3315583448b0ad5a55111a325299e380ab85c0edccf768637b811cde17fd2deebaff51f78456
+  metadata.gz: f10ad1fb87c9378e8dcadbd46e85207073345871fed953793e53a4ed20ef1d0d0a8e687a86c23fcad8ddb25fd4a68d11e9f8ef2bce87d2aea90e374dfbbf1b52
+  data.tar.gz: ccd3dafafbdff4fed38a0fa6ff09fb9d3c68d8d8c1fa197a1636f12dba017f72d351b58b8d18ae0955681f9c503fcb038e22514791ed6c3200a103834e09ffd9

data/.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0", "3.1", ruby-head, jruby-head]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true # 'bundle install' and cache gems
+          ruby-version: ${{ matrix.ruby }}
+      - name: Run tests
+        run: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.4.0
+
+- Drop support ruby@2.6
+- Drop support rails@6.0
+- Proc can now be passed to `headers` option.
+
+## 0.2.0
+
+- Drop support ruby@2.5
+- Fix keyword args warn
+
 ## 0.1.2
 
 - Update dependency

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

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.2'
+    VERSION = '0.4.0'
   end
 end

data/lib/activemodel/validations/csv_validator.rb

@@ -12,11 +12,16 @@ module ActiveModel
         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?
-          missing_headers = options[:headers] - rows.headers
+          headers = options[:headers].respond_to?(:call) ? options[:headers].call(record) : options[:headers]
+          missing_headers = headers - rows.headers
           if missing_headers.present?
             record.errors.add(attribute, :missing_headers, missing_headers: missing_headers.to_sentence)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-csv_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.4.0
 platform: ruby
 authors:
 - aki77
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-22 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -116,14 +116,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.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/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.3
-before_install: gem install bundler -v 2.0.2