paranoia_uniqueness_validator 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6c43ab07ae51e7b81827a2eb89534c4fd26ef36
-  data.tar.gz: a5a83e727c9ea0a0a6b45a06164fc52c2b44465d
+  metadata.gz: ad82f8dc3a747d34926d95905b6194f554db18f6
+  data.tar.gz: b5a9e10595083c04576275f1a6ddb99ed1091ea8
 SHA512:
-  metadata.gz: 5e57390dcc1bdee3a5d356fdf0d94bebc9c08b5501fe74de02c0bbee526139dad60a46ddf7d5cc32eb626d645bd6b32a199b3ec30e7abb4415762ff3ffd4ae62
-  data.tar.gz: 0bbf526c132a4c7efb252ed0704d946a0de03809595e4868cdbcdb7134c6940e41bc396a7c9c80d1beb1fb1e7e902115d5d60ba5223954024bfbab18d309d8e3
+  metadata.gz: 6d0780ebd71e952aaabbd1de3101d6fe86b22b8154c190e038f05e4a1841d27efdb92ecdd7487887d7443641fa62cc2c6734d8e1da7348e678137842b015c15a
+  data.tar.gz: 12e46e861c058e500e3273711287d4c59501a9e5f294be2b325c94287a7fd7a13b50d97a5cb1523a14976aa0f88d592a6f2c5ad70dee9006651b832c6e96c493

data/.travis.yml

@@ -2,12 +2,12 @@ language: ruby
 rvm:
   - 2.2.5
   - 2.3.0
+  - 2.4.0
   - ruby-head
   - jruby-head
 env:
   - "RAILS_VERSION=master"
-  - "RAILS_VERSION=5.0.0"
-  - "RAILS_VERSION=5.0.0.1"
+  - "RAILS_VERSION=5.1.0"
 matrix:
   allow_failures:
     - rvm: ruby-head

data/Gemfile

@@ -10,7 +10,7 @@ rails = case rails_version
 when 'master'
   { github: 'rails/rails' }
 when 'default'
-  '>= 5.0.0'
+  '>= 5.1.0'
 else
   "~> #{rails_version}"
 end

data/README.md

@@ -16,9 +16,12 @@ Add this line to your application's Gemfile:
     # Rails 4
     gem 'paranoia_uniqueness_validator', '1.1.0'
 
-    # Rails 5
+    # Rails 5.0
     gem 'paranoia_uniqueness_validator', '2.0.0'
-    
+
+    # Rails 5.1
+    gem 'paranoia_uniqueness_validator', '3.0.0'
+
 And then execute:
 
     $ bundle

data/docker-compose.yml

@@ -1,8 +1,8 @@
 version: '2'
 services:
   lib:
-    build: .
     command: rspec
+    image: sticksnleaves/ruby-project:2.4
     volumes:
       - .:/usr/src/app
       - lib.volume:/usr/local/bundle

data/lib/paranoia_uniqueness_validator/validations/uniqueness_without_deleted.rb

@@ -3,18 +3,17 @@ module ParanoiaUniquenessValidator
     class UniquenessWithoutDeletedValidator < ActiveRecord::Validations::UniquenessValidator
       def validate_each(record, attribute, value)
         finder_class = find_finder_class_for(record)
-        table = finder_class.arel_table
         value = map_enum_attribute(finder_class, attribute, value)
 
-        relation = build_relation(finder_class, table, attribute, value)
+        relation = build_relation(finder_class, attribute, value)
         if record.persisted?
           if finder_class.primary_key
-            relation = relation.where.not(finder_class.primary_key => record.id_was || record.id)
+            relation = relation.where.not(finder_class.primary_key => record.id_in_database || record.id)
           else
             raise UnknownPrimaryKey.new(finder_class, "Can not validate uniqueness for persisted record without primary key.")
           end
         end
-        relation = scope_relation(record, table, relation)
+        relation = scope_relation(record, relation)
         relation = relation.merge(options[:conditions]) if options[:conditions]
 
         if defined?('Paranoia') && Paranoia.respond_to?(:default_sentinel_value)

data/lib/paranoia_uniqueness_validator/version.rb

@@ -1,3 +1,3 @@
 module ParanoiaUniquenessValidator
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/paranoia_uniqueness_validator.gemspec

@@ -10,16 +10,17 @@ Gem::Specification.new do |gem|
   gem.email         = ["anthony@sticksnleaves.com"]
   gem.description   = %q{Adds the validates_uniqueness_without_deleted validator to ignore deleted fields when validating for uniqueness.}
   gem.summary       = %q{Validate unique fields without letting those pesky deleted records get in the way. Great for use with Paranoia.}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/anthonator/paranoia_uniqueness_validator"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", ">= 5.0.0", "< 5.1"
+  gem.add_dependency "activerecord", ">= 5.1.0", "< 5.2"
 
-  gem.add_development_dependency "paranoia"
-  gem.add_development_dependency "database_cleaner"
-  gem.add_development_dependency "rspec-rails"
+  gem.add_development_dependency "paranoia", "~> 2.3"
+  gem.add_development_dependency "database_cleaner", "~> 1.6"
+  gem.add_development_dependency "rspec-rails", "~> 3.6"
 end

data/spec/dummy/config/initializers/new_framework_defaults.rb

@@ -17,8 +17,5 @@ ActiveSupport.to_time_preserves_timezone = true
 # Require `belongs_to` associations by default. Previous versions had false.
 Rails.application.config.active_record.belongs_to_required_by_default = true
 
-# Do not halt callback chains when a callback returns false. Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = false
-
 # Configure SSL options to enable HSTS with subdomains. Previous versions had false.
 Rails.application.config.ssl_options = { hsts: { subdomains: true } }

data/spec/validations/uniqueness_without_deleted_spec.rb

@@ -32,14 +32,15 @@ describe ParanoiaUniquenessValidator::Validations::UniquenessWithoutDeletedValid
 
     it "should validate uniqueness" do
       DummyNonNilModel.create(:unique_field => "unique")
-      DummyNonNilModel.new(:unique_field => "unique").should_not be_valid
+
+      expect(DummyNonNilModel.new(:unique_field => "unique")).to_not be_valid
     end
 
     it "should should be valid if not unique with a deleted record" do
       dummy_model = DummyNonNilModel.create(:unique_field => "unique")
       dummy_model.destroy
       dummy_model = DummyNonNilModel.new(:unique_field => "unique")
-      dummy_model.should be_valid
+      expect(dummy_model).to be_valid
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoia_uniqueness_validator
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,62 +16,62 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 description: Adds the validates_uniqueness_without_deleted validator to ignore deleted
   fields when validating for uniqueness.
 email:
@@ -82,7 +82,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -164,8 +163,9 @@ files:
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/spec_helper.rb
 - spec/validations/uniqueness_without_deleted_spec.rb
-homepage: ''
-licenses: []
+homepage: https://github.com/anthonator/paranoia_uniqueness_validator
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Validate unique fields without letting those pesky deleted records get in

data/Dockerfile

@@ -1,13 +0,0 @@
-FROM ruby:2.3
-
-MAINTAINER Anthony Smith <anthony@sticksnleaves.com>
-
-ENV APP_HOME /usr/src/app
-
-RUN apt-get update -y \
-    && apt-get upgrade -y
-
-RUN gem install rubygems-update --no-document
-RUN gem install bundler --no-document
-
-WORKDIR $APP_HOME