validates_overlap 0.0.6 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.1.0

data/lib/validates_overlap/overlap_validator.rb

@@ -5,6 +5,7 @@ class OverlapValidator < ActiveModel::EachValidator
 
   attr_accessor :sql_conditions
   attr_accessor :sql_values
+  attr_accessor :scoped_model
 
   def initialize(args)
     attributes_are_range(args[:attributes])
@@ -12,7 +13,13 @@ class OverlapValidator < ActiveModel::EachValidator
   end
 
   def validate(record)
-    record.errors.add(attributes.first, :overlap) if self.find_crossed(record)
+    if self.find_crossed(record)
+      if record.respond_to? attributes.first
+        record.errors.add(attributes.first, :overlap)
+      else
+        record.errors.add(:base, :overlap)
+      end
+    end
   end
 
 
@@ -20,20 +27,34 @@ 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.add_attributes(record, options[:scope]) if options && !(scope = options[:scope]).blank?
+    self.add_attributes(record, options[:scope]) if options && options[:scope].present?
+    self.add_query_options(options[:query_options]) if options && options[:query_options].present?
 
-    return record.class.exists?([sql_conditions, sql_values])
+    return self.scoped_model.exists?([sql_conditions, sql_values])
   end
 
 
   # Resolve attributes values from record to use in sql conditions
   # return array in form ['2011-01-10', '2011-02-20']
   def resolve_values_from_attributes(record)
-    attributes.map { |attr| record.send(attr.to_sym) }
+    attributes.map do |attr|
+      if attr.to_s.include?(".")
+        self.get_assoc_value(record, attr)
+      else
+        record.send(attr.to_sym)
+      end
+    end
   end
 
+  def get_assoc_value(record, attr)
+    assoc, attr_name = attr.to_s.split(".")
+    assoc_name = assoc.singularize.to_sym
+    assoc_obj = record.send(assoc_name) if record.respond_to?(assoc_name)
+    (assoc_obj || record).send(attr_name.to_sym)
+  end
   # Prepare attribute names to use in sql conditions
   # return array in form ['meetings.starts_at', 'meetings.ends_at']
   def attributes_to_sql(record)
@@ -43,7 +64,11 @@ class OverlapValidator < ActiveModel::EachValidator
 
   # Prepare attribute name to use in sql conditions created in form 'table_name.attribute_name'
   def attribute_to_sql(attr, record)
-    "#{record_table_name(record)}.#{attr}"
+    if attr.to_s.include?(".")
+      attr
+    else
+      "#{record_table_name(record)}.#{attr}"
+    end
   end
 
 
@@ -76,12 +101,12 @@ 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) ? ">" : ">="
+    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"
   end
 
@@ -91,6 +116,10 @@ class OverlapValidator < ActiveModel::EachValidator
   def add_attributes(record, attrs)
     if attrs.is_a?(Array)
       attrs.each { |attr| self.add_attribute(record, attr) }
+    elsif attrs.is_a?(Hash)
+      attrs.each do |attr_name, value|
+        self.add_attribute(record, attr_name, value)
+      end
     else
       self.add_attribute(record, attrs)
     end
@@ -98,9 +127,31 @@ class OverlapValidator < ActiveModel::EachValidator
 
 
   # Add attribute and his value to sql condition
-  def add_attribute(record, attr)
-    self.sql_conditions += " AND #{attribute_to_sql(attr, record)} = :#{attr}_value"
-    self.sql_values.merge!({:"#{attr}_value" => record.send(:"#{attr}")})
+  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)})
+  end
+
+  def value_attribute_name(attr_name)
+    name = attr_name.to_s.include?(".") ? attr_name.to_s.gsub(".", "_") : attr_name
+    name + "_value"
+  end
+
+  def resolve_scope_value(record, attr_name, value = nil)
+    if value
+      value.is_a?(Proc) ? value.call(record) : value
+    else
+      record.send(:"#{attr_name}")
+    end
+  end
+
+  # Allow to use scope, joins, includes methods before querying
+  # == Example:
+  # validates_overlap :date_from, :date_to, :query_options => {:includes => "visits"}
+  def add_query_options(methods)
+    methods.each do |method_name, params|
+      self.scoped_model = self.scoped_model.send(method_name.to_sym, *params)
+    end
   end
 
 end

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

@@ -0,0 +1,9 @@
+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/spec/dummy/app/models/start_overlap_meeting.rb

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

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

@@ -0,0 +1,8 @@
+class TimeSlot < ActiveRecord::Base
+  has_many :positions
+  validates "time_slots.starts_at", "time_slots.ends_at",
+    :overlap => {
+      :query_options => {:includes => :positions},
+      :scope => {"positions.user_id" => proc{|time_slot| time_slot.positions.map(&:user_id)} }
+    }
+end

data/spec/dummy/db/migrate/20121207162212_create_time_slot.rb

@@ -0,0 +1,20 @@
+class CreateTimeSlot < ActiveRecord::Migration
+  def self.up
+    create_table :time_slots do |t|
+      t.date :starts_at
+      t.date :ends_at
+      t.timestamps
+    end
+
+    create_table :positions do |t|
+      t.belongs_to :user
+      t.belongs_to :time_slot
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :time_slots
+    drop_table :positions
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120509131032) do
+ActiveRecord::Schema.define(:version => 20121207162212) do
 
   create_table "end_overlap_meetings", :force => true do |t|
     t.date     "starts_at"
@@ -27,6 +27,13 @@ ActiveRecord::Schema.define(:version => 20120509131032) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "positions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "time_slot_id"
+    t.datetime "created_at",   :null => false
+    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"
@@ -41,6 +48,13 @@ ActiveRecord::Schema.define(:version => 20120509131032) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "time_slots", :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/position.rb

@@ -0,0 +1,4 @@
+Factory.define :position do |u|
+  u.association(:user, :factory => :user)
+  u.association(:time_slot, :factory => :time_slot)
+end

data/spec/dummy/spec/factories/time_slot.rb

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

data/spec/dummy/spec/factories/user.rb

@@ -1,3 +1,3 @@
 Factory.define :user do |u|
-      u.name 'John'
-end
+  u.name 'John'
+end

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

@@ -0,0 +1,44 @@
+require_relative '../../../spec_helper'
+require_relative '../factories/position'
+require_relative '../factories/time_slot'
+require_relative '../factories/user'
+
+describe Position do
+
+  before(:all) do
+    Position.delete_all
+    TimeSlot.delete_all
+    User.delete_all
+  end
+
+  it "create position" do
+    lambda {
+      Factory(:position)
+    }.should change(Position, :count).by(1)
+  end
+
+  context "Validation with scope and association" do
+
+    it "is not valid if exists time slot which have position with same person" do
+      time_slot1 = Factory.create(:time_slot, :starts_at => "2012-10-11".to_date, :ends_at => "2012-10-13".to_date)
+      time_slot2 = Factory.create(:time_slot, :starts_at => "2012-10-12".to_date, :ends_at => "2012-10-13".to_date)
+      user = Factory.create(:user)
+      position1 = Factory.create(:position, :time_slot => time_slot1, :user => user)
+      position2 = Factory.build(:position, :time_slot => time_slot2, :user => user)
+      position2.should_not be_valid
+      position2.errors[:base].should_not be_empty
+    end
+
+    it "is be valid if exists time slot which have position with same person" do
+      time_slot1 = Factory.create(:time_slot, :starts_at => "2012-10-11".to_date, :ends_at => "2012-10-13".to_date)
+      time_slot2 = Factory.create(:time_slot, :starts_at => "2012-10-14".to_date, :ends_at => "2012-10-15".to_date)
+      user = Factory.create(:user)
+      position1 = Factory.create(:position, :time_slot => time_slot1, :user => user)
+      position2 = Factory.build(:position, :time_slot => time_slot2, :user => user)
+      position2.should be_valid
+      position2.errors[:base].should be_empty
+    end
+
+  end
+
+end

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

@@ -0,0 +1,47 @@
+require_relative '../../../spec_helper'
+require_relative '../factories/position'
+require_relative '../factories/time_slot'
+require_relative '../factories/user'
+
+describe TimeSlot do
+
+  before(:all) do
+    Position.delete_all
+    TimeSlot.delete_all
+    User.delete_all
+  end
+
+  it "create time_slot" do
+    lambda {
+      Factory(:time_slot)
+    }.should change(TimeSlot, :count).by(1)
+  end
+
+  context "Validation with scope and association" do
+
+    it "is not valid if exists time slot which have position with same person" do
+      time_slot1 = Factory.create(:time_slot, :starts_at => "2012-10-11".to_date, :ends_at => "2012-10-13".to_date)
+      time_slot2 = Factory.create(:time_slot, :starts_at => "2012-10-15".to_date, :ends_at => "2012-10-16".to_date)
+      user = Factory.create(:user)
+      position1 = Factory.create(:position, :time_slot => time_slot1, :user => user)
+      position2 = Factory.create(:position, :time_slot => time_slot2, :user => user)
+      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
+      time_slot1 = Factory.create(:time_slot, :starts_at => "2012-10-11".to_date, :ends_at => "2012-10-13".to_date)
+      time_slot2 = Factory.create(:time_slot, :starts_at => "2012-10-14".to_date, :ends_at => "2012-10-16".to_date)
+      user = Factory.create(:user)
+      position1 = Factory.create(:position, :time_slot => time_slot1, :user => user)
+      position2 = Factory.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
+    end
+
+  end
+
+end

data/validates_overlap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "validates_overlap"
-  s.version = "0.0.6"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Bortlik"]
-  s.date = "2012-05-13"
+  s.date = "2012-12-07"
   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 = [
@@ -30,8 +30,10 @@ Gem::Specification.new do |s|
     "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/position.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",
     "spec/dummy/app/models/user.rb",
     "spec/dummy/app/models/user_meeting.rb",
     "spec/dummy/app/views/layouts/application.html.erb",
@@ -56,6 +58,7 @@ Gem::Specification.new do |s|
     "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/migrate/20121207162212_create_time_slot.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/public/404.html",
     "spec/dummy/public/422.html",
@@ -71,14 +74,18 @@ Gem::Specification.new do |s|
     "spec/dummy/script/rails",
     "spec/dummy/spec/factories/end_overlap_meeting.rb",
     "spec/dummy/spec/factories/meeting.rb",
+    "spec/dummy/spec/factories/position.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",
     "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/position_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",
     "spec/dummy/spec/models/user_meeting_spec.rb",
     "spec/dummy/spec/models/user_spec.rb",
     "spec/spec_helper.rb",
@@ -87,7 +94,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/robinbortlik/validates_overlap"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "1.8.24"
   s.summary = "This gem helps validate records with time overlap."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70310037153900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70310037153900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70310037153420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310037153420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70310037152920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 2.0.0.beta
   type: :development
   prerelease: false
-  version_requirements: *70310037152920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70310037152400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310037152400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70310037151840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70310037151840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70310037151340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70310037151340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 description: It can be useful when you you are developing some app where you will
   work with meetings, events etc.
 email: robinbortlik@gmail.com
@@ -99,8 +129,10 @@ files:
 - 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/position.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
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_meeting.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -125,6 +157,7 @@ files:
 - 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/migrate/20121207162212_create_time_slot.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -140,14 +173,18 @@ files:
 - spec/dummy/script/rails
 - spec/dummy/spec/factories/end_overlap_meeting.rb
 - spec/dummy/spec/factories/meeting.rb
+- spec/dummy/spec/factories/position.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
 - 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/position_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
 - spec/dummy/spec/models/user_meeting_spec.rb
 - spec/dummy/spec/models/user_spec.rb
 - spec/spec_helper.rb
@@ -167,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 486938746215204514
+      hash: 1024957372964977180
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This gem helps validate records with time overlap.