validates_overlap 0.8.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 887de1441f7986508de96a9fa513847b67ff47fb
-  data.tar.gz: 98ff051afa57c042628eefa246b48d53717babfb
+SHA256:
+  metadata.gz: a4cb1a64ca3a5f173591cc6e6ee54268711a12dc49da4e8e5041aedd94f40e81
+  data.tar.gz: ad351e1f69f9c6f05dc9a38b6d23530672bc986fb19d48e890ba4a94e14ee9ba
 SHA512:
-  metadata.gz: 302740541f1b75fc706bb98e9c26da12c9a2b966842240cca98f0aeeecf1ea801c9849da260453867d373f2d00c06390be87bd955d8253ecb103c088b53b6a33
-  data.tar.gz: 225d5db1e766e50af82cb0ebddc11f79b965ccc12fe8c3ca2d7a3ccd05603c289a4e01d2696245e28696cb7234f5ed3ed809833f0108ed8a2d4fdb431c5e24f8
+  metadata.gz: 0da45c30fd0a89545921403ed0956891c3828a42494130369bc9ffba80a36070beeead19caac80c9ef0ce21773cd355f73dbab9fc8750f2ab19df0d28acb5d0a
+  data.tar.gz: 4c3d245beba5c257f8682d2ff23dcc491caede32a68237a12838965da94101e520bd975ab761ef86d66cf44e9ac8065381612f756b2d3a93d76db3d2f87d279d

data/.travis.yml

@@ -1,10 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.5.0
 gemfile:
-  - Gemfile.rails30
-  - Gemfile.rails32
-  - Gemfile.rails40
-  - Gemfile.rails41
-  - Gemfile.rails42
-  - Gemfile.rails50
+  - Gemfile.rails60
+script: bundle exec rspec

data/{Gemfile.rails50 → Gemfile.rails60}

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 5.0'
+gem 'rails', '~> 6.0'

data/README.md

@@ -4,7 +4,7 @@
 
 This project rocks and uses MIT-LICENSE.
 
-#### This gem is compatible with Rails 3, 4, 5.
+#### This gem is compatible with Rails 6. If you are looking for version compatible with Rails 3,4,5 please use version 0.8.6 .
 
 #### When this gem should be helpful for you?
 Ideal solution for booking applications where you want to make sure, that one place can be booked only once in specific time period.
@@ -62,7 +62,7 @@ class Position < ActiveRecord::Base
   belongs_to :user
   validates "time_slots.starts_at", "time_slots.ends_at",
     :overlap => {
-      :query_options => {:includes => :time_slot},
+      :query_options => {:joins => :time_slot},
       :scope => { "positions.user_id" => proc{|position| position.user_id} }
     }
 end
@@ -90,18 +90,3 @@ class ActiveMeeting < ActiveRecord::Base
 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.8.6
+1.0.0

data/lib/validates_overlap/locale/ru.yml

@@ -0,0 +1,4 @@
+ru:
+  errors:
+    messages:
+      overlap: пересекается с другой записью

data/lib/validates_overlap/overlap_validator.rb

@@ -40,7 +40,8 @@ class OverlapValidator < ActiveModel::EachValidator
   protected
 
   def initialize_query(record, options = {})
-    self.scoped_model = options[:scoped_model].present? ? options[:scoped_model].constantize : record.class
+    scoped_model = options[:scoped_model].present? ? options[:scoped_model].constantize : record.class
+    self.scoped_model = scoped_model.default_scoped
     generate_overlap_sql_values(record)
     generate_overlap_sql_conditions(record)
     add_attributes(record, options[:scope]) if options && options[:scope].present?

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

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

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

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

data/spec/dummy/db/migrate/20110406082020_create_meetings.rb

@@ -1,4 +1,4 @@
-class CreateMeetings < ActiveRecord::Migration
+class CreateMeetings < ActiveRecord::Migration[6.0]
   def self.up
     create_table :meetings do |t|
       t.date :starts_at

data/spec/dummy/db/migrate/20110406082053_create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[6.0]
   def self.up
     create_table :users do |t|
       t.string :name

data/spec/dummy/db/migrate/20110407060725_create_user_meetings.rb

@@ -1,4 +1,4 @@
-class CreateUserMeetings < ActiveRecord::Migration
+class CreateUserMeetings < ActiveRecord::Migration[6.0]
   def self.up
     create_table :user_meetings do |t|
       t.integer :user_id

data/spec/dummy/db/migrate/20120509130956_create_end_overlap_meetings.rb

@@ -1,4 +1,4 @@
-class CreateEndOverlapMeetings < ActiveRecord::Migration
+class CreateEndOverlapMeetings < ActiveRecord::Migration[6.0]
   def self.up
     create_table :end_overlap_meetings do |t|
       t.date :starts_at

data/spec/dummy/db/migrate/20120509131012_create_start_overlap_meetings.rb

@@ -1,4 +1,4 @@
-class CreateStartOverlapMeetings < ActiveRecord::Migration
+class CreateStartOverlapMeetings < ActiveRecord::Migration[6.0]
   def self.up
     create_table :start_overlap_meetings do |t|
       t.date :starts_at

data/spec/dummy/db/migrate/20120509131032_create_start_end_overlap_meetings.rb

@@ -1,4 +1,4 @@
-class CreateStartEndOverlapMeetings < ActiveRecord::Migration
+class CreateStartEndOverlapMeetings < ActiveRecord::Migration[6.0]
   def self.up
     create_table :start_end_overlap_meetings do |t|
       t.date :starts_at

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

@@ -1,4 +1,4 @@
-class CreateTimeSlot < ActiveRecord::Migration
+class CreateTimeSlot < ActiveRecord::Migration[6.0]
   def self.up
     create_table :time_slots do |t|
       t.date :starts_at

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

@@ -1,4 +1,4 @@
-class CreateActiveMeetings < ActiveRecord::Migration
+class CreateActiveMeetings < ActiveRecord::Migration[6.0]
   def self.up
     create_table :active_meetings do |t|
       t.date :starts_at

data/spec/dummy/db/migrate/20150707155107_create_secure_meetings.rb

@@ -1,4 +1,4 @@
-class CreateSecureMeetings < ActiveRecord::Migration
+class CreateSecureMeetings < ActiveRecord::Migration[6.0]
   def self.up
     create_table :secure_meetings, id: false do |t|
       t.primary_key :id

data/spec/dummy/db/migrate/20151203153132_create_shifts.rb

@@ -1,4 +1,4 @@
-class CreateShifts < ActiveRecord::Migration
+class CreateShifts < ActiveRecord::Migration[6.0]
   def self.up
     create_table :shifts do |t|
       t.date :starts_at

data/spec/dummy/db/migrate/20170102162952_add_documents_with_enum.rb

@@ -1,4 +1,4 @@
-class AddDocumentsWithEnum < ActiveRecord::Migration
+class AddDocumentsWithEnum < ActiveRecord::Migration[6.0]
   def self.up
     create_table :documents_with_enum do |t|
       t.date :valid_from

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ ActionMailer::Base.default_url_options[:host] = 'test.com'
 Rails.backtrace_cleaner.remove_silencers!
 
 # Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path('../dummy/db/migrate/', __FILE__)
+ActiveRecord::MigrationContext.new(File.expand_path('../dummy/db/migrate/', __FILE__), ActiveRecord::SchemaMigration).migrate
 
 # Load support files
 FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), '/dummy/spec/factories')
@@ -43,6 +43,8 @@ RSpec.configure do |config|
   end
 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],

data/validates_overlap.gemspec

@@ -18,14 +18,13 @@ Gem::Specification.new do |s|
   s.licenses = ['MIT']
   s.require_paths = ['lib']
   s.summary = 'This gem helps validate records with time overlap.'
-  s.add_dependency 'rails', '>= 3.0.0'
+  s.add_dependency 'rails', '>= 6.0.0'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec-rails', '~>2.12'
-  s.add_development_dependency 'factory_girl_rails', '~>4.2'
-  s.add_development_dependency 'bundler', '~>1.2'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'factory_girl_rails'
+  s.add_development_dependency 'bundler'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rb-readline'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'test-unit'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Robin Bortlik
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -42,46 +42,32 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-readline
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,12 +149,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.rails30
-- Gemfile.rails32
-- Gemfile.rails40
-- Gemfile.rails41
-- Gemfile.rails42
-- Gemfile.rails50
+- Gemfile.rails60
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -177,6 +158,7 @@ files:
 - lib/validates_overlap/locale/en.yml
 - lib/validates_overlap/locale/es.yml
 - lib/validates_overlap/locale/pt-BR.yml
+- lib/validates_overlap/locale/ru.yml
 - lib/validates_overlap/overlap_validator.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
@@ -280,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: This gem helps validate records with time overlap.

data/Gemfile.rails30

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

data/Gemfile.rails32

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

data/Gemfile.rails40

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

data/Gemfile.rails41

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

data/Gemfile.rails42

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