rschema 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 680986a4beef5eb8c444a63a116b9452de73f0c5
-  data.tar.gz: d010e1a72333f9e30476dd610c93397ee4f4a4f0
+  metadata.gz: 29be05f4beeb1a5f7113f78d3080284a60ff08b5
+  data.tar.gz: f4bc95c00632d5133ce9e78c90cf8b599b4a4cd5
 SHA512:
-  metadata.gz: c81e8ced5fc9fc7d5c710f9c05efda1ec02329e7f74b73176e89d9426f935d54bb94f985f6ad831dd65ec18aa8977f5cf429764dc012eb3db6bab55cacfea999
-  data.tar.gz: 51eb121432f8734d32333f67d6e9e5c57103cf994401c276c58ac237f2c9923dd1469bbb9c20b0069f9aa609736ba2cadbc5cfbb7074d9b27ed96ddb1a25d25a
+  metadata.gz: 3711949f194d8fd3f2791c83ca71cf5d9dc11618af52aa3d9168fa65899db48d40849201ebede66992775b5db2c7dfb730864501a114c2b2e9cd528d91259d96
+  data.tar.gz: a7c3f7815d70423d3ed6c98841f1473607350d26798f313d02eb1dece212a1cf6cc6172878b46c18e1598ec72748cf08e1caa94bf1cefaef4d98ab35e0e7c4bd

data/README.md

@@ -12,7 +12,7 @@ Schemas are generally just plain old hashes, arrays, and classes.
 ```ruby
 post_schema = {
   title: String,
-  tags: [Symbol],
+  tags: Array[Symbol],
   body: String
 }
 ```
@@ -43,7 +43,7 @@ Then there are composite schemas, which are schemas composed of subschemas.
 Arrays are composite schemas:
 
 ```ruby
-schema = [Integer]
+schema = Array[Integer]
 RSchema.validate(schema, [10, 11, 12]) #=> true
 RSchema.validate(schema, [10, 11, '12']) #=> false
 ```
@@ -84,12 +84,10 @@ are failing validation.
 
 ```ruby
 schema = RSchema.schema do
-  [
-    {
-      name: String,
-      hair: enum([:red, :brown, :blonde, :black])
-    }
-  ]
+  Array[{
+    name: String,
+    hair: enum([:red, :brown, :blonde, :black])
+  }]
 end
 
 value = [
@@ -136,7 +134,7 @@ There are two types of array schemas. When the array schema has a single
 element, it is a variable-length array schema:
 
 ```ruby
-schema = [Symbol]
+schema = Array[Symbol]
 RSchema.validate(schema, [:a, :b, :c]) #=> true
 RSchema.validate(schema, [:a]) #=> true
 RSchema.validate(schema, []) #=> true
@@ -145,7 +143,7 @@ RSchema.validate(schema, []) #=> true
 Otherwise, it is a fixed-length array schema
 
 ```ruby
-schema = [Integer, String]
+schema = Array[Integer, String]
 RSchema.validate(schema, [10, 'hello']) #=> true
 RSchema.validate(schema, [10, 'hello', 'world']) #=> false
 RSchema.validate(schema, [10]) #=> false
@@ -166,7 +164,7 @@ Keys can be optional:
 ```ruby
 schema = RSchema.schema {{
   :fname => String,
-  _?(:age) => Integer
+  optional(:age) => Integer
 }}
 RSchema.validate(schema, { fname: 'Lucy', age: 21 }) #=> true
 RSchema.validate(schema, { fname: 'Tom' }) #=> true
@@ -191,11 +189,18 @@ RSchema provides a few other schema types through its DSL:
 # boolean
 boolean_schema = RSchema.schema{ boolean }
 RSchema.validate(boolean_schema, false) #=> true
-RSchema.validate(boolean_schema, nil) #=> false
+RSchema.validate(boolean_schema, nil)   #=> false
+
+# any
+any_schema = RSchema.schema{ any }
+RSchema.validate(any_schema, "Hi")  #=> true
+RSchema.validate(any_schema, true)  #=> true
+RSchema.validate(any_schema, false) #=> true
+RSchema.validate(any_schema, nil)   #=> true
 
 # maybe
 maybe_schema = RSchema.schema{ maybe(Integer) }
-RSchema.validate(maybe_schema, 5) #=> true
+RSchema.validate(maybe_schema, 5)   #=> true
 RSchema.validate(maybe_schema, nil) #=> true
 
 # enum

data/lib/rschema.rb

@@ -70,9 +70,10 @@ module RSchema
 
   module DSL
     module Base
-      def _?(key)
+      def optional(key)
         OptionalHashKey.new(key)
       end
+      alias_method :_?, :optional
 
       def hash_of(subschemas_hash)
         raise InvalidSchemaError unless subschemas_hash.size == 1
@@ -101,6 +102,10 @@ module RSchema
       def boolean
         BooleanSchema
       end
+
+      def any
+        AnySchema
+      end
     end
     extend Base
   end
@@ -239,6 +244,12 @@ module RSchema
       end
     end
   end
+
+  module AnySchema
+    def self.schema_walk(value, mapper)
+      value
+    end
+  end
 end
 
 class Class

data/lib/rschema/version.rb

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

metadata

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