validates_overlap 0.0.5 → 0.0.6

data/README.rdoc

@@ -21,3 +21,7 @@ without scope
 
 with scope
   validates :starts_at, :ends_at, :overlap => {:scope => "user_id"}
+
+exclude edges
+  validates :starts_at, :ends_at, :overlap => {:exclude_edges => "starts_at"}
+  validates :starts_at, :ends_at, :overlap => {:exclude_edges => ["starts_at", "ends_at"]}

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/validates_overlap/overlap_validator.rb

@@ -62,10 +62,11 @@ class OverlapValidator < ActiveModel::EachValidator
   # Generate sql condition for time range cross
   def generate_overlap_sql_conditions(record)
     starts_at_attr, ends_at_attr = attributes_to_sql(record)
+    main_condition = condition_string(starts_at_attr, ends_at_attr)
     if record.new_record?
-      self.sql_conditions = "#{ends_at_attr} >= :starts_at_value AND #{starts_at_attr} <= :ends_at_value"
+      self.sql_conditions = main_condition
     else
-      self.sql_conditions = "#{ends_at_attr} >= :starts_at_value AND #{starts_at_attr} <= :ends_at_value AND #{record_table_name(record)}.id != #{record.id}"
+      self.sql_conditions = "#{main_condition} AND #{record_table_name(record)}.id != #{record.id}"
     end
   end
 
@@ -75,6 +76,14 @@ class OverlapValidator < ActiveModel::EachValidator
     starts_at_value, ends_at_value = resolve_values_from_attributes(record)
     self.sql_values = {:starts_at_value => starts_at_value, :ends_at_value => ends_at_value}
   end
+  
+  # Return the condition string depend on exclude_edges option.
+  def condition_string(starts_at_attr, ends_at_attr)
+    except_option = Array(options[:exclude_edges]).map(&:to_s)
+    starts_at_sign = except_option.include?(starts_at_attr.split(".").last) ? "<" : "<="  
+    ends_at_sign = except_option.include?(ends_at_attr.split(".").last) ? ">" : ">="
+    "#{ends_at_attr} #{ends_at_sign} :starts_at_value AND #{starts_at_attr} #{starts_at_sign} :ends_at_value"
+  end
 
 
   # Add attributes and values to sql conditions.

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

@@ -0,0 +1,3 @@
+class EndOverlapMeeting < ActiveRecord::Base
+  validates :starts_at, :ends_at, :overlap => {:exclude_edges => :ends_at}
+end

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

@@ -0,0 +1,3 @@
+class StartEndOverlapMeeting < ActiveRecord::Base
+  validates :starts_at, :ends_at, :overlap => {:exclude_edges => [:starts_at, :ends_at]}
+end

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

@@ -0,0 +1,3 @@
+class StartOverlapMeeting < ActiveRecord::Base
+  validates :starts_at, :ends_at, :overlap => {:exclude_edges => :starts_at}
+end

data/spec/dummy/db/migrate/20120509130956_create_end_overlap_meetings.rb

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

data/spec/dummy/db/migrate/20120509131012_create_start_overlap_meetings.rb

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

data/spec/dummy/db/migrate/20120509131032_create_start_end_overlap_meetings.rb

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

data/spec/dummy/db/schema.rb

@@ -11,7 +11,14 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110407060725) do
+ActiveRecord::Schema.define(:version => 20120509131032) do
+
+  create_table "end_overlap_meetings", :force => true do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
 
   create_table "meetings", :force => true do |t|
     t.date     "starts_at"
@@ -20,6 +27,20 @@ ActiveRecord::Schema.define(:version => 20110407060725) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "start_end_overlap_meetings", :force => true do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "start_overlap_meetings", :force => true do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "user_meetings", :force => true do |t|
     t.integer  "user_id"
     t.date     "starts_at"

data/spec/dummy/spec/factories/end_overlap_meeting.rb

@@ -0,0 +1,4 @@
+Factory.define :end_overlap_meeting do |u|
+  u.starts_at '2011-01-05'.to_date
+  u.ends_at '2011-01-08'.to_date
+end

data/spec/dummy/spec/factories/start_end_overlap_meeting.rb

@@ -0,0 +1,4 @@
+Factory.define :start_end_overlap_meeting do |u|
+  u.starts_at '2011-01-05'.to_date
+  u.ends_at '2011-01-08'.to_date
+end

data/spec/dummy/spec/factories/start_overlap_meeting.rb

@@ -0,0 +1,4 @@
+Factory.define :start_overlap_meeting do |u|
+  u.starts_at '2011-01-05'.to_date
+  u.ends_at '2011-01-08'.to_date
+end

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

@@ -0,0 +1,52 @@
+require_relative '../../../spec_helper'
+require_relative '../factories/end_overlap_meeting'
+
+describe EndOverlapMeeting do
+
+  before(:all) do
+    EndOverlapMeeting.delete_all
+  end
+
+  it "create meeting" do
+    lambda {
+      Factory(:end_overlap_meeting)
+    }.should change(EndOverlapMeeting, :count).by(1)
+  end
+
+  context "Validation with exclude edges ends_at" do
+   @valid_times = {
+        "starts at time of end and ends after" => ['2011-01-08'.to_date, '2011-01-19'.to_date]
+    }
+    
+    @not_valid_times = {
+          "has same starts_at and ends_at" => ['2011-01-05'.to_date, '2011-01-08'.to_date],
+          "starts before starts_at and ends after ends_at" => ['2011-01-04'.to_date, '2011-01-09'.to_date],
+          "starts before starts_at and ends inside" => ['2011-01-04'.to_date, '2011-01-06'.to_date],
+          "starts inside and ends after ends_at" => ['2011-01-06'.to_date, '2011-01-09'.to_date],
+          "starts inside and ends inside" => ['2011-01-06'.to_date, '2011-01-07'.to_date],
+          "starts at same time and ends inside" => ['2011-01-05'.to_date, '2011-01-07'.to_date],
+          "starts inside and ends at same time" => ['2011-01-06'.to_date, '2011-01-08'.to_date],
+          "starts before and ends at time of start" => ['2011-01-03'.to_date, '2011-01-05'.to_date],
+      }
+    
+    @not_valid_times.each do |description, time_range|
+      it "is not valid if exists meeting which #{description}" do
+        meeting = Factory.build(:end_overlap_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
+        meeting.should_not be_valid
+        meeting.errors[:starts_at].should_not be_empty
+        meeting.errors[:ends_at].should be_empty
+      end
+    end
+
+    @valid_times.each do |description, time_range|
+      it "is valid if exists meeting which #{description}" do
+        meeting = Factory.build(:end_overlap_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
+        meeting.should be_valid
+        meeting.errors[:starts_at].should be_empty
+        meeting.errors[:ends_at].should be_empty
+      end
+    end
+
+  end
+
+end

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

@@ -0,0 +1,52 @@
+require_relative '../../../spec_helper'
+require_relative '../factories/start_end_overlap_meeting'
+
+describe StartEndOverlapMeeting do
+
+  before(:all) do
+    StartEndOverlapMeeting.delete_all
+  end
+
+  it "create meeting" do
+    lambda {
+      Factory(:start_end_overlap_meeting)
+    }.should change(StartEndOverlapMeeting, :count).by(1)
+  end
+
+  context "Validation with exclude edges starts_at, ends_at" do
+   @valid_times = {
+      "starts before and ends at time of start" => ['2011-01-03'.to_date, '2011-01-05'.to_date], 
+      "starts at time of end and ends after" => ['2011-01-08'.to_date, '2011-01-19'.to_date]
+    }
+    
+    @not_valid_times = {
+          "has same starts_at and ends_at" => ['2011-01-05'.to_date, '2011-01-08'.to_date],
+          "starts before starts_at and ends after ends_at" => ['2011-01-04'.to_date, '2011-01-09'.to_date],
+          "starts before starts_at and ends inside" => ['2011-01-04'.to_date, '2011-01-06'.to_date],
+          "starts inside and ends after ends_at" => ['2011-01-06'.to_date, '2011-01-09'.to_date],
+          "starts inside and ends inside" => ['2011-01-06'.to_date, '2011-01-07'.to_date],
+          "starts at same time and ends inside" => ['2011-01-05'.to_date, '2011-01-07'.to_date],
+          "starts inside and ends at same time" => ['2011-01-06'.to_date, '2011-01-08'.to_date],
+      }
+    
+    @not_valid_times.each do |description, time_range|
+      it "is not valid if exists meeting which #{description}" do
+        meeting = Factory.build(:start_end_overlap_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
+        meeting.should_not be_valid
+        meeting.errors[:starts_at].should_not be_empty
+        meeting.errors[:ends_at].should be_empty
+      end
+    end
+
+    @valid_times.each do |description, time_range|
+      it "is valid if exists meeting which #{description}" do
+        meeting = Factory.build(:start_end_overlap_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
+        meeting.should be_valid
+        meeting.errors[:starts_at].should be_empty
+        meeting.errors[:ends_at].should be_empty
+      end
+    end
+
+  end
+
+end

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

@@ -0,0 +1,52 @@
+require_relative '../../../spec_helper'
+require_relative '../factories/start_overlap_meeting'
+
+describe StartOverlapMeeting do
+
+  before(:all) do
+    StartOverlapMeeting.delete_all
+  end
+
+  it "create meeting" do
+    lambda {
+      Factory(:start_overlap_meeting)
+    }.should change(StartOverlapMeeting, :count).by(1)
+  end
+
+  context "Validation with exclude edge starts_at" do
+   @valid_times = {
+      "starts before and ends at time of start" => ['2011-01-03'.to_date, '2011-01-05'.to_date], 
+    }
+    
+    @not_valid_times = {
+          "has same starts_at and ends_at" => ['2011-01-05'.to_date, '2011-01-08'.to_date],
+          "starts before starts_at and ends after ends_at" => ['2011-01-04'.to_date, '2011-01-09'.to_date],
+          "starts before starts_at and ends inside" => ['2011-01-04'.to_date, '2011-01-06'.to_date],
+          "starts inside and ends after ends_at" => ['2011-01-06'.to_date, '2011-01-09'.to_date],
+          "starts inside and ends inside" => ['2011-01-06'.to_date, '2011-01-07'.to_date],
+          "starts at same time and ends inside" => ['2011-01-05'.to_date, '2011-01-07'.to_date],
+          "starts inside and ends at same time" => ['2011-01-06'.to_date, '2011-01-08'.to_date],
+          "starts at time of end and ends after" => ['2011-01-08'.to_date, '2011-01-19'.to_date]
+      }
+    
+    @not_valid_times.each do |description, time_range|
+      it "is not valid if exists meeting which #{description}" do
+        meeting = Factory.build(:start_overlap_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
+        meeting.should_not be_valid
+        meeting.errors[:starts_at].should_not be_empty
+        meeting.errors[:ends_at].should be_empty
+      end
+    end
+
+    @valid_times.each do |description, time_range|
+      it "is valid if exists meeting which #{description}" do
+        meeting = Factory.build(:start_overlap_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
+        meeting.should be_valid
+        meeting.errors[:starts_at].should be_empty
+        meeting.errors[:ends_at].should be_empty
+      end
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -42,4 +42,4 @@ OVERLAP_TIME_RANGES = {
     "starts inside and ends at same time" => ['2011-01-06'.to_date, '2011-01-08'.to_date],
     "starts before and ends at time of start" => ['2011-01-03'.to_date, '2011-01-05'.to_date],
     "starts at time of end and ends after" => ['2011-01-08'.to_date, '2011-01-19'.to_date]
-}
+}

data/validates_overlap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "validates_overlap"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Bortlik"]
-  s.date = "2012-05-07"
+  s.date = "2012-05-13"
   s.description = "It can be useful when you you are developing some app where you will work with meetings, events etc."
   s.email = "robinbortlik@gmail.com"
   s.extra_rdoc_files = [
@@ -28,7 +28,10 @@ Gem::Specification.new do |s|
     "spec/dummy/Rakefile",
     "spec/dummy/app/controllers/application_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
+    "spec/dummy/app/models/end_overlap_meeting.rb",
     "spec/dummy/app/models/meeting.rb",
+    "spec/dummy/app/models/start_end_overlap_meeting.rb",
+    "spec/dummy/app/models/start_overlap_meeting.rb",
     "spec/dummy/app/models/user.rb",
     "spec/dummy/app/models/user_meeting.rb",
     "spec/dummy/app/views/layouts/application.html.erb",
@@ -50,6 +53,9 @@ Gem::Specification.new do |s|
     "spec/dummy/db/migrate/20110406082020_create_meetings.rb",
     "spec/dummy/db/migrate/20110406082053_create_users.rb",
     "spec/dummy/db/migrate/20110407060725_create_user_meetings.rb",
+    "spec/dummy/db/migrate/20120509130956_create_end_overlap_meetings.rb",
+    "spec/dummy/db/migrate/20120509131012_create_start_overlap_meetings.rb",
+    "spec/dummy/db/migrate/20120509131032_create_start_end_overlap_meetings.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/public/404.html",
     "spec/dummy/public/422.html",
@@ -63,10 +69,16 @@ Gem::Specification.new do |s|
     "spec/dummy/public/javascripts/rails.js",
     "spec/dummy/public/stylesheets/.gitkeep",
     "spec/dummy/script/rails",
+    "spec/dummy/spec/factories/end_overlap_meeting.rb",
     "spec/dummy/spec/factories/meeting.rb",
+    "spec/dummy/spec/factories/start_end_overlap_meeting.rb",
+    "spec/dummy/spec/factories/start_overlap_meeting.rb",
     "spec/dummy/spec/factories/user.rb",
     "spec/dummy/spec/factories/user_meeting.rb",
+    "spec/dummy/spec/models/end_overlap_meeting_spec.rb",
     "spec/dummy/spec/models/meeting_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/user_meeting_spec.rb",
     "spec/dummy/spec/models/user_spec.rb",
     "spec/spec_helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70299388963720 !ruby/object:Gem::Requirement
+  requirement: &70310037153900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70299388963720
+  version_requirements: *70310037153900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70299388985240 !ruby/object:Gem::Requirement
+  requirement: &70310037153420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299388985240
+  version_requirements: *70310037153420
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70299388984160 !ruby/object:Gem::Requirement
+  requirement: &70310037152920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0.beta
   type: :development
   prerelease: false
-  version_requirements: *70299388984160
+  version_requirements: *70310037152920
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70299388983400 !ruby/object:Gem::Requirement
+  requirement: &70310037152400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299388983400
+  version_requirements: *70310037152400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70299388982260 !ruby/object:Gem::Requirement
+  requirement: &70310037151840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70299388982260
+  version_requirements: *70310037151840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70299388981120 !ruby/object:Gem::Requirement
+  requirement: &70310037151340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70299388981120
+  version_requirements: *70310037151340
 description: It can be useful when you you are developing some app where you will
   work with meetings, events etc.
 email: robinbortlik@gmail.com
@@ -97,7 +97,10 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/end_overlap_meeting.rb
 - spec/dummy/app/models/meeting.rb
+- spec/dummy/app/models/start_end_overlap_meeting.rb
+- spec/dummy/app/models/start_overlap_meeting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_meeting.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -119,6 +122,9 @@ files:
 - spec/dummy/db/migrate/20110406082020_create_meetings.rb
 - spec/dummy/db/migrate/20110406082053_create_users.rb
 - spec/dummy/db/migrate/20110407060725_create_user_meetings.rb
+- spec/dummy/db/migrate/20120509130956_create_end_overlap_meetings.rb
+- spec/dummy/db/migrate/20120509131012_create_start_overlap_meetings.rb
+- spec/dummy/db/migrate/20120509131032_create_start_end_overlap_meetings.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -132,10 +138,16 @@ files:
 - spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/dummy/spec/factories/end_overlap_meeting.rb
 - spec/dummy/spec/factories/meeting.rb
+- spec/dummy/spec/factories/start_end_overlap_meeting.rb
+- spec/dummy/spec/factories/start_overlap_meeting.rb
 - spec/dummy/spec/factories/user.rb
 - spec/dummy/spec/factories/user_meeting.rb
+- spec/dummy/spec/models/end_overlap_meeting_spec.rb
 - spec/dummy/spec/models/meeting_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/user_meeting_spec.rb
 - spec/dummy/spec/models/user_spec.rb
 - spec/spec_helper.rb
@@ -155,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4277930355415785959
+      hash: 486938746215204514
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: