validates_overlap 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c44e9ddad60fc792566aa1102f2a3e85c28f3ba0
-  data.tar.gz: fd2bcb9278232214532fd6f0c794c148b53caf94
+  metadata.gz: 9e861b52a30a5b27d67b83042a658a6cd923025a
+  data.tar.gz: 242c6bff486745218266e73c6e562995d6ed7e68
 SHA512:
-  metadata.gz: 052f57ccaf9569cb66aa4c93ccfc870ff4978683cbd4208ddb924bac1919361a7db430ed1b2aca8cad10456e32edba1474b8d99054c14b2c0fa776c7cced43fc
-  data.tar.gz: 1789ddb16c06fa4d5c7faf96a6c0115986817f6c553f130c323486b6718dd90579fb17fbbaff0b784fea0a3589f01868fb738ea34e822c0749557bcf1aaae696
+  metadata.gz: 3f60ffe6700e1e3100931adb078e05d9c34a0344a4eb7221035e894cbbc18d36424fb8c09dbb40b1cd70f63a4506025c4a09ded49b7946e278633b4e7f36c242
+  data.tar.gz: 87f79459a1ef597b566a7dcccf0d16af964ba4c7229e8cea3bff813e2c9ef4580fba0f99d3b925b09a31176e867d75db63f66dfd46ae462637fa749b5bc41e4d

data/README.md

@@ -38,6 +38,12 @@ validates :starts_at, :ends_at, :overlap => {:exclude_edges => "starts_at"}
 validates :starts_at, :ends_at, :overlap => {:exclude_edges => ["starts_at", "ends_at"]}
 ```
 
+#### shift edges
+
+```ruby
+validates :starts_at, :ends_at, :overlap => {:start_shift => -1.day, :end_shift => 1.day}
+```
+
 #### define custom validation key and message
 
 ```ruby
@@ -83,4 +89,4 @@ but this code is not longer working. Currently please change your code to
 ```ruby
   {:overlap => {:query_options => {:active => nil}}}
 ```
-Thanks @supertinou for discovering and fix of this bug.
+Thanks @supertinou for discovering and fix of this bug.

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/lib/validates_overlap/overlap_validator.rb

@@ -111,6 +111,8 @@ class OverlapValidator < ActiveModel::EachValidator
   # Return hash of values for overlap sql condition
   def generate_overlap_sql_values(record)
     starts_at_value, ends_at_value = resolve_values_from_attributes(record)
+    starts_at_value += options.fetch(:start_shift) { 0 } if starts_at_value && options
+    ends_at_value += options.fetch(:end_shift) { 0 } if ends_at_value && options
     self.sql_values = {:starts_at_value => starts_at_value || BEGIN_OF_UNIX_TIME, :ends_at_value => ends_at_value || END_OF_UNIX_TIME}
   end
 

data/spec/dummy/app/models/shift.rb

@@ -0,0 +1,3 @@
+class Shift < ActiveRecord::Base
+  validates :starts_at, :ends_at, :overlap => {:start_shift => -1.day, :end_shift => 1.day}
+end

data/spec/dummy/db/migrate/20151203153132_create_shifts.rb

@@ -0,0 +1,13 @@
+class CreateShifts < ActiveRecord::Migration
+  def self.up
+    create_table :shifts do |t|
+      t.date :starts_at
+      t.date :ends_at
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :shifts
+  end
+end

data/spec/dummy/spec/factories/shift.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :shift do |u|
+    u.starts_at '2011-01-05'.to_date
+    u.ends_at '2011-01-08'.to_date
+  end
+end

data/spec/dummy/spec/models/shift_spec.rb

@@ -0,0 +1,43 @@
+require_relative '../../../spec_helper'
+require_relative '../factories/shift'
+
+describe Meeting do
+
+  context "Validation" do
+    before(:all) do
+      Shift.delete_all
+    end
+
+    it "create meeting" do
+      lambda {
+        FactoryGirl.create(:shift)
+      }.should change(Shift, :count).by(1)
+    end
+
+    it "is not valid if exists shift within wider range" do
+      shift = FactoryGirl.build(:shift, :starts_at => "2011-01-09".to_date, :ends_at => "2011-01-11".to_date)
+      shift.should_not be_valid
+      shift.errors[:starts_at].should_not be_empty
+      shift.errors[:ends_at].should be_empty
+
+      shift = FactoryGirl.build(:shift, :starts_at => "2011-01-01".to_date, :ends_at => "2011-01-04".to_date)
+      shift.should_not be_valid
+      shift.errors[:starts_at].should_not be_empty
+      shift.errors[:ends_at].should be_empty
+    end
+
+    it " validate object which has not got overlap" do
+      shift = FactoryGirl.build(:shift, :starts_at => "2011-01-10".to_date, :ends_at => "2011-01-11".to_date)
+      shift.should be_valid
+      shift.errors[:starts_at].should be_empty
+      shift.errors[:ends_at].should be_empty
+
+      shift = FactoryGirl.build(:shift, :starts_at => "2011-01-01".to_date, :ends_at => "2011-01-02".to_date)
+      shift.should be_valid
+      shift.errors[:starts_at].should be_empty
+      shift.errors[:ends_at].should be_empty
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Robin Bortlik
@@ -14,84 +14,84 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: pry
   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: It can be useful when you you are developing some app where you will
@@ -102,8 +102,8 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.rails30
 - Gemfile.rails32
@@ -126,6 +126,7 @@ files:
 - spec/dummy/app/models/meeting.rb
 - spec/dummy/app/models/position.rb
 - spec/dummy/app/models/secure_meeting.rb
+- spec/dummy/app/models/shift.rb
 - spec/dummy/app/models/start_end_overlap_meeting.rb
 - spec/dummy/app/models/start_overlap_meeting.rb
 - spec/dummy/app/models/time_slot.rb
@@ -156,6 +157,7 @@ files:
 - spec/dummy/db/migrate/20121207162212_create_time_slot.rb
 - spec/dummy/db/migrate/20130826155107_create_active_meetings.rb
 - spec/dummy/db/migrate/20150707155107_create_secure_meetings.rb
+- spec/dummy/db/migrate/20151203153132_create_shifts.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -174,6 +176,7 @@ files:
 - spec/dummy/spec/factories/meeting.rb
 - spec/dummy/spec/factories/position.rb
 - spec/dummy/spec/factories/secure_meeting.rb
+- spec/dummy/spec/factories/shift.rb
 - spec/dummy/spec/factories/start_end_overlap_meeting.rb
 - spec/dummy/spec/factories/start_overlap_meeting.rb
 - spec/dummy/spec/factories/time_slot.rb
@@ -184,6 +187,7 @@ files:
 - spec/dummy/spec/models/meeting_spec.rb
 - spec/dummy/spec/models/position_spec.rb
 - spec/dummy/spec/models/secure_meeting_spec.rb
+- spec/dummy/spec/models/shift_spec.rb
 - spec/dummy/spec/models/start_end_overlap_meeting_spec.rb
 - spec/dummy/spec/models/start_overlap_meeting_spec.rb
 - spec/dummy/spec/models/time_slot_spec.rb
@@ -202,17 +206,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: This gem helps validate records with time overlap.
@@ -222,6 +226,7 @@ test_files:
 - spec/dummy/spec/factories/meeting.rb
 - spec/dummy/spec/factories/position.rb
 - spec/dummy/spec/factories/secure_meeting.rb
+- spec/dummy/spec/factories/shift.rb
 - spec/dummy/spec/factories/start_end_overlap_meeting.rb
 - spec/dummy/spec/factories/start_overlap_meeting.rb
 - spec/dummy/spec/factories/time_slot.rb
@@ -232,6 +237,7 @@ test_files:
 - spec/dummy/spec/models/meeting_spec.rb
 - spec/dummy/spec/models/position_spec.rb
 - spec/dummy/spec/models/secure_meeting_spec.rb
+- spec/dummy/spec/models/shift_spec.rb
 - spec/dummy/spec/models/start_end_overlap_meeting_spec.rb
 - spec/dummy/spec/models/start_overlap_meeting_spec.rb
 - spec/dummy/spec/models/time_slot_spec.rb