acts_as_span 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b325eefc9a4503a854a5af5f9d62b23820ce5177752ee95b48128d3d63d86e7b
-  data.tar.gz: 89c73478dc48ca7f8f70d7e74d52a96c4660dfa4458a100b93b0a6216ce5ef5f
+  metadata.gz: dce2b4057e3f17e47bc079858edd883ae157fab1ac07255e352471fc0d4a734e
+  data.tar.gz: 004a557469880ade02c121b63446f3014ce4bcea43ab6febfdc88e7e852fec30
 SHA512:
-  metadata.gz: 5130c797f801bbd7e29bf89311603bf8d29c0659107e9c50e231d9c123f25dadc55793d54ba885ad08b1fe4e77486eab41516e8194133f9ceca693e2a94b398c
-  data.tar.gz: 7f42fe723d78b4b129b63a07677c9551ac50005d84d7ff6c5f45ccd21088a7e453122ae7fe5734c9e34636cb9ad05dbb877517e8198ef2ea64a24bc3a5ba1513
+  metadata.gz: eef25c86ddff4ce610a0cfe4e2a9b3fbf983768821566c0b056cdbb117d82f9ab0573c2309cb839ac61077f00fb7a5a6f1302f8bd64371ce43a5fa1d6068bfaa
+  data.tar.gz: 7815bd5e31b5eca225a88278dad84af946a98ad0adef280b5dcdd24f358ae3a4c2005da40dfc035344525c9f157cf98e96aea52b526c5a69c729179849c6e135

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+Types of changes:
+  - **Added** for new features.
+  - **Changed** for changes in existing functionality.
+  - **Deprecated** for soon-to-be removed features.
+  - **Removed** for now removed features.
+  - **Fixed** for any bug fixes.
+  - **Security** in case of vulnerabilities.
+
+Please include the Github issue or pull request number when applicable
+
+## [Unreleased]
+### Added
+- A change log #31
+### Fixed
+- Syntax error in EndDatePropagator#propagate #30

data/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+## Checklist
+- [ ] Continuous integration passes, or no functional code was changed
+- [ ] Changelog entry added, or no entry is necessary
+
+## Notes

data/lib/acts_as_span/end_date_propagator.rb

@@ -88,14 +88,37 @@ module ActsAsSpan
     def call
       result = propagate
       # only add new errors to the object
-      result.errors.each do |error, message|
-        object.errors.add(error) if object.errors[error].exclude? message
+
+      # NOTE: Rails 5 support
+      if ActiveRecord::VERSION::MAJOR > 5
+        add_errors(result.errors)
+      else
+        add_rails_5_errors(result.errors)
       end
+
       object
     end
 
     private
 
+    def add_errors(errors)
+      errors.each do |error|
+        if object.errors[error.attribute].exclude? error.message
+          object.errors.add(error.attribute, error.message)
+        end
+      end
+    end
+
+    # Treat errors like a Hash
+    # NOTE: Rails 5 support
+    def add_rails_5_errors(errors)
+      errors.each do |attribute, message|
+        if object.errors[attribute].exclude? message
+          object.errors.add(attribute, message)
+        end
+      end
+    end
+
     def propagate
       # return if there is nothing to propagate
       return object unless should_propagate_from? object
@@ -110,7 +133,7 @@ module ActsAsSpan
 
       if errors_cache.present?
         errors_cache.each do |message|
-          skip if object.errors.added?(:base, message)
+          next if object.errors.added?(:base, message)
 
           object.errors.add(:base, message)
         end

data/lib/acts_as_span/version.rb

@@ -4,7 +4,7 @@ module ActsAsSpan
   module VERSION
     MAJOR = 1
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/lib/end_date_propagator_spec.rb

@@ -3,8 +3,9 @@ require 'spec_helper'
 RSpec.describe ActsAsSpan::EndDatePropagator do
   let(:end_date_propagator) do
     ActsAsSpan::EndDatePropagator.new(
-      base_instance, skipped_classes: skipped_classes,
-      include_errors: include_errors
+      base_instance,
+      skipped_classes: skipped_classes,
+      include_errors: include_errors,
     )
   end
 
@@ -300,6 +301,30 @@ RSpec.describe ActsAsSpan::EndDatePropagator do
       end
     end
 
+    context 'when the record already has a validation that would be added' do
+      let(:end_date) { Date.current }
+
+      before do
+        base_instance.save!
+        base_instance.end_date = end_date
+        base_instance.errors.add(:base, 'Child is bad')
+
+        child_instance.manual_invalidation = true
+        child_instance.save(validate: false)
+
+        # add the error that would be added by the child's propagation
+        base_instance.errors.add(
+          :base,
+          "Base could not propagate Emancipation date to Child:\nChild is bad",
+        )
+      end
+
+      it 'does not add the duplicate error' do
+        expect { end_date_propagator.call }
+          .not_to(change(base_instance, :errors))
+      end
+    end
+
     context 'when a class is skipped' do
       let(:end_date) { Date.current }
       let(:skipped_classes) { [Tale] }

data/spec/spec_models.rb

@@ -170,9 +170,11 @@ Temping.create :child do
   validates_with ActsAsSpan::WithinParentDateSpanValidator,
     parents: [:base]
 
+  validate :not_manually_invalidated
+
   acts_as_span(
     start_field: :date_of_birth,
-    end_field: :emancipation_date
+    end_field: :emancipation_date,
   )
 
   with_columns do |t|
@@ -181,6 +183,12 @@ Temping.create :child do
     t.string :manual_invalidation
     t.belongs_to :base
   end
+
+  def not_manually_invalidated
+    return if manual_invalidation.blank? || manual_invalidation == false
+
+    errors.add(:base, 'Child is bad')
+  end
 end
 
 Temping.create :dog do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_span
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Eric Sullivan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,8 +147,10 @@ files:
 - ".rspec"
 - ".tool-versions"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
+- PULL_REQUEST_TEMPLATE.md
 - README.rdoc
 - Rakefile
 - acts_as_span.gemspec
@@ -200,7 +202,7 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
-summary: acts_as_span 1.2.1
+summary: acts_as_span 1.2.2
 test_files:
 - spec/lib/acts_as_span_spec.rb
 - spec/lib/delegation_spec.rb