validates_overlap 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzBhYmYyMmEzMWNmNTg4YjdhMzBkZWI5MGU5YWZhMGRkMDRjODUzYw==
-  data.tar.gz: !binary |-
-    MzhiZjk5M2ZmMDNlNGFkYjczNjU3YWZjNzA1ZDgyMzU2NjJjZDg1MQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YjU4MWY3MTdjMzAwZTRkOGRiZmYzOWU1MzAxOTgyMzBhYzMyYjI4Zjc2YzU3
-    MTEwMTEwNGFkNGFhMzNmMjg5MjliYjZmMjkwNzIwMTYxNGE0NGJmOTAyODQw
-    MmZmOTc1ZmQzOGQzZDI3Y2Q3OGJjOGQ2NTU4N2JjOGQ3NWM0ZGY=
-  data.tar.gz: !binary |-
-    N2ExNGI2N2ZkZDUwZTVmMzM1NmIyYjliMWQ1N2FhMzIzZmY2ZTNjODU0NjVl
-    ZTgzN2ZhZWEwM2NlMzM3Y2FjOTYzYjk4ZDIwN2UzN2IyODc4ZGRmYTc5MmU2
-    M2YzODg5MzM5ZGU5YWM3NjllM2U1YzhlNmJjY2RmNDk3Y2FiZjA=
+SHA1:
+  metadata.gz: 28dc14c113fd58e71304d57846deee7548ea3a49
+  data.tar.gz: fe7098e0b7a58816e3cf5b3982b6a440b1812351
+SHA512:
+  metadata.gz: 105ddbb581b205d1a3f3fc8a17ec5c4432737b9ab27da7e6fb3b85419b7ad791e0324dac686d1ae7c82ac13e1983c4d301a4d3e50368ba07cdd2dcc3fa9de062
+  data.tar.gz: af03aa8e6905d9b6b2a7eb0230c153ab671d3aec8eec193733445f400afb1afee5276ea75ff9ddb53e6b90e101d169660921c0b5f28cab84c3e2f06b481d8274

data/.travis.yml

@@ -1,4 +1,10 @@
+language: ruby
 rvm:
   - 1.9.3
-
-
+  - 2.0.0
+  - 2.1.0
+gemfile:
+  - Gemfile.rails30
+  - Gemfile.rails32
+  - Gemfile.rails40
+  - Gemfile.rails41

data/Gemfile

@@ -1,12 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "rails", ">= 3.0.0"
-
-group :test, :development do
-  gem "sqlite3", '~>1.3'
-  gem "rspec-rails", '~>2.12'
-  gem "factory_girl_rails", '~>4.2'
-  gem "bundler", '~>1.2'
-  gem "jeweler", '~>1.8'
-  gem "pry"
-end
+gemspec

data/Gemfile.rails30

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 3.0.0'

data/Gemfile.rails32

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 3.2.0'

data/Gemfile.rails40

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 4.0.0'

data/Gemfile.rails41

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 4.1.0.rc1'

data/README.md

@@ -65,7 +65,22 @@ end
 
 ```ruby
 class ActiveMeeting < ActiveRecord::Base
-  validates :starts_at, :ends_at, :overlap => {:query_options => {:active => true}}
+  validates :starts_at, :ends_at, :overlap => {:query_options => {:active => nil}}
   scope :active, where(:is_active => true)
 end
 ```
+
+## Rails 4.1 update
+
+If you just upgraded your application to rails 4.1 you can discover some issue with custom scopes. In older versions we suggest to use definition like
+
+```ruby
+  {:overlap => {:query_options => {:active => true}}}
+```
+
+but this code is not longer working. Currently please change your code to
+
+```ruby
+  {:overlap => {:query_options => {:active => nil}}}
+```
+Thanks @supertinou for discovering and fix of this bug.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

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

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

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

@@ -1,7 +1,7 @@
 class Position < ActiveRecord::Base
   belongs_to :time_slot
   belongs_to :user
-  validates "time_slots.starts_at", "time_slots.ends_at",
+  validates :"time_slots.starts_at", :"time_slots.ends_at",
     :overlap => {
       :query_options => {:includes => :time_slot},
       :scope => { "positions.user_id" => proc{|position| position.user_id} }

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

@@ -1,6 +1,6 @@
 class TimeSlot < ActiveRecord::Base
   has_many :positions
-  validates "time_slots.starts_at", "time_slots.ends_at",
+  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)} }

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

@@ -9,9 +9,9 @@ describe ActiveMeeting do
 
   context "scoping" do
     it "should apply scope" do
-      ActiveMeeting.should_receive(:active).with(true).and_call_original
+      ActiveMeeting.should_receive(:active).and_call_original
       active_meeting = ActiveMeeting.new
-      active_meeting.valid?
+      active_meeting.should be_valid
     end
   end
 

data/spec/dummy/spec/overlap_validator_spec.rb

@@ -17,7 +17,7 @@ describe OverlapValidator do
       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"]
+      meeting.errors[:optional_key].should eq ["Message content"]
     end
 
   end

data/validates_overlap.gemspec

@@ -2,14 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: validates_overlap 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "validates_overlap"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Bortlik"]
-  s.date = "2013-10-18"
+  s.date = "2014-04-19"
   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 = [
@@ -18,6 +19,10 @@ Gem::Specification.new do |s|
   s.files = [
     ".travis.yml",
     "Gemfile",
+    "Gemfile.rails30",
+    "Gemfile.rails32",
+    "Gemfile.rails40",
+    "Gemfile.rails41",
     "MIT-LICENSE",
     "README.md",
     "Rakefile",
@@ -99,23 +104,23 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/robinbortlik/validates_overlap"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.6"
+  s.rubygems_version = "2.1.11"
   s.summary = "This gem helps validate records with time overlap."
 
   if s.respond_to? :specification_version then
     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"])
-      s.add_development_dependency(%q<sqlite3>, ["~> 1.3"])
+      s.add_runtime_dependency(%q<validates_overlap>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
       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"])
       s.add_development_dependency(%q<pry>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<sqlite3>, ["~> 1.3"])
+      s.add_dependency(%q<validates_overlap>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.12"])
       s.add_dependency(%q<factory_girl_rails>, ["~> 4.2"])
       s.add_dependency(%q<bundler>, ["~> 1.2"])
@@ -123,8 +128,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<sqlite3>, ["~> 1.3"])
+    s.add_dependency(%q<validates_overlap>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.12"])
     s.add_dependency(%q<factory_girl_rails>, ["~> 4.2"])
     s.add_dependency(%q<bundler>, ["~> 1.2"])

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Robin Bortlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: validates_overlap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
   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
@@ -118,6 +118,10 @@ extra_rdoc_files:
 files:
 - .travis.yml
 - Gemfile
+- Gemfile.rails30
+- Gemfile.rails32
+- Gemfile.rails40
+- Gemfile.rails41
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -205,19 +209,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: This gem helps validate records with time overlap.
 test_files: []
-has_rdoc: