strong_csv 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a367df39ccd195cbb7f62845c919f9718a4ef536de595294991fa7bc26693ca7
-  data.tar.gz: 220e1d69c32123c78d5a31cb63d2c9c21686bbe76feb68e4f0aeb9762601e0e3
+  metadata.gz: 8078bf75d84307eb32f647a418d2cd2214d6891a78a25a73f7589b82fec0716c
+  data.tar.gz: 318af2a0c3a42ac7141819b06e729a5e98967c5106988bc4349b308f9c9d87f8
 SHA512:
-  metadata.gz: bfe0ecbb668a07be731f9f50143812fc42d213993b4e3591e04678a4c6323347f69f18a6241d4dbfa524faa37baada63c7ffc0ab394073c1f435c914910f5d95
-  data.tar.gz: d345d0c12929b60d801c16e8d994fa1570f0e5fc2034f6d74de3f96bf188a7a0e85f7b9c2b1bbe61a1a0f4e4cdb4a41deddf7915cbeb540ace4b0c790c5056b0
+  metadata.gz: 63aa30f83182e0cab08f816124945d9da91149faaa82017ba0a80ca8b39ef57fed5eab521db1efd8404045aadba189550bd779f195434cef2294975dc30216f3
+  data.tar.gz: e4e74ea2446efcf32f6e67fe8be5df207ae8dbd66b392df4c2fb8895cd71aebf70894d062e64eee2814295aa00f29876afcb95b4c3a88ffffd7be0c8e9a9ba21

data/README.md

@@ -78,11 +78,11 @@ strong_csv = StrongCSV.new do
     end
   end
 
-  # TODO: The followings are not implemented so far.
-
   # Regular expressions
   let :url, %r{\Ahttps://}
 
+  # TODO: The followings are not implemented so far.
+
   # Custom validation
   #
   # This example sees the database to fetch exactly stored `User` IDs,
@@ -158,6 +158,10 @@ end
         <td><a href="#literal"><code>"abc"</code> (String literal)</a></td>
         <td>The value must be casted to the specific <code>String</code> literal.</td>
     </tr>
+    <tr>
+        <td><a href="#literal"><code>%r{\Ahttps://}</code> (Regexp literal)</a></td>
+        <td>The value must be casted to a <code>String</code> that matches the specified Regexp.</td>
+    </tr>
     <tr>
         <td><a href="#union"><code>,</code> (Union type)</a></td>
         <td>The value must satisfy one of the subtypes.</td>
@@ -338,18 +342,19 @@ strong_csv = StrongCSV.new do
   let 1, "test"
   let 2, 2.5
   let 3, 1..10
+  let 4, /[a-z]+/
 end
 
 result = strong_csv.parse(<<~CSV)
-  123,test,2.5,9
-  123,test,2.5,0
-  123,Hey,2.5,10
+  123,test,2.5,9,abc
+  123,test,2.5,0,xyz
+  123,Hey,2.5,10,!
 CSV
 
 result.map(&:valid?) # => [true, false, false]
-result[0].slice(0, 1, 2, 3) # => {0=>123, 1=>"test", 2=>2.5, 3=>9}
-result[1].slice(0, 1, 2, 3) # => {0=>123, 1=>"test", 2=>2.5, 3=>"0"} (0 is out of 1..10)
-result[2].slice(0, 1, 2, 3) # => {0=>123, 1=>"Hey", 2=>2.5, 3=>10} ("Hey" is not equal to "test")
+result[0].slice(0, 1, 2, 3, 4) # => {0=>123, 1=>"test", 2=>2.5, 3=>9, 4=>"abc"}
+result[1].slice(0, 1, 2, 3, 4) # => {0=>123, 1=>"test", 2=>2.5, 3=>"0", 4=>"xyz"} (0 is out of 1..10)
+result[2].slice(0, 1, 2, 3, 4) # => {0=>123, 1=>"Hey", 2=>2.5, 3=>10, 4=>"!"} ("Hey" is not equal to "test", and "!" does not match /[a-z]+/)
 ```
 
 ### Union
@@ -405,6 +410,9 @@ ja:
       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}`の範囲外です"

data/lib/strong_csv/i18n.rb

@@ -28,6 +28,10 @@ I18n.backend.store_translations(
           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",

data/lib/strong_csv/types/literal.rb

@@ -72,6 +72,20 @@ class StrongCSV
           end
         end
       end
+
+      refine ::Regexp do
+        # @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?
+
+          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")])
+          end
+        end
+      end
     end
   end
 end

data/lib/strong_csv/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_csv
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Yutaka Kamei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-04 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n