validates_overlap 0.0.1 → 0.0.3

data/Gemfile

@@ -1,12 +1,12 @@
 source "http://rubygems.org"
 
 gem "rails", ">= 3.0.0"
-gem "mysql2"
+gem "sqlite3"
 
 gem "rspec-rails", ">= 2.0.0.beta"
 gem "factory_girl_rails"
-gem "bundler", "~> 1.0.0"
-gem "jeweler", "~> 1.5.2"
+gem "bundler", ">= 1.0.0"
+gem "jeweler", ">= 1.5.2"
 
 # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
 # gem 'ruby-debug'

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/lib/{overlap_validator.rb → validates_overlap/overlap_validator.rb}

@@ -9,7 +9,7 @@ class OverlapValidator < ActiveModel::EachValidator
   end
 
   def validate(record)
-    record.errors[attributes.first] << "is overlapped" if self.find_crossed(record)
+    record.errors[attributes.first] << (options[:message] || "is overlapped") if self.find_crossed(record)
   end
 
 
@@ -40,7 +40,13 @@ 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.class.name.underscore.pluralize.downcase}.#{attr}"
+    "#{record_table_name(record)}.#{attr}"
+  end
+
+
+  # Get the table name for the record
+  def record_table_name(record)
+    record.class.table_name
   end
 
 
@@ -53,7 +59,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)
-    self.sql_conditions = "#{ends_at_attr} >= :starts_at_value AND #{starts_at_attr} <= :ends_at_value"
+    if record.new_record?
+      self.sql_conditions = "#{ends_at_attr} >= :starts_at_value AND #{starts_at_attr} <= :ends_at_value"
+    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}"
+    end
   end
 
 
@@ -81,4 +91,4 @@ class OverlapValidator < ActiveModel::EachValidator
     self.sql_values.merge!({:"#{attr}_value" => record.send(:"#{attr}")})
   end
 
-end
+end

data/lib/validates_overlap.rb

@@ -1 +1 @@
-require 'overlap_validator'
+require File.join(File.dirname(__FILE__), 'validates_overlap', 'overlap_validator')

data/spec/dummy/config/database.yml

@@ -1,22 +1,22 @@
 # SQLite version 3.x
-#   gem install sqlite3
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
 development:
-  adapter: mysql2
-  database: overlap_app
-  user: root
-  password:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql2
-  database: overlap_app
-  user: root
-  password:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
 
 production:
-  adapter: mysql2
-  database: overlap_app
-  user: root
-  password:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/validates_overlap.gemspec

@@ -4,26 +4,25 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{validates_overlap}
-  s.version = "0.0.1"
+  s.name = "validates_overlap"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Bortlik"]
-  s.date = %q{2011-04-07}
-  s.description = %q{It can be useful when you you are developing some app where you will work with meetings, events etc.}
-  s.email = %q{robinbortlik@gmail.com}
+  s.date = "2012-04-21"
+  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 = [
     "README.rdoc"
   ]
   s.files = [
     "Gemfile",
-    "Gemfile.lock",
     "MIT-LICENSE",
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "lib/overlap_validator.rb",
     "lib/validates_overlap.rb",
+    "lib/validates_overlap/overlap_validator.rb",
     "spec/dummy/Rakefile",
     "spec/dummy/app/controllers/application_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
@@ -71,74 +70,43 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "validates_overlap.gemspec"
   ]
-  s.homepage = %q{http://github.com/robinbortlik/validates_overlap}
+  s.homepage = "http://github.com/robinbortlik/validates_overlap"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{This gem helps validate records with time overlap.}
-  s.test_files = [
-    "spec/dummy/app/controllers/application_controller.rb",
-    "spec/dummy/app/helpers/application_helper.rb",
-    "spec/dummy/app/models/meeting.rb",
-    "spec/dummy/app/models/user.rb",
-    "spec/dummy/app/models/user_meeting.rb",
-    "spec/dummy/config/application.rb",
-    "spec/dummy/config/boot.rb",
-    "spec/dummy/config/environment.rb",
-    "spec/dummy/config/environments/development.rb",
-    "spec/dummy/config/environments/production.rb",
-    "spec/dummy/config/environments/test.rb",
-    "spec/dummy/config/initializers/backtrace_silencers.rb",
-    "spec/dummy/config/initializers/inflections.rb",
-    "spec/dummy/config/initializers/mime_types.rb",
-    "spec/dummy/config/initializers/secret_token.rb",
-    "spec/dummy/config/initializers/session_store.rb",
-    "spec/dummy/config/routes.rb",
-    "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/schema.rb",
-    "spec/dummy/spec/factories/meeting.rb",
-    "spec/dummy/spec/factories/user.rb",
-    "spec/dummy/spec/factories/user_meeting.rb",
-    "spec/dummy/spec/models/meeting_spec.rb",
-    "spec/dummy/spec/models/user_meeting_spec.rb",
-    "spec/dummy/spec/models/user_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "1.8.17"
+  s.summary = "This gem helps validate records with time overlap."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<mysql2>, [">= 0"])
+      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
       s.add_runtime_dependency(%q<rspec-rails>, [">= 2.0.0.beta"])
       s.add_runtime_dependency(%q<factory_girl_rails>, [">= 0"])
-      s.add_runtime_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_runtime_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
       s.add_development_dependency(%q<factory_girl_rails>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<mysql2>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 2.0.0.beta"])
       s.add_dependency(%q<factory_girl_rails>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
       s.add_dependency(%q<factory_girl_rails>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<mysql2>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 2.0.0.beta"])
     s.add_dependency(%q<factory_girl_rails>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
     s.add_dependency(%q<factory_girl_rails>, [">= 0"])

metadata

@@ -1,167 +1,130 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: validates_overlap
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Robin Bortlik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-07 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70323191174620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mysql2
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70323191174620
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70323191173900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70323191173900
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70323191172920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0.beta
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70323191172920
+- !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70323191171980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70323191171980
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70323191171500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70323191171500
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70323191171020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70323191171020
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70323191170540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70323191170540
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70323191376100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70323191376100
+- !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70323191375620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-description: It can be useful when you you are developing some app where you will work with meetings, events etc.
+  version_requirements: *70323191375620
+description: It can be useful when you you are developing some app where you will
+  work with meetings, events etc.
 email: robinbortlik@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/overlap_validator.rb
 - lib/validates_overlap.rb
+- lib/validates_overlap/overlap_validator.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -208,65 +171,32 @@ files:
 - spec/dummy/spec/models/user_spec.rb
 - spec/spec_helper.rb
 - validates_overlap.gemspec
-has_rdoc: true
 homepage: http://github.com/robinbortlik/validates_overlap
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 4203573218918511967
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1147309324226676592
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: This gem helps validate records with time overlap.
-test_files: 
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/meeting.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/models/user_meeting.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/routes.rb
-- 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/schema.rb
-- spec/dummy/spec/factories/meeting.rb
-- spec/dummy/spec/factories/user.rb
-- spec/dummy/spec/factories/user_meeting.rb
-- spec/dummy/spec/models/meeting_spec.rb
-- spec/dummy/spec/models/user_meeting_spec.rb
-- spec/dummy/spec/models/user_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/Gemfile.lock

@@ -1,100 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.6)
-      actionpack (= 3.0.6)
-      mail (~> 2.2.15)
-    actionpack (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.6)
-      activesupport (= 3.0.6)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
-    activesupport (3.0.6)
-    arel (2.0.9)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    factory_girl (1.3.3)
-    factory_girl_rails (1.0.1)
-      factory_girl (~> 1.3)
-      railties (>= 3.0.0)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    mysql2 (0.2.7)
-    polyglot (0.3.1)
-    rack (1.2.2)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.6)
-      actionmailer (= 3.0.6)
-      actionpack (= 3.0.6)
-      activerecord (= 3.0.6)
-      activeresource (= 3.0.6)
-      activesupport (= 3.0.6)
-      bundler (~> 1.0)
-      railties (= 3.0.6)
-    railties (3.0.6)
-      actionpack (= 3.0.6)
-      activesupport (= 3.0.6)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.5.0)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.26)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  factory_girl_rails
-  jeweler (~> 1.5.2)
-  mysql2
-  rails (>= 3.0.0)
-  rspec-rails (>= 2.0.0.beta)