active_record_uniqueness_via_db 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7556335bb1fcc56da55ed0031d128002c12369e
-  data.tar.gz: d647666cf6c1017f75893b7a86977c1e3adc8454
+  metadata.gz: 7980eb4f317095b5096afb5a4bdf848000db18c4
+  data.tar.gz: 1fae04a20b3e9b4dfd5077089820a8260384d912
 SHA512:
-  metadata.gz: efc263c832180afef0864b5ca3185d13918f4ff41d9d32f68859e0bb6261eafd117d667c6d320476aaaf413ae712de89816dae0bc48547d1ec9cb86a6c7884bf
-  data.tar.gz: 2418afe4919adcbf6f6a36f0a49c031e1513413f14f4de0f85a6356627e3a4a130a12698eb1fe4f8d69e0542072f23d6905d12858d54be61e356c4ae74eb1590
+  metadata.gz: 5d92f5036357aa76ec2d2f1f05dd7d240a4ae6e27fbf2c6986ea13c4cddee212311570ea6110150a56718e319e7280afdd14e06826c4ef80638a1913314a25a4
+  data.tar.gz: 6f4a3fef3aab9565844761f4ae81c74b7d004504a4fde8bafd94a8389f8380cacf3bfd8b6c30f02e9838b1cff2ed66047748b49130c6e9f856c2e8829a981e5b

data/.travis.yml

@@ -2,3 +2,9 @@ language: ruby
 rvm:
   - 2.2.0
 before_install: gem install bundler -v 1.10.6
+before_script:
+  - gem install mysql2
+  - mysql -e 'create database myapp_test;'
+  - mysql myapp_test -e 'create table foos (bar varchar(36) NOT NULL, PRIMARY KEY(bar), UNIQUE KEY `index_foos_on_bar` (`bar`));'
+script:
+  - rspec spec

data/README.md

@@ -36,13 +36,16 @@ Or install it yourself as:
 
     $ gem install active_record_uniqueness_via_db
 
-run this command to set up the initializer:
-Note: if upgrading from v0.1.0, re-run the generator to add the
-uniqueness validator initializer
-
-```ruby
-  rails generate active_record_uniqueness_via_db:install
-```
+Notes:
+- if you are upgrading from VERSION <= v0.1.1, remove the
+  initializers
+- if you use the `composite_primary_keys` gem, ensure that
+  `gem 'active_record_uniqueness_via_db'` is
+  included **after** the reference for `composite_primary_keys`.  (This is
+  necessary because `composite_primary_keys` rather than extending the
+  uniqueness validation overwrites it, in contrast, this gem just extends
+  the functionality so they play nice together as long as this gem comes
+  after that one).
 
 ## Usage
 
@@ -60,7 +63,7 @@ Note: to add databases, add a file under `lib/adapters/db_adapter_name.rb`
 that implements the `error_matches_att` method
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/active_record_uniqueness_via_db. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/jamesmacwilliam/active_record_uniqueness_via_db. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/{generators/templates/active_record_uniqueness_via_db.rb → active_record/extend_base.rb}

@@ -1,6 +1,5 @@
 module ActiveRecord
-  module Persistence
-    extend ActiveSupport::Concern
+  class Base
 
     cattr_accessor ActiveRecordUniquenessViaDb::ATTRS_IVAR
 

data/lib/{generators/templates/active_record_uniqueness_via_db_validator.rb → active_record/validations/uniqueness_validator.rb}

@@ -1,6 +1,6 @@
 module ActiveRecord
   module Validations
-    class UniquenessValidator < ActiveModel::EachValidator
+    class UniquenessValidator
 
       alias :old_validate_each :validate_each
       alias :old_initialize    :initialize

data/lib/active_record_uniqueness_via_db.rb

@@ -1,10 +1,13 @@
-require 'active_record'
+module ActiveRecordUniquenessViaDb
+  ATTRS_IVAR = :attrs_to_rescue_uniqueness_db
+end
+
 require 'active_record_uniqueness_via_db/version'
 require 'active_record_uniqueness_via_db/builder'
 require 'active_record_uniqueness_via_db/validator'
 require 'active_record_uniqueness_via_db/adapters'
 require 'active_record_uniqueness_via_db/adapter'
 
-module ActiveRecordUniquenessViaDb
-  ATTRS_IVAR = :attrs_to_rescue_uniqueness_db
-end
+require 'active_record'
+require 'active_record/validations/uniqueness_validator'
+require 'active_record/extend_base'

data/lib/active_record_uniqueness_via_db/adapter.rb

@@ -1,4 +1,5 @@
 require 'active_record_uniqueness_via_db/adapters/mysql2'
+require 'active_record_uniqueness_via_db/adapters/postgresql'
 require 'active_support/inflector'
 
 class ActiveRecordUniquenessViaDb::Adapter

data/lib/active_record_uniqueness_via_db/adapters/postgresql.rb

@@ -0,0 +1,5 @@
+class ActiveRecordUniquenessViaDb::Adapters::Postgresql
+  def error_matches_attr(attr, err_msg)
+    err_msg =~ /PG[:]*UniqueViolation[^(]*[(]#{attr}[)].*/
+  end
+end

data/lib/active_record_uniqueness_via_db/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordUniquenessViaDb
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_uniqueness_via_db
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - James Mac William
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,16 +110,16 @@ files:
 - active_record_uniqueness_via_db.gemspec
 - bin/console
 - bin/setup
+- lib/active_record/extend_base.rb
+- lib/active_record/validations/uniqueness_validator.rb
 - lib/active_record_uniqueness_via_db.rb
 - lib/active_record_uniqueness_via_db/adapter.rb
 - lib/active_record_uniqueness_via_db/adapters.rb
 - lib/active_record_uniqueness_via_db/adapters/mysql2.rb
+- lib/active_record_uniqueness_via_db/adapters/postgresql.rb
 - lib/active_record_uniqueness_via_db/builder.rb
 - lib/active_record_uniqueness_via_db/validator.rb
 - lib/active_record_uniqueness_via_db/version.rb
-- lib/generators/active_record_uniqueness_via_db/install_generator.rb
-- lib/generators/templates/active_record_uniqueness_via_db.rb
-- lib/generators/templates/active_record_uniqueness_via_db_validator.rb
 homepage: https://github.com/jamesmacwilliam/active_record_uniqueness_via_db
 licenses:
 - MIT

data/lib/generators/active_record_uniqueness_via_db/install_generator.rb

@@ -1,15 +0,0 @@
-require 'rails/generators/base'
-
-module ActiveRecordUniquenessViaDb
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-      desc "Creates an ActiveRecordUniqunessViaDb initializer."
-
-      def copy_initializer
-        copy_file "active_record_uniqueness_via_db.rb", "config/initializers/active_record_uniqueness_via_db.rb"
-        copy_file "active_record_uniqueness_via_db_validator.rb", "config/initializers/active_record_uniqueness_via_db_validator.rb"
-      end
-    end
-  end
-end