validates_overlap 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f52e21cae0ed67d7035a9523672ef94e66549e5
-  data.tar.gz: 32e4fc3767599a660bf04ecb77e0e7b05da8adb5
+  metadata.gz: c44e9ddad60fc792566aa1102f2a3e85c28f3ba0
+  data.tar.gz: fd2bcb9278232214532fd6f0c794c148b53caf94
 SHA512:
-  metadata.gz: 0dd4746359bcb5c47d60184c6e80c13a41add3338650f670d2b63faeb5157cd9f62c8dcca5cfb512317aa3ddf667d63b7bcf7746f8ab225b63874ae94f5f6f50
-  data.tar.gz: 69aa3757a23e6615e0adea8129c034b1c83e6cb2e616074ee73125f140e4bba33c358d3869487edf85127cce38c1b27fe0101a8e1274528fd3d609ce3de4d730
+  metadata.gz: 052f57ccaf9569cb66aa4c93ccfc870ff4978683cbd4208ddb924bac1919361a7db430ed1b2aca8cad10456e32edba1474b8d99054c14b2c0fa776c7cced43fc
+  data.tar.gz: 1789ddb16c06fa4d5c7faf96a6c0115986817f6c553f130c323486b6718dd90579fb17fbbaff0b784fea0a3589f01868fb738ea34e822c0749557bcf1aaae696

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/validates_overlap/locale/pt-BR.yml

@@ -0,0 +1,4 @@
+pt-BR:
+  errors:
+    messages:
+      overlap: coincide com outro registro

data/lib/validates_overlap/overlap_validator.rb

@@ -90,19 +90,24 @@ class OverlapValidator < ActiveModel::EachValidator
     record.class.primary_key
   end
 
+  def primary_key_value(primary_key_name, record)
+    record.send(primary_key_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)
+    key = primary_key_value(primary_key_name, record)
     if record.new_record?
       self.sql_conditions = main_condition
     else
-      self.sql_conditions = "#{main_condition} AND #{record_table_name(record)}.#{primary_key_name} != #{record.send(primary_key_name)}"
+      self.sql_conditions = "#{main_condition} AND #{record_table_name(record)}.#{primary_key(record)} !="
+      self.sql_conditions +=   key.is_a?(String) ? "'#{key}'" : key.to_s
     end
   end
 
-
   # Return hash of values for overlap sql condition
   def generate_overlap_sql_values(record)
     starts_at_value, ends_at_value = resolve_values_from_attributes(record)
@@ -160,7 +165,7 @@ class OverlapValidator < ActiveModel::EachValidator
     if value
       value.is_a?(Proc) ? value.call(record) : value
     else
-      record.send(:"#{attr_name}")
+      record.read_attribute(attr_name)
     end
   end
 

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

@@ -0,0 +1,3 @@
+class SecureMeeting < ActiveRecord::Base
+  validates :starts_at, :ends_at, :overlap => true
+end

data/spec/dummy/config/environments/development.rb

@@ -11,7 +11,7 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
+  #config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

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

@@ -0,0 +1,14 @@
+class CreateSecureMeetings < ActiveRecord::Migration
+  def self.up
+    create_table :secure_meetings, id: false do |t|
+      t.primary_key :id
+      t.date :starts_at
+      t.date :ends_at
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :secure_meetings
+  end
+end

data/spec/dummy/db/schema.rb

@@ -9,72 +9,79 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130826155107) do
+ActiveRecord::Schema.define(version: 20150707155107) do
 
-  create_table "active_meetings", :force => true do |t|
+  create_table "active_meetings", force: :cascade 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
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "end_overlap_meetings", :force => true do |t|
+  create_table "end_overlap_meetings", force: :cascade do |t|
     t.date     "starts_at"
     t.date     "ends_at"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "meetings", :force => true do |t|
+  create_table "meetings", force: :cascade do |t|
     t.date     "starts_at"
     t.date     "ends_at"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "positions", :force => true do |t|
+  create_table "positions", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "time_slot_id"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+    t.datetime "created_at",   null: false
+    t.datetime "updated_at",   null: false
   end
 
-  create_table "start_end_overlap_meetings", :force => true do |t|
+  create_table "secure_meetings", force: :cascade do |t|
     t.date     "starts_at"
     t.date     "ends_at"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "start_overlap_meetings", :force => true do |t|
+  create_table "start_end_overlap_meetings", force: :cascade do |t|
     t.date     "starts_at"
     t.date     "ends_at"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "time_slots", :force => true do |t|
+  create_table "start_overlap_meetings", force: :cascade do |t|
     t.date     "starts_at"
     t.date     "ends_at"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "user_meetings", :force => true do |t|
+  create_table "time_slots", force: :cascade do |t|
+    t.date     "starts_at"
+    t.date     "ends_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "user_meetings", force: :cascade do |t|
     t.integer  "user_id"
     t.date     "starts_at"
     t.date     "ends_at"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "users", :force => true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
 end

data/spec/dummy/spec/factories/secure_meeting.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :secure_meeting do |u|
+    u.starts_at '2010-11-05'.to_date
+    u.ends_at '2010-11-08'.to_date
+  end
+end

data/spec/dummy/spec/models/secure_meeting_spec.rb

@@ -0,0 +1,21 @@
+require_relative '../../../spec_helper'
+require_relative '../factories/secure_meeting'
+
+describe SecureMeeting do
+  context "A model with a UUID as a primary key" do
+    before(:all) do
+      if SecureMeeting.count >= 1 then
+        SecureMeeting.delete_all
+      end
+    end
+
+    it "updates the relevant record" do
+      securemeeting = FactoryGirl.create(:secure_meeting)
+      securemeeting.starts_at = '2012-01-05'.to_date
+      securemeeting.ends_at = '2012-02-05'.to_date
+      securemeeting.should be_valid
+      securemeeting.errors[:starts_at].should be_empty
+      securemeeting.errors[:ends_at].should be_empty
+    end
+  end
+end

data/validates_overlap.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "validates_overlap"
-  s.version = "0.5.1"
+  s.version = File.read('VERSION')
 
   s.authors = ["Robin Bortlik"]
   s.date = "2013-10-18"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_overlap
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Robin Bortlik
@@ -14,84 +14,84 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
 - !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:
-    - - ">="
+    - - '>='
       - !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
@@ -102,8 +102,8 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.rails30
 - Gemfile.rails32
@@ -116,6 +116,7 @@ files:
 - VERSION
 - lib/validates_overlap.rb
 - lib/validates_overlap/locale/en.yml
+- lib/validates_overlap/locale/pt-BR.yml
 - lib/validates_overlap/overlap_validator.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
@@ -124,6 +125,7 @@ files:
 - spec/dummy/app/models/end_overlap_meeting.rb
 - spec/dummy/app/models/meeting.rb
 - spec/dummy/app/models/position.rb
+- spec/dummy/app/models/secure_meeting.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
@@ -153,6 +155,7 @@ files:
 - 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/migrate/20150707155107_create_secure_meetings.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -170,6 +173,7 @@ files:
 - spec/dummy/spec/factories/end_overlap_meeting.rb
 - spec/dummy/spec/factories/meeting.rb
 - spec/dummy/spec/factories/position.rb
+- spec/dummy/spec/factories/secure_meeting.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
@@ -179,6 +183,7 @@ files:
 - 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/secure_meeting_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
@@ -197,17 +202,17 @@ 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.4.7
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: This gem helps validate records with time overlap.
@@ -216,6 +221,7 @@ test_files:
 - spec/dummy/spec/factories/end_overlap_meeting.rb
 - spec/dummy/spec/factories/meeting.rb
 - spec/dummy/spec/factories/position.rb
+- spec/dummy/spec/factories/secure_meeting.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
@@ -225,6 +231,7 @@ test_files:
 - 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/secure_meeting_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