datacaster 3.1.3 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7cd7191206c373ab38c5516505bf38cbbdc76a7b7c433f976498accda34b054
-  data.tar.gz: 0443edf8c8f494caeacfb55ba902cce19210a53cf9f726e8306f7e487de58fd8
+  metadata.gz: 29c3f6c825f2c2d9a664e370079cde58df4ce9685d34d8428fb29aa7b98c52f3
+  data.tar.gz: 7d90ad442a4bd32ae4526d403629676c3aec9566973486bacd6565e8cb3d7bbd
 SHA512:
-  metadata.gz: 2f00d6cd8c2aae72cba3723dbea6b1c6cb9d760309e9fefa7897e5da691123459496348045849f47700f241df668e505120ba1d2e2f54c93a033e72b222dc3b9
-  data.tar.gz: 15c5d76c7cc7a16be05890bec3bcf549c0a5d103e9ba8bb42e2743c834e874bc1296fa5daa3af4feff93107d5acd8db2bd3b2da103f1c29aca1a169b86883c24
+  metadata.gz: acc11fefd17414ba1400bd98d2105b194301ac63f4d6b4204f001f918984326ab711c92d89133b475fd09d51b10c5d6427f6d6f516742a4ceb0a3eb2cf07f983
+  data.tar.gz: 07f288ab4e44e0b7a931aa43b34bac1a98d34d68f9d72241fc34f1648aeedc0412b51bdbe1113d9c34674a283e5fc6c559d4d2c5c385f5ec55c65d3b8345fb73

data/README.md

@@ -415,6 +415,7 @@ Notice that shortcut definitions are available (illustrated in the example above
 
 * `switch(:key)` is exactly the same as `switch(pick(:key))` (works for a string, a symbol, or an array thereof)
 * `on(:key, ...)` is exactly the same as `on(compare(:key), ...)` (works for a string or a symbol)
+* `on(:key, ...)` will match on `:key` and `'key'` value, and the same is true for `on('key', ...)` (to disable that behavior provide `strict: true` keyword arg: `on('key', ..., strict: true)`)
 * `switch([caster], on_check => on_caster, ...)` is exactly the same as `switch([caster]).on(on_check, on_caster).on(...)`
 
 `switch()` without a `base` argument will pass the incoming value to the `.on(...)` casters.

data/lib/datacaster/config.rb

@@ -7,17 +7,14 @@ module Datacaster
     attr_accessor :i18n_module
 
     def add_predefined_caster(name, definition)
-      caster =
-        case definition
-        when Proc
-          Datacaster.partial_schema(&definition)
-        when Base
-          definition
-        else
-          raise ArgumentError.new("Expected Datacaster defintion lambda or Datacaster instance")
-        end
-
-      Predefined.define_method(name.to_sym) { caster }
+      case definition
+      when Proc
+        Predefined.define_method(name.to_sym, &definition)
+      when Base
+        Predefined.define_method(name.to_sym) { definition }
+      else
+        raise ArgumentError.new("Expected Datacaster defintion lambda or Datacaster instance")
+      end
     end
 
     def i18n_t

data/lib/datacaster/predefined.rb

@@ -54,15 +54,15 @@ module Datacaster
     end
 
     def schema(base)
-      ContextNodes::StructureCleaner.new(base, strategy: :fail)
+      ContextNodes::StructureCleaner.new(base, :fail)
     end
 
     def choosy_schema(base)
-      ContextNodes::StructureCleaner.new(base, strategy: :remove)
+      ContextNodes::StructureCleaner.new(base, :remove)
     end
 
     def partial_schema(base)
-      ContextNodes::StructureCleaner.new(base, strategy: :pass)
+      ContextNodes::StructureCleaner.new(base, :pass)
     end
 
     # 'Meta' types

data/lib/datacaster/switch_node.rb

@@ -16,11 +16,18 @@ module Datacaster
       @else = else_caster
     end
 
-    def on(caster_or_value, clause)
+    def on(caster_or_value, clause, strict: false)
       caster =
         case caster_or_value
         when Datacaster::Base
           caster_or_value
+        when String, Symbol
+          if strict
+            Datacaster::Predefined.compare(caster_or_value)
+          else
+            Datacaster::Predefined.compare(caster_or_value.to_s) |
+              Datacaster::Predefined.compare(caster_or_value.to_sym)
+          end
         else
           Datacaster::Predefined.compare(caster_or_value)
         end

data/lib/datacaster/version.rb

@@ -1,3 +1,3 @@
 module Datacaster
-  VERSION = "3.1.3"
+  VERSION = "3.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacaster
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.5
 platform: ruby
 authors:
 - Eugene Zolotarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel