validates_overlap 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28dc14c113fd58e71304d57846deee7548ea3a49
-  data.tar.gz: fe7098e0b7a58816e3cf5b3982b6a440b1812351
+  metadata.gz: e7a51580e30d5481872fae597e3e0cc31969a94b
+  data.tar.gz: 91e351d1b763236f5e87daf4885438818631d881
 SHA512:
-  metadata.gz: 105ddbb581b205d1a3f3fc8a17ec5c4432737b9ab27da7e6fb3b85419b7ad791e0324dac686d1ae7c82ac13e1983c4d301a4d3e50368ba07cdd2dcc3fa9de062
-  data.tar.gz: af03aa8e6905d9b6b2a7eb0230c153ab671d3aec8eec193733445f400afb1afee5276ea75ff9ddb53e6b90e101d169660921c0b5f28cab84c3e2f06b481d8274
+  metadata.gz: 61febadf4ae4e2ccf328f6e91d42f1ced3eab42431f2f44019c6bf85a6197e377add81dee66f673afaeb0219ae081a0d624c78685086f734354136a186f61fce
+  data.tar.gz: 5e0090bb470717b5b8441ad2e0ab50a11fc5976447d384aa9a4e37110c7d884f728da6590ef2d621137426b6bbbeb6c58912629197a5eb56e4e489a2e91a06e5

data/.gitignore

@@ -0,0 +1,10 @@
+.bundle/
+.idea/
+log/*.log
+pkg/
+spec/dummy/db/*.sqlite3
+spec/dummy/log/*.log
+spec/dummy/tmp/
+database.yml
+Gemfile*.lock
+.DS_Store

data/Rakefile

@@ -1,38 +1,25 @@
 require 'rubygems'
 require 'bundler'
+require 'rake'
+require 'rspec/core'
+require 'rspec/core/rake_task'
+require 'rdoc/task'
+
 begin
+  Bundler::GemHelper.install_tasks
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "validates_overlap"
-  gem.homepage = "http://github.com/robinbortlik/validates_overlap"
-  gem.license = "MIT"
-  gem.summary = "This gem helps validate records with time overlap."
-  gem.description = "It can be useful when you you are developing some app where you will work with meetings, events etc."
-  gem.email = "robinbortlik@gmail.com"
-  gem.authors = ["Robin Bortlik"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
+
 task :default => :spec
 
-require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "validates_overlap #{version}"
   rdoc.rdoc_files.include('README*')

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/validates_overlap/overlap_validator.rb

@@ -1,4 +1,5 @@
 require 'active_support/i18n'
+
 I18n.load_path << File.dirname(__FILE__) + '/locale/en.yml'
 
 class OverlapValidator < ActiveModel::EachValidator
@@ -85,15 +86,19 @@ class OverlapValidator < ActiveModel::EachValidator
     raise "Validation of time range must be defined by 2 attributes" unless attributes.size == 2
   end
 
+  def primary_key(record)
+    record.class.columns.find(&:primary).name
+  end
 
   # Generate sql condition for time range cross
   def generate_overlap_sql_conditions(record)
     starts_at_attr, ends_at_attr = attributes_to_sql(record)
     main_condition = condition_string(starts_at_attr, ends_at_attr)
+    primary_key_name = primary_key(record)
     if record.new_record?
       self.sql_conditions = main_condition
     else
-      self.sql_conditions = "#{main_condition} AND #{record_table_name(record)}.id != #{record.id}"
+      self.sql_conditions = "#{main_condition} AND #{record_table_name(record)}.#{primary_key_name} != #{record.send(primary_key_name)}"
     end
   end
 

data/validates_overlap.gemspec

@@ -1,140 +1,27 @@
-# Generated by jeweler
-# 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.3.0"
+  s.version = "0.4.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Bortlik"]
-  s.date = "2014-04-19"
+  s.date = "2013-10-18"
   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.md"
   ]
-  s.files = [
-    ".travis.yml",
-    "Gemfile",
-    "Gemfile.rails30",
-    "Gemfile.rails32",
-    "Gemfile.rails40",
-    "Gemfile.rails41",
-    "MIT-LICENSE",
-    "README.md",
-    "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",
-    "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",
-    "spec/dummy/app/models/start_end_overlap_meeting.rb",
-    "spec/dummy/app/models/start_overlap_meeting.rb",
-    "spec/dummy/app/models/time_slot.rb",
-    "spec/dummy/app/models/user.rb",
-    "spec/dummy/app/models/user_meeting.rb",
-    "spec/dummy/app/views/layouts/application.html.erb",
-    "spec/dummy/config.ru",
-    "spec/dummy/config/application.rb",
-    "spec/dummy/config/boot.rb",
-    "spec/dummy/config/database.yml",
-    "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/locales/en.yml",
-    "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/migrate/20120509130956_create_end_overlap_meetings.rb",
-    "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",
-    "spec/dummy/public/500.html",
-    "spec/dummy/public/favicon.ico",
-    "spec/dummy/public/javascripts/application.js",
-    "spec/dummy/public/javascripts/controls.js",
-    "spec/dummy/public/javascripts/dragdrop.js",
-    "spec/dummy/public/javascripts/effects.js",
-    "spec/dummy/public/javascripts/prototype.js",
-    "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",
-    "spec/dummy/spec/factories/start_end_overlap_meeting.rb",
-    "spec/dummy/spec/factories/start_overlap_meeting.rb",
-    "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",
-    "spec/dummy/spec/models/start_end_overlap_meeting_spec.rb",
-    "spec/dummy/spec/models/start_overlap_meeting_spec.rb",
-    "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.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- spec/dummy/spec/*`.split("\n")
+
   s.homepage = "http://github.com/robinbortlik/validates_overlap"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  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<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<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"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8"])
-      s.add_dependency(%q<pry>, [">= 0"])
-    end
-  else
-    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"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8"])
-    s.add_dependency(%q<pry>, [">= 0"])
-  end
+  s.add_dependency "rails", ">= 3.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 "pry"
 end
-

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Robin Bortlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: validates_overlap
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +102,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- .gitignore
 - .travis.yml
 - Gemfile
 - Gemfile.rails30
@@ -219,8 +206,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: This gem helps validate records with time overlap.
-test_files: []
+test_files:
+- 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
+- spec/dummy/spec/factories/start_end_overlap_meeting.rb
+- spec/dummy/spec/factories/start_overlap_meeting.rb
+- 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
+- spec/dummy/spec/models/start_end_overlap_meeting_spec.rb
+- spec/dummy/spec/models/start_overlap_meeting_spec.rb
+- 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