dedupe 0.0.0 → 0.0.1

data/.rvmrc

@@ -1,5 +1,5 @@
 # default gemset
-rvm 1.9.2@dedupe
+rvm 1.9.2@dedupe --create
 
 # return to system ruby on leaving directory
 rvm_project_rvmrc_default=1

data/Gemfile

@@ -1,15 +1,15 @@
 source "http://rubygems.org"
 
-gem "activesupport", "~> 3.0.0"
-gem "activemodel", "~> 3.0.0"
+gem "activesupport", ">= 3.0.0", "< 4.0.0"
+gem "activemodel", ">= 3.0.0", "< 4.0.0"
 
 group :development do
-  gem "rspec", ">= 2.0.0.beta.19"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.0.pre3"
-  gem "rcov", ">= 0"
-  gem "mongoid", "2.0.0.beta.19"
-  gem "bson_ext", "1.0.9"
-  gem "activerecord", "~> 3.0.0"
-  gem "sqlite3-ruby", "~> 1.3.1"
+  gem "bundler"
+  gem "rspec"
+  gem "jeweler"
+  gem "rcov"
+  gem "mongoid"
+  gem "bson_ext"
+  gem "activerecord"
+  gem "sqlite3-ruby"
 end

data/Gemfile.lock

@@ -1,62 +1,66 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    bson (1.0.9)
-    bson_ext (1.0.9)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
+    activemodel (3.2.5)
+      activesupport (= 3.2.5)
+      builder (~> 3.0.0)
+    activerecord (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.5)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    bson (1.6.4)
+    bson_ext (1.6.4)
+      bson (~> 1.6.4)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
     git (1.2.5)
-    i18n (0.4.1)
-    jeweler (1.5.0.pre3)
-      bundler (~> 1.0.0)
+    i18n (0.6.0)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mongo (1.0.9)
-      bson (>= 1.0.5)
-    mongoid (2.0.0.beta.19)
-      activemodel (~> 3.0)
-      mongo (= 1.0.9)
+      rdoc
+    json (1.7.3)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongoid (2.4.11)
+      activemodel (~> 3.1)
+      mongo (<= 1.6.2)
       tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    sqlite3-ruby (1.3.1)
-    tzinfo (0.3.23)
-    will_paginate (3.0.pre2)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    rcov (1.0.0)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    sqlite3 (1.3.6)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 3.0.0)
-  activerecord (~> 3.0.0)
-  activesupport (~> 3.0.0)
-  bson_ext (= 1.0.9)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.0.pre3)
-  mongoid (= 2.0.0.beta.19)
+  activemodel (>= 3.0.0, < 4.0.0)
+  activerecord
+  activesupport (>= 3.0.0, < 4.0.0)
+  bson_ext
+  bundler
+  jeweler
+  mongoid
   rcov
-  rspec (>= 2.0.0.beta.19)
-  sqlite3-ruby (~> 1.3.1)
+  rspec
+  sqlite3-ruby

data/README.rdoc

@@ -70,6 +70,14 @@ Then, mix the Dedupe module into your model using the "validates_uniqueness" mac
   validates_uniqueness :using => :with_matching_foo_and_bar
 
 
+== Note on require-order issues
+
+Dedupe doesn't declare a dependency on Mongoid or ActiveRecord because it can be used with either individually or both simultaneously.  Therefore, they must be required *before* Dedupe for it to work.  I haven't had trouble with this, but if you do please create an issue here: http://github.com/jamescallmebrent/dedupe/issues
+
+Check out this post by Yehuda Katz for more about require-order problems:
+http://yehudakatz.com/2010/04/17/ruby-require-order-problems/
+
+
 == Note on Patches/Pull Requests
 
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/dedupe.gemspec

@@ -0,0 +1,84 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "dedupe"
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Brent Hargrave"]
+  s.date = "2012-06-09"
+  s.description = "ActiveModel validation against duplicating records."
+  s.email = "brent.hargrave@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "dedupe.gemspec",
+    "lib/dedupe.rb",
+    "lib/dedupe/errors.rb",
+    "lib/dedupe/orm/active_record.rb",
+    "lib/dedupe/orm/mongoid.rb",
+    "lib/dedupe/validations.rb",
+    "spec/dedupe_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/active_record.rb",
+    "spec/support/mongoid.rb"
+  ]
+  s.homepage = "http://github.com/jamescallmebrent/dedupe"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "ActiveModel validation against duplicating records."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, ["< 4.0.0", ">= 3.0.0"])
+      s.add_runtime_dependency(%q<activemodel>, ["< 4.0.0", ">= 3.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<mongoid>, [">= 0"])
+      s.add_development_dependency(%q<bson_ext>, [">= 0"])
+      s.add_development_dependency(%q<activerecord>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+    else
+      s.add_dependency(%q<activesupport>, ["< 4.0.0", ">= 3.0.0"])
+      s.add_dependency(%q<activemodel>, ["< 4.0.0", ">= 3.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<mongoid>, [">= 0"])
+      s.add_dependency(%q<bson_ext>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, ["< 4.0.0", ">= 3.0.0"])
+    s.add_dependency(%q<activemodel>, ["< 4.0.0", ">= 3.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<mongoid>, [">= 0"])
+    s.add_dependency(%q<bson_ext>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+  end
+end
+

data/lib/dedupe/orm/active_record.rb

@@ -2,6 +2,7 @@ module Dedupe
   module Orm
     module ActiveRecord
       extend ActiveSupport::Concern
+      include Errors
       
       included do
         scope :excluding, lambda { |instance|
@@ -9,23 +10,18 @@ module Dedupe
         }
       end
       
-      module InstanceMethods
-        include Errors
-        
-        def duplicates
-          klass, scope_name = self.class, self.class.dedupe_scope_name
-          raise MissingScope unless klass.respond_to? scope_name 
-          result_set = klass.send scope_name, self 
-          raise InvalidScope unless result_set.is_a? ::ActiveRecord::Relation
-          result_set.excluding self 
-        end
-        
-        def duplicate?
-          self.duplicates.present?
-        end
+      def duplicates
+        klass, scope_name = self.class, self.class.dedupe_scope_name
+        raise MissingScope unless klass.respond_to? scope_name 
+        result_set = klass.send scope_name, self 
+        raise InvalidScope unless result_set.is_a? ::ActiveRecord::Relation
+        result_set.excluding self 
+      end
         
+      def duplicate?
+        self.duplicates.present?
       end
       
     end
   end
-end
+end

data/lib/dedupe/orm/mongoid.rb

@@ -2,30 +2,26 @@ module Dedupe
   module Orm
     module Mongoid
       extend ActiveSupport::Concern
+      include Errors
       
       included do
         scope :excluding, lambda { |instance|
           excludes(:id => instance.id)
         }
       end
-      
-      module InstanceMethods
-        include Errors
-        
-        def duplicates
-          klass, scope_name = self.class, self.class.dedupe_scope_name
-          raise MissingScope unless klass.respond_to? scope_name 
-          result_set = klass.send scope_name, self 
-          raise InvalidScope unless result_set.is_a? ::Mongoid::Criteria
-          result_set.excluding self 
-        end
-        
-        def duplicate?
-          self.duplicates.present?
-        end
+
+      def duplicates
+        klass, scope_name = self.class, self.class.dedupe_scope_name
+        raise MissingScope unless klass.respond_to? scope_name 
+        result_set = klass.send scope_name, self 
+        raise InvalidScope unless result_set.is_a? ::Mongoid::Criteria
+        result_set.excluding self 
+      end
         
+      def duplicate?
+        self.duplicates.present?
       end
-      
+
     end
   end
-end
+end

metadata

@@ -1,187 +1,141 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dedupe
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 0
-  version: 0.0.0
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Brent Hargrave
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-02 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70214876808380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70214876808380
+- !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70214876806140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70214876806140
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70214876828180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70214876828180
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70214876827080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70214876827080
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70214876837420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 0
-        - pre3
-        version: 1.5.0.pre3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70214876837420
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70214876833960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70214876833960
+- !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70214876831920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70214876831920
+- !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70214876855560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 9
-        version: 1.0.9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70214876855560
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70214876866740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70214876866740
+- !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70214876865200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *70214876865200
 description: ActiveModel validation against duplicating records.
 email: brent.hargrave@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
 - .rspec
 - .rvmrc
 - Gemfile
@@ -190,6 +144,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- dedupe.gemspec
 - lib/dedupe.rb
 - lib/dedupe/errors.rb
 - lib/dedupe/orm/active_record.rb
@@ -199,41 +154,31 @@ files:
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/mongoid.rb
-has_rdoc: true
 homepage: http://github.com/jamescallmebrent/dedupe
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1388205667040375508
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4421831209046156014
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ActiveModel validation against duplicating records.
-test_files: 
-- spec/dedupe_spec.rb
-- spec/spec_helper.rb
-- spec/support/active_record.rb
-- spec/support/mongoid.rb
+test_files: []

data/.gitignore

@@ -1,15 +0,0 @@
-# rcov generated
-coverage
-
-# rdoc generated
-rdoc
-
-# yard generated
-doc
-.yardoc
-
-# bundler
-.bundle
-
-# jeweler generated
-pkg