composite_primary_keys 0.3.2 → 0.3.3

data/lib/composite_primary_keys.rb

@@ -34,7 +34,10 @@ unless defined?(ActiveRecord)
   end
 end
 
+require 'composite_primary_keys/fixtures'
 require 'composite_primary_keys/composite_arrays'
+require 'composite_primary_keys/associations'
+require 'composite_primary_keys/reflection'
 require 'composite_primary_keys/base'
 
 ActiveRecord::Base.class_eval do

data/lib/composite_primary_keys/associations.rb

@@ -0,0 +1,4 @@
+module ActiveRecord
+  class Base
+  end
+end

data/lib/composite_primary_keys/base.rb

@@ -1,5 +1,8 @@
 module CompositePrimaryKeys
   module ActiveRecord #:nodoc:
+    class CompositeKeyError < StandardError #:nodoc:
+    end
+
     module Base #:nodoc:
 
       INVALID_FOR_COMPOSITE_KEYS = 'Not appropriate for composite primary keys'
@@ -51,7 +54,7 @@ module CompositePrimaryKeys
         end
         
         def id_before_type_cast #:nodoc:
-            raise CompositePrimaryKeys::ActiveRecord::Base::NOT_IMPLEMENTED_YET
+            raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::NOT_IMPLEMENTED_YET
         end
   
         def quoted_id #:nodoc:
@@ -62,12 +65,14 @@ module CompositePrimaryKeys
         end
   
         # Sets the primary ID.
-        def id=(value)
-          ids = id.split(value) if value.is_a?(String)
+        def id=(ids)
+          ids = ids.split(ID_SEP) if ids.is_a?(String)
+          ids.flatten!
           unless ids.is_a?(Array) and ids.length == self.class.primary_keys.length
             raise "#{self.class}.id= requires #{self.class.primary_keys.length} ids"
           end
-          ids.each {|id| write_attribute(self.class.primary_key , id)}
+          [primary_keys, ids].transpose.each {|key, an_id| write_attribute(key , an_id)}
+          id
         end
           
         # Deletes the record in the database and freezes this instance to reflect that no changes should
@@ -96,6 +101,36 @@ module CompositePrimaryKeys
           end
         end
   
+        # Allows +attr_name+ to be the list of primary_keys, and returns the id
+        # of the object
+        # e.g. @object[@object.class.primary_key] => [1,1]
+        def [](attr_name)
+          if attr_name.is_a?(String) and attr_name != attr_name.split(ID_SEP).first
+            attr_name = attr_name.split(ID_SEP)
+          end
+          attr_name.is_a?(Array) ?
+            attr_name.map {|name| read_attribute(name)} :
+            read_attribute(attr_name)
+        end
+  
+        # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+.
+        # (Alias for the protected write_attribute method).
+        def []=(attr_name, value)
+          if attr_name.is_a?(String) and attr_name != attr_name.split(ID_SEP).first
+            attr_name = attr_name.split(ID_SEP)
+          end
+          if attr_name.is_a? Array
+            value = value.split(ID_SEP) if value.is_a? String
+            unless value.length == attr_name.length
+              raise "Number of attr_names and values do not match"
+            end
+            #breakpoint
+            [attr_name, value].transpose.map {|name,val| write_attribute(name.to_s, val)}
+          else
+            write_attribute(attr_name, value)
+          end
+        end
+
         # Define an attribute reader method.  Cope with nil column.
         def define_read_method(symbol, attr_name, column)
           cast_code = column.type_cast_code('v') if column
@@ -146,6 +181,25 @@ module CompositePrimaryKeys
           )
           return true
         end
+        
+        # Creates a new record with values matching those of the instance attributes.
+        def create
+          if self.id.nil?
+            raise CompositeKeyError, "Composite keys do not generated ids from sequences, you must provide id values"
+          end
+  
+          self.id = connection.insert(
+            "INSERT INTO #{self.class.table_name} " +
+            "(#{quoted_column_names.join(', ')}) " +
+            "VALUES(#{attributes_with_quotes.values.join(', ')})",
+            "#{self.class.name} Create",
+            self.class.primary_key, self.id
+          )
+  
+          @new_record = false
+          
+          return true
+        end
       end
       
       module CompositeClassMethods
@@ -207,40 +261,44 @@ module CompositePrimaryKeys
         # Lazy-set the sequence name to the connection's default.  This method
         # is only ever called once since set_sequence_name overrides it.
           def sequence_name #:nodoc:
-            raise CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS
+            raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS
           end
     
           def reset_sequence_name #:nodoc:
-            raise CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS
+            raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS
           end
     
           def set_primary_key(value = nil, &block)
-            raise CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS
+            raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS
           end
        
         private
           def find_one(id, options)
-            raise CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS
+            raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS
           end
        
           def find_some(ids, options)
-            raise CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS
+            raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::INVALID_FOR_COMPOSITE_KEYS
           end
   
           def find_from_ids(ids, options)
             conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions]
             # if ids is just a flat list, then its size must = primary_key.length (one id per primary key, in order)
             # if ids is list of lists, then each inner list must follow rule above
-            #if ids.first.is_a?(String) - find '2,1' -> find_from_ids ['2,1']
-            ids = ids[0].split(';').map {|id_set| id_set.split ','} if ids.first.is_a? String
-            ids = [ids] if not ids.first.kind_of?(Array)
             
+            if ids.first.is_a? String
+              # find '2,1' -> ids = ['2,1']
+              # find '2,1;7,3' -> ids = ['2,1;7,3']
+              ids = ids.first.split(ID_SET_SEP).map {|id_set| id_set.split(ID_SEP).to_composite_ids}
+              # find '2,1;7,3' -> ids = [['2','1'],['7','3']], inner [] are CompositeIds
+            end
+            ids = [ids.to_composite_ids] if not ids.first.kind_of?(Array)
             ids.each do |id_set| 
               unless id_set.is_a?(Array)
                 raise "Ids must be in an Array, instead received: #{id_set.inspect}"
               end
               unless id_set.length == primary_keys.length
-                raise "Incorrect number of primary keys for #{class_name}: #{primary_keys.inspect}"
+                raise "#{id_set.inspect}: Incorrect number of primary keys for #{class_name}: #{primary_keys.inspect}"
               end
             end
             

data/lib/composite_primary_keys/composite_arrays.rb

@@ -1,5 +1,6 @@
 module CompositePrimaryKeys
   ID_SEP = ','
+  ID_SET_SEP = ';'
   module ArrayExtension
     def to_composite_keys
       CompositeKeys.new(self)

data/lib/composite_primary_keys/fixtures.rb

@@ -1,600 +1,9 @@
-require 'erb'
-require 'yaml'
-require 'csv'
-
-module YAML #:nodoc:
-  class Omap #:nodoc:
-    def keys;   map { |k, v| k } end
-    def values; map { |k, v| v } end
-  end
-end
-
-class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc:
-end
-
-# Fixtures are a way of organizing data that you want to test against; in short, sample data. They come in 3 flavours:
-#
-#   1.  YAML fixtures
-#   2.  CSV fixtures
-#   3.  Single-file fixtures
-#
-# = YAML fixtures
-#
-# This type of fixture is in YAML format and the preferred default. YAML is a file format which describes data structures
-# in a non-verbose, humanly-readable format. It ships with Ruby 1.8.1+.
-#
-# Unlike single-file fixtures, YAML fixtures are stored in a single file per model, which are placed in the directory appointed
-# by <tt>Test::Unit::TestCase.fixture_path=(path)</tt> (this is automatically configured for Rails, so you can just
-# put your files in <your-rails-app>/test/fixtures/). The fixture file ends with the .yml file extension (Rails example:
-# "<your-rails-app>/test/fixtures/web_sites.yml"). The format of a YAML fixture file looks like this:
-#
-#   rubyonrails:
-#     id: 1
-#     name: Ruby on Rails
-#     url: http://www.rubyonrails.org
-#
-#   google:
-#     id: 2
-#     name: Google
-#     url: http://www.google.com
-#
-# This YAML fixture file includes two fixtures.  Each YAML fixture (ie. record) is given a name and is followed by an
-# indented list of key/value pairs in the "key: value" format.  Records are separated by a blank line for your viewing
-# pleasure.
-#
-# Note that YAML fixtures are unordered. If you want ordered fixtures, use the omap YAML type.  See http://yaml.org/type/omap.html
-# for the specification.  You will need ordered fixtures when you have foreign key constraints on keys in the same table.
-# This is commonly needed for tree structures.  Example:
-#
-#    --- !omap
-#    - parent:
-#        id:         1
-#        parent_id:  NULL
-#        title:      Parent
-#    - child:
-#        id:         2
-#        parent_id:  1
-#        title:      Child
-#
-# = CSV fixtures
-#
-# Fixtures can also be kept in the Comma Separated Value format. Akin to YAML fixtures, CSV fixtures are stored
-# in a single file, but instead end with the .csv file extension (Rails example: "<your-rails-app>/test/fixtures/web_sites.csv")
-#
-# The format of this type of fixture file is much more compact than the others, but also a little harder to read by us
-# humans.  The first line of the CSV file is a comma-separated list of field names.  The rest of the file is then comprised
-# of the actual data (1 per line).  Here's an example:
-#
-#   id, name, url
-#   1, Ruby On Rails, http://www.rubyonrails.org
-#   2, Google, http://www.google.com
-#
-# Should you have a piece of data with a comma character in it, you can place double quotes around that value.  If you
-# need to use a double quote character, you must escape it with another double quote.
-#
-# Another unique attribute of the CSV fixture is that it has *no* fixture name like the other two formats.  Instead, the
-# fixture names are automatically generated by deriving the class name of the fixture file and adding an incrementing
-# number to the end.  In our example, the 1st fixture would be called "web_site_1" and the 2nd one would be called
-# "web_site_2".
-#
-# Most databases and spreadsheets support exporting to CSV format, so this is a great format for you to choose if you
-# have existing data somewhere already.
-#
-# = Single-file fixtures
-#
-# This type of fixtures was the original format for Active Record that has since been deprecated in favor of the YAML and CSV formats.
-# Fixtures for this format are created by placing text files in a sub-directory (with the name of the model) to the directory
-# appointed by <tt>Test::Unit::TestCase.fixture_path=(path)</tt> (this is automatically configured for Rails, so you can just
-# put your files in <your-rails-app>/test/fixtures/<your-model-name>/ -- like <your-rails-app>/test/fixtures/web_sites/ for the WebSite
-# model).
-#
-# Each text file placed in this directory represents a "record".  Usually these types of fixtures are named without
-# extensions, but if you are on a Windows machine, you might consider adding .txt as the extension.  Here's what the
-# above example might look like:
-#
-#   web_sites/google
-#   web_sites/yahoo.txt
-#   web_sites/ruby-on-rails
-#
-# The file format of a standard fixture is simple.  Each line is a property (or column in db speak) and has the syntax
-# of "name => value".  Here's an example of the ruby-on-rails fixture above:
-#
-#   id => 1
-#   name => Ruby on Rails
-#   url => http://www.rubyonrails.org
-#
-# = Using Fixtures
-#
-# Since fixtures are a testing construct, we use them in our unit and functional tests.  There are two ways to use the
-# fixtures, but first let's take a look at a sample unit test found:
-#
-#   require 'web_site'
-#
-#   class WebSiteTest < Test::Unit::TestCase
-#     def test_web_site_count
-#       assert_equal 2, WebSite.count
-#     end
-#   end
-#
-# As it stands, unless we pre-load the web_site table in our database with two records, this test will fail.  Here's the
-# easiest way to add fixtures to the database:
-#
-#   ...
-#   class WebSiteTest < Test::Unit::TestCase
-#     fixtures :web_sites # add more by separating the symbols with commas
-#   ...
-#
-# By adding a "fixtures" method to the test case and passing it a list of symbols (only one is shown here tho), we trigger
-# the testing environment to automatically load the appropriate fixtures into the database before each test.  
-# To ensure consistent data, the environment deletes the fixtures before running the load.
-#
-# In addition to being available in the database, the fixtures are also loaded into a hash stored in an instance variable
-# of the test case.  It is named after the symbol... so, in our example, there would be a hash available called
-# @web_sites.  This is where the "fixture name" comes into play.
-#
-# On top of that, each record is automatically "found" (using Model.find(id)) and placed in the instance variable of its name.
-# So for the YAML fixtures, we'd get @rubyonrails and @google, which could be interrogated using regular Active Record semantics:
-#
-#   # test if the object created from the fixture data has the same attributes as the data itself
-#   def test_find
-#     assert_equal @web_sites["rubyonrails"]["name"], @rubyonrails.name
-#   end
-#
-# As seen above, the data hash created from the YAML fixtures would have @web_sites["rubyonrails"]["url"] return
-# "http://www.rubyonrails.org" and @web_sites["google"]["name"] would return "Google". The same fixtures, but loaded
-# from a CSV fixture file, would be accessible via @web_sites["web_site_1"]["name"] == "Ruby on Rails" and have the individual
-# fixtures available as instance variables @web_site_1 and @web_site_2.
-#
-# If you do not wish to use instantiated fixtures (usually for performance reasons) there are two options.
-#
-#   - to completely disable instantiated fixtures:
-#       self.use_instantiated_fixtures = false
-#
-#   - to keep the fixture instance (@web_sites) available, but do not automatically 'find' each instance:
-#       self.use_instantiated_fixtures = :no_instances 
-#
-# Even if auto-instantiated fixtures are disabled, you can still access them
-# by name via special dynamic methods. Each method has the same name as the
-# model, and accepts the name of the fixture to instantiate:
-#
-#   fixtures :web_sites
-#
-#   def test_find
-#     assert_equal "Ruby on Rails", web_sites(:rubyonrails).name
-#   end
-#
-# = Dynamic fixtures with ERb
-#
-# Some times you don't care about the content of the fixtures as much as you care about the volume. In these cases, you can
-# mix ERb in with your YAML or CSV fixtures to create a bunch of fixtures for load testing, like:
-#
-# <% for i in 1..1000 %>
-# fix_<%= i %>:
-#   id: <%= i %>
-#   name: guy_<%= 1 %>
-# <% end %>
-#
-# This will create 1000 very simple YAML fixtures.
-#
-# Using ERb, you can also inject dynamic values into your fixtures with inserts like <%= Date.today.strftime("%Y-%m-%d") %>.
-# This is however a feature to be used with some caution. The point of fixtures are that they're stable units of predictable
-# sample data. If you feel that you need to inject dynamic values, then perhaps you should reexamine whether your application
-# is properly testable. Hence, dynamic values in fixtures are to be considered a code smell.
-#
-# = Transactional fixtures
-#
-# TestCases can use begin+rollback to isolate their changes to the database instead of having to delete+insert for every test case. 
-# They can also turn off auto-instantiation of fixture data since the feature is costly and often unused.
-#
-#   class FooTest < Test::Unit::TestCase
-#     self.use_transactional_fixtures = true
-#     self.use_instantiated_fixtures = false
-#   
-#     fixtures :foos
-#   
-#     def test_godzilla
-#       assert !Foo.find(:all).empty?
-#       Foo.destroy_all
-#       assert Foo.find(:all).empty?
-#     end
-#   
-#     def test_godzilla_aftermath
-#       assert !Foo.find(:all).empty?
-#     end
-#   end
-#   
-# If you preload your test database with all fixture data (probably in the Rakefile task) and use transactional fixtures, 
-# then you may omit all fixtures declarations in your test cases since all the data's already there and every case rolls back its changes.
-#
-# In order to use instantiated fixtures with preloaded data, set +self.pre_loaded_fixtures+ to true. This will provide 
-# access to fixture data for every table that has been loaded through fixtures (depending on the value of +use_instantiated_fixtures+)
-#
-# When *not* to use transactional fixtures: 
-#   1. You're testing whether a transaction works correctly. Nested transactions don't commit until all parent transactions commit, 
-#      particularly, the fixtures transaction which is begun in setup and rolled back in teardown. Thus, you won't be able to verify 
-#      the results of your transaction until Active Record supports nested transactions or savepoints (in progress.) 
-#   2. Your database does not support transactions. Every Active Record database supports transactions except MySQL MyISAM. 
-#      Use InnoDB, MaxDB, or NDB instead.
-class Fixtures < YAML::Omap
-  DEFAULT_FILTER_RE = /\.ya?ml$/
-
-  def self.instantiate_fixtures(object, table_name, fixtures, load_instances=true)
-    object.instance_variable_set "@#{table_name.to_s.gsub('.','_')}", fixtures
-    if load_instances
-      ActiveRecord::Base.silence do
-        fixtures.each do |name, fixture|
-          begin
-            object.instance_variable_set "@#{name}", fixture.find
-          rescue FixtureClassNotFound
-            nil
-          end
-        end
-      end
-    end
-  end
-
-  def self.instantiate_all_loaded_fixtures(object, load_instances=true)
-    all_loaded_fixtures.each do |table_name, fixtures|
-      Fixtures.instantiate_fixtures(object, table_name, fixtures, load_instances)
-    end
-  end
-  
-  cattr_accessor :all_loaded_fixtures
-  self.all_loaded_fixtures = {}
-
-  def self.create_fixtures(fixtures_directory, table_names, class_names = {})
-    table_names = [table_names].flatten.map { |n| n.to_s }
-    connection = block_given? ? yield : ActiveRecord::Base.connection
-    ActiveRecord::Base.silence do
-      fixtures_map = {}
-      fixtures = table_names.map do |table_name|
-        fixtures_map[table_name] = Fixtures.new(connection, File.split(table_name.to_s).last, class_names[table_name.to_sym], File.join(fixtures_directory, table_name.to_s))
-      end               
-      all_loaded_fixtures.merge! fixtures_map  
-
-      connection.transaction do
-        fixtures.reverse.each { |fixture| fixture.delete_existing_fixtures }
-        fixtures.each { |fixture| fixture.insert_fixtures }
-
-        # Cap primary key sequences to max(pk).
-        if connection.respond_to?(:reset_pk_sequence!)
-          table_names.each do |table_name|
-            connection.reset_pk_sequence!(table_name)
-          end
-        end
-      end
-
-      return fixtures.size > 1 ? fixtures : fixtures.first
-    end
-  end
-
-
-  attr_reader :table_name
-
-  def initialize(connection, table_name, class_name, fixture_path, file_filter = DEFAULT_FILTER_RE)
-    @connection, @table_name, @fixture_path, @file_filter = connection, table_name, fixture_path, file_filter
-    @class_name = class_name || 
-                  (ActiveRecord::Base.pluralize_table_names ? @table_name.singularize.camelize : @table_name.camelize)
-    @table_name = ActiveRecord::Base.table_name_prefix + @table_name + ActiveRecord::Base.table_name_suffix
-    read_fixture_files
-  end
-
-  def delete_existing_fixtures
-    @connection.delete "DELETE FROM #{@table_name}", 'Fixture Delete'
-  end
-
-  def insert_fixtures
-    values.each do |fixture|
-      @connection.execute "INSERT INTO #{@table_name} (#{fixture.key_list}) VALUES (#{fixture.value_list})", 'Fixture Insert'
-    end
-  end
-
-  private
-
-    def read_fixture_files
-      if File.file?(yaml_file_path)
-        # YAML fixtures
-        begin
-          yaml_string = ""
-          Dir["#{@fixture_path}/**/*.yml"].select {|f| test(?f,f) }.each do |subfixture_path|
-            yaml_string << IO.read(subfixture_path)
-          end
-          yaml_string << IO.read(yaml_file_path)
-
-          if yaml = YAML::load(erb_render(yaml_string))
-            yaml = yaml.value if yaml.respond_to?(:type_id) and yaml.respond_to?(:value)
-            yaml.each do |name, data|
-              self[name] = Fixture.new(data, @class_name)
-            end
-          end
-        rescue Exception=>boom
-          raise Fixture::FormatError, "a YAML error occured parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n  #{boom.class}: #{boom}"
-        end
-      elsif File.file?(csv_file_path)
-        # CSV fixtures
-        reader = CSV::Reader.create(erb_render(IO.read(csv_file_path)))
-        header = reader.shift
-        i = 0
-        reader.each do |row|
-          data = {}
-          row.each_with_index { |cell, j| data[header[j].to_s.strip] = cell.to_s.strip }
-          self["#{Inflector::underscore(@class_name)}_#{i+=1}"]= Fixture.new(data, @class_name)
-        end
-      elsif File.file?(deprecated_yaml_file_path)
-        raise Fixture::FormatError, ".yml extension required: rename #{deprecated_yaml_file_path} to #{yaml_file_path}"
-      else
-        # Standard fixtures
-        Dir.entries(@fixture_path).each do |file|
-          path = File.join(@fixture_path, file)
-          if File.file?(path) and file !~ @file_filter
-            self[file] = Fixture.new(path, @class_name)
-          end
-        end
-      end
-    end
-
-    def yaml_file_path
-      "#{@fixture_path}.yml"
-    end
-
-    def deprecated_yaml_file_path
-      "#{@fixture_path}.yaml"
-    end
-
-    def csv_file_path
-      @fixture_path + ".csv"
-    end
-
-    def yaml_fixtures_key(path)
-      File.basename(@fixture_path).split(".").first
-    end
-
-    def erb_render(fixture_content)
-      ERB.new(fixture_content).result
-    end
-end
-
 class Fixture #:nodoc:
-  include Enumerable
-  class FixtureError < StandardError#:nodoc:
-  end
-  class FormatError < FixtureError#:nodoc:
-  end
-
-  def initialize(fixture, class_name)
-    case fixture
-      when Hash, YAML::Omap
-        @fixture = fixture
-      when String
-        @fixture = read_fixture_file(fixture)
-      else
-        raise ArgumentError, "Bad fixture argument #{fixture.inspect}"
-    end
-
-    @class_name = class_name
-  end
-
-  def each
-    @fixture.each { |item| yield item }
-  end
-
   def [](key)
-    @fixture[key]
-  end
-
-  def to_hash
-    @fixture
-  end
-
-  def key_list
-    columns = @fixture.keys.collect{ |column_name| ActiveRecord::Base.connection.quote_column_name(column_name) }
-    columns.join(", ")
-  end
-
-  def value_list
-    @fixture.values.map { |v| ActiveRecord::Base.connection.quote(v).gsub('\\n', "\n").gsub('\\r', "\r") }.join(", ")
-  end
-
-  def find
-    klass = @class_name.is_a?(Class) ? @class_name : Object.const_get(@class_name) rescue nil
-    if klass
-      klass.find(self[klass.primary_key])
-    else
-      raise FixtureClassNotFound, "The class #{@class_name.inspect} was not found."
+    if key.is_a? Array
+      return key.map {|a_key| self[a_key.to_s]}.
+        to_composite_ids.to_s
     end
+    @fixture[key]
   end
-
-  private
-    def read_fixture_file(fixture_file_path)
-      IO.readlines(fixture_file_path).inject({}) do |fixture, line|
-        # Mercifully skip empty lines.
-        next if line =~ /^\s*$/
-
-        # Use the same regular expression for attributes as Active Record.
-        unless md = /^\s*([a-zA-Z][-_\w]*)\s*=>\s*(.+)\s*$/.match(line)
-          raise FormatError, "#{fixture_file_path}: fixture format error at '#{line}'.  Expecting 'key => value'."
-        end
-        key, value = md.captures
-
-        # Disallow duplicate keys to catch typos.
-        raise FormatError, "#{fixture_file_path}: duplicate '#{key}' in fixture." if fixture[key]
-        fixture[key] = value.strip
-        fixture
-      end
-    end
-end
-
-module Test #:nodoc:
-  module Unit #:nodoc:
-    class TestCase #:nodoc:
-      cattr_accessor :fixture_path
-      class_inheritable_accessor :fixture_table_names
-      class_inheritable_accessor :fixture_class_names
-      class_inheritable_accessor :use_transactional_fixtures
-      class_inheritable_accessor :use_instantiated_fixtures   # true, false, or :no_instances
-      class_inheritable_accessor :pre_loaded_fixtures
-
-      self.fixture_table_names = []
-      self.use_transactional_fixtures = false
-      self.use_instantiated_fixtures = true
-      self.pre_loaded_fixtures = false
-      
-      self.fixture_class_names = {}
-      
-      @@already_loaded_fixtures = {}
-      self.fixture_class_names = {}
-      
-      def self.set_fixture_class(class_names = {})
-        self.fixture_class_names = self.fixture_class_names.merge(class_names)
-      end
-      
-      def self.fixtures(*table_names)
-        table_names = table_names.flatten.map { |n| n.to_s }
-        self.fixture_table_names |= table_names
-        require_fixture_classes(table_names)
-        setup_fixture_accessors(table_names)
-      end
-
-      def self.require_fixture_classes(table_names=nil)
-        (table_names || fixture_table_names).each do |table_name| 
-          file_name = table_name.to_s
-          file_name = file_name.singularize if ActiveRecord::Base.pluralize_table_names
-          begin
-            require file_name
-          rescue LoadError
-            # Let's hope the developer has included it himself
-          end
-        end
-      end
-
-      def self.setup_fixture_accessors(table_names=nil)
-        (table_names || fixture_table_names).each do |table_name|
-          table_name = table_name.to_s.tr('.','_')
-          define_method(table_name) do |fixture, *optionals|
-            force_reload = optionals.shift
-            @fixture_cache[table_name] ||= Hash.new
-            @fixture_cache[table_name][fixture] = nil if force_reload
-            if @loaded_fixtures[table_name][fixture.to_s]
-              @fixture_cache[table_name][fixture] ||= @loaded_fixtures[table_name][fixture.to_s].find
-            else
-              raise StandardError, "No fixture with name '#{fixture}' found for table '#{table_name}'"
-            end
-          end
-        end
-      end
-
-      def self.uses_transaction(*methods)
-        @uses_transaction ||= []
-        @uses_transaction.concat methods.map { |m| m.to_s }
-      end
-
-      def self.uses_transaction?(method)
-        @uses_transaction && @uses_transaction.include?(method.to_s)
-      end
-
-      def use_transactional_fixtures?
-        use_transactional_fixtures &&
-          !self.class.uses_transaction?(method_name)
-      end
-
-      def setup_with_fixtures
-        if pre_loaded_fixtures && !use_transactional_fixtures
-          raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures' 
-        end
-
-        @fixture_cache = Hash.new
-
-        # Load fixtures once and begin transaction.
-        if use_transactional_fixtures?
-          if @@already_loaded_fixtures[self.class]
-            @loaded_fixtures = @@already_loaded_fixtures[self.class]
-          else
-            load_fixtures
-            @@already_loaded_fixtures[self.class] = @loaded_fixtures
-          end
-          ActiveRecord::Base.lock_mutex
-          ActiveRecord::Base.connection.begin_db_transaction
-
-        # Load fixtures for every test.
-        else
-          @@already_loaded_fixtures[self.class] = nil
-          load_fixtures
-        end
-
-        # Instantiate fixtures for every test if requested.
-        instantiate_fixtures if use_instantiated_fixtures
-      end
-
-      alias_method :setup, :setup_with_fixtures
-
-      def teardown_with_fixtures
-        # Rollback changes.
-        if use_transactional_fixtures?
-          ActiveRecord::Base.connection.rollback_db_transaction
-          ActiveRecord::Base.unlock_mutex
-        end
-        ActiveRecord::Base.verify_active_connections!
-      end
-
-      alias_method :teardown, :teardown_with_fixtures
-
-      def self.method_added(method)
-        case method.to_s
-        when 'setup'
-          unless method_defined?(:setup_without_fixtures)
-            alias_method :setup_without_fixtures, :setup
-            define_method(:setup) do
-              setup_with_fixtures
-              setup_without_fixtures
-            end
-          end
-        when 'teardown'
-          unless method_defined?(:teardown_without_fixtures)
-            alias_method :teardown_without_fixtures, :teardown
-            define_method(:teardown) do
-              teardown_without_fixtures
-              teardown_with_fixtures
-            end
-          end
-        end
-      end
-
-      private
-        def load_fixtures
-          @loaded_fixtures = {}
-          fixtures = Fixtures.create_fixtures(fixture_path, fixture_table_names, fixture_class_names)
-          unless fixtures.nil?
-            if fixtures.instance_of?(Fixtures)
-              @loaded_fixtures[fixtures.table_name] = fixtures
-            else
-              fixtures.each { |f| @loaded_fixtures[f.table_name] = f }
-            end
-          end
-        end
-
-        # for pre_loaded_fixtures, only require the classes once. huge speed improvement
-        @@required_fixture_classes = false
-
-        def instantiate_fixtures
-          if pre_loaded_fixtures
-            raise RuntimeError, 'Load fixtures before instantiating them.' if Fixtures.all_loaded_fixtures.empty?
-            unless @@required_fixture_classes
-              self.class.require_fixture_classes Fixtures.all_loaded_fixtures.keys
-              @@required_fixture_classes = true
-            end
-            Fixtures.instantiate_all_loaded_fixtures(self, load_instances?)
-          else
-            raise RuntimeError, 'Load fixtures before instantiating them.' if @loaded_fixtures.nil?
-            @loaded_fixtures.each do |table_name, fixtures|
-              Fixtures.instantiate_fixtures(self, table_name, fixtures, load_instances?)
-            end
-          end
-        end
-
-        def load_instances?
-          use_instantiated_fixtures != :no_instances
-        end
-    end
-
-  end
-end
+end

data/lib/composite_primary_keys/reflection.rb

@@ -0,0 +1,19 @@
+module ActiveRecord
+  module Reflection
+    class AssociationReflection
+      def primary_key_name
+        return @primary_key_name if @primary_key_name
+        case
+          when macro == :belongs_to
+            @primary_key_name = options[:foreign_key] || class_name.foreign_key
+          when options[:as]
+            @primary_key_name = options[:foreign_key] || "#{options[:as]}_id"
+          else
+            @primary_key_name = options[:foreign_key] || active_record.name.foreign_key
+        end
+        @primary_key_name = @primary_key_name.to_composite_keys.to_s if @primary_key_name.is_a? Array
+        @primary_key_name
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

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

data/test/abstract_unit.rb

@@ -8,7 +8,6 @@ require 'active_support/binding_of_caller'
 require 'active_support/breakpoint'
 require 'connection'
 require 'composite_primary_keys'
-require 'composite_primary_keys/fixtures'
 
 QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type') unless Object.const_defined?(:QUOTED_TYPE)
 
@@ -63,11 +62,12 @@ protected
   end
   
   def first_id
-    (1..@primary_keys.length).map {|num| 1}
+    ids = (1..@primary_keys.length).map {|num| 1}
+    composite? ? ids.to_composite_ids : ids.first
   end
   
   def first_id_str
-    first_id.join(CompositePrimaryKeys::ID_SEP)
+    composite? ? first_id.join(CompositePrimaryKeys::ID_SEP) : first_id.to_s
   end
   
   def composite?

data/test/associations_test.rb

@@ -0,0 +1,44 @@
+require 'abstract_unit'
+require 'fixtures/product'
+require 'fixtures/tariff'
+require 'fixtures/product_tariff'
+
+class AssociationTest < Test::Unit::TestCase
+  fixtures :products, :tariffs, :product_tariffs
+
+  def setup
+    super
+    @first_product = products(:first_product)
+    @flat = tariffs(:flat)
+    @free = tariffs(:free)
+    @first_flat = product_tariffs(:first_flat)
+  end
+  
+  def test_setup
+    assert_not_nil @first_product
+    assert_not_nil @flat
+    assert_not_nil @free
+    assert_not_nil @first_flat
+  end
+  
+  def test_products
+    assert_not_nil @first_product.product_tariffs
+    assert_equal 2, @first_product.product_tariffs.length
+    assert_not_nil @first_product.tariffs
+    assert_equal 2, @first_product.tariffs.length
+  end
+  
+  def test_product_tariffs
+    assert_not_nil @first_flat.product
+    assert_not_nil @first_flat.tariff
+    assert_equal Product, @first_flat.product.class
+    assert_equal Tariff, @first_flat.tariff.class
+  end
+  
+  def test_tariffs
+    assert_not_nil @flat.product_tariffs
+    assert_equal 2, @flat.product_tariffs.length
+    assert_not_nil @flat.products
+    assert_equal 2, @flat.products.length
+  end
+end

data/test/attributes_test.rb

@@ -0,0 +1,85 @@
+require 'abstract_unit'
+require 'fixtures/reference_type'
+require 'fixtures/reference_code'
+require 'fixtures/product'
+require 'fixtures/tariff'
+require 'fixtures/product_tariff'
+
+class AttributesTest < Test::Unit::TestCase
+  fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
+
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => [:reference_type_id],
+    },
+    :dual   => { 
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+  }
+  
+  def setup
+    super
+    self.class.classes = CLASSES
+  end
+  
+  def test_brackets
+    testing_with do
+      @first.attributes.each_pair do |attr_name, value|
+        assert_equal value, @first[attr_name]
+      end
+    end
+  end
+    
+  def test_brackets_primary_key
+    testing_with do
+      assert_equal @first.id, @first[@primary_keys]
+      assert_equal @first.id, @first[@first.class.primary_key]
+    end
+  end
+
+  def test_brackets_assignment
+    testing_with do
+      @first.attributes.each_pair do |attr_name, value|
+        @first[attr_name]= !value.nil? ? value * 2 : '1'
+        assert_equal !value.nil? ? value * 2 : '1', @first[attr_name]
+      end
+    end
+  end
+    
+  def test_brackets_foreign_key_assignment
+    @flat = tariffs(:flat)
+    @second_free = product_tariffs(:second_free)
+    @second_free_fk = [:tariff_id, :tariff_start_date]
+    @second_free[key = @second_free_fk] = @flat.id
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+      assert_equal @flat.id, @second_free[key]
+    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id
+      assert_equal @flat.id, @second_free[key]
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id.to_s
+      assert_equal @flat.id, @second_free[key]
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id.to_s
+      assert_equal @flat.id, @second_free[key]
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+    @second_free[key = @second_free_fk.to_composite_ids.to_s] = @flat.id
+      assert_equal @flat.id, @second_free[key]
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+    @second_free[key = @second_free_fk.to_composite_ids.to_s] = @flat.id.to_s
+      assert_equal @flat.id, @second_free[key]
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+  end
+private
+  def compare_indexes(obj_name1, indexes1, obj_name2, indexes2)
+    obj1, obj2 = eval "[#{obj_name1}, #{obj_name2}]"
+    indexes1.length.times do |key_index|
+      assert_equal obj1[indexes1[key_index].to_s], 
+                   obj2[indexes2[key_index].to_s],
+                   "#{obj_name1}[#{indexes1[key_index]}]=#{obj1[indexes1[key_index].to_s].inspect} != " +
+                   "#{obj_name2}[#{indexes2[key_index]}]=#{obj2[indexes2[key_index].to_s].inspect}; " +
+                   "#{obj_name2} = #{obj2.inspect}"
+    end
+  end
+end

data/test/create_test.rb

@@ -0,0 +1,52 @@
+require 'abstract_unit'
+require 'fixtures/reference_type'
+require 'fixtures/reference_code'
+
+class DummyTest < Test::Unit::TestCase
+  fixtures :reference_types, :reference_codes
+
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => [:reference_type_id],
+      :create => {:reference_type_id => 10, :type_label => 'NEW_TYPE', :abbreviation => 'New Type'}
+    },
+    :dual   => { 
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+      :create => {:reference_type_id => 1, :reference_code => 20, :code_label => 'NEW_CODE', :abbreviation => 'New Code'}
+    },
+  }
+  
+  def setup
+    super
+    self.class.classes = CLASSES
+  end
+  
+  def test_setup
+    testing_with do
+      assert_not_nil @klass_info[:create]
+    end
+  end
+  
+  def test_create
+    testing_with do
+      assert new_obj = @klass.create(@klass_info[:create])
+      assert !new_obj.new_record?
+    end
+  end
+  
+  def test_create_no_id
+    testing_with do
+      begin
+        @obj = @klass.create(@klass_info[:create].block(@klass.primary_key))
+        @successful = !composite?
+      rescue CompositePrimaryKeys::ActiveRecord::CompositeKeyError
+        @successful = false
+      rescue
+        flunk "Incorrect exception raised: #{$!}, #{$!.class}"
+      end
+      assert_equal composite?, !@successful, "Create should have failed for composites; #{@obj.inspect}"
+    end
+  end
+end

data/test/dummy_test.rb

@@ -17,6 +17,7 @@ class DummyTest < Test::Unit::TestCase
   }
   
   def setup
+    super
     self.class.classes = CLASSES
   end
   

data/test/find_test.rb

@@ -40,6 +40,16 @@ class FindTest < Test::Unit::TestCase
     end
   end
   
+  def test_find_composite_ids
+    testing_with do
+      found = @klass.find(first_id) # e.g. find([1,1].to_composite_ids)
+      assert found
+      assert_equal @klass, found.class
+      assert_equal found, @klass.find(found.id)
+      assert_equal found, @klass.find(found.to_param)
+    end
+  end
+  
   def test_to_param
     testing_with do
       assert_equal first_id_str, @first.to_param.to_s

data/test/fixtures/db_definitions/mysql.drop.sql

@@ -1,30 +1,2 @@
-DROP TABLE accounts;
-DROP TABLE funny_jokes;
-DROP TABLE companies;
-DROP TABLE topics;
-DROP TABLE developers;
-DROP TABLE projects;
-DROP TABLE developers_projects;
-DROP TABLE customers;
-DROP TABLE orders;
-DROP TABLE movies;
-DROP TABLE subscribers;
-DROP TABLE booleantests;
-DROP TABLE auto_id_tests;
-DROP TABLE entrants;
-DROP TABLE colnametests;
-DROP TABLE mixins;
-DROP TABLE people;
-DROP TABLE readers;
-DROP TABLE binaries;
-DROP TABLE computers;
-DROP TABLE tasks;
-DROP TABLE posts;
-DROP TABLE comments;
-DROP TABLE authors;
-DROP TABLE categories;
-DROP TABLE categories_posts;
-DROP TABLE fk_test_has_fk;
-DROP TABLE fk_test_has_pk;
-DROP TABLE keyboards;
-DROP TABLE legacy_things;
+DROP TABLE reference_codes;
+DROP TABLE reference_types;

data/test/fixtures/db_definitions/mysql.sql

@@ -14,3 +14,24 @@ CREATE TABLE `reference_codes` (
   `description` varchar(50) default NULL,
   PRIMARY KEY  (`reference_type_id`,`reference_code`)
 ) TYPE=InnoDB;
+
+CREATE TABLE `products` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) default NULL,
+  PRIMARY KEY  (`id`)
+) TYPE=InnoDB;
+
+CREATE TABLE `tariffs` (
+  `tariff_id` int(11) NOT NULL,
+  `start_date` date NOT NULL,
+  `amount` integer(11) default NULL,
+  PRIMARY KEY  (`tariff_id`,`start_date`)
+) TYPE=InnoDB;
+
+CREATE TABLE `product_tariffs` (
+  `product_id` int(11) NOT NULL,
+  `tariff_id` int(11) NOT NULL,
+  `tariff_start_date` date NOT NULL,
+  PRIMARY KEY  (`product_id`,`tariff_id`,`tariff_start_date`)
+) TYPE=InnoDB;
+

data/test/fixtures/product.rb

@@ -0,0 +1,5 @@
+class Product < ActiveRecord::Base
+	set_primary_key :id  # redundant
+	has_many :product_tariffs, :foreign_key => :product_id
+	has_many :tariffs, :through => :product_tariffs, :foreign_key => :product_id
+end

data/test/fixtures/product_tariff.rb

@@ -0,0 +1,5 @@
+class ProductTariff < ActiveRecord::Base
+	set_primary_keys :product_id, :tariff_id, :tariff_start_date
+	belongs_to :product, :foreign_key => :product_id
+	belongs_to :tariff,  :foreign_key => [:tariff_id, :tariff_start_date]
+end

data/test/fixtures/product_tariffs.yml

@@ -0,0 +1,12 @@
+first_flat:
+  product_id: 1
+  tariff_id: 1
+  tariff_start_date: <%= Date.today.to_s(:db) %>
+first_free:  
+  product_id: 1
+  tariff_id: 2
+  tariff_start_date: <%= Date.today.to_s(:db) %>
+second_free:
+  product_id: 2
+  tariff_id: 2
+  tariff_start_date: <%= Date.today.to_s(:db) %>

data/test/fixtures/products.yml

@@ -0,0 +1,6 @@
+first_product:
+  id: 1
+  name: Product One
+second_product:
+  id: 2
+  name: Product Two

data/test/fixtures/tariff.rb

@@ -0,0 +1,4 @@
+class Tariff < ActiveRecord::Base
+	set_primary_keys [:tariff_id, :start_date]
+	has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
+end

data/test/fixtures/tariffs.yml

@@ -0,0 +1,13 @@
+flat:
+  tariff_id: 1
+  start_date: <%= Date.today.to_s(:db) %>
+  amount: 50
+free:
+  tariff_id: 2
+  start_date: <%= Date.today.to_s(:db) %>
+  amount: 0
+flat_future:
+  tariff_id: 1
+  start_date: <%= Date.today.next.to_s(:db) %>
+  amount: 100
+  

data/test/ids_test.rb

@@ -42,6 +42,33 @@ class IdsTest < Test::Unit::TestCase
     end
   end
   
+  def test_set_ids_string
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected.to_s
+      assert_equal expected, @first.id
+    end
+  end
+  
+  def test_set_ids_array
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected
+      assert_equal expected, @first.id
+    end
+  end
+  
+  def test_set_ids_comp
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected
+      assert_equal expected, @first.id
+    end
+  end
+  
   def test_primary_keys
     testing_with do
       if composite?

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
-date: 2006-07-23 00:00:00 +02:00
+  version: 0.3.3
+date: 2006-07-30 00:00:00 +02:00
 summary: Support for composite primary keys in ActiveRecords
 require_paths: 
 - lib
@@ -34,10 +34,12 @@ files:
 - CHANGELOG
 - lib/composite_primary_keys
 - lib/composite_primary_keys.rb
-- lib/composite_primary_keys/fixtures.rb
 - lib/composite_primary_keys/composite_arrays.rb
 - lib/composite_primary_keys/version.rb
 - lib/composite_primary_keys/base.rb
+- lib/composite_primary_keys/fixtures.rb
+- lib/composite_primary_keys/reflection.rb
+- lib/composite_primary_keys/associations.rb
 - test/connections
 - test/fixtures
 - test/composite_arrays_test.rb
@@ -51,6 +53,9 @@ files:
 - test/pagination_test.rb
 - test/dummy_test.rb
 - test/clone_test.rb
+- test/associations_test.rb
+- test/attributes_test.rb
+- test/create_test.rb
 - test/connections/native_mysql
 - test/connections/native_mysql/connection.rb
 - test/fixtures/reference_type.rb
@@ -58,10 +63,14 @@ files:
 - test/fixtures/reference_types.yml
 - test/fixtures/reference_codes.yml
 - test/fixtures/db_definitions
+- test/fixtures/product.rb
+- test/fixtures/product_tariff.rb
+- test/fixtures/tariff.rb
+- test/fixtures/products.yml
+- test/fixtures/tariffs.yml
+- test/fixtures/product_tariffs.yml
 - test/fixtures/db_definitions/mysql.drop.sql
 - test/fixtures/db_definitions/mysql.sql
-- test/fixtures/db_definitions/mysql2.drop.sql
-- test/fixtures/db_definitions/mysql2.sql
 test_files: []
 
 rdoc_options: 

data/test/fixtures/db_definitions/mysql2.drop.sql

@@ -1,2 +0,0 @@
-DROP TABLE courses;
-

data/test/fixtures/db_definitions/mysql2.sql

@@ -1,5 +0,0 @@
-CREATE TABLE `courses` (
- `id` INTEGER NOT NULL PRIMARY KEY,
- `name` VARCHAR(255) NOT NULL
-) TYPE=InnoDB;
-