validates_overlap 0.1.1 → 0.1.2

data/Gemfile

@@ -3,9 +3,9 @@ source "http://rubygems.org"
 gem "rails", ">= 3.0.0"
 
 group :test, :development do
-  gem "sqlite3", '~>1.3.7'
-  gem "rspec-rails", '~>2.12.2'
-  gem "factory_girl_rails", '~>4.2.1'
-  gem "bundler", '~>1.2.4'
-  gem "jeweler", '~>1.8.4'
+  gem "sqlite3", '~>1.3'
+  gem "rspec-rails", '~>2.12'
+  gem "factory_girl_rails", '~>4.2'
+  gem "bundler", '~>1.2'
+  gem "jeweler", '~>1.8'
 end

data/README.rdoc

@@ -12,42 +12,36 @@ If you are developing Rails 3 app, let say some meeting planner and you can't sa
 === Using
 
 Add to your gemfile
-```ruby
-gem 'validates_overlap'
-```
+  gem 'validates_overlap'
+
 
 In your model
 
 without scope
-```ruby
-validates :starts_at, :ends_at, :overlap => true
-```
+  validates :starts_at, :ends_at, :overlap => true
+
 
 with scope
-```ruby
-validates :starts_at, :ends_at, :overlap => {:scope => "user_id"}
-```
+  validates :starts_at, :ends_at, :overlap => {:scope => "user_id"}
+
 
 exclude edges
-```ruby
-validates :starts_at, :ends_at, :overlap => {:exclude_edges => "starts_at"}
-validates :starts_at, :ends_at, :overlap => {:exclude_edges => ["starts_at", "ends_at"]}
-```
+  validates :starts_at, :ends_at, :overlap => {:exclude_edges => "starts_at"}
+  validates :starts_at, :ends_at, :overlap => {:exclude_edges => ["starts_at", "ends_at"]}
+
 
 with complicated relation relations
 
 Exaple 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.
 
-```ruby
-class Position < ActiveRecord::Base
-  belongs_to :time_slot
-  belongs_to :user
-  validates "time_slots.starts_at", "time_slots.ends_at",
-    :overlap => {
-      :query_options => {:includes => :time_slot},
-      :scope => { "positions.user_id" => proc{|position| position.user_id} }
-    }
-end
-
-```
+
+  class Position < ActiveRecord::Base
+    belongs_to :time_slot
+    belongs_to :user
+    validates "time_slots.starts_at", "time_slots.ends_at",
+      :overlap => {
+        :query_options => {:includes => :time_slot},
+        :scope => { "positions.user_id" => proc{|position| position.user_id} }
+      }
+  end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/validates_overlap/overlap_validator.rb

@@ -128,8 +128,11 @@ class OverlapValidator < ActiveModel::EachValidator
 
   # Add attribute and his value to sql condition
   def add_attribute(record, attr_name, value = nil)
-    self.sql_conditions += " AND #{attribute_to_sql(attr_name, record)} = :#{value_attribute_name(attr_name)}"
-    self.sql_values.merge!({:"#{value_attribute_name(attr_name)}" => resolve_scope_value(record, attr_name, value)})
+    _value = resolve_scope_value(record, attr_name, value)
+    operator = _value.is_a?(Array) ? " IN (:%s)" : " = :%s"
+
+    self.sql_conditions += " AND #{attribute_to_sql(attr_name, record)} #{operator}" % value_attribute_name(attr_name)
+    self.sql_values.merge!({:"#{value_attribute_name(attr_name)}" => _value})
   end
 
   def value_attribute_name(attr_name)

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

@@ -23,20 +23,24 @@ describe TimeSlot do
       time_slot1 = FactoryGirl.create(:time_slot, :starts_at => "2012-10-11".to_date, :ends_at => "2012-10-13".to_date)
       time_slot2 = FactoryGirl.create(:time_slot, :starts_at => "2012-10-15".to_date, :ends_at => "2012-10-16".to_date)
       user = FactoryGirl.create(:user)
+      user_2 = FactoryGirl.create(:user)
       position1 = FactoryGirl.create(:position, :time_slot => time_slot1, :user => user)
       position2 = FactoryGirl.create(:position, :time_slot => time_slot2, :user => user)
+      position3 = FactoryGirl.create(:position, :time_slot => time_slot2, :user => user_2)
       time_slot2.reload
       time_slot2.starts_at = "2012-10-12".to_date
       time_slot2.should_not be_valid
+
       time_slot2.errors[:base].should_not be_empty
     end
 
-    it "is be valid if exists time slot which have position with same person" do
+    it "is valid if exists time slot which have position with same person" do
       time_slot1 = FactoryGirl.create(:time_slot, :starts_at => "2012-10-11".to_date, :ends_at => "2012-10-13".to_date)
       time_slot2 = FactoryGirl.create(:time_slot, :starts_at => "2012-10-14".to_date, :ends_at => "2012-10-16".to_date)
       user = FactoryGirl.create(:user)
       position1 = FactoryGirl.create(:position, :time_slot => time_slot1, :user => user)
       position2 = FactoryGirl.build(:position, :time_slot => time_slot2, :user => user)
+
       time_slot2.starts_at = "2012-10-15".to_date
       time_slot2.should be_valid
       time_slot2.errors[:base].should be_empty

data/validates_overlap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "validates_overlap"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Bortlik"]
-  s.date = "2013-02-19"
+  s.date = "2013-03-05"
   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 = [
@@ -102,26 +102,26 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_development_dependency(%q<sqlite3>, ["~> 1.3.7"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 2.12.2"])
-      s.add_development_dependency(%q<factory_girl_rails>, ["~> 4.2.1"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.2.4"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<sqlite3>, ["~> 1.3"])
+      s.add_development_dependency(%q<rspec-rails>, ["~> 2.12"])
+      s.add_development_dependency(%q<factory_girl_rails>, ["~> 4.2"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<sqlite3>, ["~> 1.3.7"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.12.2"])
-      s.add_dependency(%q<factory_girl_rails>, ["~> 4.2.1"])
-      s.add_dependency(%q<bundler>, ["~> 1.2.4"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<sqlite3>, ["~> 1.3"])
+      s.add_dependency(%q<rspec-rails>, ["~> 2.12"])
+      s.add_dependency(%q<factory_girl_rails>, ["~> 4.2"])
+      s.add_dependency(%q<bundler>, ["~> 1.2"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<sqlite3>, ["~> 1.3.7"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.12.2"])
-    s.add_dependency(%q<factory_girl_rails>, ["~> 4.2.1"])
-    s.add_dependency(%q<bundler>, ["~> 1.2.4"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<sqlite3>, ["~> 1.3"])
+    s.add_dependency(%q<rspec-rails>, ["~> 2.12"])
+    s.add_dependency(%q<factory_girl_rails>, ["~> 4.2"])
+    s.add_dependency(%q<bundler>, ["~> 1.2"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '1.8'
 description: It can be useful when you you are developing some app where you will
   work with meetings, events etc.
 email: robinbortlik@gmail.com
@@ -204,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3573107370652400302
+      hash: 2932668315205371865
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: