composite_primary_keys 2.2.2 → 2.3.2

data/History.txt

@@ -1,3 +1,11 @@
+== 2.3.2 2009-07-16
+
+* explicitly load associations.rb due to some getting an unitialized constant error
+
+== 2.3.2 2009-05-28
+
+* get tests working again with AR 2.3.2
+
 == 2.2.1 2009-01-21
 
 * fix ActiveRecord#exists? to work when passing conditions instead of ids

data/Rakefile

@@ -52,7 +52,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
 
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [['activerecord', '>= 2.2.0']]  #An array of rubygem dependencies.
+  p.extra_deps = [['activerecord', '>= 2.3.2']]  #An array of rubygem dependencies.
   #p.spec_extras    - A hash of extra values to set in the gemspec.
 end
 

data/lib/composite_primary_keys.rb

@@ -33,6 +33,8 @@ unless defined?(ActiveRecord)
   end
 end
 
+load 'active_record/associations.rb'
+
 require 'composite_primary_keys/fixtures'
 require 'composite_primary_keys/composite_arrays'
 require 'composite_primary_keys/associations'

data/lib/composite_primary_keys/version.rb

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

data/test/abstract_unit.rb

@@ -15,7 +15,9 @@ require 'composite_primary_keys'
 
 QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type') unless Object.const_defined?(:QUOTED_TYPE)
 
-class Test::Unit::TestCase #:nodoc:
+class ActiveSupport::TestCase #:nodoc:
+  include ActiveRecord::TestFixtures
+  
   self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
   self.use_instantiated_fixtures = false
   self.use_transactional_fixtures = true

data/test/test_associations.rb

@@ -15,7 +15,7 @@ require 'fixtures/room_assignment'
 require 'fixtures/user'
 require 'fixtures/reading'
 
-class TestAssociations < Test::Unit::TestCase
+class TestAssociations < ActiveSupport::TestCase
   fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs,
            :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings
   

data/test/test_attribute_methods.rb

@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'fixtures/kitchen_sink'
 require 'fixtures/reference_type'
 
-class TestAttributeMethods < Test::Unit::TestCase
+class TestAttributeMethods < ActiveSupport::TestCase
   fixtures :kitchen_sinks, :reference_types
   
   def test_read_attribute_with_single_key

data/test/test_attributes.rb

@@ -5,7 +5,7 @@ require 'fixtures/product'
 require 'fixtures/tariff'
 require 'fixtures/product_tariff'
 
-class TestAttributes < Test::Unit::TestCase
+class TestAttributes < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
   
   CLASSES = {

data/test/test_clone.rb

@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'fixtures/reference_type'
 require 'fixtures/reference_code'
 
-class TestClone < Test::Unit::TestCase
+class TestClone < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes
   
   CLASSES = {

data/test/test_composite_arrays.rb

@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'fixtures/reference_type'
 require 'fixtures/reference_code'
 
-class CompositeArraysTest < Test::Unit::TestCase
+class CompositeArraysTest < ActiveSupport::TestCase
 
   def test_new_primary_keys
     keys = CompositePrimaryKeys::CompositeKeys.new

data/test/test_create.rb

@@ -4,7 +4,7 @@ require 'fixtures/reference_code'
 require 'fixtures/street'
 require 'fixtures/suburb'
 
-class TestCreate < Test::Unit::TestCase
+class TestCreate < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes, :streets, :suburbs
   
   CLASSES = {

data/test/test_delete.rb

@@ -4,7 +4,7 @@ require 'fixtures/reference_code'
 require 'fixtures/department'
 require 'fixtures/employee'
 
-class TestDelete < Test::Unit::TestCase
+class TestDelete < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes, :departments, :employees
   
   CLASSES = {

data/test/test_dummy.rb

@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'fixtures/reference_type'
 require 'fixtures/reference_code'
 
-class TestDummy < Test::Unit::TestCase
+class TestDummy < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes
   
   classes = {

data/test/test_exists.rb

@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'fixtures/article'
 require 'fixtures/department'
 
-class TestExists < Test::Unit::TestCase
+class TestExists < ActiveSupport::TestCase
   fixtures :articles, :departments
   
   def test_single_key_exists_giving_id

data/test/test_find.rb

@@ -3,7 +3,7 @@ require 'fixtures/reference_type'
 require 'fixtures/reference_code'
 
 # Testing the find action on composite ActiveRecords with two primary keys
-class TestFind < Test::Unit::TestCase
+class TestFind < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes
   
   CLASSES = {

data/test/test_ids.rb

@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'fixtures/reference_type'
 require 'fixtures/reference_code'
 
-class TestIds < Test::Unit::TestCase
+class TestIds < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes
   
   CLASSES = {

data/test/test_miscellaneous.rb

@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'fixtures/reference_type'
 require 'fixtures/reference_code'
 
-class TestMiscellaneous < Test::Unit::TestCase
+class TestMiscellaneous < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes, :products
   
   CLASSES = {

data/test/test_pagination.rb

@@ -3,7 +3,7 @@ require 'fixtures/reference_type'
 require 'fixtures/reference_code'
 require 'plugins/pagination'
 
-class TestPagination < Test::Unit::TestCase
+class TestPagination < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes
   
   include ActionController::Pagination

data/test/test_polymorphic.rb

@@ -4,7 +4,7 @@ require 'fixtures/user'
 require 'fixtures/employee'
 require 'fixtures/hack'
 
-class TestPolymorphic < Test::Unit::TestCase
+class TestPolymorphic < ActiveSupport::TestCase
   fixtures :users, :employees, :comments, :hacks
   
   def test_polymorphic_has_many

data/test/test_santiago.rb

@@ -6,7 +6,7 @@ require 'fixtures/user'
 require 'fixtures/article'
 require 'fixtures/reading'
 
-class TestSantiago < Test::Unit::TestCase
+class TestSantiago < ActiveSupport::TestCase
   fixtures :suburbs, :streets, :users, :articles, :readings
   
   def test_normal_and_composite_associations

data/test/test_tutorial_examle.rb

@@ -4,7 +4,7 @@ require 'fixtures/group'
 require 'fixtures/membership_status'
 require 'fixtures/membership'
 
-class TestTutorialExample < Test::Unit::TestCase
+class TestTutorialExample < ActiveSupport::TestCase
   fixtures :users, :groups, :memberships, :membership_statuses
   
   def test_membership

data/test/test_update.rb

@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'fixtures/reference_type'
 require 'fixtures/reference_code'
 
-class TestUpdate < Test::Unit::TestCase
+class TestUpdate < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes
   
   CLASSES = {

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.2</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">2.3.2</a>
     </div>
     <h1>&#8594; Ruby on Rails</h1>
 <h1>&#8594; ActiveRecords</h1>
@@ -98,15 +98,12 @@ throughout your application. Just like a normal ActiveRecord.</p>
 	and I	didn&#8217;t see any information about what I should do to address it in the<br />
 	documentation (might have missed it).</p>
 <p>The problem was that the urls being generated for a &#8216;show&#8217; action (for<br />
-	example) had a syntax like:<br />
-	<br />
-	<pre>/controller/show/123000,Bu70</pre></p>
+	example) had a syntax like:</p>
+<p><pre>/controller/show/123000,Bu70</pre></p>
 <p>for a two-field composite PK. The default routing would not match that,<br />
-	so after working out how to do the routing I added:<br />
-	<br />
-	<pre class="syntax"><span class="ident">map</span><span class="punct">.</span><span class="ident">connect</span> <span class="punct">'</span><span class="string">:controller/:action/:id</span><span class="punct">',</span> <span class="symbol">:id</span> <span class="punct">=&gt;</span> <span class="punct">/</span><span class="regex"><span class="escape">\w</span>+(,<span class="escape">\w</span>+)*</span><span class="punct">/</span></pre><br />
-	<br />
-	to my <code>route.rb</code> file.</p>
+	so after working out how to do the routing I added:</p>
+<p><pre class="syntax"><span class="ident">map</span><span class="punct">.</span><span class="ident">connect</span> <span class="punct">'</span><span class="string">:controller/:action/:id</span><span class="punct">',</span> <span class="symbol">:id</span> <span class="punct">=&gt;</span> <span class="punct">/</span><span class="regex"><span class="escape">\w</span>+(,<span class="escape">\w</span>+)*</span><span class="punct">/</span></pre></p>
+<p>to my <code>route.rb</code> file.</p>
 </blockquote>
 <p><a name="dbs"></a></p>
 <h2>Which databases?</h2>
@@ -175,15 +172,14 @@ other stories and things.</p>
 <p><a href="http://groups.google.com/group/compositekeys">http://groups.google.com/group/compositekeys</a></p>
 <h2>How to submit patches</h2>
 <p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
-<p>The source for this project is available via git. You can <a href="http://github.com/drnic/composite_primary_keys/tree/master">browse and/or fork the source</a>, or to clone the project locally:<br />
-  <br />
-<pre>git clone git://github.com/drnic/composite_primary_keys.git</pre></p>
+<p>The source for this project is available via git. You can <a href="http://github.com/drnic/composite_primary_keys/tree/master">browse and/or fork the source</a>, or to clone the project locally:</p>
+<pre>git clone git://github.com/drnic/composite_primary_keys.git</pre>
 <h2>Licence</h2>
 <p>This code is free to use under the terms of the <span class="caps">MIT</span> licence.</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>, 21st January 2009<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 16th July 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.2";
+var version = "2.3.2";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  version: 2.3.2
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-24 00:00:00 -06:00
+date: 2009-07-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.0
+        version: 2.3.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 2.3.2
     version: 
 description: Composite key support for ActiveRecords
 email: drnicwilliams@gmail.com
@@ -43,7 +43,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 - README_DB2.txt
-- test/README_tests.txt
 - website/index.txt
 - website/version-raw.txt
 - website/version.txt
@@ -172,6 +171,8 @@ files:
 - website/version.txt
 has_rdoc: true
 homepage: http://compositekeys.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -193,9 +194,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: compositekeys
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Composite key support for ActiveRecords
 test_files: 
 - test/test_associations.rb