composite_primary_keys 2.2.0 → 2.2.1

data/History.txt

@@ -1,3 +1,7 @@
+== 2.2.1 2009-01-21
+
+* fix ActiveRecord#exists? to work when passing conditions instead of ids
+
 == 2.2.0 2008-10-29
 
 * Rails 2.2.0 compatibility

data/Manifest.txt

@@ -100,6 +100,7 @@ test/test_composite_arrays.rb
 test/test_create.rb
 test/test_delete.rb
 test/test_dummy.rb
+test/test_exists.rb
 test/test_find.rb
 test/test_ids.rb
 test/test_miscellaneous.rb

data/lib/composite_primary_keys/base.rb

@@ -183,8 +183,12 @@ module CompositePrimaryKeys
         # Example:
         #   Person.exists?(5,7)
         def exists?(ids)
-          obj = find(ids) rescue false
-          !obj.nil? and obj.is_a?(self)
+          if ids.is_a?(Array) && ids.first.is_a?(String)
+            count(:conditions => ids).size > 0
+          else
+            obj = find(ids) rescue false
+            !obj.nil? and obj.is_a?(self)            
+          end
         end
 
         # Deletes the record with the given +ids+ without instantiating an object first, e.g. delete(1,2)

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/test_exists.rb

@@ -0,0 +1,27 @@
+require 'abstract_unit'
+require 'fixtures/article'
+require 'fixtures/department'
+
+class TestExists < Test::Unit::TestCase
+  fixtures :articles, :departments
+  
+  def test_single_key_exists_giving_id
+    assert Article.exists?(1)
+  end
+  
+  def test_single_key_exists_giving_condition
+    assert Article.exists?(['name = ?', 'Article One'])
+  end
+  
+  def test_composite_key_exists_giving_ids_as_string
+    assert Department.exists?('1,1,')
+  end
+  
+  def test_composite_key_exists_giving_ids_as_array
+    assert Department.exists?([1,1])
+  end
+  
+  def test_composite_key_exists_giving_ids_as_condition
+    assert Department.exists?(['department_id = ? and location_id = ?', 1, 1])
+  end
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Composite Primary Keys</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/compositekeys"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">2.2.0</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">2.2.1</a>
     </div>
     <h1>&#8594; Ruby on Rails</h1>
 <h1>&#8594; ActiveRecords</h1>
@@ -183,7 +183,7 @@ other stories and things.</p>
 <h2>Contact</h2>
 <p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a>.</p>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 29th October 2008<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 21st January 2009<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/version-raw.js

@@ -1,3 +1,3 @@
 // Announcement JS file
-var version = "2.2.0";
+var version = "2.2.1";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "2.2.0";
+var version = "2.2.1";
 
 document.write(" - " + version);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-29 00:00:00 -05:00
+date: 2009-01-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.8.3
     version: 
 description: Composite key support for ActiveRecords
 email: drnicwilliams@gmail.com
@@ -150,6 +150,7 @@ files:
 - test/test_create.rb
 - test/test_delete.rb
 - test/test_dummy.rb
+- test/test_exists.rb
 - test/test_find.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
@@ -192,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: compositekeys
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Composite key support for ActiveRecords
@@ -205,6 +206,7 @@ test_files:
 - test/test_create.rb
 - test/test_delete.rb
 - test/test_dummy.rb
+- test/test_exists.rb
 - test/test_find.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb