composite_primary_keys 0.8.4 → 0.8.5

data/History.txt

@@ -1,33 +1,64 @@
-*** 0.8.4 / 2007-5-3
+== 0.8.5 / 2007-6-5
 
-+ 1 bugfix
-				+ Corrected ids_list => ids in the exception message. That'll teach me for not adding unit tests before fixing bugs. 
+* 1 change due to Rails Core change
+  * Can no longer use RAILS_CONNECTION_ADAPTERS from Rails core
+* 7 dev improvement:
+  * Changed History.txt syntax to rdoc format
+  * Added deploy tasks
+  * Removed CHANGELOG + migrated into History.txt
+  * Changed PKG_NAME -> GEM_NAME in Rakefile
+  * Renamed README -> README.txt for :publish_docs task
+  * Added :check_version task
+  * VER => VERS in rakefile
+* 1 website improvement:
+  * website/index.txt includes link to "8 steps to fix other ppls code"
 
-*** 0.8.3 / 2007-5-3
+== 0.8.4 / 2007-5-3
 
-+ 1 bugfix
-				+ Explicit reference to ::ActiveRecord::RecordNotFound
-+ 1 website addition:
-        + Added routing help [Pete Sumskas]
+* 1 bugfix
+  * Corrected ids_list => ids in the exception message. That'll teach me for not adding unit tests before fixing bugs. 
 
-*** 0.8.2 / 2007-4-11
+== 0.8.3 / 2007-5-3
 
-+ 1 major enhancement:
-        + Oracle unit tests!! [Darrin Holst]
-				+ And they work too
+* 1 bugfix
+  * Explicit reference to ::ActiveRecord::RecordNotFound
+* 1 website addition:
+  * Added routing help [Pete Sumskas]
 
-*** 0.8.1 / 2007-4-10
+== 0.8.2 / 2007-4-11
 
-+ 1 bug fix:
-        + Fixed the distinct(count) for oracle (removed 'as')
+* 1 major enhancement:
+  * Oracle unit tests!! [Darrin Holst]
+  * And they work too
 
-*** 0.8.0 / 2007-4-6
+== 0.8.1 / 2007-4-10
 
-+ 1 major enhancement:
-        + Support for calcualtions on associations
-+ 2 new DB supported:
-        + Tests run on sqlite
-        + Tests run on postgresql
-+ History.txt to keep track of changes like these
-+ Using Hoe for Rakefile
-+ Website generator rake tasks
+* 1 bug fix:
+  * Fixed the distinct(count) for oracle (removed 'as')
+
+== 0.8.0 / 2007-4-6
+
+* 1 major enhancement:
+  * Support for calcualtions on associations
+* 2 new DB supported:
+  * Tests run on sqlite
+  * Tests run on postgresql
+* History.txt to keep track of changes like these
+* Using Hoe for Rakefile
+* Website generator rake tasks
+
+== 0.3.3
+* id=
+* create now work
+
+== 0.1.4
+* it was important that #{primary_key} for composites --> 'key1,key2' and not 'key1key2' so created PrimaryKeys class
+
+== 0.0.1 
+* Initial version
+* set_primary_keys(*keys) is the activation class method to transform an ActiveRecord into a composite primary key AR
+* find(*ids) supports the passing of 
+  * id sets: Foo.find(2,1), 
+  * lists of id sets: Foo.find([2,1], [7,3], [8,12]), 
+  * and even stringified versions of the above:
+  * Foo.find '2,1' or Foo.find '2,1;7,3'

data/Manifest.txt

@@ -1,7 +1,6 @@
-CHANGELOG
 History.txt
 Manifest.txt
-README
+README.txt
 Rakefile
 install.rb
 lib/composite_primary_keys.rb

data/Rakefile

@@ -15,12 +15,14 @@ AUTHOR = "Dr Nic Williams"
 EMAIL = "drnicwilliams@gmail.com"
 DESCRIPTION = "Composite key support for ActiveRecords"
 GEM_NAME = "composite_primary_keys" # what ppl will type to install your gem
+config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+RUBYFORGE_USERNAME = config["username"]
 RUBYFORGE_PROJECT = "compositekeys"
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 
 REV = nil #File.read(".svn/entries")[/committed-rev="(\d+)"/, 1] rescue nil
-VER = ENV['VERSION'] || (CompositePrimaryKeys::VERSION::STRING + (REV ? ".#{REV}" : ""))
-CLEAN.include ['**/.*.sw?', '*.gem', '.config','debug.log','*.db','logfile','.DS_Store']
+VERS = ENV['VERSION'] || (CompositePrimaryKeys::VERSION::STRING + (REV ? ".#{REV}" : ""))
+CLEAN.include ['**/.*.sw?', '*.gem', '.config','debug.log','*.db','logfile','.DS_Store', '.project']
 RDOC_OPTS = ['--quiet', '--title', "newgem documentation",
     "--opname", "index.html",
     "--line-numbers", 
@@ -35,7 +37,7 @@ end
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VER) do |p|
+hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.author = AUTHOR 
   p.description = DESCRIPTION
   p.email = EMAIL
@@ -43,7 +45,7 @@ hoe = Hoe.new(GEM_NAME, VER) do |p|
   p.url = HOMEPATH
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
   p.test_globs = ["test/**/test*.rb"]
-  p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
+  p.clean_globs |= CLEAN  #An array of file patterns to delete on clean.
 
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
@@ -51,18 +53,13 @@ hoe = Hoe.new(GEM_NAME, VER) do |p|
   #p.spec_extras    - A hash of extra values to set in the gemspec.
 end
 
-PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-PKG_NAME      = 'composite_primary_keys'
-PKG_VERSION   = CompositePrimaryKeys::VERSION::STRING + PKG_BUILD
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
+CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\n\n")
+PATH    = RUBYFORGE_PROJECT
+hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
 
-RELEASE_NAME  = "REL #{PKG_VERSION}"
 
-RUBY_FORGE_PROJECT = "compositekeys"
-RUBY_FORGE_USER    = "nicwilliams"
-
-
-for adapter in %w( mysql sqlite oracle postgresql ) # UNTESTED - firebird sqlserver sqlserver_odbc db2 sybase openbase )
+# UNTESTED - firebird sqlserver sqlserver_odbc db2 sybase openbase
+for adapter in %w( mysql sqlite oracle postgresql ) 
   Rake::TestTask.new("test_#{adapter}") { |t|
     t.libs << "test" << "test/connections/native_#{adapter}"
     t.pattern = "test/test_*.rb"
@@ -75,13 +72,17 @@ SCHEMA_PATH = File.join(File.dirname(__FILE__), *%w(test fixtures db_definitions
 desc 'Build the MySQL test databases'
 task :build_mysql_databases do 
   puts File.join(SCHEMA_PATH, 'mysql.sql')
-  sh %{ mysqladmin -u root create "#{PKG_NAME}_unittest" }
-  sh %{ mysql -u root "#{PKG_NAME}_unittest" < #{File.join(SCHEMA_PATH, 'mysql.sql')} }
+  socket = '/Applications/MAMP/tmp/mysql/mysql.sock'
+  user   = 'root'
+  sh %{ mysqladmin -u #{user} -S #{socket} -p create "#{GEM_NAME}_unittest" }
+  sh %{ mysql -u #{user} -S #{socket} -p "#{GEM_NAME}_unittest" < #{File.join(SCHEMA_PATH, 'mysql.sql')} }
 end
 
 desc 'Drop the MySQL test databases'
 task :drop_mysql_databases do 
-  sh %{ mysqladmin -u root -f drop "#{PKG_NAME}_unittest" }
+  socket = '/Applications/MAMP/tmp/mysql/mysql.sock'
+  user   = 'root'
+  sh %{ mysqladmin -u #{user} -S #{socket} -p -f drop "#{GEM_NAME}_unittest" }
 end
 
 desc 'Rebuild the MySQL test databases'
@@ -106,13 +107,13 @@ task :rebuild_sqlite_databases => [:drop_sqlite_databases, :build_sqlite_databas
 
 desc 'Build the PostgreSQL test databases'
 task :build_postgresql_databases do 
-  sh %{ createdb "#{PKG_NAME}_unittest" }
-  sh %{ psql "#{PKG_NAME}_unittest" -f #{File.join(SCHEMA_PATH, 'postgresql.sql')} }
+  sh %{ createdb "#{GEM_NAME}_unittest" }
+  sh %{ psql "#{GEM_NAME}_unittest" -f #{File.join(SCHEMA_PATH, 'postgresql.sql')} }
 end
 
 desc 'Drop the PostgreSQL test databases'
 task :drop_postgresql_databases do 
-  sh %{ dropdb "#{PKG_NAME}_unittest" }
+  sh %{ dropdb "#{GEM_NAME}_unittest" }
 end
 
 desc 'Rebuild the PostgreSQL test databases'
@@ -145,8 +146,31 @@ task :website_upload do
   host = "#{config["username"]}@rubyforge.org"
   remote_dir = "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/"
   local_dir = 'website'
-  sh %{rsync -av #{local_dir}/ #{host}:#{remote_dir}}
+  sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
 end
 
 desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload]
+task :website => [:website_generate, :website_upload, :publish_docs]
+
+desc 'Release the website and new gem version'
+task :deploy => [:check_version, :website, :release] do
+  puts "Remember to create SVN tag:"
+  puts "svn copy svn+ssh://#{RUBYFORGE_USERNAME}@rubyforge.org/var/svn/#{PATH}/trunk " +
+    "svn+ssh://#{RUBYFORGE_USERNAME}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
+  puts "Suggested comment:"
+  puts "Tagging release #{CHANGES}"
+end
+
+desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
+task :local_deploy => [:website_generate, :install_gem]
+
+task :check_version do
+  unless ENV['VERSION']
+    puts 'Must pass a VERSION=x.y.z release version'
+    exit
+  end
+  unless ENV['VERSION'] == VERS
+    puts "Please update your version.rb to match the release version, currently #{VERS}"
+    exit
+  end
+end

data/lib/composite_primary_keys.rb

@@ -45,9 +45,9 @@ ActiveRecord::Base.class_eval do
   include CompositePrimaryKeys::ActiveRecord::Base
 end
 
-RAILS_CONNECTION_ADAPTERS.each do |adapter|
+Dir[File.dirname(__FILE__) + '/composite_primary_keys/connection_adapters/*.rb'].each do |adapter|
   begin
-    require "composite_primary_keys/connection_adapters/" + adapter + "_adapter"
+    require "composite_primary_keys/connection_adapters/" + adapter.gsub('.rb','')
   rescue MissingSourceFile
   end
 end

data/lib/composite_primary_keys/version.rb

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

data/test/connections/native_mysql/connection.rb

@@ -8,6 +8,8 @@ db1 = 'composite_primary_keys_unittest'
 connection_options = {
   :adapter  => "mysql",
   :username => "root",
+  :password => "root",
+  :socket   => '/Applications/MAMP/tmp/mysql/mysql.sock',
   :encoding => "utf8",
   :database => db1
 }

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">0.8.4</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">0.8.5</a>
     </div>
     <h1>&#x2192; Ruby on Rails</h1>
 
@@ -271,6 +271,15 @@ 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 trunk repository is <code>svn://rubyforge.org/var/svn/compositekeys/trunk</code> for anonymous access.</p>
+
+
 	<h2>Licence</h2>
 
 
@@ -282,7 +291,7 @@ other stories and things.</p>
 
 	<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>, 3rd May 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 1st June 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -145,6 +145,13 @@ h2. Forum
 
 "http://groups.google.com/group/compositekeys":http://groups.google.com/group/compositekeys
 
+h2. How to submit patches
+
+Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
+
+
+The trunk repository is <code>svn://rubyforge.org/var/svn/compositekeys/trunk</code> for anonymous access.
+
 h2. Licence
 
 This code is free to use under the terms of the MIT licence. 

data/website/version-raw.js

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

data/website/version.js

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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4.1
 specification_version: 1
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
-date: 2007-05-03 00:00:00 +02:00
+  version: 0.8.5
+date: 2007-06-05 00:00:00 +02:00
 summary: Composite key support for ActiveRecords
 require_paths: 
 - lib
@@ -29,10 +29,9 @@ post_install_message:
 authors: 
 - Dr Nic Williams
 files: 
-- CHANGELOG
 - History.txt
 - Manifest.txt
-- README
+- README.txt
 - Rakefile
 - install.rb
 - lib/composite_primary_keys.rb
@@ -122,10 +121,16 @@ test_files:
 - test/test_santiago.rb
 - test/test_tutorial_examle.rb
 - test/test_update.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- website/index.txt
+- website/version-raw.txt
+- website/version.txt
 executables: []
 
 extensions: []

data/CHANGELOG

@@ -1,16 +0,0 @@
-* 0.3.3 * - bug fixes
-  - id=
-  - create now work
-
-* 0.1.4 *
-	- it was important that #{primary_key} for composites --> 'key1,key2' and not 'key1key2'
-	  so created PrimaryKeys class
-
-* 0.0.1 * Initial version
- - set_primary_keys(*keys) is the activation class method to transform an ActiveRecord into
- 		a composite primary key AR
- - find(*ids) supports the passing of 
- 		- id sets: Foo.find(2,1), 
- 		- lists of id sets: Foo.find([2,1], [7,3], [8,12]), 
- 		- and even stringified versions of the above:
- 		- Foo.find '2,1' or Foo.find '2,1;7,3'