jimmy 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9291e6dbeb83c3460efcb1d9c9c6a26ea984c260436f405491a550158d5bc98e
-  data.tar.gz: 01cb215623de4558ed11d2a8a3034ce5fe536af7ed7b737f98ff465a4b4b2f12
+  metadata.gz: 0d18b13c6558a49c5a5247d5f4cdc0f7d12805b2583b2bab2557d75c29bd823f
+  data.tar.gz: bc2e9e773f340dbd4ee3bcf07e6f2eb47fed1d6b5ebb1d4e0f9f195e94ab0d2e
 SHA512:
-  metadata.gz: 97be3aa9c5780a9b752759749d35d23eb490c0d88b2b05b10b58336a3d06a09e4f08b47820db2ae76be820e72588ebb88f3b3a2e42bee806c24e8cabedc9cf74
-  data.tar.gz: a0486165c43307663fb94fa5d557d8213b9b5f32f6c57ea8ad8717af48ff528543752c9823b1c8997bf1ff92acfd7315a79379654b97b9923e906c2337a07440
+  metadata.gz: 5133ac0b7b56a3b6b4272a02099e8b1cad2a3b58435cea3b0f0984bf8844128f23a8f6d2c5a4970e0335c134638b768c02befc727bc2ca7f0ac4a08dfc486cc9
+  data.tar.gz: d5f0148b17deab8950954970e6a1b6f1964db0144c3121176822b35c140a5a5f7029c95a36a3f62e37366da131a71fc1c9f6687a1cbcf8f529d7e0d90bbe904a

data/lib/jimmy.rb

@@ -18,7 +18,7 @@ module Jimmy
     SchemerFactory.new(*args, **opts).schemer
   end
 
-  # Passes +schema+ to {Schema.new}, unless it is already a {Schema}, in which
+  # Passes +schema+ to +Schema.new+, unless it is already a {Schema}, in which
   # case it is returned unmodified.
   # @param [Schema, Object] schema
   # @return [Schema]

data/lib/jimmy/declaration.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'jimmy/declaration/composites'
+require 'jimmy/declaration/conditions'
 require 'jimmy/declaration/number'
 require 'jimmy/declaration/object'
 require 'jimmy/declaration/string'
@@ -60,9 +61,10 @@ module Jimmy
     end
 
     # Set an enum value for the schema.
-    # @param [Array] allowed_values The allowed values in the enum.
+    # @param [Array, Set] allowed_values The allowed values in the enum.
     # @return [self] self, for chaining
     def enum(allowed_values)
+      allowed_values = allowed_values.to_a if allowed_values.is_a? Set
       assert_array allowed_values, minimum: 1, unique: true
       set enum: allowed_values
     end

data/lib/jimmy/declaration/casting.rb

@@ -7,8 +7,8 @@ module Jimmy
     CASTS = {
       TrueClass  => ->(s, _) { s },
       FalseClass => ->(s, _) { s.nothing },
-      Regexp     => ->(s, v) { s.string.pattern v },
-      Range      => ->(s, v) { s.number.range v }
+      Regexp     => ->(s, v) { s.pattern v },
+      Range      => ->(s, v) { s.range v }
     }.freeze
 
     CASTABLE_CLASSES = CASTS.keys.freeze

data/lib/jimmy/declaration/conditions.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Jimmy
+  module Declaration
+    # Define the schema that determines whether the +then+ or +else+ schemas
+    # must be valid.
+    # @param schema [Schema] The +if+ schema.
+    # @param then_schema [Schema] The +then+ schema.
+    # @param else_schema [Schema] The +else+ schema.
+    # @return [self] self, for chaining
+    def if(schema, then_schema = nil, else_schema = nil)
+      set(if: cast_schema(schema)).tap do |s|
+        s.then then_schema unless then_schema.nil?
+        s.else else_schema unless else_schema.nil?
+      end
+    end
+  end
+end

data/lib/jimmy/schema.rb

@@ -129,6 +129,7 @@ require 'jimmy/schema/number'
 require 'jimmy/schema/object'
 require 'jimmy/schema/string'
 
+require 'jimmy/schema/conditions'
 require 'jimmy/schema/operators'
 require 'jimmy/schema/json'
 require 'jimmy/schema/casting'

data/lib/jimmy/schema/conditions.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Jimmy
+  class Schema
+    # Define the schema that must be valid if the +if+ schema is valid.
+    # @param schema [Jimmy::Schema] The +then+ schema.
+    # @return [self] self, for chaining
+    def then(schema)
+      set then: cast_schema(schema)
+    end
+
+    # Define the schema that must be valid if the +if+ schema is not valid.
+    # @param schema [Jimmy::Schema] The +else+ schema.
+    # @return [self] self, for chaining
+    def else(schema)
+      set else: cast_schema(schema)
+    end
+  end
+end

data/lib/jimmy/schemer_factory.rb

@@ -29,7 +29,7 @@ module Jimmy
       @options[:ref_resolver] = res
     end
 
-    # Get an instance of {JSONSchemer::Schema::Base} that can be used to
+    # Get an instance of +JSONSchemer::Schema::Base+ that can be used to
     # validate JSON documents against the given {Schema}.
     # @return [JSONSchemer::Schema::Base]
     def schemer

data/lib/jimmy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jimmy
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jimmy
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Neil E. Pearson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies: []
 description: Jimmy the Gem
 email:
@@ -36,6 +36,7 @@ files:
 - lib/jimmy/declaration/assertion.rb
 - lib/jimmy/declaration/casting.rb
 - lib/jimmy/declaration/composites.rb
+- lib/jimmy/declaration/conditions.rb
 - lib/jimmy/declaration/number.rb
 - lib/jimmy/declaration/object.rb
 - lib/jimmy/declaration/string.rb
@@ -55,6 +56,7 @@ files:
 - lib/jimmy/schema.rb
 - lib/jimmy/schema/array.rb
 - lib/jimmy/schema/casting.rb
+- lib/jimmy/schema/conditions.rb
 - lib/jimmy/schema/json.rb
 - lib/jimmy/schema/number.rb
 - lib/jimmy/schema/object.rb