validates_overlap 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51a9d0225831152c676f511f8bb393d9a8b3ed5f
-  data.tar.gz: 2352b75e04fa67608a16d08b1e1fd304352fbab8
+  metadata.gz: 03d095c00004db43b1b61ae30b0de3df1f7ca9b6
+  data.tar.gz: 0f1df2c05348e4e972011eb36a9a969b02907f34
 SHA512:
-  metadata.gz: 070384cc4d4447894c1131f4077c691ec8b3bb73a6f52eb1665cbba0a1f15646161bd77200a88feff96bebdb598b9dbf87ba5c3efba91ae7778f443d3a388b0d
-  data.tar.gz: 823d335905e96d0bc560c0a30c485fa26d004b2e1840fb00545e6478f4feeb9485a20fa249b254a604f41969e728e2ebf8a03e8fb503af83d17221fc050ac428
+  metadata.gz: 0730c4937d1ac05b221c96328bbd9dee9795352a0c62792921202ef7ba435ac395e01f5e66ffe7ec03c159848003642811330f17456b957e2c44e891d70771e5
+  data.tar.gz: ec70192d3ba6a7633395a5ef3f036de336730fc9dc8d52655574de76b24e4af3328b9a85d27c5678fa03a82dfe975a2ff190aface62b023002aaaa9cc774a02e

data/.travis.yml

@@ -1,11 +1,10 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.2.2
 gemfile:
   - Gemfile.rails30
   - Gemfile.rails32
   - Gemfile.rails40
   - Gemfile.rails41
   - Gemfile.rails42
+  - Gemfile.rails50

data/Rakefile

@@ -5,6 +5,17 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 require 'rdoc/task'
 
+
+# Temporary fix of rake issue
+# http://stackoverflow.com/questions/35893584/nomethoderror-undefined-method-last-comment-after-upgrading-to-rake-11/35893941
+module TempFixForRakeLastComment
+  def last_comment
+    last_description
+  end
+end
+Rake::Application.send :include, TempFixForRakeLastComment
+
+
 begin
   Bundler::GemHelper.install_tasks
   Bundler.setup(:default, :development)
@@ -14,6 +25,7 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
+
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/validates_overlap/overlap_validator.rb

@@ -150,7 +150,7 @@ class OverlapValidator < ActiveModel::EachValidator
 
   # Add attribute and his value to sql condition
   def add_attribute(record, attr_name, value = nil)
-    _value = resolve_scope_value(record, attr_name, value)
+    _value = resolve_attribute_value(record, attr_name, value)
     operator = if _value.nil?
                  ' IS NULL'
                elsif _value.is_a?(Array)
@@ -168,14 +168,28 @@ class OverlapValidator < ActiveModel::EachValidator
     name + '_value'
   end
 
-  def resolve_scope_value(record, attr_name, value = nil)
+  def resolve_attribute_value(record, attr_name, value = nil)
     if value
       value.is_a?(Proc) ? value.call(record) : value
     else
-      record.read_attribute(attr_name)
+      value = record.read_attribute(attr_name)
+
+      if is_enum_attribute?(record, attr_name)
+        value = record.class.defined_enums[attr_name][value]
+      end
+
+      value
     end
   end
 
+  def is_enum_attribute?(record, attr_name)
+    implement_enum? && record.class.defined_enums[attr_name].present?
+  end
+
+  def implement_enum?
+    (ActiveRecord::VERSION::MAJOR > 5) || (ActiveRecord::VERSION::MAJOR > 4 && ActiveRecord::VERSION::MINOR > 1)
+  end
+
   # Allow to use scope, joins, includes methods before querying
   # == Example:
   # validates_overlap :date_from, :date_to, :query_options => {:includes => "visits"}

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

@@ -0,0 +1,26 @@
+class DocumentWithEnum < ActiveRecord::Base
+  self.table_name = 'documents_with_enum'
+  KINDS = [:contract, :fact, :draft]
+
+
+  if (ActiveRecord::VERSION::MAJOR > 5) || (ActiveRecord::VERSION::MAJOR > 4 && ActiveRecord::VERSION::MINOR > 1)
+    enum kind: KINDS
+  else
+    # Simulate enum functionality implemented in rails 4.1 and 5
+    # For rails version < 4.1 we always read read attribute by using read_attribute method
+    def kind=(value)
+      write_attribute(:kind, KINDS.index(value))
+    end
+
+    def kind
+      return nil if read_attribute(:kind).nil?
+      KINDS[read_attribute(:kind).to_i]
+    end
+
+  end
+
+  validates :valid_from, :valid_until, overlap: {
+    exclude_edges: ['valid_from', 'valid_until'],
+    scope: ['kind']
+  }
+end

data/spec/dummy/db/migrate/20170102162952_add_documents_with_enum.rb

@@ -0,0 +1,14 @@
+class AddDocumentsWithEnum < ActiveRecord::Migration
+  def self.up
+    create_table :documents_with_enum do |t|
+      t.date :valid_from
+      t.date :valid_until
+      t.integer :kind
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :documents_with_enum
+  end
+end

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,75 +10,92 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20_150_707_155_107) do
-  create_table 'active_meetings', force: :cascade do |t|
-    t.date 'starts_at'
-    t.date 'ends_at'
-    t.boolean 'is_active'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+ActiveRecord::Schema.define(version: 20170102162952) do
+
+  create_table "active_meetings", force: :cascade do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.boolean  "is_active"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "documents_with_enum", force: :cascade do |t|
+    t.date     "valid_from"
+    t.date     "valid_until"
+    t.integer  "kind"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table 'end_overlap_meetings', force: :cascade do |t|
-    t.date 'starts_at'
-    t.date 'ends_at'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "end_overlap_meetings", force: :cascade do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table 'meetings', force: :cascade do |t|
-    t.date 'starts_at'
-    t.date 'ends_at'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "meetings", force: :cascade do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table 'positions', force: :cascade do |t|
-    t.integer 'user_id'
-    t.integer 'time_slot_id'
-    t.datetime 'created_at',   null: false
-    t.datetime 'updated_at',   null: false
+  create_table "positions", force: :cascade do |t|
+    t.integer  "user_id"
+    t.integer  "time_slot_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table 'secure_meetings', force: :cascade do |t|
-    t.date 'starts_at'
-    t.date 'ends_at'
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
+  create_table "secure_meetings", force: :cascade do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table 'start_end_overlap_meetings', force: :cascade do |t|
-    t.date 'starts_at'
-    t.date 'ends_at'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "shifts", force: :cascade do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table 'start_overlap_meetings', force: :cascade do |t|
-    t.date 'starts_at'
-    t.date 'ends_at'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "start_end_overlap_meetings", force: :cascade do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table 'time_slots', force: :cascade do |t|
-    t.date 'starts_at'
-    t.date 'ends_at'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "start_overlap_meetings", force: :cascade do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table 'user_meetings', force: :cascade do |t|
-    t.integer 'user_id'
-    t.date 'starts_at'
-    t.date 'ends_at'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "time_slots", force: :cascade do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table 'users', force: :cascade do |t|
-    t.string 'name'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "user_meetings", force: :cascade do |t|
+    t.integer  "user_id"
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
+
+  create_table "users", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
 end

data/spec/dummy/spec/factories/document_with_enum.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :document_with_enum do |d|
+    d.valid_from '2011-01-05'.to_date
+    d.valid_until '2011-01-08'.to_date
+    d.kind :draft
+  end
+end

data/spec/dummy/spec/models/active_meetings_spec.rb

@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require_relative '../factories/active_meeting'
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
 
 describe ActiveMeeting do
   context 'scoping' do

data/spec/dummy/spec/models/document_with_enum_spec.rb

@@ -0,0 +1,53 @@
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
+
+describe DocumentWithEnum do
+  context '2 overlapping documents with same kind' do
+    it 'are invalid' do
+
+      document_1 = FactoryGirl.create(
+        :document_with_enum,
+        kind: :draft,
+        valid_from: '2011-01-05'.to_date,
+        valid_until: '2011-01-08'.to_date
+      )
+
+      document_2 = FactoryGirl.build(
+        :document_with_enum,
+        kind: :draft,
+        valid_from: '2011-01-06'.to_date,
+        valid_until: '2011-01-07'.to_date
+      )
+
+      expect(document_2).not_to be_valid
+      expect(document_2.errors[:valid_from]).to eq ["overlaps with another record"]
+    end
+  end
+
+  context '2 overlapping documents with different kind' do
+    it 'are valid' do
+      document_1 = FactoryGirl.create(
+        :document_with_enum,
+        kind: :draft,
+        valid_from: '2011-01-05'.to_date,
+        valid_until: '2011-01-08'.to_date
+      )
+
+      document_2 = FactoryGirl.build(
+        :document_with_enum,
+        kind: :contract,
+        valid_from: '2011-01-06'.to_date,
+        valid_until: '2011-01-07'.to_date
+      )
+
+      expect(document_2).to be_valid
+    end
+  end
+
+  describe '#kind' do
+    it 'save and read attribute properly' do
+      docuemnt = FactoryGirl.create(:document_with_enum, kind: :contract)
+      docuemnt.reload
+      expect(docuemnt.kind).to eq :contract
+    end
+  end
+end

data/spec/dummy/spec/models/end_overlap_meeting_spec.rb

@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require_relative '../factories/end_overlap_meeting'
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
 
 describe EndOverlapMeeting do
   it 'create meeting' do

data/spec/dummy/spec/models/meeting_spec.rb

@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require_relative '../factories/meeting'
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
 
 describe Meeting do
   context 'Validation' do

data/spec/dummy/spec/models/position_spec.rb

@@ -1,7 +1,4 @@
-require_relative '../../../spec_helper'
-require_relative '../factories/position'
-require_relative '../factories/time_slot'
-require_relative '../factories/user'
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
 
 describe Position do
   it 'create position' do

data/spec/dummy/spec/models/secure_meeting_spec.rb

@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require_relative '../factories/secure_meeting'
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
 
 describe SecureMeeting do
   context 'A model with a UUID as a primary key' do

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

@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require_relative '../factories/shift'
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
 
 describe Meeting do
   context 'Validation' do

data/spec/dummy/spec/models/start_end_overlap_meeting_spec.rb

@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require_relative '../factories/start_end_overlap_meeting'
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
 
 describe StartEndOverlapMeeting do
   it 'create meeting' do

data/spec/dummy/spec/models/start_overlap_meeting_spec.rb

@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require_relative '../factories/start_overlap_meeting'
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
 
 describe StartOverlapMeeting do
   it 'create meeting' do

data/spec/dummy/spec/models/time_slot_spec.rb

@@ -1,7 +1,4 @@
-require_relative '../../../spec_helper'
-require_relative '../factories/position'
-require_relative '../factories/time_slot'
-require_relative '../factories/user'
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
 
 describe TimeSlot do
   it 'create time_slot' do

data/spec/dummy/spec/models/user_meeting_spec.rb

@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require_relative '../factories/user_meeting'
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
 
 describe UserMeeting do
   it 'create johns meeting' do

data/spec/dummy/spec/models/user_spec.rb

@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require_relative '../factories/user'
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
 
 describe User do
   it 'create user' do

data/spec/spec_helper.rb

@@ -18,7 +18,8 @@ Rails.backtrace_cleaner.remove_silencers!
 ActiveRecord::Migrator.migrate File.expand_path('../dummy/db/migrate/', __FILE__)
 
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), '/dummy/spec/factories')
+FactoryGirl.find_definitions
 
 RSpec.configure do |config|
   # Remove this line if you don't want RSpec's should and should_not

data/validates_overlap.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rb-readline'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'test-unit'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Robin Bortlik
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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
   work with meetings, events etc.
 email: robinbortlik@gmail.com
@@ -168,6 +182,7 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/active_meeting.rb
+- spec/dummy/app/models/document_with_enum.rb
 - spec/dummy/app/models/end_overlap_meeting.rb
 - spec/dummy/app/models/meeting.rb
 - spec/dummy/app/models/position.rb
@@ -204,6 +219,7 @@ files:
 - 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/migrate/20170102162952_add_documents_with_enum.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -218,6 +234,7 @@ files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/dummy/spec/factories/active_meeting.rb
+- spec/dummy/spec/factories/document_with_enum.rb
 - spec/dummy/spec/factories/end_overlap_meeting.rb
 - spec/dummy/spec/factories/meeting.rb
 - spec/dummy/spec/factories/position.rb
@@ -229,6 +246,7 @@ files:
 - spec/dummy/spec/factories/user.rb
 - spec/dummy/spec/factories/user_meeting.rb
 - spec/dummy/spec/models/active_meetings_spec.rb
+- spec/dummy/spec/models/document_with_enum_spec.rb
 - spec/dummy/spec/models/end_overlap_meeting_spec.rb
 - spec/dummy/spec/models/meeting_spec.rb
 - spec/dummy/spec/models/position_spec.rb
@@ -268,6 +286,7 @@ specification_version: 4
 summary: This gem helps validate records with time overlap.
 test_files:
 - spec/dummy/spec/factories/active_meeting.rb
+- spec/dummy/spec/factories/document_with_enum.rb
 - spec/dummy/spec/factories/end_overlap_meeting.rb
 - spec/dummy/spec/factories/meeting.rb
 - spec/dummy/spec/factories/position.rb
@@ -279,6 +298,7 @@ test_files:
 - spec/dummy/spec/factories/user.rb
 - spec/dummy/spec/factories/user_meeting.rb
 - spec/dummy/spec/models/active_meetings_spec.rb
+- spec/dummy/spec/models/document_with_enum_spec.rb
 - spec/dummy/spec/models/end_overlap_meeting_spec.rb
 - spec/dummy/spec/models/meeting_spec.rb
 - spec/dummy/spec/models/position_spec.rb