find_duplicates 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6418b13e2f8b0ef1e2560ecfd8a539c5f949a92a
-  data.tar.gz: 86207fd75fbc54eb803627a6ce7884e32fb83156
+  metadata.gz: dcba9dbaac1d95a2a7db55acc525fe99044c7b15
+  data.tar.gz: 2bb1b972fbb79fbca75928e47c2e528fe1340eea
 SHA512:
-  metadata.gz: 99d2919631fed769b0d0964212c6ad610b0d09745e0eb787c74745cb80972d47bfc47fed62636bba2473f92b1b969d8ee52e9a715b7e4e9d118a51465400911d
-  data.tar.gz: 65309b95e0acb4da772c7aa992b702c3f1485ab157d1c3cea56f97f6acfa4f788f0fe5471f83eb1d8fd43a0a3bf20e569aa8b6e84ca67ce21a40445220699edf
+  metadata.gz: 4fc54d866ece1ca1602f08332fe841da89227f42abbf05aba28eece7728a28915075a69c6275c3e5d40a8a111bf3e181ddd9254feb795490cd190832f03c67ce
+  data.tar.gz: 487b12b8a2ff9a503352f230613049c1b4d3cadddd0d3237aeeb7b1382ad345afd7e400263bc4c0d6fdad7a4badba7a2d5e1fb5c94975c621a32f2da9bc04c7f

data/README.md

@@ -1,8 +1,7 @@
 # FindDuplicates
 
-This is home to the find_duplicates GEM.
-
-Use it to add methods to ActiveRecord models, that allow to find rows with duplicate values in certain columns. For example, find all users with the same first name, or find all items with the same price as a specific item.
+This GEM allows you to find duplicate models with same value for a column, e.g.:
+Find all users with the same first name.
 
 Just add 'find_duplicates' to your Gemfile, and you automatically enhance your AR models functionality.
 
@@ -39,6 +38,14 @@ class methods:
 > User.duplicates(:last_name)           # => [@user1, @user2]
 ```
 
+also works with multiple fields:
+```ruby
+> @user4 = User.create first_name: 'John', last_name: 'Major'
+> @user5 = User.create first_name: 'John', last_name: 'Major'
+> User.duplicates(:first_name, :last_name)         # => [@user4, @user5]
+> User.duplicates([:first_name, :last_name])       # => [@user4, @user5]
+```
+
 instance methods:
 ```ruby
 > @user1.duplicate?(:first_name)             # => true
@@ -46,6 +53,12 @@ instance methods:
 > @user1.duplicates_with_self(:last_name)    # => [@user1, @user2]
 ```
 
+instance methods also work with multiple fields:
+```ruby
+> @user1.duplicates_with_self(:first_name, :last_name)    # => []
+> @user4.duplicates_with_self(:first_name, :last_name)    # => [@user4, @user5]
+```
+
 ## Contributing
 
 1. Fork it

data/lib/find_duplicates/version.rb

@@ -1,3 +1,3 @@
 module FindDuplicates
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/find_duplicates.rb

@@ -4,23 +4,48 @@ require 'active_support/concern'
 
 module FindDuplicates
   extend ActiveSupport::Concern
-  def duplicate?(field)
-    duplicates_with_self(field).count > 1
+  def duplicate?(*args)
+    set_fields(args)
+    duplicates_with_self(@fields).count > 1
   end
 
-  def duplicates(field)
-    duplicates_with_self(field).where('id <> ?', id)
+  def duplicates(*args)
+    set_fields(args)
+    duplicates_with_self(@fields).where('id <> ?', id)
   end
 
-  def duplicates_with_self(field)
-    self.class.where(field => self[field])
+  def duplicates_with_self(*args)
+    set_fields(args)
+    self.class.where(self.attributes.slice(*@fields))
   end
   module ClassMethods
-    def duplicates(field)
-      field = field.to_sym
-      where field => self.select(['count(*)', field]).group(field).having('count(*) > 1').map(&field)
+    def duplicates(*args)
+      set_fields(args)
+      self.joins("join (
+            select #{fields_str}, count(*) as qty
+            from #{self.table_name}
+            group by #{fields_str}
+            having count(*) > 1
+        ) t on #{fields_query}").all
     end
+    private
+      def set_fields(args)
+        @fields = args.is_a?(Array) ? args : [args]
+        @fields = @fields.flatten.map &:to_s
+      end
+      def fields_str
+        @fields.join(',')
+      end
+      def fields_query
+        @fields.map {|f| "#{self.table_name}.#{f} = t.#{f}"}.join(' and ')
+      end
   end
+
+  private
+    def set_fields(args)
+      @fields = args.is_a?(Array) ? args : [args]
+      @fields = @fields.flatten.map &:to_s
+    end
 end
 
 class ActiveRecord::Base

data/spec/find_duplicates_spec.rb

@@ -5,43 +5,104 @@ describe FindDuplicates do
     setup
   end
 
-  context 'duplicate records' do
-    before do
-      @first = TestDuplicates.create!(title: 'first!')
-      @second = TestDuplicates.create!(title: 'second!')
-      @third = TestDuplicates.create!(title: 'first!')
-    end
+  context 'single' do
+    context 'duplicate records' do
+      before do
+        @first = TestDuplicates.create!(title: 'first!')
+        @second = TestDuplicates.create!(title: 'second!')
+        @third = TestDuplicates.create!(title: 'first!')
+      end
 
-    it 'class duplicates' do
-      expect(TestDuplicates.duplicates(:title)).not_to be_empty
-    end
-    it 'instance duplicates' do
-      expect(@first.duplicates(:title)).to match_array([@third])
-    end
-    it 'duplicates_with_self' do
-      expect(@first.duplicates_with_self(:title)).to match_array([@first, @third])
+      it 'class duplicates' do
+        expect(TestDuplicates.duplicates(:title)).to match_array([@first, @third])
+      end
+      it 'instance duplicates' do
+        expect(@first.duplicates(:title)).to match_array([@third])
+      end
+      it 'duplicates_with_self' do
+        expect(@first.duplicates_with_self(:title)).to match_array([@first, @third])
+      end
+      it 'duplicate?' do
+        expect(@first.duplicate?(:title)).to be_truthy
+      end
     end
-    it 'duplicate?' do
-      expect(@first.duplicate?(:title)).to be_truthy
+    context 'no duplicate records' do
+      before do
+        @first = TestDuplicates.create!(title: 'first!')
+        @second = TestDuplicates.create!(title: 'second!')
+        @third = TestDuplicates.create!(title: 'third!')
+      end
+      it 'duplicates' do
+        expect(TestDuplicates.duplicates(:title)).to be_empty
+      end
+      it 'instance duplicates' do
+        expect(@first.duplicates(:title)).to be_empty
+      end
+      it 'duplicates_with_self' do
+        expect(@first.duplicates_with_self(:title)).to match_array([@first])
+      end
+      it 'duplicate?' do
+        expect(@first.duplicate?(:title)).to be_falsey
+      end
     end
   end
-  context 'no duplicate records' do
-    before do
-      @first = TestDuplicates.create!(title: 'first!')
-      @second = TestDuplicates.create!(title: 'second!')
-      @third = TestDuplicates.create!(title: 'third!')
+  context 'multiple' do
+    context 'duplicate records' do
+      before do
+        @first = TestDuplicatesMultiple.create!(first_name: 'first!', last_name: 'first!')
+        @second = TestDuplicatesMultiple.create!(first_name: 'first!', last_name: 'first!')
+        @third = TestDuplicatesMultiple.create!(first_name: 'second!', last_name: 'first!')
+        @forth = TestDuplicatesMultiple.create!(first_name: 'first!', last_name: 'second!')
+      end
+
+      it 'class duplicates' do
+        expect(TestDuplicatesMultiple.duplicates(:first_name, :last_name)).to match_array([@first, @second])
+      end
+      it 'instance duplicates' do
+        expect(@first.duplicates(:first_name, :last_name)).to match_array([@second])
+      end
+      it 'duplicates_with_self' do
+        expect(@first.duplicates_with_self(:first_name, :last_name)).to match_array([@first, @second])
+      end
+      it 'duplicate?' do
+        expect(@first.duplicate?(:first_name, :last_name)).to be_truthy
+      end
     end
-    it 'duplicates' do
-      expect(TestDuplicates.duplicates(:title)).to be_empty
+    context 'no duplicate records' do
+      before do
+        @first = TestDuplicatesMultiple.create!(first_name: 'first!', last_name: 'first!')
+        @second = TestDuplicatesMultiple.create!(first_name: 'first!', last_name: 'second!')
+        @third = TestDuplicatesMultiple.create!(first_name: 'second!', last_name: 'first!')
+      end
+      it 'duplicates' do
+        expect(TestDuplicatesMultiple.duplicates(:first_name, :last_name)).to be_empty
+      end
+      it 'instance duplicates' do
+        expect(@first.duplicates(:first_name, :last_name)).to be_empty
+      end
+      it 'duplicates_with_self' do
+        expect(@first.duplicates_with_self(:first_name, :last_name)).to match_array([@first])
+      end
+      it 'duplicate?' do
+        expect(@first.duplicate?(:first_name, :last_name)).to be_falsey
+      end
     end
-    it 'instance duplicates' do
-      expect(@first.duplicates(:title)).to be_empty
+  end
+  context 'params' do
+    it 'single param' do
+      td = TestDuplicatesMultiple.new
+      td.send(:set_fields, [:first_name])
+      expect(td.instance_variable_get(:@fields)).to eql(['first_name'])
     end
-    it 'duplicates_with_self' do
-      expect(@first.duplicates_with_self(:title)).to match_array([@first])
+    it 'multiple params' do
+      td = TestDuplicatesMultiple.new
+      td.send(:set_fields, [:first_name, :last_name])
+      expect(td.instance_variable_get(:@fields)).to eql(['first_name', 'last_name'])
     end
-    it 'duplicate?' do
-      expect(@first.duplicate?(:title)).to be_falsey
+    it 'params array' do
+      td = TestDuplicatesMultiple.new
+      td.send(:set_fields, [[:first_name, :last_name]])
+      expect(td.instance_variable_get(:@fields)).to eql(['first_name', 'last_name'])
     end
   end
 end

data/spec/spec_helper.rb

@@ -28,7 +28,15 @@ def setup
       t.column :title, :string
     end
   end
+  ActiveRecord::Schema.define do
+    create_table :test_duplicates_multiples, force: true do |t|
+      t.column :first_name, :string
+      t.column :last_name, :string
+    end
+  end
 end
 
 class TestDuplicates < ActiveRecord::Base
 end
+class TestDuplicatesMultiple < ActiveRecord::Base
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: find_duplicates
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - adam klein
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord