shaped 0.6.2 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b652bad6c74a2a070b673bd751e54809d2164f27b296fb24925dbc83c5906921
-  data.tar.gz: 24b055aa823685eaa4a7e94d5b4e7a2a0f0ba9606c95cf4614e380c6d4869ab0
+  metadata.gz: c17eca1a62726455801d77acc63877eadf199ad58ceba789262917f93a8fd56a
+  data.tar.gz: 723367acf980be0ac1e427aa792825f9e4b513b917e8929ed41f16b02ee67d5c
 SHA512:
-  metadata.gz: 017fa0101043d18e9f9421f01d6275f22aedc4ac76323c43c359f3bded23f1e71fde3156877eb7ee1998370d67f7060d16582ac8b78ac435f0c2aaf7e7c5af39
-  data.tar.gz: 2d1c6c3f4199eb179e39511d6590dad3166d93506790b8b133846be707ced15c6c5f13ad33424319ce0a8a8b635d904f4c3bbedf020e166f5a400e55c6838939
+  metadata.gz: 6232fb1b87dca1f98184ef631444c05b9a74be191ed82d12af8263b30dad6df8826b91eb27ad9ed85543fb65f9a19c2900cd925cde0730b582b7806be17ee491
+  data.tar.gz: 53b0b230f2b1fe6f0b13c1cfd624ec2f62284ad7aafb4d60bf2625fc33c8f2d83cdd2cc6bb657eff88166ea4cdb171de4adcff76aabedd8de079db022ff7e160

data/.rubocop.yml

@@ -1,142 +1,5 @@
-AllCops:
-  EnabledByDefault: true
-  Exclude:
-    - !ruby/regexp /\/db\/migrate/201[1-8].*\.rb\z/
-    # auto-generated files; best to leave as-is
-    - bin/{annotate,brakeman,bundle,database_consistency,pallets,rubocop,sidekiq}
-    - db/schema.rb
-    - lib/tasks/auto_annotate_models.rake
-    - node_modules/**/*
-  TargetRubyVersion: 2.7
-Bundler/GemComment:
-  Enabled: false
-Layout/ArgumentAlignment:
-  EnforcedStyle: with_fixed_indentation
-Layout/ClassStructure:
-  ExpectedOrder:
-      - module_inclusion
-      - constants
-      - public_class_methods
-      - initializer
-      - public_methods
-      - protected_methods
-      - private_methods
-Layout/DotPosition:
-  EnforcedStyle: trailing
-Layout/FirstArgumentIndentation:
-  Enabled: false # this rule doesn't play nicely with the way that I like to use `memoize`
-Layout/FirstArrayElementIndentation:
-  EnforcedStyle: consistent
-Layout/LineLength:
-  IgnoredPatterns:
-    # ignore line length if the line is a comment without any spaces; it's probably not something we
-    # can fix (e.g. a long file path)
-    - !ruby/regexp /^ *#? [\S]+$/
-  Max: 100
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-Layout/SpaceBeforeBlockBraces:
-  Enabled: false
-Layout/SpaceBeforeSemicolon:
-  Enabled: false
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: space
-Lint/RedundantSplatExpansion:
-  Enabled: false
-Metrics/AbcSize:
-  Enabled: false
-Metrics/BlockLength:
-  Enabled: false
-Metrics/ClassLength:
-  Enabled: false
-Metrics/MethodLength:
-  Max: 30
-Naming/RescuedExceptionsVariableName:
-  Enabled: false
-Style/BlockDelimiters:
-  Enabled: false
-Style/ClassAndModuleChildren:
-  EnforcedStyle: compact
-Style/CollectionMethods:
-  Enabled: false
-Style/ConstantVisibility:
-  Enabled: false
-Style/Copyright:
-  Enabled: false
-Style/DisableCopsWithinSourceCodeDirective:
-  Enabled: false
-Style/Documentation:
-  Enabled: false
-Style/DocumentationMethod:
-  Enabled: false
-Style/EmptyCaseCondition:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: true
-Style/GlobalVars:
-  Enabled: false
-Style/GuardClause:
-  Enabled: false
-Style/IfUnlessModifier:
-  Enabled: false
-Style/InlineComment:
-  Enabled: false
-Style/Lambda:
-  Enabled: false
-Style/MethodCallWithArgsParentheses:
-  IgnoredMethods:
-    - add_runtime_dependency
-    - desc
-    - fail
-    - file
-    - gem
-    - head
-    - include
-    - integer
-    - load
-    - p
-    - print
-    - puts
-    - render
-    - require
-    - require_relative
-    - ruby
-    - run
-    - string
-    - source
-Style/MissingElse:
-  Enabled: false
-Style/NegatedIf:
-  Enabled: false
-Style/ImplicitRuntimeError:
-  Enabled: false
-Style/MethodCalledOnDoEndBlock:
-  Enabled: false
-Style/NumericPredicate:
-  Enabled: false
-Style/ParenthesesAroundCondition:
-  Enabled: false
-Style/RescueModifier:
-  Enabled: false
-Style/RescueStandardError:
-  Enabled: false
-Style/ReturnNil:
-  Enabled: false
-Style/RegexpLiteral:
-  Enabled: false
-Style/Semicolon:
-  Enabled: false
-Style/SignalException:
-  Enabled: false
-Style/StderrPuts:
-  Enabled: false
-Style/StringHashKeys:
-  Enabled: false
-Style/TernaryParentheses:
-  Enabled: false
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: comma
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
+inherit_gem:
+  runger_style:
+    - rulesets/default.yml # gem 'rubocop'
+    - rulesets/performance.yml # gem 'rubocop-performance'
+    - rulesets/rspec.yml # gem 'rubocop-rspec'

data/.travis.yml

@@ -10,5 +10,5 @@ notifications:
     on_success: never
     on_failure: always
 script:
-  - bin/rubocop $(git ls-tree -r HEAD --name-only) --force-exclusion --format clang
+  - bin/rubocop --format clang
   - bin/rspec

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+## v0.7.2 (2020-07-13)
+### Dependencies
+- Bump `rubocop` to 0.88.0 and `runger_style` to 0.2.3
+
+## v0.7.1 (2020-07-02)
+### Internal
+- Source Rubocop rules/config from `runger_style` gem
+
+## v0.7.0 (2020-06-24)
+### BREAKING CHANGES
+- Rename the `Or` shape to `Any`
+- Add a `Method` shape (where the shape description is the name of a method which, when called on a
+  test object, must return a truthy value). This is a breaking change because the `Shaped::Shape`
+  constructor will now return an instance of `Shaped::Shapes::Method` rather than
+  `Shaped::Shapes::Equality` when called with a Symbol argument.
+
+### Added
+- Add an `All` shape (w/ multiple sub-shapes, all of which must be matched)
+
+## 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
+
 ## v0.6.2 (2020-06-21)
 ### Docs
 - Update README.md and `bin/release` to reflect release via RubyGems
@@ -81,7 +111,7 @@
   `Shaped::Shapes::Hash`):
   1. `Shaped::Shapes::Class`
   2. `Shaped::Shapes::Equality`
-  3. `Shaped::Shapes::Or`
+  3. `Shaped::Shapes::Any`
 - All hashes and arrays in shape definitions are parsed "recursively" as shape definitions. For
   example, instead of:
 

data/Gemfile

@@ -5,10 +5,15 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in shaped.gemspec
 gemspec
 
-gem 'amazing_print'
-gem 'pry-byebug'
-gem 'rake'
-gem 'rubocop'
+group :development, :test do
+  gem 'amazing_print'
+  gem 'pry-byebug'
+  gem 'rake'
+  gem 'rubocop', require: false
+  gem 'rubocop-performance', require: false
+  gem 'rubocop-rspec', require: false
+  gem 'runger_style', github: 'davidrunger/runger_style', require: false
+end
 
 group :test do
   gem 'codecov', require: false

data/Gemfile.lock

@@ -7,10 +7,16 @@ GIT
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
 
+GIT
+  remote: https://github.com/davidrunger/runger_style.git
+  revision: 3d13e2985df67c4b9ce60c6039433ffa14ea87c9
+  specs:
+    runger_style (0.2.3)
+
 PATH
   remote: .
   specs:
-    shaped (0.6.2)
+    shaped (0.7.2)
       activemodel (~> 6.0)
       activesupport (~> 6.0)
 
@@ -28,11 +34,12 @@ GEM
     amazing_print (1.2.1)
     ast (2.4.1)
     byebug (11.1.3)
-    codecov (0.1.17)
+    codecov (0.2.0)
+      colorize
       json
       simplecov
-      url
     coderay (1.1.3)
+    colorize (0.8.1)
     concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     docile (1.3.2)
@@ -50,7 +57,7 @@ GEM
     guard-compat (1.2.1)
     i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
+    json (2.3.1)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -61,9 +68,9 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -71,7 +78,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)
@@ -90,30 +97,34 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.85.1)
+    rubocop (0.88.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
+    rubocop-ast (0.1.0)
       parser (>= 2.7.0.1)
+    rubocop-performance (1.7.0)
+      rubocop (>= 0.82.0)
+    rubocop-rspec (1.42.0)
+      rubocop (>= 0.87.0)
     ruby-progressbar (1.10.1)
     shellany (0.0.1)
-    simplecov (0.18.5)
+    simplecov (0.17.1)
       docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     thor (1.0.1)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    url (0.3.2)
-    zeitwerk (2.3.0)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby
@@ -126,6 +137,9 @@ DEPENDENCIES
   rake
   rspec
   rubocop
+  rubocop-performance
+  rubocop-rspec
+  runger_style!
   shaped!
 
 BUNDLED WITH

data/README.md

@@ -1,5 +1,7 @@
 [![codecov](https://codecov.io/gh/davidrunger/shaped/branch/master/graph/badge.svg)](https://codecov.io/gh/davidrunger/shaped)
 [![Build Status](https://travis-ci.com/davidrunger/shaped.svg?branch=master)](https://travis-ci.com/davidrunger/shaped)
+[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=davidrunger/shaped)](https://dependabot.com)
+[![Gem Version](https://badge.fury.io/rb/shaped.svg)](https://badge.fury.io/rb/shaped)
 
 # Shaped
 
@@ -19,15 +21,17 @@ Validate the "shape" of Ruby objects!
       * [Shaped::Shapes::Array](#shapedshapesarray)
       * [Shaped::Shapes::Class](#shapedshapesclass)
          * [ActiveModel validations](#activemodel-validations)
+      * [Shaped::Shapes::Method](#shapedshapesmethod)
       * [Shaped::Shapes::Callable](#shapedshapescallable)
       * [Shaped::Shapes::Equality](#shapedshapesequality)
-      * [Shaped::Shapes::Or](#shapedshapesor)
+      * [Shaped::Shapes::Any](#shapedshapesany)
+      * [Shaped::Shapes::All](#shapedshapesall)
       * [#to_s](#to_s)
    * [Development](#development)
    * [For maintainers](#for-maintainers)
    * [License](#license)
 
-<!-- Added by: david, at: Fri Jun 19 21:29:30 PDT 2020 -->
+<!-- Added by: david, at: Wed Jun 24 13:56:49 PDT 2020 -->
 
 <!--te-->
 
@@ -89,7 +93,7 @@ types (all of which inherit from `Shaped::Shape`):
 1. `Shaped::Shapes::Class`
 1. `Shaped::Shapes::Callable`
 1. `Shaped::Shapes::Equality`
-1. `Shaped::Shapes::Or`
+1. `Shaped::Shapes::Any`
 
 Examples illustrating the use of each shape type are below.
 
@@ -202,6 +206,21 @@ shape.matched_by?('a@b.c') # too short
 # => false
 ```
 
+## Shaped::Shapes::Method
+
+This shape allows specifying a method name that, when called upon a test object, must return a
+truthy value in order for `matched_by?` to be true.
+
+```rb
+shape = Shaped::Shape(:odd?)
+
+shape.matched_by?(55)
+# => true
+
+shape.matched_by?(60)
+# => false
+```
+
 ## Shaped::Shapes::Callable
 
 This shape is very powerful if you need a very customized shape definition; you can define any
@@ -280,7 +299,7 @@ shape.matched_by?(verification_code: '321cba', new_role: 'SuperAdmin')
 # => false
 ```
 
-## Shaped::Shapes::Or
+## Shaped::Shapes::Any
 
 This shape is used behind the scenes to build "compound matchers", such as an Array shape that
 allows multiple different classes:
@@ -297,7 +316,7 @@ shape.matched_by?([0.333, 55])
 # => false
 ```
 
-You can build an `Or` shape by invoking the `Shaped::Shape` constructor with more than one argument.
+You can build an `Any` shape by invoking the `Shaped::Shape` constructor with more than one argument.
 Below is a (rather artificial) example illustrating this. To match this `shape`, an object must be
 either greater than zero OR an Integer (or both).
 
@@ -314,6 +333,23 @@ shape.matched_by?(-11.5) # it's neither greater than 0 nor an Integer
 # => false
 ```
 
+## Shaped::Shapes::All
+
+This shape can be used to combine multiple checks, all of which must be true for a test object in
+order for `#matched_by?` to be true:
+
+```rb
+shape = Shaped::Shapes::All.new(Numeric, ->(number) { number.even? })
+shape.to_s
+# => "Numeric AND Proc test defined at (eval):10"
+
+shape.matched_by?(22) # 22 is both a Numeric and `#even?`
+# => true
+
+shape.matched_by?(33) # 33 is a Numeric but it's not `#even?`
+# => false
+```
+
 ## `#to_s`
 
 Each Shape type implements a `#to_s` instance method that aims to provide a relatively clear
@@ -356,8 +392,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/bin/_guard-core

@@ -17,7 +17,7 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path(
 bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/guard

@@ -17,7 +17,7 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path(
 bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/rspec

@@ -18,7 +18,7 @@ ENV['BUNDLE_GEMFILE'] ||=
 bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
     load(bundle_binstub)
   else
     abort(<<~ERROR)

data/bin/rubocop

@@ -14,7 +14,7 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE_
 bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
     load(bundle_binstub)
   else
     abort(<<~ERROR)

data/lib/shaped.rb

@@ -13,7 +13,7 @@ module Shaped
   def self.Shape(*shape_descriptions)
     validation_options = shape_descriptions.extract_options!
     if shape_descriptions.size >= 2
-      Shaped::Shapes::Or.new(*shape_descriptions, validation_options)
+      Shaped::Shapes::Any.new(*shape_descriptions, validation_options)
     else
       # If the shape_descriptions argument list was just one hash, then `extract_options!` would
       # have removed it, making `shape_descriptions` an empty array, so we need to "restore" the
@@ -27,8 +27,10 @@ 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 Symbol then Shaped::Shapes::Method.new(shape_description)
       when Class then Shaped::Shapes::Class.new(shape_description, validation_options)
       else
         if shape_description.respond_to?(:call)

data/lib/shaped/shapes/all.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Shaped::Shapes::All < Shaped::Shape
+  def initialize(*shape_descriptions)
+    validation_options = shape_descriptions.extract_options!
+    if shape_descriptions.size <= 1
+      raise(Shaped::InvalidShapeDescription, <<~ERROR.squish)
+        A #{self.class} description must be a list of two or more shape descriptions.
+      ERROR
+    end
+
+    @shapes =
+      shape_descriptions.map do |description|
+        Shaped::Shape(description, validation_options)
+      end
+  end
+
+  def matched_by?(object)
+    @shapes.all? { |shape| shape.matched_by?(object) }
+  end
+
+  def to_s
+    @shapes.map(&:to_s).join(' AND ')
+  end
+end

data/lib/shaped/shapes/{or.rb → any.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Shaped::Shapes::Or < Shaped::Shape
+class Shaped::Shapes::Any < Shaped::Shape
   def initialize(*shape_descriptions)
     validation_options = shape_descriptions.extract_options!
     if shape_descriptions.size <= 1

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/shapes/method.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Shaped::Shapes::Method < Shaped::Shape
+  def initialize(method_name)
+    @method_name = method_name
+  end
+
+  def matched_by?(object)
+    !!object.public_send(@method_name)
+  end
+
+  def to_s
+    "object returning truthy for ##{@method_name}"
+  end
+end

data/lib/shaped/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shaped
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.2
 platform: ruby
 authors:
 - David Runger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -65,12 +65,14 @@ files:
 - bin/setup
 - lib/shaped.rb
 - lib/shaped/shape.rb
+- lib/shaped/shapes/all.rb
+- lib/shaped/shapes/any.rb
 - lib/shaped/shapes/array.rb
 - lib/shaped/shapes/callable.rb
 - lib/shaped/shapes/class.rb
 - lib/shaped/shapes/equality.rb
 - lib/shaped/shapes/hash.rb
-- lib/shaped/shapes/or.rb
+- lib/shaped/shapes/method.rb
 - lib/shaped/version.rb
 - shaped.gemspec
 homepage: https://github.com/davidrunger/shaped