golden_fleece 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f996bbd5d3cba822166100ddbc5dce786e65b816
-  data.tar.gz: f35cf4bf3aa2e42e6570e802be2f643fe9304a92
+  metadata.gz: 6dadad30183120be89348ef186c0be8de8d1cf6e
+  data.tar.gz: 13e14e0c497115e0e7dff33822b2864efd0bb7c6
 SHA512:
-  metadata.gz: 9c6fb47d237602b4f038de774bf5b5a596f1e73f9639d0892a4f49e60c1b5f33f2c4b9b42e52718ed952dd21f5ba0e88721a3c8ffd35775febea096cd44852c8
-  data.tar.gz: c677a968dc4a79037c4f5580787e23452d8fd53bee4c317986ec42515b0039abf989e5b4bafececf4419ff0b449740559c5424cec63cd0a618f424f1886be7c8
+  metadata.gz: c5b3b5e14665764464cbf89ba630db8c549463572696dc98de7a31a607549426d0d9cc821f06838850313aec07f4f5fcdbaa37cb05acff66544b01638f66fc03
+  data.tar.gz: 7c115cdb975db18cda2b27aca36329e2c7d23e3ac0c160601e922e18f50a9bb348cdc8df721efbeef5071ff19172889c6f7f8529a9e84b9379307d7493fe35ae

data/CHANGELOG.md

@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### [0.1.2] - 2015-05-26
+### Changed
+- Allow redefining individual schemas
+
+### Fixed
+- Validation no longer stops after encountering a single invalid key in a hash
 
 ## [0.1.1] - 2017-05-25
 ### Fixed
@@ -20,5 +26,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Getters
 - Specs
 
-[Unreleased]: https://github.com/earksiinni/golden_fleece/compare/v0.1.1...HEAD
-[0.1.1]: https://github.com/earksiinni/golden_fleece/compare/ad25a847b5678b1f3a6c1c0b6a986d784142d38f...v0.1.1
+[Unreleased]: https://github.com/earksiinni/golden_fleece/compare/v0.1.2...HEAD
+[0.1.2]: https://github.com/earksiinni/golden_fleece/compare/v0.1.1...v0.1.2
+[0.1.1]: https://github.com/earksiinni/golden_fleece/compare/v0.1.0...v0.1.1

data/lib/golden_fleece/context/schemas.rb

@@ -2,8 +2,18 @@ module GoldenFleece
   class Context
     module Schemas
       def define_schemas(attribute, schema_definitions = {})
-        schemas[attribute.to_sym] ||= schema_definitions
-        attributes << attribute
+        attribute_schema = schemas[attribute.to_sym]
+
+        # Allow redefining individual schemas
+        if attribute_schema
+          schema_definitions.each do |schema_name, schema_definition|
+            schemas[attribute.to_sym][schema_name.to_sym] = schema_definition
+          end
+        else
+          schemas[attribute.to_sym] = schema_definitions
+        end
+
+        attributes << attribute unless attributes.include? attribute
       end
     end
   end

data/lib/golden_fleece/validations/validator_context.rb

@@ -29,10 +29,7 @@ module GoldenFleece
       validatable_keys.each do |key|
         path = build_json_path(parent_path, key)
 
-        validate_key key, path
-
-        # If all keys on our current level are valid, proceed
-        if errors.empty?
+        if validate_key key, path
           schema = schemas[key]
           value = schema.value.compute(record)
 
@@ -52,7 +49,12 @@ module GoldenFleece
     attr_reader :persisted_json, :schemas, :parent_path, :validatable_keys, :record, :attribute, :errors
 
     def validate_key(key, path)
-      errors << "Invalid key #{error_suffix(attribute, path)}" unless schemas.keys.include? key
+      if schemas.keys.include? key
+        true
+      else
+        errors << "Invalid key #{error_suffix(attribute, path)}"
+        false
+      end
     end
 
     def validate_type(value, valid_types, path)

data/lib/golden_fleece/value.rb

@@ -4,7 +4,7 @@ require 'hana'
 module GoldenFleece
   class Value
     include Utility
-    
+
     def initialize(schema)
       @schema = schema
       self.value_initialized = false

data/lib/golden_fleece/version.rb

@@ -1,3 +1,3 @@
 module GoldenFleece
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: golden_fleece
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ersin Akinci