validates_overlap 0.0.4 → 0.0.5

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+
+

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://secure.travis-ci.org/robinbortlik/validates_overlap.png?branch=master" alt="Build Status" />}[http://travis-ci.org/robinbortlik/validates_overlap]
+
 = ValidatesOverlap
 
 This project rocks and uses MIT-LICENSE.

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/validates_overlap/locale/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    messages:
+      overlap: overlaps with another record

data/lib/validates_overlap/overlap_validator.rb

@@ -1,3 +1,6 @@
+require 'active_support/i18n'
+I18n.load_path << File.dirname(__FILE__) + '/locale/en.yml'
+
 class OverlapValidator < ActiveModel::EachValidator
 
   attr_accessor :sql_conditions
@@ -9,7 +12,7 @@ class OverlapValidator < ActiveModel::EachValidator
   end
 
   def validate(record)
-    record.errors[attributes.first] << (options[:message] || "is overlapped") if self.find_crossed(record)
+    record.errors.add(attributes.first, :overlap) if self.find_crossed(record)
   end
 
 

data/spec/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -15,22 +16,22 @@ ActiveRecord::Schema.define(:version => 20110407060725) do
   create_table "meetings", :force => true do |t|
     t.date     "starts_at"
     t.date     "ends_at"
-    t.datetime "created_at"
-    t.datetime "updated_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"
     t.date     "ends_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "users", :force => true do |t|
     t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
 end

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

@@ -13,21 +13,8 @@ describe Meeting do
     }.should change(Meeting, :count).by(1)
   end
 
-
-  OVERLAP_TIME_RANGES = {
-      "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],
-      "starts at time of end and ends after" => ['2011-01-08'.to_date, '2011-01-19'.to_date]
-  }
-
   context "Validation" do
-
+    
     OVERLAP_TIME_RANGES.each do |description, time_range|
       it "is not valid if exists meeting which #{description}" do
         meeting = Factory.build(:meeting, :starts_at => time_range.first, :ends_at => time_range.last)

data/spec/spec_helper.rb

@@ -31,3 +31,15 @@ RSpec.configure do |config|
   # == Mock Framework
   config.mock_with :rspec
 end
+
+OVERLAP_TIME_RANGES = {
+    "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],
+    "starts at time of end and ends after" => ['2011-01-08'.to_date, '2011-01-19'.to_date]
+}

data/validates_overlap.gemspec

@@ -5,23 +5,25 @@
 
 Gem::Specification.new do |s|
   s.name = "validates_overlap"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Bortlik"]
-  s.date = "2012-04-25"
+  s.date = "2012-05-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 = [
     "README.rdoc"
   ]
   s.files = [
+    ".travis.yml",
     "Gemfile",
     "MIT-LICENSE",
     "README.rdoc",
     "Rakefile",
     "VERSION",
     "lib/validates_overlap.rb",
+    "lib/validates_overlap/locale/en.yml",
     "lib/validates_overlap/overlap_validator.rb",
     "spec/dummy/Rakefile",
     "spec/dummy/app/controllers/application_controller.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70279637001300 !ruby/object:Gem::Requirement
+  requirement: &70299388963720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70279637001300
+  version_requirements: *70299388963720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70279637000300 !ruby/object:Gem::Requirement
+  requirement: &70299388985240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70279637000300
+  version_requirements: *70299388985240
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70279636999560 !ruby/object:Gem::Requirement
+  requirement: &70299388984160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0.beta
   type: :development
   prerelease: false
-  version_requirements: *70279636999560
+  version_requirements: *70299388984160
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70279636999080 !ruby/object:Gem::Requirement
+  requirement: &70299388983400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70279636999080
+  version_requirements: *70299388983400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70279636998600 !ruby/object:Gem::Requirement
+  requirement: &70299388982260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70279636998600
+  version_requirements: *70299388982260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70279636998020 !ruby/object:Gem::Requirement
+  requirement: &70299388981120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70279636998020
+  version_requirements: *70299388981120
 description: It can be useful when you you are developing some app where you will
   work with meetings, events etc.
 email: robinbortlik@gmail.com
@@ -85,12 +85,14 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/validates_overlap.rb
+- lib/validates_overlap/locale/en.yml
 - lib/validates_overlap/overlap_validator.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
@@ -153,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3739914896069167697
+      hash: 4277930355415785959
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: