validates_duplicity_of 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e3bf057fa7474081194521f3e227118b783c880
-  data.tar.gz: 5609fa7c0fb610544b5dc9dd687d2aca6c7c11c5
+  metadata.gz: b8059f9febbe7dfc82d2ca9ac828303efaf1ed74
+  data.tar.gz: 2dd82ed7bd23ebc3c28c9bcbb22d15bd07099c8b
 SHA512:
-  metadata.gz: fb8fe3834a5bf9a188691ee85632ca1717ffc12f236142ec6c8ade705b05d59e0d54d118a21e86511e6fffd6fa9784e19bf59716b6fb1dd89e5b267b9e900012
-  data.tar.gz: 4a05b2b33694e80c136ae9a2ffcc8b927785c9a5e8ea95c9df9ab91fea9ad0e763bdf24b60d88374c93f116b91aef4a426a8dbcec85824936de6195d1c48fdc0
+  metadata.gz: 25591738d1ddb68caf0fa024d42a55a41c7b77e1256bf8f3931ad6372eefdb5e6dbb57bc62ca3d064a4773160d354ac6b81022ca57259dceb4ebb6edfc5a84e8
+  data.tar.gz: a2b55ebd390817312ee264abf094f1f10190b8931172c2ce5cb21e0bc81fbce1a4172a03977ad9ca2323f46d1738be98f09e841e60980d91c6f40dd73715ca7b

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.2.4
+  - 2.3.0

data/README.md

@@ -1,20 +1,22 @@
 # validates_duplicity_of
 
-[![Build Status](https://travis-ci.org/madwork/validates_duplicity_of.png)](https://travis-ci.org/madwork/validates_duplicity_of)
-[![Gem Version](https://badge.fury.io/rb/validates_duplicity_of.png)](http://badge.fury.io/rb/validates_duplicity_of)
+[![Build Status](https://img.shields.io/travis/madwork/validates_duplicity_of.svg)](https://travis-ci.org/madwork/validates_duplicity_of)
+[![Gem](https://img.shields.io/gem/v/validates_duplicity_of.svg)](https://rubygems.org/gems/validates_duplicity_of)
 
 ActiveRecord (>= 3.2) callback which handle the name duplication in your model with ease.
 Ruby 2 only!
 
 **Example:**
 
-Untitled File > Untitled File (1) > Untitled File (2) …
+Untitled File > Untitled File (1) > Untitled File (2) ...
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'validates_duplicity_of'
+```ruby
+gem 'validates_duplicity_of'
+```
 
 And then execute:
 
@@ -24,37 +26,47 @@ Or install it yourself as:
 
     $ gem install validates_duplicity_of
 
-Or with security:
+## Usage
 
-	$ wget http://git.io/hHL6zQ -O madwork-public_cert.pem
-	$ gem cert --add madwork-public_cert.pem
-	$ gem install validates_duplicity_of --trust-policy=HighSecurity
+Use the method `validates_duplicity_of` with an attribute in your Rails model. The scope is optional.
 
-## Usage
+```ruby
+class Post < ActiveRecord::Base
+  validates_duplicity_of :name
+end
+
+post = Post.create name: "Foo"
+post.name
+=> "Foo"
+
+post = Post.create name: "Foo"
+post.name
+=> "Foo (1)"
 
-Use method `validates_duplicity_of` with attribute in your Rails model. Scope is optional. Default callback is `before_save`.
+class Note < ActiveRecord::Base
+  validates_duplicity_of :title, scope: :user_id
+end
 
-	class Post < ActiveRecord::Base
-	  validates_duplicity_of :name, scope: :user_id
-	end
+note = Note.create title: "Bar", user_id: 1
+note.title
+=> "Bar"
 
-	p = Post.create name: "Foo", user_id: 1
-	p.name
-	=> "Foo"
+note = Note.create title: "Bar", user_id: 1
+note.title
+=> "Bar (1)"
+```
 
-	p = Post.create name: "Foo", user_id: 1
-	p.name
-	=> "Foo (1)"
+## Development
 
-	class Note < ActiveRecord::Base
-	  validates_uniqueness_of :name
-	  validates_duplicity_of :name, callback: :before_validation
-	end
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-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
+Bug reports and pull requests are welcome on GitHub at https://github.com/madwork/validates_duplicity_of.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "validates_duplicity_of"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/validates_duplicity_of/callback.rb

@@ -0,0 +1,15 @@
+module ValidatesDuplicityOf
+  class Callback
+    attr_reader :attr_name, :scope
+
+    def initialize(attr_name, scope)
+      @attr_name = attr_name
+      @scope = scope
+    end
+
+    def before_save(record)
+      duplicator = Duplicator.new self, record
+      duplicator.validate!
+    end
+  end
+end

data/lib/validates_duplicity_of/duplicator.rb

@@ -0,0 +1,38 @@
+module ValidatesDuplicityOf
+  class Duplicator
+    def initialize(callback, record)
+      @callback = callback
+      @record = Record.new record, callback.attr_name, callback.scope
+    end
+
+    # Updates the attribute of the record
+    def validate!
+      return unless @record.update_required?
+
+      if changed_attribute_match?
+        @record.attr_value = @record.attr_changed_value
+      else
+        @record.attr_value.concat(next_index)
+      end
+    end
+
+    private
+
+    # Computes the next index
+    def next_index
+      match_names = record_names.flat_map{ |name| name.match(/\((\d+)\)$/) }.compact
+      match_ids = match_names.flat_map(&:captures).map(&:to_i)
+      index = match_ids.sort.last.to_i + 1
+      " (#{index})"
+    end
+
+    # Finds the record names with this match
+    def record_names
+      @record.where_match("#{@record.attr_value} (%)").pluck(@record.attr_name)
+    end
+
+    def changed_attribute_match?
+      /#{Regexp.escape(@record.attr_value)} \(\d+\)$/.match @record.attr_changed_value
+    end
+  end
+end

data/lib/validates_duplicity_of/record.rb

@@ -0,0 +1,51 @@
+module ValidatesDuplicityOf
+  class Record < SimpleDelegator
+    attr_reader :attr_name, :scope
+
+    def initialize(record, attr_name, scope)
+      super(record)
+      @attr_name = attr_name.to_s
+      @scope = scope
+    end
+
+    # Callback attribute getter
+    def attr_value
+      __getobj__[attr_name]
+    end
+
+    # Callback attribute setter
+    def attr_value=(value)
+      __getobj__[attr_name] = value
+    end
+
+    def update_required?
+      value_changed? && value_present? && record_exists?
+    end
+
+    def attr_changed_value
+      changed_attributes[attr_name]
+    end
+
+    def where_match(pattern)
+      scoped_relation.where __getobj__.class.arel_table[attr_name].matches(pattern)
+    end
+
+    private
+
+    def value_changed?
+      changed.include? attr_name
+    end
+
+    def value_present?
+      attr_value.present?
+    end
+
+    def record_exists?
+      scoped_relation.where(attr_name => attr_value).exists?
+    end
+
+    def scoped_relation
+      scope ? __getobj__.class.where(scope => __getobj__[scope]) : __getobj__.class
+    end
+  end
+end

data/lib/validates_duplicity_of/version.rb

@@ -1,3 +1,3 @@
 module ValidatesDuplicityOf
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/validates_duplicity_of.rb

@@ -2,23 +2,15 @@ require 'validates_duplicity_of/version'
 require 'active_record'
 
 module ValidatesDuplicityOf
-  def validates_duplicity_of(attr_name, scope: nil, callback: :before_save)
-    validates = -> do
-      return unless changed.include? attr_name.to_s
-      return unless self[attr_name].present?
-      if self.class.exists?(Hash[*[attr_name, self[attr_name], scope, self[scope]].compact])
-        if /#{Regexp.escape(self[attr_name])} \(\d+\)$/.match changed_attributes[attr_name.to_s]
-          self[attr_name] = changed_attributes[attr_name.to_s]
-        else
-          relation = scope ? self.class.where(Hash[*[scope, self[scope]]]) : self.class
-          names = relation.where(self.class.arel_table[attr_name].matches("#{self[attr_name]} (%)")).pluck(attr_name)
-          name_ids = names.flat_map{ |name| name.match(/\((\d+)\)$/).captures }.map(&:to_i)
-          index = name_ids.sort.last.to_i + 1
-          self[attr_name].concat " (#{index})"
-        end
-      end
-    end
-    set_callback *callback.to_s.split('_').reverse.map(&:to_sym), &validates # default: set_callback :save, :before, &validates
+  autoload :Callback,   'validates_duplicity_of/callback'
+  autoload :Duplicator, 'validates_duplicity_of/duplicator'
+  autoload :Record,     'validates_duplicity_of/record'
+
+  # Creates a before save callback for duplicate value
+  # @param attr_name [Symbol] the ActiveRecord attribute
+  # @param scope [Symbol] a scope for the query
+  def validates_duplicity_of(attr_name, scope: nil)
+    set_callback :save, :before, Callback.new(attr_name, scope)
   end
 end
 

data/spec/lib/validates_duplicity_of_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "validates_duplicity_of" do
   context "without scope" do
-    before(:each) { Post.create name: "New name" }
-    after(:each)  { Post.delete_all }
+    before { Post.create name: "New name" }
+    after  { Post.delete_all }
 
     it "should update name if post already exists" do
       10.times do |index|
@@ -46,14 +46,25 @@ describe "validates_duplicity_of" do
       post = Post.create name: ""
       expect(post.name).to eq ""
     end
+
+    it "should handle invalid previous matches" do
+      Post.create [{ name: "Name" }, { name: "Name (first)" }]
+      post = Post.create name: "Name"
+      expect(post.name).to eq "Name (1)"
+    end
+
+    it "should handle non digit matches" do
+      Post.create name: "Name (first)"
+      post = Post.create name: "Name"
+      expect(post.name).to eq "Name"
+      post.update_attributes name: "Name (first)"
+      expect(post.name).to eq "Name (first) (1)"
+    end
   end
 
   context "with scope" do
-    before(:each) do
-      Note.create title: "New title", user_id: 1
-      Note.create title: "New title", user_id: 2
-    end
-    after(:each)  { Note.delete_all }
+    before { Note.create [{ title: "New title", user_id: 1 }, { title: "New title", user_id: 2 }] }
+    after  { Note.delete_all }
 
     it "should update title if note already exists" do
       10.times do |index|
@@ -73,14 +84,4 @@ describe "validates_duplicity_of" do
       expect(note.title).to eq "New title (11)"
     end
   end
-
-  context "with before_validation callback" do
-    before(:each) { Comment.create name: "New name" }
-    after(:each)  { Comment.delete_all }
-
-    it "should update name before validation" do
-      comment = Comment.create name: "New name"
-      expect(comment.name).to eq "New name (1)"
-    end
-  end
-end
+end

data/spec/support/models.rb

@@ -5,8 +5,3 @@ end
 class Note < ActiveRecord::Base
   validates_duplicity_of :title, scope: :user_id
 end
-
-class Comment < ActiveRecord::Base
-  validates_uniqueness_of :name
-  validates_duplicity_of :name, callback: :before_validation
-end

data/spec/support/schema.rb

@@ -9,8 +9,4 @@ ActiveRecord::Schema.define do
     t.string :title
     t.integer :user_id
   end
-
-  create_table :comments, force: true do |t|
-    t.string :name
-  end
-end
+end

metadata

@@ -1,121 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: validates_duplicity_of
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Vincent Durand
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDkjCCAnqgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMRcwFQYDVQQDDA52aW5j
-  ZW50LmR1cmFuZDEXMBUGCgmSJomT8ixkARkWB21hZHdvcmsxEzARBgoJkiaJk/Is
-  ZAEZFgNvcmcwHhcNMTMwOTE4MTY0MDEwWhcNMTQwOTE4MTY0MDEwWjBHMRcwFQYD
-  VQQDDA52aW5jZW50LmR1cmFuZDEXMBUGCgmSJomT8ixkARkWB21hZHdvcmsxEzAR
-  BgoJkiaJk/IsZAEZFgNvcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-  AQDzlsghBvfbH4yPzi3dXyfkmxjy/uksOkYwzqwbZ6z/TvJdIjY9Xqi/gLe2AxGF
-  kuVxDuxih84WDG8qxCnAfUxt2nDGAVEspmTXHBAsyZqLLDRiP5LvmH/eAKsJY+rU
-  ERSJOaLAotMqHHqXiWnpRgFnzE6RM3Cnqq8LH0jIGF9F8gZVLZeRD+VXK4IX1Vyd
-  HgZKgTPL15k92u7bzqBw7niPCBa9LfYxID6E1bnSHw/kb+7hWarVd/sxpgeH0jgb
-  f8ieDs8S9+bL/TfzEDAOALAqMDgPXPX1mDKESDZ/wBGW/tP3NSbVKsSZFK8b0e00
-  Au/fVbAe+P7+T8po/a5UhjMbAgMBAAGjgYgwgYUwCQYDVR0TBAIwADALBgNVHQ8E
-  BAMCBLAwHQYDVR0OBBYEFKne49vGKR3nRMYhyEbJDI2BVQikMCUGA1UdEQQeMByB
-  GnZpbmNlbnQuZHVyYW5kQG1hZHdvcmsub3JnMCUGA1UdEgQeMByBGnZpbmNlbnQu
-  ZHVyYW5kQG1hZHdvcmsub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQB0EDvvwy8uol26
-  Xm4O1iYcfgkTTX11UwgI6XIbS+1AzUwhl4BdWWFFxcy7v2/UMcx4QaJm+tL2B05V
-  CcVFS8tOMaGk6s7fPdhFswRp+HE9Ex5aiCMAhoIdUbrR5LCJTWyiEBLJhforT+3R
-  RARQ4FabsVVHevPHxzEAUGGGdWzbG4BcvKpWxbsOz/6yVgy3dpscmanMPH6pBpNH
-  XD6+HDD0HP0RBeQtHV2LIhLpiJLmNWRmJ9/Cfry72diEnM7173RAelpJNj0kRYjJ
-  xDr7hfCTJQsNosd7V5q7Uz+SYPK9ALyONt5t3KKYEWS/mBCStEuQXwjIsWG/bqwr
-  vqfQstIS
-  -----END CERTIFICATE-----
-date: 2013-12-17 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   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: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 description: ActiveRecord callback which handle the name duplication in your model.
 email: vincent.durand@madwork.org
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - lib/validates_duplicity_of.rb
+- lib/validates_duplicity_of/callback.rb
+- lib/validates_duplicity_of/duplicator.rb
+- lib/validates_duplicity_of/record.rb
 - lib/validates_duplicity_of/version.rb
 - spec/lib/validates_duplicity_of_spec.rb
 - spec/spec_helper.rb
@@ -132,17 +116,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.1.11
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: ActiveRecord callback which handle the name duplication in your model with

checksums.yaml.gz.sig

@@ -1,3 +0,0 @@
-Ͱ��
-<��Y�w��F|>]3yC<M��O}SAh���z_볾�\;����q����VFt�b�l@C�$�2��[�eX�Z���#:@Z���pV�E�zbLwTB���
��
-��b\-)5/l�Hs3�y^�We=	[DU�