acts_as_span 1.0.0 → 1.2.2

data/spec/lib/no_overlap_validator_spec.rb

@@ -42,6 +42,29 @@ RSpec.describe ActsAsSpan::NoOverlapValidator do
 
   let(:all_siblings) { [brother, sister, brother_from_another_mother] }
 
+  describe 'instance_scope' do
+    let(:child_class) { OneParentChild }
+
+    let(:new_child_start_date) { Date.current - 2 }
+    let(:new_child_end_date) { Date.current + 3 }
+
+    before { new_child.favorite = favorite }
+
+    context 'when instance_scope evaluates to false' do
+      let(:favorite) { false }
+      it 'skips validation on the record for which instance_scope is false' do
+        expect(new_child).to be_valid
+      end
+    end
+
+    context 'when instance_scope evaluates to true' do
+      let(:favorite) { true }
+      it 'validates normally' do
+        expect(new_child).not_to be_valid
+      end
+    end
+  end
+
   describe 'an object with a single parent' do
     let(:child_class) { OneParentChild }
 
@@ -69,7 +92,7 @@ RSpec.describe ActsAsSpan::NoOverlapValidator do
 
     before do
       all_siblings.each do |sibling|
-        sibling.update_attributes(papa: papa)
+        sibling.update(papa: papa)
       end
 
       new_child.papa = papa
@@ -93,4 +116,14 @@ RSpec.describe ActsAsSpan::NoOverlapValidator do
       end
     end
   end
+
+  describe 'error messages' do
+    let(:child_class) { OneParentChildCustom }
+    let(:new_child_start_date) { sister_start_date }
+    let(:new_child_end_date) { sister_end_date }
+    it 'allows using custom error messages' do
+      expect(new_child).not_to be_valid
+      expect(new_child.errors.messages[:base]).to include('Custom error message')
+    end
+  end
 end

data/spec/lib/span_instance_spec.rb

@@ -12,5 +12,17 @@ RSpec.describe "Span" do
     it "should return the end_date" do
       expect(span.end_date).to eq(span_model.end_date)
     end
+
+    context "changed?" do
+      it 'returns true when start_date has changed' do
+        span_model.start_date = span_model.start_date + 5
+        expect(span.start_date_changed?).to eq(true)
+      end
+
+      it 'returns true when end_date has changed' do
+        span_model.end_date = span_model.end_date + 5
+        expect(span.end_date_changed?).to eq(true)
+      end
+    end
   end
 end

data/spec/lib/span_klass/status_spec.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ActsAsSpan::SpanKlass::Status do
+  let(:span_klass) { ::SpanModel }
+
+  let!(:today) { Date.current }
+
+  describe '.current' do
+    let!(:record) do
+      span_klass.create(
+        start_date: today - 1.week,
+        end_date: today + 1.week,
+      )
+    end
+
+    subject { span_klass.current(query_date) }
+
+    context "when query_date is within the record's span" do
+      let(:query_date) { record.start_date + 3.days }
+
+      it { is_expected.not_to be_empty }
+    end
+
+    context "when query_date is before the record's span" do
+      let(:query_date) { record.start_date - 1.week }
+
+      it { is_expected.to be_empty }
+    end
+
+    context "when query_date is after the record's span" do
+      let(:query_date) { record.end_date + 1.week }
+
+      it { is_expected.to be_empty }
+    end
+  end
+end

data/spec/lib/within_parent_date_span_validator_spec.rb

@@ -112,4 +112,15 @@ RSpec.describe ActsAsSpan::WithinParentDateSpanValidator do
       end
     end
   end
+
+  describe 'error messages' do
+    let(:child_class) { OneParentChildCustom }
+    let(:new_child_start_date) { mama_start_date - 3.days }
+    let(:new_child_end_date) { mama_end_date + 5.days }
+
+    it 'allows using custom error messages' do
+      expect(new_child).not_to be_valid
+      expect(new_child.errors.messages[:base]).to include('Custom error message')
+    end
+  end
 end

data/spec/spec_models.rb

@@ -28,17 +28,51 @@ Temping.create :one_parent_child do
 
     t.date :start_date
     t.date :end_date
+
+    # every one-parent child is a favorite! ...by default
+    t.boolean :favorite, default: true
   end
 
   acts_as_span
 
+  def favorite?
+    favorite
+  end
+
   belongs_to :mama
   has_siblings through: [:mama]
 
-  validates_with ActsAsSpan::NoOverlapValidator, scope: proc { siblings }
+  validates_with ActsAsSpan::NoOverlapValidator,
+    scope: proc { siblings }, instance_scope: proc { favorite? }
   validates_with ActsAsSpan::WithinParentDateSpanValidator, parents: [:mama]
 end
 
+Temping.create :one_parent_child_custom do
+  with_columns do |t|
+    t.belongs_to :mama
+
+    t.date :start_date
+    t.date :end_date
+
+    # every one-parent child is a favorite! ...by default
+    t.boolean :favorite, default: true
+  end
+
+  acts_as_span
+
+  def favorite?
+    favorite
+  end
+
+  belongs_to :mama
+  has_siblings through: [:mama]
+
+  validates_with ActsAsSpan::NoOverlapValidator,
+    scope: proc { siblings }, instance_scope: proc { favorite? }, message: 'Custom error message'
+  validates_with ActsAsSpan::WithinParentDateSpanValidator, parents: [:mama], message: 'Custom error message'
+end
+
+
 Temping.create :two_parent_child do
   with_columns do |t|
     t.belongs_to :mama
@@ -64,8 +98,11 @@ Temping.create :mama do
     t.date :end_date
   end
 
+  acts_as_span
+
   has_many :one_parent_children
   has_many :two_parent_children
+  has_many :one_parent_child_customs
 end
 
 Temping.create :papa do
@@ -74,5 +111,124 @@ Temping.create :papa do
     t.date :end_date
   end
 
+  acts_as_span
+
   has_many :one_parent_children
 end
+
+# fulfill association requirements for EndDatePropagator
+Temping.create :base do
+  has_many :children, dependent: :destroy
+  has_many :dogs, dependent: :destroy
+  has_many :birds, through: :children
+  has_many :tales, dependent: :destroy
+
+  acts_as_span
+
+  with_columns do |t|
+    t.date :end_date
+    t.date :start_date
+  end
+end
+
+Temping.create :cat_owner do
+  has_many :cats, dependent: :destroy
+
+  acts_as_span
+
+  with_columns do |t|
+    t.date :start_date
+    t.date :end_date
+  end
+end
+
+Temping.create :cat do
+  belongs_to :cat_owner
+
+  with_columns do |t|
+    t.belongs_to :cat_owner
+  end
+end
+
+Temping.create :other_base do
+  has_many :children, dependent: :destroy
+
+  acts_as_span
+
+  with_columns do |t|
+    t.date :end_date
+    t.date :start_date
+  end
+end
+
+# has non-standard start_ and end_field names
+Temping.create :child do
+  belongs_to :base
+  belongs_to :other_base
+  has_many :birds, dependent: :destroy
+
+  validates_with ActsAsSpan::WithinParentDateSpanValidator,
+    parents: [:base]
+
+  validate :not_manually_invalidated
+
+  acts_as_span(
+    start_field: :date_of_birth,
+    end_field: :emancipation_date,
+  )
+
+  with_columns do |t|
+    t.date :date_of_birth
+    t.date :emancipation_date
+    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
+  belongs_to :base
+
+  acts_as_span
+
+  with_columns do |t|
+    t.date :start_date
+    t.date :end_date
+    t.belongs_to :base
+  end
+end
+
+
+Temping.create :bird do
+  belongs_to :child
+
+  validates_with ActsAsSpan::WithinParentDateSpanValidator,
+    parents: [:child]
+
+  acts_as_span
+
+  with_columns do |t|
+    t.date :end_date
+    t.date :start_date
+    t.belongs_to :child
+  end
+end
+
+Temping.create :tale do
+  belongs_to :base
+
+  acts_as_span
+
+  with_columns do |t|
+    t.date :end_date
+    t.date :start_date
+    t.belongs_to :base
+  end
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_span
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Eric Sullivan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,86 +16,86 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: has_siblings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: has_siblings
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: temping
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: temping
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 description: ActiveRecord model w/ a start_date and an end_date == ActsAsSpan
 email:
 - eric.sullivan@annkissam.com
@@ -145,13 +145,18 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
+- PULL_REQUEST_TEMPLATE.md
 - README.rdoc
 - Rakefile
 - acts_as_span.gemspec
+- config/locales/en/acts_as_span.yml
 - lib/acts_as_span.rb
+- lib/acts_as_span/end_date_propagator.rb
 - lib/acts_as_span/no_overlap_validator.rb
 - lib/acts_as_span/span_instance.rb
 - lib/acts_as_span/span_instance/status.rb
@@ -162,6 +167,7 @@ files:
 - lib/acts_as_span/within_parent_date_span_validator.rb
 - spec/lib/acts_as_span_spec.rb
 - spec/lib/delegation_spec.rb
+- spec/lib/end_date_propagator_spec.rb
 - spec/lib/no_overlap_validator_spec.rb
 - spec/lib/span_instance/named_scopes_on_spec.rb
 - spec/lib/span_instance/named_scopes_spec.rb
@@ -169,6 +175,7 @@ files:
 - spec/lib/span_instance/status_spec.rb
 - spec/lib/span_instance/validations_spec.rb
 - spec/lib/span_instance_spec.rb
+- spec/lib/span_klass/status_spec.rb
 - spec/lib/within_parent_date_span_validator_spec.rb
 - spec/spec_helper.rb
 - spec/spec_models.rb
@@ -177,7 +184,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,9 +199,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
-summary: acts_as_span 1.0.0
-test_files: []
+summary: acts_as_span 1.2.2
+test_files:
+- spec/lib/acts_as_span_spec.rb
+- spec/lib/delegation_spec.rb
+- spec/lib/end_date_propagator_spec.rb
+- spec/lib/no_overlap_validator_spec.rb
+- spec/lib/span_instance/named_scopes_on_spec.rb
+- spec/lib/span_instance/named_scopes_spec.rb
+- spec/lib/span_instance/overlap_spec.rb
+- spec/lib/span_instance/status_spec.rb
+- spec/lib/span_instance/validations_spec.rb
+- spec/lib/span_instance_spec.rb
+- spec/lib/span_klass/status_spec.rb
+- spec/lib/within_parent_date_span_validator_spec.rb
+- spec/spec_helper.rb
+- spec/spec_models.rb