paranoia_uniqueness_validator 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a61f98888b05a46e6a994dd16e1bdf7136a22c91
-  data.tar.gz: 19699acd3367c7551a071a1accae0105c8f0a9cd
+  metadata.gz: d6c43ab07ae51e7b81827a2eb89534c4fd26ef36
+  data.tar.gz: a5a83e727c9ea0a0a6b45a06164fc52c2b44465d
 SHA512:
-  metadata.gz: 45cddd3449be7e2d54767cd37e4251e0e9bb79aa9d019f32c093716aaa869acee8fefb21ebbc6e46b1d16460d4f4a85c367cac17978c8858024b9ee6122955de
-  data.tar.gz: 2fd6d1fd44c9bb25fb7a34d87e08c9d638599ec9a42c6028322a0f769e645b2d47cd52528ce017ffd69fe172b62c3fb5b4bbf9d782b2c91f0e1ff8d6ab5fd597
+  metadata.gz: 5e57390dcc1bdee3a5d356fdf0d94bebc9c08b5501fe74de02c0bbee526139dad60a46ddf7d5cc32eb626d645bd6b32a199b3ec30e7abb4415762ff3ffd4ae62
+  data.tar.gz: 0bbf526c132a4c7efb252ed0704d946a0de03809595e4868cdbcdb7134c6940e41bc396a7c9c80d1beb1fb1e7e902115d5d60ba5223954024bfbab18d309d8e3

data/.gitignore

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

data/.travis.yml

@@ -1,19 +1,16 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
+  - 2.2.5
+  - 2.3.0
   - ruby-head
-  - jruby-19mode
   - jruby-head
-  - rbx
 env:
-  - "RAILS_VERSION=4.0.0"
-  - "RAILS_VERSION=4.1.0"
-  - "RAILS_VERSION=4.2.0"
+  - "RAILS_VERSION=master"
+  - "RAILS_VERSION=5.0.0"
+  - "RAILS_VERSION=5.0.0.1"
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - env: RAILS_VERSION=master
 sudo: false

data/Dockerfile

@@ -0,0 +1,13 @@
+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

data/Gemfile

@@ -6,10 +6,11 @@ gemspec
 rails_version = ENV['RAILS_VERSION'] || 'default'
 
 rails = case rails_version
+
 when 'master'
   { github: 'rails/rails' }
 when 'default'
-  '>= 4.2.0'
+  '>= 5.0.0'
 else
   "~> #{rails_version}"
 end
@@ -30,16 +31,9 @@ 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 'listen'
   gem 'rake'
 end

data/README.md

@@ -15,6 +15,10 @@ Add this line to your application's Gemfile:
 
     # Rails 4
     gem 'paranoia_uniqueness_validator', '1.1.0'
+
+    # Rails 5
+    gem 'paranoia_uniqueness_validator', '2.0.0'
+    
 And then execute:
 
     $ bundle

data/docker-compose.yml

@@ -0,0 +1,11 @@
+version: '2'
+services:
+  lib:
+    build: .
+    command: rspec
+    volumes:
+      - .:/usr/src/app
+      - lib.volume:/usr/local/bundle
+volumes:
+  lib.volume:
+    driver: local

data/lib/paranoia_uniqueness_validator/validations/uniqueness_without_deleted.rb

@@ -4,24 +4,27 @@ module ParanoiaUniquenessValidator
       def validate_each(record, attribute, value)
         finder_class = find_finder_class_for(record)
         table = finder_class.arel_table
-
-        if ActiveRecord.version.to_s >= '4.2.0'
-          value = map_enum_attribute(finder_class, attribute, value)
-        else
-          value = deserialize_attribute(record, attribute, value)
-        end
+        value = map_enum_attribute(finder_class, attribute, value)
 
         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))
-
+        if record.persisted?
+          if finder_class.primary_key
+            relation = relation.where.not(finder_class.primary_key => record.id_was || 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 = finder_class.unscoped.where(relation)
         relation = relation.merge(options[:conditions]) if options[:conditions]
 
+        if defined?('Paranoia') && Paranoia.respond_to?(:default_sentinel_value)
+          sentinel_value = Paranoia.default_sentinel_value
+        else
+          sentinel_value = nil
+        end
+
+        relation = relation.where(deleted_at: sentinel_value)
+
         if relation.exists?
           error_options = options.except(:case_sensitive, :scope, :conditions)
           error_options[:value] = value

data/lib/paranoia_uniqueness_validator/version.rb

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

data/paranoia_uniqueness_validator.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   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.0.0", "< 5.1"
 
   gem.add_development_dependency "paranoia"
   gem.add_development_dependency "database_cleaner"

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>

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

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/spec/dummy/app/views/layouts/mailer.text.erb

@@ -0,0 +1 @@
+<%= yield %>

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/bin/setup

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/spec/dummy/bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end