paranoia_uniqueness_validator 1.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a61f98888b05a46e6a994dd16e1bdf7136a22c91
-  data.tar.gz: 19699acd3367c7551a071a1accae0105c8f0a9cd
+SHA256:
+  metadata.gz: d29fc508132d418f52aea5d237bcccce95c994e3fb4d16b759542aa77fffec04
+  data.tar.gz: ae973b381406fdf16690ea60c0dd6744ed31091f1a0a3293d15e28ffe2157b8d
 SHA512:
-  metadata.gz: 45cddd3449be7e2d54767cd37e4251e0e9bb79aa9d019f32c093716aaa869acee8fefb21ebbc6e46b1d16460d4f4a85c367cac17978c8858024b9ee6122955de
-  data.tar.gz: 2fd6d1fd44c9bb25fb7a34d87e08c9d638599ec9a42c6028322a0f769e645b2d47cd52528ce017ffd69fe172b62c3fb5b4bbf9d782b2c91f0e1ff8d6ab5fd597
+  metadata.gz: d9ab8068e76c5903abc9dedce9c9d217471da093e4c5fb477c5c29ae17b9e4634519068467070a98b5c351ccd09a1f62d795bafe8545e6b410a52dae2ce127c8
+  data.tar.gz: fd54fb5b3e9cd372ee51ebca5fd096e766ba1b97f8342e22a7eb81000dbff6d84a4c39ae5a845251d5a54585b155526f78a2e1b6ae8f7a61f41a38539ea36b87

data/.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+
+updates:
+  - package-ecosystem: bundler
+
+    directory: "/"
+
+    schedule:
+      interval: daily
+
+    open-pull-requests-limit: 10
+
+    target-branch: develop

data/.github/workflows/ci.yml

@@ -0,0 +1,46 @@
+name: ci
+
+on: push
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        rails: ['6.1', '5.2']
+
+        ruby: ['2.5', '2.6', '2.7']
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-ruby@v1
+
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Install native toolchain
+
+        run: |
+          sudo apt-get update
+
+          sudo apt-get install build-essential libsqlite3-dev
+
+      - name: Run gem install bundler
+
+        run: gem install bundler
+
+      - name: Run bundle install
+
+        env:
+          RAILS_VERSION: ${{ matrix.rails }}
+
+        run: bundle install
+
+      - name: Run bundle exec rspec
+
+        env:
+          RAILS_VERSION: ${{ matrix.rails }}
+          
+        run: bundle exec rspec

data/.gitignore

@@ -8,4 +8,7 @@ spec/dummy/tmp/
 spec/dummy/.sass-cache
 Gemfile.lock
 .rbenv*
-coverage
+coverage
+.ruby-version
+.gems/
+.DS_Store

data/Gemfile

@@ -5,41 +5,23 @@ gemspec
 
 rails_version = ENV['RAILS_VERSION'] || 'default'
 
-rails = case rails_version
-when 'master'
-  { github: 'rails/rails' }
-when 'default'
-  '>= 4.2.0'
-else
-  "~> #{rails_version}"
-end
+rails =
+  case rails_version
+  when 'master'
+    { github: 'rails/rails' }
+  when 'default'
+    '>= 6.1.0'
+  else
+    "~> #{rails_version}"
+  end
 
 gem 'rails', rails
 
-platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "jruby-openssl"
-end
-
-platforms :ruby do
-  gem "sqlite3"
-  gem "test-unit"
-end
-
-platforms :ruby_19, :jruby_19 do
-  gem "mime-types", "< 3.0"
-end
-
-platforms :rbx do
-  #gem 'psych'
-  #gem 'racc'
-  #gem 'rubinius-coverage'
-  #gem 'rubysl'
-  #gem 'rubysl-test-unit'
-end
-
 group :development do
   gem 'bundler'
-  gem 'coveralls', :require => false
+  gem 'coveralls', require: false
+  gem 'listen'
   gem 'rake'
+  gem 'sqlite3'
+  gem 'test-unit'
 end

data/README.md

@@ -1,10 +1,13 @@
 # ParanoiaUniquenessValidator
 
-Adds validator validates_uniqueness_without_deleted.
+Adds `validates_uniqueness_without_deleted`.
 
-This validator will ignore any record that has a non-null value for the deleted_at field. This gem was made specifically for use with the [Paranoia](https://github.com/radar/paranoia) gem but it can be used with any gem that uses the deleted_at field for marking records as deleted.
+This validator will ignore any record that has a non-null value for the
+`deleted_at` field. This gem was made specifically for use with the
+[Paranoia](https://github.com/radar/paranoia) gem but it can be used with any
+gem that uses the `deleted_at` field for marking records as deleted.
 
-[![Gem Version](https://badge.fury.io/rb/paranoia_uniqueness_validator.png)](http://badge.fury.io/rb/paranoia_uniqueness_validator) [![Build Status](https://secure.travis-ci.org/anthonator/paranoia_uniqueness_validator.png)](http://travis-ci.org/anthonator/paranoia_uniqueness_validator) [![Dependency Status](https://gemnasium.com/anthonator/paranoia_uniqueness_validator.png)](https://gemnasium.com/anthonator/paranoia_uniqueness_validator) [![Coverage Status](https://coveralls.io/repos/anthonator/paranoia_uniqueness_validator/badge.png)](https://coveralls.io/r/anthonator/paranoia_uniqueness_validator) [![Code Climate](https://codeclimate.com/github/anthonator/paranoia_uniqueness_validator.png)](https://codeclimate.com/github/anthonator/paranoia_uniqueness_validator)
+[![Gem Version](https://badge.fury.io/rb/paranoia_uniqueness_validator.png)](http://badge.fury.io/rb/paranoia_uniqueness_validator) ![ci](https://github.com/anthonator/paranoia_uniqueness_validator/workflows/ci/badge.svg) [![Coverage Status](https://coveralls.io/repos/anthonator/paranoia_uniqueness_validator/badge.png)](https://coveralls.io/r/anthonator/paranoia_uniqueness_validator) [![Code Climate](https://codeclimate.com/github/anthonator/paranoia_uniqueness_validator.png)](https://codeclimate.com/github/anthonator/paranoia_uniqueness_validator)
 
 ## Installation
 
@@ -15,6 +18,16 @@ Add this line to your application's Gemfile:
 
     # Rails 4
     gem 'paranoia_uniqueness_validator', '1.1.0'
+
+    # Rails 5.0
+    gem 'paranoia_uniqueness_validator', '2.0.0'
+
+    # Rails 5.1
+    gem 'paranoia_uniqueness_validator', '3.1.0'
+
+    # Rails 6
+    gem 'paranoia_uniqueness_validator', '3.3.0'
+
 And then execute:
 
     $ bundle
@@ -25,13 +38,14 @@ Or install it yourself as:
 
 ## Configuration
 
-This validator supports all configuration options used by the base ActiveRecord uniqueness validator. For more information check out the [Rails API documentation](http://api.rubyonrails.org/classes/ActiveRecord/Validations/ClassMethods.html#method-i-validates_uniqueness_of).
+This validator supports all configuration options used by the base ActiveRecord
+uniqueness validator. For more information check out the [Rails API documentation](http://api.rubyonrails.org/classes/ActiveRecord/Validations/ClassMethods.html#method-i-validates_uniqueness_of).
 
 ## Usage
 
 ```ruby
 class SomeModel < ActiveRecord::Base
-    validates :some_field, :uniqueness_without_deleted => true
+  validates :some_field, uniqueness_without_deleted: true
 end
 ```
 
@@ -42,11 +56,3 @@ end
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-## Credits
-
-[![Sticksnleaves](http://sticksnleaves-wordpress.herokuapp.com/wp-content/themes/sticksnleaves/images/snl-logo-116x116.png)](http://www.sticksnleaves.com)
-
-paranoia_uniqueness_validator is maintained and funded by [Sticksnleaves](http://www.sticksnleaves.com)
-
-Thanks to all of our [contributors](https://github.com/anthonator/paranoia_uniqueness_validator/graphs/contributors)

data/lib/paranoia_uniqueness_validator/validations/uniqueness_without_deleted.rb

@@ -3,24 +3,26 @@ 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, attribute, value)
+        if record.persisted?
+          if finder_class.primary_key
+            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, relation)
+        relation = relation.merge(options[:conditions]) if options[:conditions]
 
-        if ActiveRecord.version.to_s >= '4.2.0'
-          value = map_enum_attribute(finder_class, attribute, value)
+        if defined?('Paranoia') && Paranoia.respond_to?(:default_sentinel_value)
+          sentinel_value = Paranoia.default_sentinel_value
         else
-          value = deserialize_attribute(record, attribute, value)
+          sentinel_value = nil
         end
 
-        relation = build_relation(finder_class, table, attribute, value)
-        relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.id)) if record.persisted?
-
-        default_sentinel_value = Object.const_defined?('Paranoia') ? Paranoia.default_sentinel_value : nil
-
-        relation = relation.and(table[:deleted_at].eq(default_sentinel_value))
-
-        relation = scope_relation(record, table, relation)
-        relation = finder_class.unscoped.where(relation)
-        relation = relation.merge(options[:conditions]) if options[:conditions]
+        relation = relation.where(deleted_at: sentinel_value)
 
         if relation.exists?
           error_options = options.except(:case_sensitive, :scope, :conditions)

data/lib/paranoia_uniqueness_validator/version.rb

@@ -1,3 +1,3 @@
 module ParanoiaUniquenessValidator
-  VERSION = "1.2.0"
+  VERSION = "3.3.0"
 end

data/paranoia_uniqueness_validator.gemspec

@@ -6,20 +6,21 @@ require 'paranoia_uniqueness_validator/version'
 Gem::Specification.new do |gem|
   gem.name          = "paranoia_uniqueness_validator"
   gem.version       = ParanoiaUniquenessValidator::VERSION
+  gem.licenses      = ['MIT']
   gem.authors       = ["Anthony Smith"]
   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.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", ">= 4.0.0"
+  gem.add_dependency "activerecord", ">= 5.1.0", "< 6.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", "~> 4.0"
 end

data/spec/dummy/.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
 #
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:
@@ -8,8 +8,14 @@
 /.bundle
 
 # Ignore the default SQLite database.
+/db/*.sqlite3
 /db/*.sqlite3-journal
 
 # Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore Byebug command history file.
+.byebug_history

data/spec/dummy/.rspec

@@ -1 +1,2 @@
 --color
+--require spec_helper

data/spec/dummy/{README.rdoc → README.md}

@@ -1,4 +1,4 @@
-== README
+# README
 
 This README would normally document whatever steps are necessary to get the
 application up and running.
@@ -22,7 +22,3 @@ Things you may want to cover:
 * Deployment instructions
 
 * ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.

data/spec/dummy/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
-Dummy::Application.load_tasks
+Rails.application.load_tasks

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/app/assets/javascripts/application.js

@@ -2,13 +2,13 @@
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
 //
 //= require jquery
 //= require jquery_ujs

data/spec/dummy/app/assets/javascripts/cable.js

@@ -0,0 +1,13 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the rails generate channel command.
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function() {
+  this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);

data/spec/dummy/app/assets/stylesheets/application.css

@@ -3,11 +3,13 @@
  * listed below.
  *
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
  *
- *= require_self
  *= require_tree .
+ *= require_self
  */

data/spec/dummy/app/channels/application_cable/channel.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end

data/spec/dummy/app/channels/application_cable/connection.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,5 +1,3 @@
 class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 end

data/spec/dummy/app/jobs/application_job.rb

@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end

data/spec/dummy/app/mailers/application_mailer.rb

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end

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

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

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

@@ -1,3 +1,3 @@
-class DummyModel < ActiveRecord::Base
+class DummyModel < ApplicationRecord
   validates :unique_field, :uniqueness_without_deleted => true
 end

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

@@ -1,3 +1,3 @@
-class DummyNonNilModel < ActiveRecord::Base
+class DummyNonNilModel < ApplicationRecord
   validates :unique_field, :uniqueness_without_deleted => true
 end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
+  <head>
+    <title>Dummy</title>
+    <%= csrf_meta_tags %>
 
-<%= yield %>
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+  </head>
 
-</body>
+  <body>
+    <%= yield %>
+  </body>
 </html>