composite_primary_keys 4.0.0.beta7 → 4.0.0.beta8

data/History.txt

@@ -1,3 +1,8 @@
+== 4.0.0.beta8 2011-082-22
+* Sqlite 3 fixes (Jan Vlnas)
+* Fixes for to_key method (Jan Vlnas)
+* Compatible with Rails 3.1 RC6 (Ari Epstein, Travis Warlick)
+
 == 4.0.0.beta7 2011-07-26
 * Compatible with Rails 3.1 RC5 (TycoooN)
 * Do not use Arel::Nodes::Or to combine predicates because it creates a

data/Rakefile

@@ -20,7 +20,7 @@ Dir.glob('tasks/**/*.rake').each do |rake_file|
 end
 
 # Set up test tasks for each supported connection adapter
-%w(mysql sqlite oracle oracle_enhanced postgresql ibm_db).each do |adapter|
+%w(mysql sqlite3 oracle oracle_enhanced postgresql ibm_db).each do |adapter|
   namespace adapter do
     desc "Run tests using the #{adapter} adapter"
     task "test" do

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '= 3.1.0.rc5'
+  gem 'activerecord', '~> 3.1.0.rc5'
   require 'active_record'
 end
 

data/lib/composite_primary_keys/base.rb

@@ -125,10 +125,10 @@ module ActiveRecord
         false
       end
 
-      # Returns this record's primary keys values in an Array or nil if
-      # the record is not persisted? or has just been destroyed.
+      # Returns this record's primary keys values in an Array
+      # if any value is avaliable
       def to_key
-        ids.to_a if persisted? && !ids.compact.empty? # XXX Maybe use primary_keys with send instead of ids
+        ids.to_a if !ids.compact.empty? # XXX Maybe use primary_keys with send instead of ids
       end
     end
   end

data/lib/composite_primary_keys/version.rb

@@ -3,6 +3,6 @@ module CompositePrimaryKeys
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY, 'beta7'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'beta8'].join('.')
   end
 end

data/tasks/databases/sqlite3.rake

@@ -24,6 +24,6 @@ namespace :sqlite3 do
   task :rebuild_databases => [:drop_databases, :build_databases]
 
   task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlite", "connection")
+    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlite3", "connection")
   end
-end
+end

data/test/README_tests.txt

@@ -9,10 +9,24 @@ There are tests available for the following adapters:
 * oracle
 * oracle_enhanced
 * postgresql
-* sqlite
+* sqlite3
 
 To run the tests for one of the adapters follow these steps (using mysql in the example):
 
+* You will need the following gems:
+    - rake
+    - activerecord (3.1.0.rc5 or later)
+    - mysql (or the adapter of your choice)
+
+* Put your mysql connection settings to test/connections/databases.yml
+  look into databases.example.sql for reference,
+  keep only one connection spec at once in databases.yml
+
+    mysql:
+      adapter: mysql
+      username: root
+      database: composite_primary_keys_unittest
+
 * rake -T mysql
 
     rake mysql:build_databases         # Build the MySQL test databases

data/test/abstract_unit.rb

@@ -2,7 +2,7 @@ PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 require "pp"
 require "test/unit"
-require "hash_tricks"
+require "./hash_tricks"
 
 # To make debugging easier, test within this source tree versus an installed gem
 #require 'composite_primary_keys'

data/test/test_associations.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestAssociations < ActiveSupport::TestCase
   fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants,

data/test/test_attribute_methods.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestAttributeMethods < ActiveSupport::TestCase
   fixtures :reference_types
@@ -42,13 +42,13 @@ class TestAttributeMethods < ActiveSupport::TestCase
   def test_to_key_with_single_key_destroyed
     rt = ReferenceType.find(1)
     rt.destroy
-    assert_nil(rt.to_key)
+    assert_equal([1], rt.to_key)
   end
 
   def test_to_key_with_composite_key_destroyed
     ref_code = ReferenceCode.find(1, 1)
     ref_code.destroy
-    assert_nil(ref_code.to_key)
+    assert_equal([1,1], ref_code.to_key)
   end
 
 

data/test/test_attributes.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestAttributes < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs

data/test/test_composite_arrays.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class CompositeArraysTest < ActiveSupport::TestCase
 

data/test/test_create.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestCreate < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes, :streets, :suburbs

data/test/test_delete.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestDelete < ActiveSupport::TestCase
   fixtures :departments, :employees, :products, :product_tariffs,

data/test/test_dup.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestClone < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes

data/test/test_equal.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestEqual < ActiveSupport::TestCase
   fixtures :capitols

data/test/test_exists.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestExists < ActiveSupport::TestCase
   fixtures :articles, :departments

data/test/test_find.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 # Testing the find action on composite ActiveRecords with two primary keys
 class TestFind < ActiveSupport::TestCase

data/test/test_habtm.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestHabtm < ActiveSupport::TestCase
   fixtures :suburbs, :restaurants, :restaurants_suburbs, :products

data/test/test_ids.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestIds < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes

data/test/test_miscellaneous.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestMiscellaneous < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes, :products

data/test/test_pagination.rb

@@ -1,36 +1,36 @@
-require 'abstract_unit'
-require 'plugins/pagination'
-
-class TestPagination < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-  
-  include ActionController::Pagination
-  DEFAULT_PAGE_SIZE = 2
-  
-  attr_accessor :params
-   
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-      :table => :reference_types,
-    },
-    :dual   => { 
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-      :table => :reference_codes,
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-    @params = {}
-  end
-
-  def test_paginate_all
-    testing_with do
-      @object_pages, @objects = paginate @klass_info[:table], :per_page => DEFAULT_PAGE_SIZE
-      assert_equal 2, @objects.length, "Each page should have #{DEFAULT_PAGE_SIZE} items"
-    end
-  end
-end
+#require './abstract_unit'
+#require 'plugins/pagination'
+#
+#class TestPagination < ActiveSupport::TestCase
+#  fixtures :reference_types, :reference_codes
+#
+#  include ActionController::Pagination
+#  DEFAULT_PAGE_SIZE = 2
+#
+#  attr_accessor :params
+#
+#  CLASSES = {
+#    :single => {
+#      :class => ReferenceType,
+#      :primary_keys => :reference_type_id,
+#      :table => :reference_types,
+#    },
+#    :dual   => {
+#      :class => ReferenceCode,
+#      :primary_keys => [:reference_type_id, :reference_code],
+#      :table => :reference_codes,
+#    },
+#  }
+#
+#  def setup
+#    self.class.classes = CLASSES
+#    @params = {}
+#  end
+#
+#  def test_paginate_all
+#    testing_with do
+#      @object_pages, @objects = paginate @klass_info[:table], :per_page => DEFAULT_PAGE_SIZE
+#      assert_equal 2, @objects.length, "Each page should have #{DEFAULT_PAGE_SIZE} items"
+#    end
+#  end
+#end

data/test/test_polymorphic.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestPolymorphic < ActiveSupport::TestCase
   fixtures :users, :employees, :comments, :hacks

data/test/test_predicates.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestEqual < ActiveSupport::TestCase
   fixtures :departments

data/test/test_santiago.rb

@@ -1,6 +1,6 @@
 # Test cases devised by Santiago that broke the Composite Primary Keys
 # code at one point in time. But no more!!!
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestSantiago < ActiveSupport::TestCase
   fixtures :suburbs, :streets, :users, :articles, :readings

data/test/test_suite.rb

@@ -1,22 +1,22 @@
 require 'test/unit'
 
-require 'test_associations'
-require 'test_attribute_methods'
-require 'test_attributes'
-require 'test_composite_arrays'
-require 'test_create'
-require 'test_delete'
-require 'test_dup'
-require 'test_equal'
-require 'test_exists'
-require 'test_find'
-require 'test_habtm'
-require 'test_ids'
-require 'test_miscellaneous'
-require 'test_pagination'
-require 'test_polymorphic'
-require 'test_predicates'
-require 'test_santiago'
-require 'test_tutorial_example'
-require 'test_update'
-require 'test_validations'
+require './test_associations'
+require './test_attribute_methods'
+require './test_attributes'
+require './test_composite_arrays'
+require './test_create'
+require './test_delete'
+require './test_dup'
+require './test_equal'
+require './test_exists'
+require './test_find'
+require './test_habtm'
+require './test_ids'
+require './test_miscellaneous'
+require './test_pagination'
+require './test_polymorphic'
+require './test_predicates'
+require './test_santiago'
+require './test_tutorial_example'
+require './test_update'
+require './test_validations'

data/test/test_tutorial_example.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestTutorialExample < ActiveSupport::TestCase
   fixtures :users, :groups, :memberships, :membership_statuses

data/test/test_update.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestUpdate < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes

data/test/test_validations.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require './abstract_unit'
 
 class TestValidations < ActiveSupport::TestCase
   fixtures :seats

metadata

@@ -1,53 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: composite_primary_keys
-version: !ruby/object:Gem::Version 
-  hash: 62196269
+version: !ruby/object:Gem::Version
+  version: 4.0.0.beta8
   prerelease: 6
-  segments: 
-  - 4
-  - 0
-  - 0
-  - beta
-  - 7
-  version: 4.0.0.beta7
 platform: ruby
-authors: 
+authors:
 - Dr Nic Williams
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &21190524 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15424111
-        segments: 
-        - 3
-        - 1
-        - 0
-        - rc
-        - 5
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 3.1.0.rc5
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *21190524
 description: Composite key support for ActiveRecord 3
-email: 
+email:
 - drnicwilliams@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - History.txt
 - README.txt
@@ -101,7 +83,7 @@ files:
 - test/connections/native_oracle/connection.rb
 - test/connections/native_oracle_enhanced/connection.rb
 - test/connections/native_postgresql/connection.rb
-- test/connections/native_sqlite/connection.rb
+- test/connections/native_sqlite3/connection.rb
 - test/db_test.rb
 - test/debug.log
 - test/fixtures/article.rb
@@ -192,42 +174,29 @@ files:
 - test/test_validations.rb
 homepage: http://github.com/cfis/composite_primary_keys
 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: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: compositekeys
-rubygems_version: 1.8.5
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord
-test_files: 
+test_files:
 - test/abstract_unit.rb
 - test/db_test.rb
 - test/debug.log