rschema 3.1.1 → 3.2.0

data/lib/rschema/schemas/variable_hash.rb

@@ -1,78 +1,80 @@
+# frozen_string_literal: true
+
 module RSchema
-module Schemas
+  module Schemas
+    #
+    # A schema that matches variable-sized `Hash` objects, where the keys are
+    # _not_ known ahead of time.
+    #
+    # @example A hash of integers to strings
+    #     schema = RSchema.define { variable_hash(_Integer => _String) }
+    #     schema.valid?({ 5 => "hello", 7 => "world" }) #=> true
+    #     schema.valid?({}) #=> true
+    #
+    class VariableHash
+      attr_reader :key_schema, :value_schema
 
-#
-# A schema that matches variable-sized `Hash` objects, where the keys are _not_
-# known ahead of time.
-#
-# @example A hash of integers to strings
-#     schema = RSchema.define { variable_hash(_Integer => _String) }
-#     schema.valid?({ 5 => "hello", 7 => "world" }) #=> true
-#     schema.valid?({}) #=> true
-#
-class VariableHash
-  attr_reader :key_schema, :value_schema
+      def initialize(key_schema, value_schema)
+        @key_schema = key_schema
+        @value_schema = value_schema
+      end
 
-  def initialize(key_schema, value_schema)
-    @key_schema = key_schema
-    @value_schema = value_schema
-  end
+      def call(value, options)
+        return not_a_hash_result(value) unless value.is_a?(Hash)
 
-  def call(value, options)
-    return not_a_hash_result(value) unless value.is_a?(Hash)
+        validated_hash, key_errors, value_errors = apply_subschemas(value, options)
 
-    result, key_errors, value_errors = apply_subschemas(value, options)
+        if key_errors.empty? && value_errors.empty?
+          Result.success(validated_hash)
+        else
+          Result.failure(keys: key_errors, values: value_errors)
+        end
+      end
 
-    if key_errors.empty? && value_errors.empty?
-      Result.success(result)
-    else
-      Result.failure(keys: key_errors, values: value_errors)
-    end
-  end
+      def with_wrapped_subschemas(wrapper)
+        self.class.new(
+          wrapper.wrap(key_schema),
+          wrapper.wrap(value_schema),
+        )
+      end
 
-  def with_wrapped_subschemas(wrapper)
-    self.class.new(
-      wrapper.wrap(key_schema),
-      wrapper.wrap(value_schema),
-    )
-  end
+      private
 
-  private
+      def not_a_hash_result(value)
+        Result.failure(
+          Error.new(
+            schema: self,
+            value: value,
+            symbolic_name: :not_a_hash,
+          ),
+        )
+      end
 
-    def not_a_hash_result(value)
-      Result.failure(Error.new(
-        schema: self,
-        value: value,
-        symbolic_name: :not_a_hash,
-      ))
-    end
+      def apply_subschemas(value, options)
+        validated_hash = {}
+        key_errors = {}
+        value_errors = {}
 
-    def apply_subschemas(value, options)
-      result = {}
-      key_errors = {}
-      value_errors = {}
+        value.each do |key, subvalue|
+          key_result = key_schema.call(key, options)
+          if key_result.invalid?
+            key_errors[key] = key_result.error
+            break if options.fail_fast?
+          end
 
-      value.each do |key, subvalue|
-        key_result = key_schema.call(key, options)
-        if key_result.invalid?
-          key_errors[key] = key_result.error
-          break if options.fail_fast?
-        end
+          subvalue_result = value_schema.call(subvalue, options)
+          if subvalue_result.invalid?
+            value_errors[key] = subvalue_result.error
+            break if options.fail_fast?
+          end
 
-        subvalue_result = value_schema.call(subvalue, options)
-        if subvalue_result.invalid?
-          value_errors[key] = subvalue_result.error
-          break if options.fail_fast?
+          if key_result.valid? && subvalue_result.valid?
+            validated_hash[key_result.value] = subvalue_result.value
+          end
         end
 
-        if key_result.valid? && subvalue_result.valid?
-          result[key_result.value] = subvalue_result.value
-        end
+        [validated_hash, key_errors, value_errors]
       end
-
-      return result, key_errors, value_errors
     end
-
-end
-end
+  end
 end

data/lib/rschema/schemas/variable_length_array.rb

@@ -1,60 +1,66 @@
+# frozen_string_literal: true
+
 module RSchema
-module Schemas
-
-#
-# A schema that matches variable-length arrays, where all elements conform to
-# a single subschema
-#
-# @example A variable-length array schema
-#     schema = RSchema.define { array(_Integer) }
-#     schema.valid?([1,2,3]) #=> true
-#     schema.valid?([]) #=> true
-#
-class VariableLengthArray
-  attr_accessor :element_schema
-
-  def initialize(element_schema)
-    @element_schema = element_schema
-  end
+  module Schemas
+    #
+    # A schema that matches variable-length arrays, where all elements conform
+    # to a single subschema
+    #
+    # @example A variable-length array schema
+    #     schema = RSchema.define { array(_Integer) }
+    #     schema.valid?([1,2,3]) #=> true
+    #     schema.valid?([]) #=> true
+    #
+    class VariableLengthArray
+      attr_accessor :element_schema
 
-  def call(value, options)
-    if value.kind_of?(Array)
-      validated_values, errors = validate_elements(value, options)
-      if errors.empty?
-        Result.success(validated_values)
-      else
-        Result.failure(errors)
+      def initialize(element_schema)
+        @element_schema = element_schema
       end
-    else
-      Result.failure(Error.new(
-        schema: self,
-        value: value,
-        symbolic_name: :not_an_array,
-      ))
-    end
-  end
 
-  def with_wrapped_subschemas(wrapper)
-    self.class.new(wrapper.wrap(element_schema))
-  end
+      def call(value, options)
+        return type_failure(value) unless value.is_a?(Array)
 
-  def validate_elements(array, options)
-    errors = {}
-    validated_values = []
-
-    array.each_with_index do |subvalue, idx|
-      result = @element_schema.call(subvalue, options)
-      if result.valid?
-        validated_values[idx] = result.value
-      else
-        errors[idx] = result.error
-        break if options.fail_fast?
+        validated_values, errors = validate_elements(value, options)
+        if errors.empty?
+          Result.success(validated_values)
+        else
+          Result.failure(errors)
+        end
       end
-    end
 
-    [validated_values, errors]
-  end
+      def with_wrapped_subschemas(wrapper)
+        self.class.new(wrapper.wrap(element_schema))
+      end
 
-end
-end
+      private
+
+      def type_failure(value)
+        Result.failure(
+          Error.new(
+            schema: self,
+            value: value,
+            symbolic_name: :not_an_array,
+          ),
+        )
+      end
+
+      def validate_elements(array, options)
+        errors = {}
+        validated_values = []
+
+        array.each_with_index do |subvalue, idx|
+          result = @element_schema.call(subvalue, options)
+          if result.valid?
+            validated_values[idx] = result.value
+          else
+            errors[idx] = result.error
+            break if options.fail_fast?
+          end
+        end
+
+        [validated_values, errors]
+      end
+    end
+  end
 end

data/lib/rschema/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RSchema
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rschema
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Tom Dalling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -25,77 +25,105 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -181,6 +209,7 @@ files:
 - lib/rschema/dsl.rb
 - lib/rschema/error.rb
 - lib/rschema/options.rb
+- lib/rschema/rails.rb
 - lib/rschema/result.rb
 - lib/rschema/schemas.rb
 - lib/rschema/schemas/anything.rb
@@ -211,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="