composite_primary_keys 4.1.2 → 5.0.0.rc1

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'
+  gem 'activerecord', '~> 3.2.0.rc2'
   require 'active_record'
 end
 
@@ -34,6 +34,7 @@ end
 require 'active_record/fixtures'
 require 'active_record/persistence'
 require 'active_record/relation'
+require 'active_record/sanitization'
 
 require 'active_record/associations/association'
 require 'active_record/associations/association_scope'
@@ -68,6 +69,7 @@ require 'composite_primary_keys/composite_predicates'
 require 'composite_primary_keys/fixtures'
 require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/relation'
+require 'composite_primary_keys/sanitization'
 require 'composite_primary_keys/version'
 
 require 'composite_primary_keys/associations/association'

data/lib/composite_primary_keys/attribute_methods/read.rb

@@ -2,50 +2,26 @@ module ActiveRecord
   module AttributeMethods
     module Read
       module ClassMethods
-        def define_read_method(method_name, attr_name, column)
-          cast_code = column.type_cast_code('v')
+        def internal_attribute_access_code(attr_name, cast_code)
           # CPK - this is a really horrid hack, needed to get
           # right class namespace :(
           if cast_code.match(/^ActiveRecord/)
             cast_code = "::#{cast_code}"
           end
-
-          access_code = "(v=@attributes['#{attr_name}']) && #{cast_code}"
+          access_code = "(v=@attributes[attr_name]) && #{cast_code}"
 
           # CPK
-          # unless attr_name.to_s == self.primary_key.to_s
-          #   access_code.insert(0, "missing_attribute('#{attr_name}', caller) unless @attributes.has_key?('#{attr_name}'); ")
-          # end
+          #unless attr_name == primary_key
           primary_keys = Array(self.primary_key)
-
           unless primary_keys.include?(attr_name.to_s)
-            access_code = access_code.insert(0, "missing_attribute('#{attr_name}', caller) unless @attributes.has_key?('#{attr_name}'); ")
+            access_code.insert(0, "missing_attribute(attr_name, caller) unless @attributes.has_key?(attr_name); ")
           end
 
           if cache_attribute?(attr_name)
-            access_code = "@attributes_cache['#{attr_name}'] ||= (#{access_code})"
+            access_code = "@attributes_cache[attr_name] ||= (#{access_code})"
           end
 
-          # Where possible, generate the method by evalling a string, as this will result in
-          # faster accesses because it avoids the block eval and then string eval incurred
-          # by the second branch.
-          #
-          # The second, slower, branch is necessary to support instances where the database
-          # returns columns with extra stuff in (like 'my_column(omg)').
-          if method_name =~ ActiveModel::AttributeMethods::COMPILABLE_REGEXP
-            generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__
-              def _#{method_name}
-                #{access_code}
-              end
-
-              alias #{method_name} _#{method_name}
-            STR
-          else
-            generated_attribute_methods.module_eval do
-              define_method("_#{method_name}") { eval(access_code) }
-              alias_method(method_name, "_#{method_name}")
-            end
-          end
+          "attr_name = '#{attr_name}'; #{access_code}"
         end
       end
 
@@ -53,30 +29,8 @@ module ActiveRecord
         # CPK
         if attr_name.kind_of?(Array)
           attr_name.map {|name| read_attribute(name)}.to_composite_keys
-        elsif respond_to? "_#{attr_name}"
-          send "_#{attr_name}" if @attributes.has_key?(attr_name.to_s)
         else
-          _read_attribute attr_name
-        end
-      end
-
-
-      def _read_attribute(attr_name)
-        attr_name = attr_name.to_s
-        # CPK
-        # attr_name = self.class.primary_key if attr_name == 'id'
-        attr_name = self.class.primary_key if (attr_name == 'id' and !self.composite?)
-        value = @attributes[attr_name]
-        unless value.nil?
-          if column = column_for_attribute(attr_name)
-            if unserializable_attribute?(attr_name, column)
-              unserialize_attribute(attr_name)
-            else
-              column.type_cast(value)
-            end
-          else
-            value
-          end
+          self.class.type_cast_attribute(attr_name, @attributes, @attributes_cache)
         end
       end
     end
@@ -85,4 +39,4 @@ end
 
 ActiveRecord::Base.class_eval do
   alias :[] :read_attribute
-end
+end

data/lib/composite_primary_keys/attribute_methods/write.rb

@@ -12,13 +12,15 @@ module ActiveRecord
         else
           attr_name = attr_name.to_s
           # CPK
-          # attr_name = self.class.primary_key if attr_name == 'id'
-          attr_name = self.class.primary_key if (attr_name == 'id' and !self.composite?)
+          # attr_name = self.class.primary_key if attr_name == 'id' && self.class.primary_key
+          attr_name = self.class.primary_key if attr_name == 'id' && self.class.primary_key && !self.composite?
           @attributes_cache.delete(attr_name)
-          if (column = column_for_attribute(attr_name)) && column.number?
-            @attributes[attr_name] = convert_number_column_value(value)
+          column = column_for_attribute(attr_name)
+
+          if column || @attributes.has_key?(attr_name)
+            @attributes[attr_name] = type_cast_attribute_for_write(column, value)
           else
-            @attributes[attr_name] = value
+            raise ActiveModel::MissingAttributeError, "can't write unknown attribute `#{attr_name}'"
           end
         end
       end
@@ -26,8 +28,7 @@ module ActiveRecord
   end
 end
 
-#ActiveRecord::Base.class_eval do
-#  alias :[]= :write_attribute
-#  alias :raw_write_attribute :write_attribute
-#  public :[]=
-#end
+ActiveRecord::Base.class_eval do
+  alias :[]= :write_attribute
+  public :[]=
+end

data/lib/composite_primary_keys/base.rb

@@ -33,6 +33,31 @@ module ActiveRecord
       self.class.composite?
     end
 
+    def initialize_dup(other)
+      cloned_attributes = other.clone_attributes(:read_attribute_before_type_cast)
+      # CPK
+      # cloned_attributes.delete(self.class.primary_key)
+      Array(self.class.primary_key).each {|key| cloned_attributes.delete(key.to_s)}
+
+      @attributes = cloned_attributes
+
+      _run_after_initialize_callbacks if respond_to?(:_run_after_initialize_callbacks)
+
+      @changed_attributes = {}
+      self.class.column_defaults.each do |attr, orig_value|
+        @changed_attributes[attr] = orig_value if field_changed?(attr, orig_value, @attributes[attr])
+      end
+
+      @aggregation_cache = {}
+      @association_cache = {}
+      @attributes_cache = {}
+      @new_record  = true
+
+      ensure_proper_type
+      populate_with_current_scope_attributes
+      super
+    end
+
     module CompositeClassMethods
       def primary_key
         primary_keys
@@ -75,12 +100,6 @@ module ActiveRecord
         end
       end
 
-      def quoted_id #:nodoc:
-        [self.class.primary_keys, ids].
-          transpose.
-          map {|attr_name,id| quote_value(id, column_for_attribute(attr_name))}
-      end
-
       # Sets the primary ID.
       def id=(ids)
         ids = ids.split(CompositePrimaryKeys::ID_SEP) if ids.is_a?(String)
@@ -96,31 +115,6 @@ module ActiveRecord
         ids.is_a?(Array) ? super(comparison_object) && ids.all? {|id| id.present?} : super(comparison_object)
       end
 
-      def initialize_dup(other)
-        cloned_attributes = other.clone_attributes(:read_attribute_before_type_cast)
-        # CPK
-        #cloned_attributes.delete(self.class.primary_key)
-        self.class.primary_key.each {|key| cloned_attributes.delete(key.to_s)}
-
-        @attributes = cloned_attributes
-
-        _run_after_initialize_callbacks if respond_to?(:_run_after_initialize_callbacks)
-
-        @changed_attributes = {}
-        attributes_from_column_definition.each do |attr, orig_value|
-          @changed_attributes[attr] = orig_value if field_changed?(attr, orig_value, @attributes[attr])
-        end
-
-        @aggregation_cache = {}
-        @association_cache = {}
-        @attributes_cache = {}
-        @new_record  = true
-
-        ensure_proper_type
-        populate_with_current_scope_attributes
-        clear_timestamp_attributes
-      end
-
       def can_change_primary_key_values?
         false
       end

data/lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb

@@ -2,10 +2,11 @@ module ActiveRecord
   module ConnectionAdapters
     class PostgreSQLAdapter
       def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
-        # Extract the table from the insert sql. Yuck.
-        _, table = extract_schema_and_table(sql.split(" ", 4)[2])
-
-        pk ||= primary_key(table)
+        unless pk
+          # Extract the table from the insert sql. Yuck.
+          table_ref = extract_table_ref_from_insert_sql(sql)
+          pk = primary_key(table_ref) if table_ref
+        end
 
         if pk
           # CPK
@@ -19,9 +20,9 @@ module ActiveRecord
 
       def sql_for_insert(sql, pk, id_value, sequence_name, binds)
         unless pk
-          _, table = extract_schema_and_table(sql.split(" ", 4)[2])
-
-          pk = primary_key(table)
+          # Extract the table from the insert sql. Yuck.
+          table_ref = extract_table_ref_from_insert_sql(sql)
+          pk = primary_key(table_ref) if table_ref
         end
 
         # CPK

data/lib/composite_primary_keys/sanitization.rb

@@ -0,0 +1,15 @@
+module ActiveRecord
+  module Sanitization
+    def quoted_id
+      # CPK
+      #quote_value(id, column_for_attribute(self.class.primary_key))
+      if self.composite?
+        [self.class.primary_keys, ids].
+          transpose.
+          map {|attr_name,id| quote_value(id, column_for_attribute(attr_name))}
+      else
+        quote_value(id, column_for_attribute(self.class.primary_key))
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

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

data/scripts/txt2html

@@ -7,7 +7,9 @@ gem 'syntax'
 require 'redcloth'
 require 'syntax/convertors/html'
 require 'erb'
-require File.dirname(__FILE__) + '/../lib/composite_primary_keys/version.rb'
+
+version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
+require File.expand_path(version_path)
 
 version  = CompositePrimaryKeys::VERSION::STRING
 download = 'http://rubygems.org/gems/composite_primary_keys'
@@ -18,10 +20,14 @@ class Fixnum
     return 'th' if (10..19).include?(self % 100)
     # others
     case self % 10
-    when 1: return 'st'
-    when 2: return 'nd'
-    when 3: return 'rd'
-    else    return 'th'
+    when 1
+       return 'st'
+    when 2
+      return 'nd'
+    when 3
+      return 'rd'
+    else
+      return 'th'
     end
   end
 end

data/scripts/txt2js

@@ -5,7 +5,9 @@ require 'redcloth'
 require 'syntax/convertors/html'
 require 'erb'
 require 'active_support'
-require File.dirname(__FILE__) + '/../lib/composite_primary_keys/version.rb'
+
+version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
+require File.expand_path(version_path)
 
 version  = CompositePrimaryKeys::VERSION::STRING
 download = 'http://rubygems.org/gems/composite_primary_keys'
@@ -16,10 +18,14 @@ class Fixnum
     return 'th' if (10..19).include?(self % 100)
     # others
     case self % 10
-    when 1: return 'st'
-    when 2: return 'nd'
-    when 3: return 'rd'
-    else    return 'th'
+    when 1
+      return 'st'
+    when 2
+      return 'nd'
+    when 3
+      return 'rd'
+    else
+      return 'th'
     end
   end
 end

data/test/abstract_unit.rb

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

data/test/test_attributes.rb

@@ -43,28 +43,18 @@ class TestAttributes < ActiveSupport::TestCase
   end
     
   def test_brackets_foreign_key_assignment
-    flat = tariffs(:flat)
-    second_free = tariffs(: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_keys] = 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_keys.to_s] = flat.id
-    assert_equal flat.id, second_free[key]
-    compare_indexes(flat, flat.class.primary_key, second_free, second_free_fk)
+    tarrif = tariffs(:flat)
+    product_tariff = product_tariffs(:first_flat)
+    compare_indexes(tarrif, tarrif.class.primary_key, product_tariff, [:tariff_id, :tariff_start_date])
   end
   
   private
 
   def compare_indexes(obj1, indexes1, obj2, indexes2)
     indexes1.length.times do |key_index|
-      assert_equal(obj1[indexes1[key_index].to_s], obj2[indexes2[key_index].to_s])
+      key1 = indexes1[key_index]
+      key2 = indexes2[key_index]
+      assert_equal(obj1[key1], obj2[key2])
     end
   end
 end

data/test/test_create.rb

@@ -36,7 +36,7 @@ class TestCreate < ActiveSupport::TestCase
   def test_create_no_id
     testing_with do
       begin
-        @obj = @klass.create(@klass_info[:create].block(@klass.primary_key))
+        @obj = @klass.create(@klass_info[:create].except(@klass.primary_key))
         @successful = !composite?
       rescue ActiveRecord::CompositeKeyError
         @successful = false

data/test/test_dup.rb

@@ -21,7 +21,9 @@ class TestClone < ActiveSupport::TestCase
   def test_dup
     testing_with do
       clone = @first.dup
-      assert_equal(@first.attributes.block(@klass.primary_key), clone.attributes)
+      
+      remove_keys = Array(@klass.primary_key).map &:to_s
+      assert_equal(@first.attributes.except(*remove_keys), clone.attributes)
 
       if composite?
         @klass.primary_key.each do |key|

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 4.1.2
-  prerelease: 
+  version: 5.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Dr Nic Williams
@@ -10,19 +10,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000 Z
+date: 2012-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &22966128 !ruby/object:Gem::Requirement
+  requirement: &24769260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *22966128
+  version_requirements: *24769260
 description: Composite key support for ActiveRecord 3
 email:
 - drnicwilliams@gmail.com
@@ -63,6 +63,7 @@ files:
 - lib/composite_primary_keys/relation/finder_methods.rb
 - lib/composite_primary_keys/relation/query_methods.rb
 - lib/composite_primary_keys/relation.rb
+- lib/composite_primary_keys/sanitization.rb
 - lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
 - lib/composite_primary_keys.rb
@@ -146,7 +147,6 @@ files:
 - test/fixtures/tariffs.yml
 - test/fixtures/user.rb
 - test/fixtures/users.yml
-- test/hash_tricks.rb
 - test/plugins/pagination.rb
 - test/plugins/pagination_helper.rb
 - test/README_tests.txt
@@ -187,12 +187,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: compositekeys
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord
@@ -200,7 +200,6 @@ test_files:
 - test/abstract_unit.rb
 - test/db_test.rb
 - test/debug.log
-- test/hash_tricks.rb
 - test/README_tests.txt
 - test/setup.rb
 - test/test_associations.rb

data/test/hash_tricks.rb

@@ -1,34 +0,0 @@
-# From:
-# http://www.bigbold.com/snippets/posts/show/2178
-# http://blog.caboo.se/articles/2006/06/11/stupid-hash-tricks
-# 
-# An example utilisation of these methods in a controller is:
-# def some_action
-#    # some script kiddie also passed in :bee, which we don't want tampered with _here_.
-#    @model = Model.create(params.pass(:foo, :bar))
-#  end
-class Hash
-
-  # lets through the keys in the argument
-  # >> {:one => 1, :two => 2, :three => 3}.pass(:one)
-  # => {:one=>1}
-  def pass(*keys)
-    keys = keys.first if keys.first.is_a?(Array)
-    tmp = self.clone
-    tmp.delete_if {|k,v| ! keys.include?(k.to_sym) }
-    tmp.delete_if {|k,v| ! keys.include?(k.to_s) }
-    tmp
-  end
-
-  # blocks the keys in the arguments
-  # >> {:one => 1, :two => 2, :three => 3}.block(:one)
-  # => {:two=>2, :three=>3}
-  def block(*keys)
-    keys = keys.first if keys.first.is_a?(Array)
-    tmp = self.clone
-    tmp.delete_if {|k,v| keys.include?(k.to_sym) }
-    tmp.delete_if {|k,v| keys.include?(k.to_s) }
-    tmp
-  end
-
-end