validation_matcher 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2256f5aae95d9a85c63454d483aa53d63b920579
-  data.tar.gz: 9b7f1c07918b26a57646055107d523b95330016c
+  metadata.gz: 44aea0bbd6d53fd36664be6e5f80d2f42d4b7dca
+  data.tar.gz: d2a20e572b8ed5e999cb54324bd8fe8770727b8b
 SHA512:
-  metadata.gz: 39cdb61a3f6be45f76d7676eed2addaa6b6d4d24cbc7c8a455a684709deb43d82a2bfbd22397ecb28c7f8ba6b91cb6fc24d692cf50ad5c41b8005a649a06a259
-  data.tar.gz: dd45b03f8fee1a7acdd8809485f7ed75b9c2ed7c43d28394a38bc19ca5d8c1bdcdf852c692e80d0f7eb5b45aacd7d0ef95380d209034b663b3f99ebc7e368f9a
+  metadata.gz: f00bd4e341890244dfbd9f7e154fb3b8df854aabf0a02a981e438e3b5ef61311fd3d4801eed0c91deab0c539455571bc2ec7608c1cf8e0b8bd91c8a6065cdac5
+  data.tar.gz: cdd896f57cf72f9c32755f5e90e939c3979d5063c89d88e1776baec4cd936dfb551f1ec9b47ec6afbe90aa97a908df7dd115ce2b940ea33f7acaa85a386bf9c8

data/.gitlab-ci.yml

@@ -0,0 +1,36 @@
+stages:
+  - style
+  - specs
+
+.ruby: &ruby
+  before_script: ["bundle install"]
+  cache:
+    key: "$CI_COMMIT_REF_NAME"
+    paths: ["vendor/bundle"]
+  image: devfu/ci:2.4-alpine
+  variables:
+    BUNDLE_CLEAN:   "true"
+    BUNDLE_JOBS:    "$(nproc)"
+    BUNDLE_PATH:    "vendor/bundle"
+    BUNDLE_RETRY:   "3"
+    BUNDLE_WITHOUT: "production,staging"
+
+#
+# style
+#
+
+rubocop:
+  <<: *ruby
+  except: [tags]
+  script: ["rubocop"]
+  stage: style
+
+#
+# specs
+#
+
+rspec:
+  <<: *ruby
+  except: [tags]
+  script: ["rake spec"]
+  stage: specs

data/.rubocop.yml

@@ -0,0 +1,17 @@
+AllCops:
+  TargetRubyVersion: 2.4
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  ExtraDetails: true
+  Exclude:
+    - Gemfile.lock
+    - vendor/**/*
+
+inherit_from:
+  - .rubocop_todo.yml
+
+inherit_gem:
+  yoshiki: .devfu-rubocop.yml
+
+Style/Documentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,16 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-08-28 06:11:21 +0000 using RuboCop version 0.49.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Metrics/AbcSize:
+  Max: 19
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 13

data/Dockerfile

@@ -0,0 +1,17 @@
+FROM devfu/ci:2.4-alpine
+
+ENV app /src
+ENV BUNDLE_NO_PRUNE true
+ENV BUNDLE_PATH /bundle
+RUN bundle config jobs $(nproc)
+
+# Copy the bundle config
+# COPY .bundle/config /usr/local/bundle/config
+
+RUN mkdir $app
+WORKDIR $app
+ADD . $app
+
+VOLUME /bundle
+
+CMD bundle console

data/Gemfile

@@ -1,10 +1,6 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in validation_matcher.gemspec
-gemspec :development_group => :test
-
-group :development do
-  # install the appropriate pry debug tool
-  gem 'pry-byebug',   require: false, platform: 'ruby_20'
-  gem 'pry-debugger', require: false, platform: 'ruby_19'
-end
+gemspec development_group: :test

data/Rakefile

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new :spec
-task :default => :spec
+task default: :spec

data/docker-compose.yml

@@ -0,0 +1,38 @@
+version: '3'
+
+services:
+  ruby:
+    build: .
+    volumes: &ruby_volumes
+      - .:/src:cached
+      - gems:/bundle:cached
+
+  #
+  # fake binstubs with additional services
+  #
+
+  # docker-compose run bundle [cmd]
+  bundle:
+    build: .
+    command: check
+    entrypoint: ["bundle"]
+    volumes: *ruby_volumes
+
+  # docker-compose run rake [task]
+  rake:
+    build: .
+    command: spec
+    entrypoint: ["bundle", "exec", "rake"]
+    volumes: *ruby_volumes
+
+  # docker-compose run rspec [pattern]
+  rspec:
+    build: .
+    command: spec
+    entrypoint: ["bundle", "exec", "rspec"]
+    volumes: *ruby_volumes
+
+volumes:
+  gems:
+    external:
+      name: docker-gems

data/lib/validation_matcher.rb

@@ -1,56 +1,70 @@
+# frozen_string_literal: true
+
 require 'validation_matcher/version'
 require 'rspec/expectations'
 
 module ValidationMatcher
 
-  class UnexpectedOptions < RuntimeError
-
-    attr_reader :validator
+  RSpec::Matchers.define :validate do |_expected|
+    chain(:of) { |attr| @attribute = attr }
 
-    def initialze validator
-      @validator = validator
+    chain(:with) do |*opts|
+      @options = opts.extract_options!
+      @options = opts if @options.empty?
     end
 
-    def message
-      <<-MSG
-        Cannot validate options with custom validator.
-        Use `should validate #{ validator.inspect }` (with no options) instead."
-      MSG
+    match do |_actual|
+      if @attribute
+        validator.present? && (@options ? validator.options.should =~ @options : true)
+      else
+        callback.present? && (@options ? check_callback_options : true)
+      end
     end
 
-  end
-
-  RSpec::Matchers.define :validate do |*expected|
-    attr_reader :expected_attribute, :expected_options, :expected_validator
+    match_when_negated do |_actual|
+      if @attribute
+        raise "Negating a matcher with options doesn't really make sense!" if @options
+        validator.should be_nil
+      else
+        callback.should be_nil
+      end
+    end
 
-    chain(:of)   { |field| @expected_attribute = field }
-    chain(:with) { |hash|  @expected_options = hash }
+    def callback
+      actual.class._validate_callbacks.detect { |c| c.filter == expected }
+    end
 
-    match do |actual|
-      @expected_options ||= {}
-      @expected_validator = expected.first
+    def check_callback_options
+      opts = parse_callback_options
 
-      validator? or callback?
+      if @options.is_a? Hash
+        raise 'Cannot expect custom procs' if @options.values.any? { |v| v.is_a? Proc }
+        @options.each { |k, _| opts[k].should =~ Array(@options[k]) }
+      else
+        opts.keys.should =~ @options
+      end
     end
 
-    def callback_methods
-      actual._validate_callbacks.select { |c| c.filter == expected_validator }
-    end
+    def parse_callback_options
+      ifs = callback.instance_variable_get '@if'
 
-    def callback?
-      callback = callback_methods.any?
-      fail UnexpectedOptions if callback and expected_options.any?
-      callback
-    end
+      if ifs.first.is_a? Proc
+        proc_binding = ifs.first.binding
+        if proc_binding.local_variables.include? :options
+          ons = proc_binding.local_variable_get(:options)[:on]
+          ifs = ifs[1..-1]
+        end
+      end
 
-    def attribute_validators
-      expected_attribute ? actual.class.validators_on(expected_attribute) : []
+      {
+        if:     Array(ifs),
+        on:     Array(ons),
+        unless: Array(callback.instance_variable_get('@unless'))
+      }.reject { |_, v| v.empty? }
     end
 
-    def validator?
-      attribute_validators.any? do |validator|
-        validator.kind == expected_validator && validator.options == expected_options
-      end
+    def validator
+      actual.class.validators_on(@attribute).detect { |v| v.kind == expected }
     end
   end
 

data/lib/validation_matcher/version.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
 module ValidationMatcher
-  VERSION = '3.2.0'
+
+  VERSION = '4.0.0'
+
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 libs = %w[
   active_model
   active_support/core_ext
@@ -38,6 +40,8 @@ class Thing
   validates :field_c, numericality: { allow_nil: false, only_integer: true }
 
   validate :custom_validator
+  validate :another_custom_validator, on: :update
+  validate :procs_cannot_be_speced,   if: -> { new_record? }
 
 private
 

data/spec/thing_spec.rb

@@ -1,23 +1,34 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Thing do
 
   describe 'each validators' do
 
-    describe 'without options' do
+    describe 'with options' do
 
-      it { should_not validate(:presence).of :field_a }
-      it { should     validate(:presence).of :field_b }
+      it 'can be expected without specifying options' do
+        should validate(:numericality).of :field_c
+      end
 
-      it { should_not validate(:numericality).of :field_c }
+      it 'can be expected with specified options' do
+        should validate(:numericality).of(:field_c).with only_integer: true, allow_nil: false
+      end
 
-    end
+      it 'cannot be negated with specified options' do
+        lambda do
+          opts = { only_integer: false }
+          should_not validate(:numericality).of(:field_c).with opts
+        end.should raise_exception RuntimeError
+      end
 
-    describe 'with options' do
+    end
 
-      it { should_not validate(:numericality).of(:field_c).with only_integer: true }
+    describe 'without options' do
 
-      it { should validate(:numericality).of(:field_c).with only_integer: true, allow_nil: false }
+      it { should_not validate(:presence).of :field_a }
+      it { should     validate(:presence).of :field_b }
 
     end
 
@@ -28,13 +39,26 @@ describe Thing do
     describe 'without options' do
 
       it { should validate :custom_validator }
+      it { should validate :another_custom_validator }
 
     end
 
     describe 'with options' do
 
-      it 'is not supported ' do
-        -> { should validate(:custom_validator).with on: :update }.should raise_exception ValidationMatcher::UnexpectedOptions
+      it { should validate(:another_custom_validator).with on: :update }
+
+    end
+
+    describe 'with a proc' do
+
+      it 'cannot be specced by key & value' do
+        lambda do
+          should validate(:procs_cannot_be_speced).with if: -> { new_record? }
+        end.should raise_exception RuntimeError
+      end
+
+      it 'can be specced by key ONLY' do
+        should validate(:procs_cannot_be_speced).with :if
       end
 
     end

data/validation_matcher.gemspec

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'validation_matcher/version'
 
 Gem::Specification.new do |s|
@@ -7,7 +9,7 @@ Gem::Specification.new do |s|
   s.version     = ValidationMatcher::VERSION
   s.authors     = ['BM5k']
   s.email       = ['me@bm5k.com']
-  s.homepage    = ""
+  s.homepage    = ''
   s.summary     = 'RSpec matcher for ActiveModel validations'
   s.description = 'Use reflection to spec ActiveModel validations'
   s.licenses    = ['MIT']
@@ -16,16 +18,18 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename f }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.1'
+  s.required_ruby_version = '>= 2.4.1'
 
   s.add_dependency 'rspec-expectations', '~> 3.1'
 
   s.add_development_dependency 'activemodel', '>= 3'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-doc'
+  s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'yoshiki'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validation_matcher
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - BM5k
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yoshiki
+  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'
 description: Use reflection to spec ActiveModel validations
 email:
 - me@bm5k.com
@@ -102,12 +130,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- docker-compose.yml
 - lib/validation_matcher.rb
 - lib/validation_matcher/version.rb
 - spec/spec_helper.rb
@@ -125,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 2.4.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -133,11 +165,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: validation_matcher
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: RSpec matcher for ActiveModel validations
 test_files:
 - spec/spec_helper.rb
 - spec/thing_spec.rb
-has_rdoc: 

data/.travis.yml

@@ -1,14 +0,0 @@
-bundler_args: --without development
-
-cache: bundler
-
-language: ruby
-
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-
-script: bundle exec rspec spec
-
-sudo: false