validates_overlap 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTc5NTQ4NDFlMTU1MjVkZDllOGEzNzVjYzhhYjNlY2VlODlhYzZmOA==
+  data.tar.gz: !binary |-
+    MzNmNWJiMjhjYWM4ODFmYTFhMGRhM2EyZjYwYTlkYjZlMGM2NTQwMg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NTIxNzM5ZWQ0ZjEzZDFiZGE3YWVjM2YzMzliZDgzN2E0MTdjNmFmZTlhNGQ0
+    M2FkOGM5ZGQ3M2JjYzc5OWNjNTVlNDg5YzIyY2U4NzUwYmVmMDZiMDMxNjhi
+    MzAxOTEyM2ZmZTdhZmVhYzNhOTE1Mzk1MDMyMjYxMWI3NWZjNTM=
+  data.tar.gz: !binary |-
+    YmU0MTU0MDNmMmQxMTdkYjQ5MmIzMjk1NGZkNjY1MzI3OTA3OTk1OTg0Nzg2
+    N2Y3NTFjZGJiODM4NTBlMzZjZmNiNjRiZTQxY2E0YjRlNDY0MjMyZGU1NDRi
+    MGMyM2U5Nzc4YmY2ZmJlMmY0YjBiOGY0ZTIxMzBiNGQ2NjgwYjQ=

data/.travis.yml

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

data/Gemfile

@@ -8,4 +8,5 @@ group :test, :development do
   gem "factory_girl_rails", '~>4.2'
   gem "bundler", '~>1.2'
   gem "jeweler", '~>1.8'
+  gem "pry"
 end

data/README.md

@@ -0,0 +1,62 @@
+[![Build Status](https://secure.travis-ci.org/robinbortlik/validates_overlap.png?branch=master)](https://secure.travis-ci.org/robinbortlik/validates_overlap)
+
+# ValidatesOverlap
+
+This project rocks and uses MIT-LICENSE.
+
+#### This gem is compatible with Rails 3 and 4.
+
+#### When this gem should be helpful for you?
+If you are developing Rails 3 app, let say some meeting planner and you can't save records which have time overlap.
+
+#### Using
+
+Add to your gemfile
+
+```ruby
+gem 'validates_overlap'
+```
+
+In your model
+
+#### without scope
+
+```ruby
+validates :starts_at, :ends_at, :overlap => true
+```
+
+#### with scope
+
+```ruby
+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"]}
+```
+
+#### define custom validation key and message
+
+```ruby
+validates :starts_at, :ends_at, :overlap => {:message_title => "Some validation title", :message_content => "Some validation message"}
+```
+
+#### with complicated relation 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.
+
+```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
+```

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/validates_overlap/overlap_validator.rb

@@ -15,9 +15,9 @@ class OverlapValidator < ActiveModel::EachValidator
   def validate(record)
     if self.find_crossed(record)
       if record.respond_to? attributes.first
-        record.errors.add(attributes.first, :overlap)
+        record.errors.add(options[:message_title] || attributes.first, options[:message_content] || :overlap)
       else
-        record.errors.add(:base, :overlap)
+        record.errors.add(options[:message_title] || :base, options[:message_content] || :overlap)
       end
     end
   end

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

@@ -0,0 +1,4 @@
+class ActiveMeeting < ActiveRecord::Base
+  validates :starts_at, :ends_at, :overlap => {:query_options => {:active => true}}
+  scope :active, where(:is_active => true)
+end

data/spec/dummy/db/migrate/20130826155107_create_active_meetings.rb

@@ -0,0 +1,14 @@
+class CreateActiveMeetings < ActiveRecord::Migration
+  def self.up
+    create_table :active_meetings do |t|
+      t.date :starts_at
+      t.date :ends_at
+      t.boolean :is_active
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :active_meetings
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,15 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121207162212) do
+ActiveRecord::Schema.define(:version => 20130826155107) do
+
+  create_table "active_meetings", :force => true do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.boolean  "is_active"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
 
   create_table "end_overlap_meetings", :force => true do |t|
     t.date     "starts_at"

data/spec/dummy/spec/factories/active_meeting.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :active_meeting do |u|
+    u.starts_at '2011-01-05'.to_date
+    u.ends_at '2011-01-08'.to_date
+    u.is_active true
+  end
+end

data/spec/dummy/spec/models/active_meetings_spec.rb

@@ -0,0 +1,18 @@
+require_relative '../../../spec_helper'
+require_relative '../factories/active_meeting'
+
+describe ActiveMeeting do
+
+  before(:all) do
+    ActiveMeeting.delete_all
+  end
+
+  context "scoping" do
+    it "should apply scope" do
+      ActiveMeeting.should_receive(:active).with(true).and_call_original
+      active_meeting = ActiveMeeting.new
+      active_meeting.valid?
+    end
+  end
+
+end

data/spec/dummy/spec/overlap_validator_spec.rb

@@ -0,0 +1,24 @@
+describe OverlapValidator do
+
+
+  context "validation message" do
+
+    it "should have default message" do
+      subject = OverlapValidator.new({:attributes => [:starts_at, :ends_at]})
+      meeting = Meeting.new
+      subject.stub(:find_crossed){true}
+      subject.validate(meeting)
+      meeting.errors[:starts_at].should eq ["overlaps with another record"]
+    end
+
+    it "should be possible to configure message" do
+      subject = OverlapValidator.new({:attributes => [:starts_at, :ends_at]})
+      meeting = Meeting.new
+      subject.stub(:find_crossed){true}
+      subject.stub(:options){ {:message_title => :optional_key, :message_content => "Message content"} }
+      subject.validate(meeting)
+      meeting.errors.messages.should eq :optional_key => ["Message content"]
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rspec/rails"
 require "factory_girl_rails"
+require 'pry'
 
 
 ActionMailer::Base.delivery_method = :test

data/validates_overlap.gemspec

@@ -5,21 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = "validates_overlap"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Bortlik"]
-  s.date = "2013-03-05"
+  s.date = "2013-08-26"
   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"
+    "README.md"
   ]
   s.files = [
     ".travis.yml",
     "Gemfile",
     "MIT-LICENSE",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "lib/validates_overlap.rb",
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "spec/dummy/Rakefile",
     "spec/dummy/app/controllers/application_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
+    "spec/dummy/app/models/active_meeting.rb",
     "spec/dummy/app/models/end_overlap_meeting.rb",
     "spec/dummy/app/models/meeting.rb",
     "spec/dummy/app/models/position.rb",
@@ -59,6 +60,7 @@ Gem::Specification.new do |s|
     "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/migrate/20130826155107_create_active_meetings.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/public/404.html",
     "spec/dummy/public/422.html",
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
     "spec/dummy/public/javascripts/rails.js",
     "spec/dummy/public/stylesheets/.gitkeep",
     "spec/dummy/script/rails",
+    "spec/dummy/spec/factories/active_meeting.rb",
     "spec/dummy/spec/factories/end_overlap_meeting.rb",
     "spec/dummy/spec/factories/meeting.rb",
     "spec/dummy/spec/factories/position.rb",
@@ -80,6 +83,7 @@ Gem::Specification.new do |s|
     "spec/dummy/spec/factories/time_slot.rb",
     "spec/dummy/spec/factories/user.rb",
     "spec/dummy/spec/factories/user_meeting.rb",
+    "spec/dummy/spec/models/active_meetings_spec.rb",
     "spec/dummy/spec/models/end_overlap_meeting_spec.rb",
     "spec/dummy/spec/models/meeting_spec.rb",
     "spec/dummy/spec/models/position_spec.rb",
@@ -88,17 +92,18 @@ Gem::Specification.new do |s|
     "spec/dummy/spec/models/time_slot_spec.rb",
     "spec/dummy/spec/models/user_meeting_spec.rb",
     "spec/dummy/spec/models/user_spec.rb",
+    "spec/dummy/spec/overlap_validator_spec.rb",
     "spec/spec_helper.rb",
     "validates_overlap.gemspec"
   ]
   s.homepage = "http://github.com/robinbortlik/validates_overlap"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.6"
   s.summary = "This gem helps validate records with time overlap."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
@@ -107,6 +112,7 @@ Gem::Specification.new do |s|
       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"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3"])
@@ -114,6 +120,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<factory_girl_rails>, ["~> 4.2"])
       s.add_dependency(%q<bundler>, ["~> 1.2"])
       s.add_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
@@ -122,6 +129,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<factory_girl_rails>, ["~> 4.2"])
     s.add_dependency(%q<bundler>, ["~> 1.2"])
     s.add_dependency(%q<jeweler>, ["~> 1.8"])
+    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Robin Bortlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,23 +90,36 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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:
-- README.rdoc
+- README.md
 files:
 - .travis.yml
 - Gemfile
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - lib/validates_overlap.rb
@@ -127,6 +128,7 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/active_meeting.rb
 - spec/dummy/app/models/end_overlap_meeting.rb
 - spec/dummy/app/models/meeting.rb
 - spec/dummy/app/models/position.rb
@@ -158,6 +160,7 @@ files:
 - 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/migrate/20130826155107_create_active_meetings.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -171,6 +174,7 @@ files:
 - spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/dummy/spec/factories/active_meeting.rb
 - spec/dummy/spec/factories/end_overlap_meeting.rb
 - spec/dummy/spec/factories/meeting.rb
 - spec/dummy/spec/factories/position.rb
@@ -179,6 +183,7 @@ files:
 - spec/dummy/spec/factories/time_slot.rb
 - spec/dummy/spec/factories/user.rb
 - spec/dummy/spec/factories/user_meeting.rb
+- spec/dummy/spec/models/active_meetings_spec.rb
 - spec/dummy/spec/models/end_overlap_meeting_spec.rb
 - spec/dummy/spec/models/meeting_spec.rb
 - spec/dummy/spec/models/position_spec.rb
@@ -187,34 +192,31 @@ files:
 - spec/dummy/spec/models/time_slot_spec.rb
 - spec/dummy/spec/models/user_meeting_spec.rb
 - spec/dummy/spec/models/user_spec.rb
+- spec/dummy/spec/overlap_validator_spec.rb
 - spec/spec_helper.rb
 - validates_overlap.gemspec
 homepage: http://github.com/robinbortlik/validates_overlap
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2932668315205371865
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem helps validate records with time overlap.
 test_files: []

data/README.rdoc

@@ -1,47 +0,0 @@
-{<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.
-
-=== This gem is available only for Rails 3.
-
-=== When this gem should be helpful for you?
-If you are developing Rails 3 app, let say some meeting planner and you can't save records which have time overlap.
-
-=== Using
-
-Add to your gemfile
-  gem 'validates_overlap'
-
-
-In your model
-
-without scope
-  validates :starts_at, :ends_at, :overlap => true
-
-
-with scope
-  validates :starts_at, :ends_at, :overlap => {:scope => "user_id"}
-
-
-exclude edges
-  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.
-
-
-  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