pathway 0.9.1 → 0.11.3

data/lib/pathway/rspec/matchers/field_list_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathway/rspec/matchers/list_helpers'
 
 module Pathway
@@ -10,11 +12,11 @@ module Pathway
       end
 
       def were_was(list)
-        list.size > 1 ? "were" : "was"
+        list.size > 1 ? 'were' : 'was'
       end
 
       def pluralize_fields
-        @fields.size > 1 ? "fields" : "field"
+        @fields.size > 1 ? 'fields' : 'field'
       end
     end
   end

data/lib/pathway/rspec/matchers/form_schema_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathway/rspec/matchers/field_list_helpers'
 
 module Pathway
@@ -5,14 +7,28 @@ module Pathway
     module FormSchemaHelpers
       include FieldListHelpers
 
-      def rules
-        @form.rules
+      if defined?(::Dry::Validation::Contract)
+        def rules
+          @form.schema.rules
+        end
+      else
+        def rules
+          @form.rules
+        end
       end
 
       def not_defined_list
         "#{as_list(not_defined)} #{were_was(not_defined)} not defined" if not_defined.any?
       end
 
+      def accepting_null_list
+        "#{as_list(null_value_allowed)} #{were_was(null_value_allowed)} accepting null values" if @not_allowing_null_values && null_value_allowed.any?
+      end
+
+      def not_accepting_null_list
+        "#{as_list(null_value_disallowed)} #{were_was(null_value_disallowed)} not accepting null values" if @allowing_null_values && null_value_disallowed.any?
+      end
+
       def required
         @required ||= @fields.select { |field| required?(field) }
       end
@@ -21,12 +37,20 @@ module Pathway
         @optional ||= @fields.select { |field| optional?(field) }
       end
 
+      def null_value_allowed
+        @null_value_allowed ||= @fields.select { |field| null_value_allowed?(field) }
+      end
+
+      def null_value_disallowed
+        @null_value_disallowed ||= @fields.select { |field| null_value_disallowed?(field) }
+      end
+
       def not_required
         @not_required ||= defined - required
       end
 
       def not_optional
-        @not_required ||= defined - optional
+        @not_optional ||= defined - optional
       end
 
       def not_defined
@@ -52,6 +76,26 @@ module Pathway
           left.type == :predicate && left.name == :key? && left.args.first == field
         end
       end
+
+      def allowing_null_values_matches?
+        @allowing_null_values ? @fields.all? { |field| null_value_allowed?(field) } : true
+      end
+
+      def not_allowing_null_values_matches?
+        @not_allowing_null_values ? @fields.all? { |field| null_value_disallowed?(field) } : true
+      end
+
+      def null_value_allowed?(field)
+        rule = rules[field]&.right&.rule
+        predicate = rule&.left
+        predicate.present? && predicate.type == :not && predicate.rules&.first&.name == :nil?
+      end
+
+      def null_value_disallowed?(field)
+        rule = rules[field]&.right&.rule
+        predicate = rule&.left
+        predicate.present? && predicate.type == :predicate && predicate.name == :filled?
+      end
     end
   end
 end

data/lib/pathway/rspec/matchers/list_helpers.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Pathway
   module Rspec
     module ListHelpers
-      def as_list(items)
-        as_sentence(items.map(&:inspect))
+      def as_list(items, **kwargs)
+        as_sentence(items.map(&:inspect), **kwargs)
       end
 
-      def as_sentence(items, connector: ", ", last_connector: " and ")
+      def as_sentence(items, connector: ', ', last_connector: ' and ')
         *rest, last = items
 
         result = String.new

data/lib/pathway/rspec/matchers/require_fields.rb

@@ -1,30 +1,43 @@
+# frozen_string_literal: true
+
 require 'pathway/rspec/matchers/form_schema_helpers'
 
 RSpec::Matchers.define :require_fields do |*fields|
   match do |form|
     @form, @fields = form, fields
 
-    not_defined.empty? && not_required.empty?
+    not_defined.empty? &&
+      not_required.empty? &&
+      allowing_null_values_matches? &&
+      not_allowing_null_values_matches?
   end
 
   match_when_negated do |form|
+    raise NotImplementedError, 'expect().not_to require_fields.not_allowing_null_values is not supported.' if @allowing_null_values || @not_allowing_null_values
+
     @form, @fields = form, fields
 
     not_defined.empty? && required.empty?
   end
 
   description do
-    "require #{field_list} as #{pluralize_fields}"
+    null_value_allowed = @allowing_null_values ? ' allowing null values' : ''
+    null_value_disallowed = @not_allowing_null_values ? ' not allowing null values' : ''
+    "require #{field_list} as #{pluralize_fields}#{null_value_allowed}#{null_value_disallowed}"
   end
 
   failure_message do
-    "Expected to require #{field_list} as #{pluralize_fields} but " +
-      [not_required_list, not_defined_list].compact.join("; and ")
+    null_value_allowed = @allowing_null_values ? ' allowing null values' : ''
+    null_value_disallowed = @not_allowing_null_values ? ' not allowing null values' : ''
+
+    "Expected to require #{field_list} as #{pluralize_fields}#{null_value_allowed}#{null_value_disallowed} but " +
+      as_sentence([not_required_list, not_defined_list, accepting_null_list, not_accepting_null_list].compact,
+                  connector: '; ', last_connector: '; and ')
   end
 
   failure_message_when_negated do
     "Did not expect to require #{field_list} as #{pluralize_fields} but " +
-      [required_list, not_defined_list].compact.join("; and ")
+      [required_list, not_defined_list].compact.join('; and ')
   end
 
   include Pathway::Rspec::FormSchemaHelpers
@@ -36,6 +49,18 @@ RSpec::Matchers.define :require_fields do |*fields|
   def not_required_list
     "#{as_list(not_required)} #{were_was(not_required)} not required" if not_required.any?
   end
+
+  chain :allowing_null_values do
+    fail 'cannot use allowing_null_values and not_allowing_null_values at the same time' if @not_allowing_null_values
+
+    @allowing_null_values = true
+  end
+
+  chain :not_allowing_null_values do
+    fail 'cannot use allowing_null_values and not_allowing_null_values at the same time' if @allowing_null_values
+
+    @not_allowing_null_values = true
+  end
 end
 
 RSpec::Matchers.alias_matcher :require_field, :require_fields

data/lib/pathway/rspec/matchers/succeed_on.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :succeed_on do |input|
   match do |operation|
     @operation, @input = operation, input
@@ -29,7 +31,7 @@ RSpec::Matchers.define :succeed_on do |input|
   end
 
   failure_message_when_negated do
-    "Did not to expected operation to be successful but it was"
+    'Did not to expected operation to be successful but it was'
   end
 
   def success?

data/lib/pathway/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pathway
-  VERSION = '0.9.1'
+  VERSION = '0.11.3'
 end

data/pathway.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "pathway/version"
@@ -14,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/pabloh/pathway"
   spec.license       = "MIT"
 
-  spec.metadata = {
+  spec.metadata      = {
     "bug_tracker_uri" => "https://github.com/pabloh/pathway/issues",
     "source_code_uri" => "https://github.com/pabloh/pathway",
   }
@@ -31,10 +32,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-inflector", ">= 0.1.0"
   spec.add_dependency "contextualizer", "~> 0.0.4"
 
-  spec.add_development_dependency "dry-validation", "~> 0.11"
+  spec.add_development_dependency "dry-validation", ">= 0.11"
   spec.add_development_dependency "bundler", ">= 1.14.0"
-  spec.add_development_dependency "sequel", "~> 4.46.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "sequel", "~> 5.25.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pathway
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.11.3
 platform: ruby
 authors:
 - Pablo Herrero
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -42,14 +42,14 @@ dependencies:
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.46.0
+        version: 5.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.46.0
+        version: 5.25.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -185,6 +186,9 @@ files:
 - bin/setup
 - lib/pathway.rb
 - lib/pathway/plugins/dry_validation.rb
+- lib/pathway/plugins/dry_validation/v0_11.rb
+- lib/pathway/plugins/dry_validation/v0_12.rb
+- lib/pathway/plugins/dry_validation/v1_0.rb
 - lib/pathway/plugins/responder.rb
 - lib/pathway/plugins/sequel_models.rb
 - lib/pathway/plugins/simple_auth.rb
@@ -221,8 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Define your business logic in simple steps.