is_unique 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/is_unique.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{is_unique}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eugene Bolshakov"]
-  s.date = %q{2010-03-24}
+  s.date = %q{2010-03-26}
   s.description = %q{Makes ActiveRecord return existing records instead of creating duplicates}
   s.email = %q{eugene.bolshakov@gmail.com}
   s.extra_rdoc_files = [

data/lib/is_unique.rb

@@ -1,6 +1,6 @@
 module IsUnique
   def self.included(base)
-    base.extend ClassMethods
+    base.extend IsUnique::ClassMethods
   end
 
   module ClassMethods
@@ -16,10 +16,12 @@ module IsUnique
         'updated_at'
       ].concat(Array(options[:ignore]).map(&:to_s))
 
-      self.class_eval do
-        include InstanceMethods
+      unless self.include?(IsUnique::InstanceMethods)
+        self.class_eval do
+          include IsUnique::InstanceMethods
 
-        before_save :calculate_unique_hash
+          before_save :calculate_unique_hash
+        end
       end
     end
   end

data/spec/support/db.rb

@@ -10,6 +10,7 @@ end
 def setup_db
   ActiveRecord::Schema.define(:version => 1) do
     create_table :locations do |t|
+      t.string     :type
       t.string     :name
       t.float      :lat, :lng
       t.string     :alias

data/spec/unique_model_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 class Location < ActiveRecord::Base
+  # String type
   # String name 
   # Float lat
   # Float lng
@@ -10,6 +11,10 @@ class Location < ActiveRecord::Base
   is_unique :ignore => :alias
 end
 
+class PopulatedPlace < Location
+  is_unique :ignore => [:name, :alias]
+end
+
 describe "A unique model" do
   before(:each) do
     @it = Location.create(
@@ -54,4 +59,28 @@ describe "A unique model" do
       should change(Location, :count).by(1)
     new_record.should_not == @it
   end
+
+  context "that is a subclass of another model" do
+    before(:each) do
+      @it = PopulatedPlace.create(
+        :name  => 'London',
+        :lat   => '51.5084152563931',
+        :lng   => '-0.125532746315002',
+        :alias => 'Londinium'
+      )
+    end
+
+    it "should be able to override columns that should be ignored" do
+      new_record = @it.clone
+      new_record.name = 'Greater London'
+      new_record.alias = 'London, UK'
+      lambda { new_record.save! }.
+        should_not change(PopulatedPlace, :count)
+    end
+
+    it "should run callbacks just once" do
+      @it.should_receive(:calculate_unique_hash).once
+      @it.save
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Eugene Bolshakov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 +03:00
+date: 2010-03-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency