shaped 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feb705e286456a57f403fa60fa90397c107dd61eb0da767f59c448379c93076a
-  data.tar.gz: 162b077604deddec490b40d25b7642dc5c11cb68df5fd662242691b9b1893b3b
+  metadata.gz: 1f6ca9518d2b3b0b55988f53d055a48c1344c54d6c8f8497877fb48e8ad621e1
+  data.tar.gz: c7e2be555928b918681670b803ea95b70ad97da25f0b4079be7fa6f16c4f6892
 SHA512:
-  metadata.gz: 73194df0310f71f4037bf3751f637f261b3cc33427ab2da282d9bef22cb8c71e2f00f5525a84137f6496defab7fd01f58feb8506d699d0b8e18e6cc0e039865b
-  data.tar.gz: b822fd85a851e383c571ecf98d4f7f1808bdead8928641fc4aa9f73c2bac6c5384325ad397ca0199e1b1c62e529be62f95e91af2cb36ebdc5d93328de3c53906
+  metadata.gz: 59c995d6a92d07d29b87a565924dbd175f8bce9e7ce158bdc98cf450aa5fb8e5073f78e6eeea5be0a140045e838e3562da9a2562a3263666dceeac23b7ac0368
+  data.tar.gz: 4c3b1e10af00279e075c7094a06b07b8624f3fc165fcea3704db18a5d52ec48b58bf9a8dffd31320465f2bad598d820f193f901be9bbe7f29e2852e7d8eda5a3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.6.4 (2020-06-22)
+### Fixed
+- Make it possible to specify optional keys in a Hash shape (using an `Or` shape as the value)
+
+### Docs
+- Remove explicit `git push` from release instructions
+
 ## v0.6.3 (2020-06-21)
 ### Docs
 - Add badges for Dependabot status and RubyGems version

data/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    shaped (0.6.3)
+    shaped (0.6.4)
       activemodel (~> 6.0)
       activesupport (~> 6.0)
 
@@ -71,7 +71,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     rainbow (3.0.0)
-    rake (12.3.3)
+    rake (13.0.1)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)

data/README.md

@@ -358,8 +358,7 @@ To release a new version:
 3. update the version number in `version.rb`
 4. `bundle install` (which will update `Gemfile.lock`)
 5. commit the changes with a message like `Prepare to release v0.1.1`
-6. push the changes to `origin/master` (GitHub) via `git push`
-7. run `bin/release` (which will create a git tag for the version, push git commits and
+6. run `bin/release` (which will create a git tag for the version, push git commits and
    tags to GitHub, and push the gem to RubyGems)
 
 # License

data/lib/shaped.rb

@@ -27,6 +27,7 @@ module Shaped
         end
 
       case shape_description
+      when Shaped::Shape then shape_description
       when Hash then Shaped::Shapes::Hash.new(shape_description)
       when Array then Shaped::Shapes::Array.new(shape_description)
       when Class then Shaped::Shapes::Class.new(shape_description, validation_options)

data/lib/shaped/shapes/hash.rb

@@ -12,9 +12,6 @@ class Shaped::Shapes::Hash < Shaped::Shape
   def matched_by?(hash)
     return false if !hash.is_a?(Hash)
 
-    missing_keys = expected_keys - hash.keys
-    return false if missing_keys.any?
-
     @hash_description.all? do |key, expected_value_shape|
       expected_value_shape.matched_by?(hash[key])
     end
@@ -28,10 +25,4 @@ class Shaped::Shapes::Hash < Shaped::Shape
 
     "{ #{printable_shape_description} }"
   end
-
-  private
-
-  def expected_keys
-    @hash_description.keys
-  end
 end

data/lib/shaped/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shaped
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaped
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - David Runger