strong_csv 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 109d3d3c31812aedff005dc2003a8066d20a551513f0d287c0ba761a9469ac04
-  data.tar.gz: 11a3cd4890a60b27231276d09bcdc05fb29487c100fdbc6afff8cc7febf58694
+  metadata.gz: 558e352db4ff9f2f719b9bb9f6217c007ff679133e2b02449858af679289281d
+  data.tar.gz: ff9881d662a6301fbdfe30bab16f02e440fc6939d0b4e89482216d1fe8902450
 SHA512:
-  metadata.gz: 6dd9abc5eb9a9b30f655ed13eae0e699c0471b09196ba5bc8ef265e06056ecf9bce526308f6a1edb28ff7d57ae9e5023e52b9e6bc827021cf186a8a62108026a
-  data.tar.gz: 3e9d411ab432f498639c8532b46be1d52e734188c48089b565a32398b690e8ceed1255b40adcc80ebc3d21256782f186576d7dd5cf8346f88b43fa6c2489ebfd
+  metadata.gz: 2dfc2c45143b4e4b435cb72627ce4a82311a5506e7fbe35449179684b2fb8ac048d509a23e1f8e08442c35d4188cdc5abc3cdd285165b1b8f1e69763b1993cf6
+  data.tar.gz: df17d984643c7830729a49c1284b60dafab1ddc14445d414d631bc87a135943cc9988cfb200f934c744d0b38cf8872a9d597ad422766cc89d08840c140f5dec4

data/README.md

@@ -14,7 +14,7 @@ Of course, it depends, but there would be common validation logic for CSV files.
 For example, some columns may have to be integers because of database requirements.
 It would be cumbersome to write such validations always.
 
-strong_json helps you to mitigate such a drudgery by letting you declare desired types beforehand.
+strong_csv helps you to mitigate such a drudgery by letting you declare desired types beforehand.
 
 ## Installation
 
@@ -61,6 +61,7 @@ strong_csv = StrongCSV.new do
   let :description, string?(within: 1..1000)
   let :active, boolean
   let :started_at, time?(format: "%Y-%m-%dT%H:%M:%S")
+  let :price, integer, error_message: "This should be Integer"
 
   # Literal declaration
   let :status, 0..6
@@ -91,8 +92,8 @@ strong_csv = StrongCSV.new do
 end
 
 data = <<~CSV
-  stock,tax_rate,name,active,status,priority,size,url
-  12,0.8,special item,True,4,20,M,https://example.com
+  stock,tax_rate,name,active,status,priority,size,url,price
+  12,0.8,special item,True,4,20,M,https://example.com,PRICE
 CSV
 
 strong_csv.parse(data, field_size_limit: 2048) do |row|
@@ -101,7 +102,7 @@ strong_csv.parse(data, field_size_limit: 2048) do |row|
     row[:active] # => true
     # do something with row
   else
-    row.errors # => { user_id: ["`nil` can't be casted to Integer"] }
+    row.errors # => {:price=>["This should be Integer"], :user_id=>["`nil` can't be casted to Integer"]}
     # do something with row.errors
   end
 end
@@ -402,45 +403,6 @@ result[1].slice(:priority, :size) # => {:priority=>30, :size=>"A"} ("A" is not o
 result[2].slice(:priority, :size) # => {:priority=>"11", :size=>"S"} (11 is not one of 10, 20, and 30)
 ```
 
-## I18n (Internationalization)
-
-strong_csv depends on [i18n](https://rubygems.org/gems/i18n) for internationalization.
-If you want to have a locale-specific error message, put the message catalog in your locale files.
-Here is an example of a locale file.
-
-```yaml
-ja:
-  strong_csv:
-    boolean:
-      cant_be_casted: "`%{value}`はBooleanに変換できません"
-    float:
-      cant_be_casted: "`%{value}`はFloatに変換できません"
-      constraint_error: "`%{value}`は指定された成約を満たしていません",
-    integer:
-      cant_be_casted: "`%{value}`はIntegerに変換できません"
-      constraint_error: "`%{value}`は指定された成約を満たしていません",
-    literal:
-      integer:
-        unexpected: "`%{expected}`ではなく`%{value}`が入力されています"
-        cant_be_casted: "`%{expected}`ではなく`%{value}`が入力されています"
-      float:
-        unexpected: "`%{expected}`ではなく`%{value}`が入力されています"
-        cant_be_casted: "`%{value}`はFloatに変換できません"
-      string:
-        unexpected: "`%{expected}`ではなく`%{value}`が入力されています"
-      range:
-        cant_be_casted: "`%{value}`は`%{expected}`の始端に変換できません"
-        out_of_range: "`%{value}`は`%{range}`の範囲外です"
-      regexp:
-        cant_be_casted: "`%{value}`はStringに変換できません"
-        unexpected: "`%{value}`は`%{expected}`とマッチしませんでした"
-    string:
-      cant_be_casted: "`%{value}`はStringに変換できません"
-      out_of_range: "`%{value}`の文字数は`%{range}`の範囲外です"
-    time:
-      cant_be_casted: "`%{value}`は`%{time_format}`でTimeに変換できません"
-```
-
 ## Contributing
 
 Bug reports and pull requests are welcome on the [GitHub repository](https://github.com/yykamei/strong_csv).

data/lib/strong_csv/let.rb

@@ -13,7 +13,7 @@ class StrongCSV
     attr_reader :pickers
 
     def initialize
-      @types = {}
+      @types = []
       @headers = false
       @pickers = {}
       @picked = {}
@@ -22,13 +22,13 @@ class StrongCSV
     # @param name [String, Symbol, Integer]
     # @param type [StrongCSV::Type::Base]
     # @param types [Array<StrongCSV::Type::Base>]
-    def let(name, type, *types, &block)
+    def let(name, type, *types, error_message: nil, &block)
       type = types.empty? ? type : Types::Union.new(type, *types)
       case name
       when ::Integer
-        @types[name] = [type, block]
+        @types << TypeWrapper.new(name: name, type: type, block: block, error_message: error_message)
       when ::String, ::Symbol
-        @types[name.to_sym] = [type, block]
+        @types << TypeWrapper.new(name: name.to_sym, type: type, block: block, error_message: error_message)
       else
         raise TypeError, "Invalid type specified for `name`. `name` must be String, Symbol, or Integer: #{name.inspect}"
       end
@@ -112,12 +112,12 @@ class StrongCSV
     private
 
     def validate_columns
-      if @types.keys.all? { |k| k.is_a?(Integer) }
+      if @types.all? { |t| t.name.is_a?(Integer) }
         @headers = false
-      elsif @types.keys.all? { |k| k.is_a?(Symbol) }
+      elsif @types.all? { |k| k.name.is_a?(Symbol) }
         @headers = true
       else
-        raise ArgumentError, "`types` cannot be mixed with Integer and Symbol keys: #{@types.keys.inspect}"
+        raise ArgumentError, "`types` cannot be mixed with Integer and Symbol keys: #{@types.map(&:name).inspect}"
       end
     end
   end

data/lib/strong_csv/row.rb

@@ -4,7 +4,6 @@ class StrongCSV
   # Row is a representation of a row in a CSV file, which has casted values with specified types.
   class Row
     extend Forwardable
-    using Types::Literal
 
     def_delegators :@values, :[], :fetch, :slice
 
@@ -21,10 +20,10 @@ class StrongCSV
       @values = {}
       @errors = {}
       @lineno = lineno
-      types.each do |key, (type, block)|
-        value_result = type.cast(row[key])
-        @values[key] = block && value_result.success? ? block.call(value_result.value) : value_result.value
-        @errors[key] = value_result.error_messages unless value_result.success?
+      types.each do |wrapper|
+        cell = row[wrapper.name]
+        @values[wrapper.name], error = wrapper.cast(cell)
+        @errors[wrapper.name] = error if error
       end
     end
 

data/lib/strong_csv/type_wrapper.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class StrongCSV # rubocop:disable Style/Documentation
+  using Types::Literal
+
+  # TypeWrapper holds the `type` along with `name` and `block`. It might be useful to store metadata for the type,
+  # such as `error_message`.
+  #
+  # @!attribute name
+  #   @return [Symbol, Integer] The name for the type. This is the CSV header name. If the CSV does not have its header, Integer should be set.
+  # @!attribute type
+  #   @return [StrongCSV::Type::Base]
+  # @!attribute error_message
+  #   @return [String, nil] The error message returned if #cast fails. If omitted, the default error message will be used.
+  # @!attribute block
+  #   @return [Proc]
+  TypeWrapper = Struct.new(:name, :type, :error_message, :block, keyword_init: true) do
+    def cast(value)
+      value_result = type.cast(value)
+      casted = block && value_result.success? ? block.call(value_result.value) : value_result.value
+      error = if value_result.success?
+                nil
+              else
+                error_message ? [error_message] : value_result.error_messages
+              end
+
+      [casted, error]
+    end
+  end
+end

data/lib/strong_csv/types/boolean.rb

@@ -17,7 +17,7 @@ class StrongCSV
         boolean = FALSE_VALUES.include?(value) ? false : nil
         return ValueResult.new(value: boolean, original_value: value) unless boolean.nil?
 
-        ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.boolean.cant_be_casted", value: value.inspect, default: :"_strong_csv.boolean.cant_be_casted")])
+        ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` can't be casted to Boolean"])
       end
     end
   end

data/lib/strong_csv/types/float.rb

@@ -21,10 +21,10 @@ class StrongCSV
         if @constraint.call(float)
           ValueResult.new(value: float, original_value: value)
         else
-          ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.float.constraint_error", value: value.inspect, default: :"_strong_csv.float.constraint_error")])
+          ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` does not satisfy the specified constraint"])
         end
       rescue ArgumentError, TypeError
-        ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.float.cant_be_casted", value: value.inspect, default: :"_strong_csv.float.cant_be_casted")])
+        ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` can't be casted to Float"])
       end
     end
   end

data/lib/strong_csv/types/integer.rb

@@ -21,10 +21,10 @@ class StrongCSV
         if @constraint.call(int)
           ValueResult.new(value: int, original_value: value)
         else
-          ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.integer.constraint_error", value: value.inspect, default: :"_strong_csv.integer.constraint_error")])
+          ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` does not satisfy the specified constraint"])
         end
       rescue ArgumentError, TypeError
-        ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.integer.cant_be_casted", value: value.inspect, default: :"_strong_csv.integer.cant_be_casted")])
+        ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` can't be casted to Integer"])
       end
     end
   end

data/lib/strong_csv/types/literal.rb

@@ -13,10 +13,10 @@ class StrongCSV
           if int == self
             ValueResult.new(value: int, original_value: value)
           else
-            ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.literal.integer.unexpected", value: int.inspect, expected: inspect, default: :"_strong_csv.literal.integer.unexpected")])
+            ValueResult.new(original_value: value, error_messages: ["`#{inspect}` is expected, but `#{int.inspect}` was given"])
           end
         rescue ArgumentError, TypeError
-          ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.literal.integer.cant_be_casted", value: value.inspect, default: :"_strong_csv.literal.integer.cant_be_casted")])
+          ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` can't be casted to Integer"])
         end
       end
 
@@ -28,10 +28,10 @@ class StrongCSV
           if float == self
             ValueResult.new(value: float, original_value: value)
           else
-            ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.literal.float.unexpected", value: float.inspect, expected: inspect, default: :"_strong_csv.literal.float.unexpected")])
+            ValueResult.new(original_value: value, error_messages: ["`#{inspect}` is expected, but `#{float.inspect}` was given"])
           end
         rescue ArgumentError, TypeError
-          ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.literal.float.cant_be_casted", value: value.inspect, default: :"_strong_csv.literal.float.cant_be_casted")])
+          ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` can't be casted to Float"])
         end
       end
 
@@ -39,7 +39,7 @@ class StrongCSV
         # @param value [Object] Value to be casted to Range
         # @return [ValueResult]
         def cast(value)
-          return ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.literal.range.cant_be_casted", value: value.inspect, expected: inspect, default: :"_strong_csv.literal.range.cant_be_casted")]) if value.nil?
+          return ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` can't be casted to the beginning of `#{inspect}`"]) if value.nil?
 
           casted = case self.begin
                    when ::Float
@@ -54,10 +54,10 @@ class StrongCSV
           if cover?(casted)
             ValueResult.new(value: casted, original_value: value)
           else
-            ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.literal.range.out_of_range", value: casted.inspect, range: inspect, default: :"_strong_csv.literal.range.out_of_range")])
+            ValueResult.new(original_value: value, error_messages: ["`#{casted.inspect}` is not within `#{inspect}`"])
           end
         rescue ArgumentError
-          ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.literal.range.cant_be_casted", value: value.inspect, expected: inspect, default: :"_strong_csv.literal.range.cant_be_casted")])
+          ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` can't be casted to the beginning of `#{inspect}`"])
         end
       end
 
@@ -68,7 +68,7 @@ class StrongCSV
           if self == value
             ValueResult.new(value: self, original_value: value)
           else
-            ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.literal.string.unexpected", value: value.inspect, expected: inspect, default: :"_strong_csv.literal.string.unexpected")])
+            ValueResult.new(original_value: value, error_messages: ["`#{inspect}` is expected, but `#{value.inspect}` was given"])
           end
         end
       end
@@ -77,12 +77,12 @@ class StrongCSV
         # @param value [Object] Value to be casted to String
         # @return [ValueResult]
         def cast(value)
-          return ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.literal.regexp.cant_be_casted", value: value.inspect, default: :"_strong_csv.literal.regexp.cant_be_casted")]) if value.nil?
+          return ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` can't be casted to String"]) if value.nil?
 
           if self =~ value
             ValueResult.new(value: value, original_value: value)
           else
-            ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.literal.regexp.unexpected", value: value.inspect, expected: inspect, default: :"_strong_csv.literal.regexp.unexpected")])
+            ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` did not match `#{inspect}`"])
           end
         end
       end

data/lib/strong_csv/types/string.rb

@@ -15,11 +15,11 @@ class StrongCSV
       # @param value [Object] Value to be casted to Boolean
       # @return [ValueResult]
       def cast(value)
-        return ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.string.cant_be_casted", value: value.inspect, default: :"_strong_csv.string.cant_be_casted")]) if value.nil?
+        return ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` can't be casted to String"]) if value.nil?
 
         casted = String(value)
         if @within && !@within.cover?(casted.size)
-          ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.string.out_of_range", value: value.inspect, range: @within.inspect, default: :"_strong_csv.string.out_of_range")])
+          ValueResult.new(original_value: value, error_messages: ["The length of `#{value.inspect}` is out of range `#{@within.inspect}`"])
         else
           ValueResult.new(value: casted, original_value: value)
         end

data/lib/strong_csv/types/time.rb

@@ -15,11 +15,11 @@ class StrongCSV
       # @param value [Object] Value to be casted to Time
       # @return [ValueResult]
       def cast(value)
-        return ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.time.cant_be_casted", value: value.inspect, time_format: @format.inspect, default: :"_strong_csv.time.cant_be_casted")]) if value.nil?
+        return ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` can't be casted to Time with the format `#{@format.inspect}`"]) if value.nil?
 
         ValueResult.new(value: ::Time.strptime(value.to_s, @format), original_value: value)
       rescue ArgumentError
-        ValueResult.new(original_value: value, error_messages: [I18n.t("strong_csv.time.cant_be_casted", value: value.inspect, time_format: @format.inspect, default: :"_strong_csv.time.cant_be_casted")])
+        ValueResult.new(original_value: value, error_messages: ["`#{value.inspect}` can't be casted to Time with the format `#{@format.inspect}`"])
       end
     end
   end

data/lib/strong_csv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class StrongCSV
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

data/lib/strong_csv.rb

@@ -4,10 +4,8 @@ require "csv"
 require "forwardable"
 require "set"
 require "time"
-require "i18n"
 
 require_relative "strong_csv/version"
-require_relative "strong_csv/i18n"
 require_relative "strong_csv/value_result"
 require_relative "strong_csv/types/base"
 require_relative "strong_csv/types/boolean"
@@ -18,6 +16,7 @@ require_relative "strong_csv/types/optional"
 require_relative "strong_csv/types/string"
 require_relative "strong_csv/types/time"
 require_relative "strong_csv/types/union"
+require_relative "strong_csv/type_wrapper"
 require_relative "strong_csv/let"
 require_relative "strong_csv/row"
 

data/sig/strong_csv.rbs

@@ -107,14 +107,13 @@ class StrongCSV
   class Let
     @picked: Hash[untyped, untyped]
 
-    attr_reader types: Hash[column, [declarable, ^(casted) -> untyped | nil]]
+    attr_reader types: Array[TypeWrapper]
     attr_reader headers: bool
     attr_reader pickers: Hash[untyped, Proc]
 
     def initialize: -> void
 
-    def let: (::String | column, declarable, *declarable) -> void
-      | (::String | column, declarable, *declarable) { (casted) -> untyped } -> void
+    def let: (::String | column, declarable, *declarable, ?error_message: ::String?) ?{ (casted) -> untyped } -> void
 
     def pick: (column, as: ::Symbol) { (Array[::String]) -> untyped } -> void
 
@@ -153,11 +152,20 @@ class StrongCSV
     attr_reader errors: Hash[column, Array[::String]]
     attr_reader lineno: ::Integer
 
-    def initialize: (row: Array[::String] | CSV::Row, types: Hash[column, [declarable, (^(casted | ::Object | nil) -> untyped | nil)]], lineno: ::Integer) -> void
+    def initialize: (row: Array[::String] | CSV::Row, types: Array[TypeWrapper], lineno: ::Integer) -> void
 
     def valid?: -> bool
   end
 
+  class TypeWrapper
+    attr_accessor name: (::Symbol | ::Integer)
+    attr_accessor type: declarable
+    attr_accessor error_message: (::String | nil)
+    attr_accessor block: (^(casted | ::Object | nil) -> untyped | nil)
+
+    def cast: (::String | nil) -> [(casted | ::Object | nil), (::String | nil)]
+  end
+
   class Error < StandardError
   end
 end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: strong_csv
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Yutaka Kamei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.11
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.11
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
+date: 2023-03-20 00:00:00.000000000 Z
+dependencies: []
 description: strong_csv is a type checker for a CSV file. It lets developers declare
   types for each column to ensure all cells are satisfied with desired types.
 email:
@@ -41,9 +21,9 @@ files:
 - LICENSE
 - README.md
 - lib/strong_csv.rb
-- lib/strong_csv/i18n.rb
 - lib/strong_csv/let.rb
 - lib/strong_csv/row.rb
+- lib/strong_csv/type_wrapper.rb
 - lib/strong_csv/types/base.rb
 - lib/strong_csv/types/boolean.rb
 - lib/strong_csv/types/float.rb
@@ -79,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Type check CSV objects

data/lib/strong_csv/i18n.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-I18n.backend.store_translations(
-  :en, {
-    _strong_csv: {
-      boolean: {
-        cant_be_casted: "`%{value}` can't be casted to Boolean",
-      },
-      float: {
-        cant_be_casted: "`%{value}` can't be casted to Float",
-        constraint_error: "`%{value}` does not satisfy the specified constraint",
-      },
-      integer: {
-        cant_be_casted: "`%{value}` can't be casted to Integer",
-        constraint_error: "`%{value}` does not satisfy the specified constraint",
-      },
-      literal: {
-        integer: {
-          unexpected: "`%{expected}` is expected, but `%{value}` was given",
-          cant_be_casted: "`%{value}` can't be casted to Integer",
-        },
-        float: {
-          unexpected: "`%{expected}` is expected, but `%{value}` was given",
-          cant_be_casted: "`%{value}` can't be casted to Float",
-        },
-        string: {
-          unexpected: "`%{expected}` is expected, but `%{value}` was given",
-        },
-        range: {
-          cant_be_casted: "`%{value}` can't be casted to the beginning of `%{expected}`",
-          out_of_range: "`%{value}` is not within `%{range}`",
-        },
-        regexp: {
-          cant_be_casted: "`%{value}` can't be casted to String",
-          unexpected: "`%{value}` did not match `%{expected}`",
-        },
-      },
-      string: {
-        cant_be_casted: "`%{value}` can't be casted to String",
-        out_of_range: "The length of `%{value}` is out of range `%{range}`",
-      },
-      time: {
-        cant_be_casted: "`%{value}` can't be casted to Time with the format `%{time_format}`",
-      },
-    },
-  },
-)