rschema 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29be05f4beeb1a5f7113f78d3080284a60ff08b5
-  data.tar.gz: f4bc95c00632d5133ce9e78c90cf8b599b4a4cd5
+  metadata.gz: 785a03d7de9b32d33c75f995a340033e2c1069ae
+  data.tar.gz: 0f8a1b61d5cad21d87d9e63c1ef2d16aed001a04
 SHA512:
-  metadata.gz: 3711949f194d8fd3f2791c83ca71cf5d9dc11618af52aa3d9168fa65899db48d40849201ebede66992775b5db2c7dfb730864501a114c2b2e9cd528d91259d96
-  data.tar.gz: a7c3f7815d70423d3ed6c98841f1473607350d26798f313d02eb1dece212a1cf6cc6172878b46c18e1598ec72748cf08e1caa94bf1cefaef4d98ab35e0e7c4bd
+  metadata.gz: 636119b1f39a6dd4ab14519cb3d4ae618ca6f160f8f9157289ca659b3fcf6658731403af552a3bdf95d33b7329e7eec4dd5abe64342a2a49e039b6652d9767af
+  data.tar.gz: ce417296490b927ccbf2dff637effae71d8a05a50bba5653325b28a55fbdd88af84af39c3beddae21515a4c7f6b1b59701e3a4a51df8cbcf7bfd6fd204211665

data/README.md

@@ -198,6 +198,13 @@ RSchema.validate(any_schema, true)  #=> true
 RSchema.validate(any_schema, false) #=> true
 RSchema.validate(any_schema, nil)   #=> true
 
+# either
+either_schema = RSchema.schema{ either(String, Integer, Float) }
+RSchema.validate(either_schema, 'hi') #=> true
+RSchema.validate(either_schema, 5555) #=> true
+RSchema.validate(either_schema, 77.1) #=> true
+RSchema.validate(either_schema, nil)  #=> false
+
 # maybe
 maybe_schema = RSchema.schema{ maybe(Integer) }
 RSchema.validate(maybe_schema, 5)   #=> true

data/lib/rschema.rb

@@ -106,6 +106,13 @@ module RSchema
       def any
         AnySchema
       end
+
+      def either(*subschemas)
+        unless subschemas.size > 1
+          raise InvalidSchemaError, 'EitherSchema requires two or more alternatives'
+        end
+        EitherSchema.new(subschemas)
+      end
     end
     extend Base
   end
@@ -180,6 +187,10 @@ module RSchema
         accum
       end
     end
+
+    def inspect
+      "hash_of(#{key_subschema.inspect} => #{value_subschema.inspect})"
+    end
   end
 
   GenericSetSchema = Struct.new(:subschema) do
@@ -194,6 +205,10 @@ module RSchema
         accum
       end
     end
+
+    def inspect
+      "set_of(#{subschema.inspect})"
+    end
   end
 
   PredicateSchema = Struct.new(:name, :block) do
@@ -204,6 +219,10 @@ module RSchema
         RSchema::ErrorDetails.new(value, 'fails predicate' + (name ? ": #{name}" : ''))
       end
     end
+
+    def inspect
+      'predicate' + (name ? "(#{name.inspect})" : '')
+    end
   end
 
   MaybeSchema = Struct.new(:subschema) do
@@ -215,6 +234,10 @@ module RSchema
         error || subvalue_walked
       end
     end
+
+    def inspect
+      "maybe(#{subschema.inspect})"
+    end
   end
 
   EnumSchema = Struct.new(:value_set, :subschema) do
@@ -233,6 +256,27 @@ module RSchema
         RSchema::ErrorDetails.new(value_walked, "is not a valid enum member")
       end
     end
+
+    def inspect
+      "enum(#{value_set.inspect}" +
+        (subschema ? ", #{subschema.inspect}" : '') +
+        ')'
+    end
+  end
+
+  EitherSchema = Struct.new(:alternatives) do
+    def schema_walk(value, mapper)
+      alternatives.each do |subschema|
+        v, error = RSchema.walk(subschema, value, mapper)
+        return v if error.nil?
+      end
+
+      RSchema::ErrorDetails.new(value, "matches none of #{alternatives.inspect}")
+    end
+
+    def inspect
+      "either(#{alternatives.map(&:inspect).join(', ')})"
+    end
   end
 
   module BooleanSchema
@@ -243,12 +287,20 @@ module RSchema
         RSchema::ErrorDetails.new(value, 'is not a boolean')
       end
     end
+
+    def self.inspect
+      'boolean'
+    end
   end
 
   module AnySchema
     def self.schema_walk(value, mapper)
       value
     end
+
+    def self.inspect
+      'any'
+    end
   end
 end
 

data/lib/rschema/version.rb

@@ -1,3 +1,3 @@
 module RSchema
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rschema
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tom Dalling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec