active_interaction 3.6.2 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eeb0d2bf770085e1b5727473d151d4d1d491a97a111fab368d95703a4fef94a
-  data.tar.gz: 2f7b4d3af429916ac2569384b176bd304cc791692d55d818773cd118774b1ec5
+  metadata.gz: a5876e7199c749e87440e2a3d4efec4685e2d0b42ab167e5089ee9b014a44850
+  data.tar.gz: 046dcc3fe7bd76e1572922904b6ea4568ff29674dc815a303a5e891d5ecf9019
 SHA512:
-  metadata.gz: 82ddd001269db6dfa265d57f77733401914652c1c0147d065d4f640dca871fe0f5a3f9de57be416304dd562ace1b0574900b95406d06727c04ff049abae4506f
-  data.tar.gz: 3c5dc00da80fe2e76782b7b38b501b2bedd5588dc6163d846657f8c57923b85cd9ae6660fbe007685244a73318bf897bcde1c25ca7e4e035557cf6731997c68c
+  metadata.gz: c6491e9403f720062ecf1ac841b50d30f70f5309ae1ab6a35bcb473dd10030995676a0913c8ad6aec7698042f564a58a465281e5da0668fb6563422d169bf6f7
+  data.tar.gz: 7078526498db343ee4d8893f57d44be58f40440fda73417e330e40ef944473261deef31e73eb16a685b0e4c5d57d3ac07e5d82c795f834b559f8a0881188ce31

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# [3.7.0][] (2019-02-10)
+
+## Added
+
+- [#454][] Support for Rails 6.
+
+## Fixed
+
+- [#435][] Errors using the `:message` option were not properly merged.
+
 # [3.6.2][] (2018-08-21)
 
 ## Fixed
@@ -735,6 +745,7 @@ Example.run
 
 - Initial release.
 
+  [3.7.0]: https://github.com/orgsync/active_interaction/compare/v3.6.2...v3.7.0
   [3.6.2]: https://github.com/orgsync/active_interaction/compare/v3.6.1...v3.6.2
   [3.6.1]: https://github.com/orgsync/active_interaction/compare/v3.6.0...v3.6.1
   [3.6.0]: https://github.com/orgsync/active_interaction/compare/v3.5.3...v3.6.0
@@ -923,3 +934,5 @@ Example.run
   [#422]: https://github.com/orgsync/active_interaction/pull/422
   [#425]: https://github.com/orgsync/active_interaction/pull/425
   [#429]: https://github.com/orgsync/active_interaction/pull/429
+  [#435]: https://github.com/orgsync/active_interaction/pull/435
+  [#454]: https://github.com/orgsync/active_interaction/pull/454

data/LICENSE.md

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 to 2015 Aaron Lasseigne and Taylor Fausak
+Copyright (c) 2013 to 2016 Aaron Lasseigne and Taylor Fausak
+Copyright (c) 2017 to 2019 Aaron Lasseigne
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -3,10 +3,10 @@
 ActiveInteraction manages application-specific business logic.
 It's an implementation of the command pattern in Ruby.
 
-[![Version](https://badge.fury.io/rb/active_interaction.svg)](https://rubygems.org/gems/active_interaction)
-[![Build](https://travis-ci.org/AaronLasseigne/active_interaction.svg?branch=master)](https://travis-ci.org/AaronLasseigne/active_interaction)
-[![Coverage](https://coveralls.io/repos/github/orgsync/active_interaction/badge.svg?branch=master)](https://coveralls.io/r/orgsync/active_interaction)
-[![Climate](https://codeclimate.com/github/orgsync/active_interaction/badges/gpa.svg)](https://codeclimate.com/github/orgsync/active_interaction)
+[![Version](https://img.shields.io/gem/v/active_interaction.svg?style=flat-square)](https://rubygems.org/gems/active_interaction)
+[![Build](https://img.shields.io/travis/AaronLasseigne/active_interaction.svg?style=flat-square)](https://travis-ci.org/AaronLasseigne/active_interaction)
+[![Coverage](https://img.shields.io/coveralls/github/AaronLasseigne/active_interaction.svg?style=flat-square)](https://coveralls.io/r/orgsync/active_interaction)
+[![Climate](https://img.shields.io/codeclimate/maintainability/orgsync/active_interaction.svg?style=flat-square)](https://codeclimate.com/github/orgsync/active_interaction)
 
 ---
 
@@ -66,21 +66,21 @@ handles your verbs.
 Add it to your Gemfile:
 
 ``` rb
-gem 'active_interaction', '~> 3.6'
+gem 'active_interaction', '~> 3.7'
 ```
 
 Or install it manually:
 
 ``` sh
-$ gem install active_interaction --version '~> 3.6'
+$ gem install active_interaction --version '~> 3.7'
 ```
 
 This project uses [Semantic Versioning][]. Check out [GitHub releases][] for a
 detailed list of changes. For help upgrading to version 2, please read [the
 announcement post][].
 
-ActiveInteraction works with Ruby 2.0 through 2.4 and ActiveModel 4.0 through
-5.0. If you want to use ActiveInteraction with an older version of Ruby or
+ActiveInteraction works with Ruby 2.0 through 2.6 and ActiveModel 4.0 through
+6.0. If you want to use ActiveInteraction with an older version of Ruby or
 ActiveModel, use ActiveInteraction < 3.0.0.
 
 ## Basic usage
@@ -492,12 +492,12 @@ StringInteraction.run!(name: 'Taylor')
 # => "Hello, Taylor!"
 ```
 
-If you want to strip leading and trailing whitespace from a string, set the
-`strip` option to `true`.
+String filter strips leading and trailing whitespace by default. To disable it, set the
+`strip` option to `false`.
 
 ``` rb
 string :comment,
-  strip: true
+  strip: false
 ```
 
 ### Symbol

data/lib/active_interaction/backports.rb

@@ -14,6 +14,8 @@ module ActiveInteraction
 
       CALLBACKS_OPTIONS = ::ActiveModel::Errors::CALLBACKS_OPTIONS
       private_constant :CALLBACKS_OPTIONS
+      MESSAGE_OPTIONS = [:message].freeze
+      private_constant :MESSAGE_OPTIONS
 
       included do
         attr_reader :details
@@ -35,7 +37,9 @@ module ActiveInteraction
 
       def add_with_details(attribute, message = :invalid, options = {})
         message = message.call if message.respond_to?(:call)
-        error = options.except(*CALLBACKS_OPTIONS).merge(error: message)
+
+        error = options.except(*CALLBACKS_OPTIONS + MESSAGE_OPTIONS)
+          .merge(error: message)
         details[attribute].push(error)
         add_without_details(attribute, message, options)
       end

data/lib/active_interaction/errors.rb

@@ -107,49 +107,51 @@ module ActiveInteraction
 
     private
 
+    def attribute?(attribute)
+      @base.respond_to?(attribute)
+    end
+
+    def detailed_error?(detail)
+      detail[:error].is_a?(Symbol)
+    end
+
     def merge_messages!(other)
       other.messages.each do |attribute, messages|
         messages.each do |message|
-          unless attribute?(attribute)
-            message = full_message(attribute, message)
-            attribute = :base
-          end
-          add(attribute, message) unless added?(attribute, message)
+          merge_message!(attribute, message)
         end
       end
     end
 
-    def merge_details!(other)
-      other.details.each do |attribute, details|
-        details.each do |detail|
-          detail = detail.dup
-          error = detail.delete(:error)
-
-          merge_detail!(other, attribute, detail, error)
-        end
+    def merge_message!(attribute, message)
+      unless attribute?(attribute)
+        message = full_message(attribute, message)
+        attribute = :base
       end
+      add(attribute, message) unless added?(attribute, message)
     end
 
-    def merge_detail!(other, attribute, detail, error)
-      if attribute?(attribute) || attribute == :base
-        add(attribute, error, detail) unless added?(attribute, error, detail)
-      else
-        translated_error = translate(other, attribute, error, detail)
-        message = full_message(attribute, translated_error)
-        attribute = :base
-        add(attribute, message) unless added?(attribute, message)
+    def merge_details!(other)
+      other.messages.each do |attribute, messages|
+        messages.zip(other.details[attribute]) do |message, detail|
+          if detailed_error?(detail)
+            merge_detail!(attribute, detail, message)
+          else
+            merge_message!(attribute, message)
+          end
+        end
       end
     end
 
-    def attribute?(attribute)
-      @base.respond_to?(attribute)
-    end
+    def merge_detail!(attribute, detail, message)
+      if attribute?(attribute) || attribute == :base
+        options = detail.dup
+        error = options.delete(:error)
+        options[:message] = message
 
-    def translate(other, attribute, error, detail)
-      if error.is_a?(Symbol)
-        other.generate_message(attribute, error, detail)
+        add(attribute, error, options) unless added?(attribute, error, options)
       else
-        error
+        merge_message!(attribute, message)
       end
     end
   end

data/lib/active_interaction/modules/input_processor.rb

@@ -12,8 +12,11 @@ module ActiveInteraction
       GROUPED_INPUT_PATTERN = /\A(.+)\((\d+)i\)\z/
       private_constant :GROUPED_INPUT_PATTERN
 
+      # Checking `syscall` is the result of what appears to be a bug in Ruby.
+      # https://bugs.ruby-lang.org/issues/15597
       def reserved?(name)
         name.to_s.start_with?('_interaction_') ||
+          name == :syscall ||
           Base.method_defined?(name) ||
           Base.private_method_defined?(name)
       end

data/lib/active_interaction/version.rb

@@ -6,5 +6,5 @@ module ActiveInteraction
   # The version number.
   #
   # @return [Gem::Version]
-  VERSION = Gem::Version.new('3.6.2')
+  VERSION = Gem::Version.new('3.7.0')
 end

data/spec/active_interaction/errors_spec.rb

@@ -91,6 +91,21 @@ describe ActiveInteraction::Errors do
           expect(errors.details[:base]).to eql [{ error: message }]
         end
       end
+
+      context 'that uses the :message option' do
+        let(:message) { SecureRandom.hex }
+        let(:error_name) { :some_error }
+
+        before do
+          other.add(:base, error_name, message: message)
+        end
+
+        it 'adds the error' do
+          errors.merge!(other)
+          expect(errors.details[:base]).to eql [{ error: error_name }]
+          expect(errors.messages[:base]).to eql [message]
+        end
+      end
     end
 
     context 'with an interpolated detailed error' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.7.0
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -20,7 +20,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -59,20 +59,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -278,8 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Manage application specific business logic.