validates_overlap 0.1.3 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTc5NTQ4NDFlMTU1MjVkZDllOGEzNzVjYzhhYjNlY2VlODlhYzZmOA==
+    NzBhYmYyMmEzMWNmNTg4YjdhMzBkZWI5MGU5YWZhMGRkMDRjODUzYw==
   data.tar.gz: !binary |-
-    MzNmNWJiMjhjYWM4ODFmYTFhMGRhM2EyZjYwYTlkYjZlMGM2NTQwMg==
+    MzhiZjk5M2ZmMDNlNGFkYjczNjU3YWZjNzA1ZDgyMzU2NjJjZDg1MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTIxNzM5ZWQ0ZjEzZDFiZGE3YWVjM2YzMzliZDgzN2E0MTdjNmFmZTlhNGQ0
-    M2FkOGM5ZGQ3M2JjYzc5OWNjNTVlNDg5YzIyY2U4NzUwYmVmMDZiMDMxNjhi
-    MzAxOTEyM2ZmZTdhZmVhYzNhOTE1Mzk1MDMyMjYxMWI3NWZjNTM=
+    YjU4MWY3MTdjMzAwZTRkOGRiZmYzOWU1MzAxOTgyMzBhYzMyYjI4Zjc2YzU3
+    MTEwMTEwNGFkNGFhMzNmMjg5MjliYjZmMjkwNzIwMTYxNGE0NGJmOTAyODQw
+    MmZmOTc1ZmQzOGQzZDI3Y2Q3OGJjOGQ2NTU4N2JjOGQ3NWM0ZGY=
   data.tar.gz: !binary |-
-    YmU0MTU0MDNmMmQxMTdkYjQ5MmIzMjk1NGZkNjY1MzI3OTA3OTk1OTg0Nzg2
-    N2Y3NTFjZGJiODM4NTBlMzZjZmNiNjRiZTQxY2E0YjRlNDY0MjMyZGU1NDRi
-    MGMyM2U5Nzc4YmY2ZmJlMmY0YjBiOGY0ZTIxMzBiNGQ2NjgwYjQ=
+    N2ExNGI2N2ZkZDUwZTVmMzM1NmIyYjliMWQ1N2FhMzIzZmY2ZTNjODU0NjVl
+    ZTgzN2ZhZWEwM2NlMzM3Y2FjOTYzYjk4ZDIwN2UzN2IyODc4ZGRmYTc5MmU2
+    M2YzODg5MzM5ZGU5YWM3NjllM2U1YzhlNmJjY2RmNDk3Y2FiZjA=

data/README.md

@@ -44,7 +44,7 @@ validates :starts_at, :ends_at, :overlap => {:exclude_edges => ["starts_at", "en
 validates :starts_at, :ends_at, :overlap => {:message_title => "Some validation title", :message_content => "Some validation message"}
 ```
 
-#### with complicated relation relations
+#### with complicated relations
 
 Example describes valildatation of user, positions and time slots.
 User can't be assigned 2 times on position which is under time slot with time overlap.
@@ -60,3 +60,12 @@ class Position < ActiveRecord::Base
     }
 end
 ```
+
+#### apply named scopes
+
+```ruby
+class ActiveMeeting < ActiveRecord::Base
+  validates :starts_at, :ends_at, :overlap => {:query_options => {:active => true}}
+  scope :active, where(:is_active => true)
+end
+```

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/validates_overlap/overlap_validator.rb

@@ -2,6 +2,8 @@ require 'active_support/i18n'
 I18n.load_path << File.dirname(__FILE__) + '/locale/en.yml'
 
 class OverlapValidator < ActiveModel::EachValidator
+  BEGIN_OF_UNIX_TIME = Time.at(-2147483648).to_datetime
+  END_OF_UNIX_TIME = Time.at(2147483648).to_datetime
 
   attr_accessor :sql_conditions
   attr_accessor :sql_values
@@ -28,8 +30,8 @@ class OverlapValidator < ActiveModel::EachValidator
   # Check if exists at least one record in DB which is crossed with current record
   def find_crossed(record)
     self.scoped_model = record.class
-    self.generate_overlap_sql_conditions(record)
     self.generate_overlap_sql_values(record)
+    self.generate_overlap_sql_conditions(record)
     self.add_attributes(record, options[:scope]) if options && options[:scope].present?
     self.add_query_options(options[:query_options]) if options && options[:query_options].present?
 
@@ -99,7 +101,7 @@ 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)
-    self.sql_values = {:starts_at_value => starts_at_value, :ends_at_value => ends_at_value}
+    self.sql_values = {:starts_at_value => starts_at_value || BEGIN_OF_UNIX_TIME, :ends_at_value => ends_at_value || END_OF_UNIX_TIME}
   end
 
   # Return the condition string depend on exclude_edges option.
@@ -107,7 +109,10 @@ class OverlapValidator < ActiveModel::EachValidator
     except_option = Array(options[:exclude_edges]).map(&:to_s)
     starts_at_sign = except_option.include?(starts_at_attr.to_s.split(".").last) ? "<" : "<="
     ends_at_sign = except_option.include?(ends_at_attr.to_s.split(".").last) ? ">" : ">="
-    "#{ends_at_attr} #{ends_at_sign} :starts_at_value AND #{starts_at_attr} #{starts_at_sign} :ends_at_value"
+    query = []
+    query << "(#{ends_at_attr} IS NULL OR #{ends_at_attr} #{ends_at_sign} :starts_at_value)"
+    query << "(#{starts_at_attr} IS NULL OR #{starts_at_attr} #{starts_at_sign} :ends_at_value)"
+    query.join(" AND ")
   end
 
 

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

@@ -3,17 +3,16 @@ require_relative '../factories/meeting'
 
 describe Meeting do
 
-  before(:all) do
-    Meeting.delete_all
-  end
-
-  it "create meeting" do
-    lambda {
-      FactoryGirl.create(:meeting)
-    }.should change(Meeting, :count).by(1)
-  end
-
   context "Validation" do
+    before(:all) do
+      Meeting.delete_all
+    end
+
+    it "create meeting" do
+      lambda {
+        FactoryGirl.create(:meeting)
+      }.should change(Meeting, :count).by(1)
+    end
 
     OVERLAP_TIME_RANGES.each do |description, time_range|
       it "is not valid if exists meeting which #{description}" do
@@ -38,4 +37,29 @@ describe Meeting do
 
   end
 
+  context "Validation of endless objects" do
+    before(:all) do
+      Meeting.delete_all
+      FactoryGirl.create(:meeting, :ends_at => nil)
+    end
+
+    it "with overlap object" do
+      meeting = FactoryGirl.build(:meeting, :starts_at => "2011-01-05".to_date, :ends_at => "2011-01-08".to_date)
+      meeting.should_not be_valid
+      meeting = FactoryGirl.build(:meeting, :starts_at => "2012-01-05".to_date, :ends_at => "2012-01-08".to_date)
+      meeting.should_not be_valid
+      meeting = FactoryGirl.build(:meeting, :starts_at => "2010-01-05".to_date, :ends_at => "2010-01-08".to_date)
+      meeting.should be_valid
+    end
+
+    it "with another endless obejct" do
+      meeting = FactoryGirl.build(:meeting, :starts_at => "2010-01-05".to_date, :ends_at => nil)
+      meeting.should_not be_valid
+      meeting = FactoryGirl.build(:meeting, :starts_at => nil, :ends_at => "2010-01-05".to_date)
+      meeting.should be_valid
+      meeting = FactoryGirl.build(:meeting, :starts_at => nil, :ends_at => nil)
+      meeting.should_not be_valid
+    end
+  end
+
 end

data/validates_overlap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "validates_overlap"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Bortlik"]
-  s.date = "2013-08-26"
+  s.date = "2013-10-18"
   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 = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Robin Bortlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -220,3 +220,4 @@ signing_key:
 specification_version: 4
 summary: This gem helps validate records with time overlap.
 test_files: []
+has_rdoc: