composite_primary_keys 7.0.9 → 7.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b5c17b61f779d1923c042647a3a0dea63142517
-  data.tar.gz: 3861e029662b85465c42b792fa44ffdfc6671c1e
+  metadata.gz: bc3c55fbf216f962790b277309e53b78e6359a09
+  data.tar.gz: 4c427b0fe5b5eb3d71f955dbc7f377ae04c3d1a8
 SHA512:
-  metadata.gz: 97c81fea4acb2ba76454d845f3d7bd009739f1d254a920a9f2332d9976e8f15113fa5e4ef8e3f7805b61e3adfcee39ce7c3866c3948251a6955af8727ddef025
-  data.tar.gz: 9e92b5600385939973741abc0bb8b27b580cd0ad5931ef1015d8de7fa2cfa5aae38df75a20b68a798a856064bccb214a5a70b3025c7369ffc0ea376f2ec2e044
+  metadata.gz: d29164453f49e2a09edcd699012ecc9264df1284875afaa3dba760a47ee9cdf4fa74c2d5792a2fec799006c03288df3f5aff48cd0d78d733275413ac0525598b
+  data.tar.gz: 91c39473f95f039f88a3094b75b884982263d2857fdf930c86a26a356972e43f0bf426b300cba6a7b67b26471b246b061eb70ba90f345924394ffac7cd98d163

data/History.rdoc

@@ -1,3 +1,9 @@
+== 7.0.10 (2014-08-07)
+
+* Update attribute dirty methods to allow attribute *_was
+  fields to be calculated correctly for enum fields (Zachary Salzbank)
+* Update read/write methods to match latest version of ActiveRecord (Charlie Savage)
+
 == 7.0.9 (2014-08-03)
 
 * Second attemp at fixing instantiation of has_many records via :includes that use composite keys - this

data/lib/composite_primary_keys/attribute_methods/dirty.rb

@@ -10,14 +10,7 @@ module ActiveRecord
         else
           attr = attr.to_s
 
-          # The attribute already has an unsaved change.
-          if attribute_changed?(attr)
-            old = @changed_attributes[attr]
-            @changed_attributes.delete(attr) unless _field_changed?(attr, old, value)
-          else
-            old = clone_attribute_value(:read_attribute, attr)
-            @changed_attributes[attr] = old if _field_changed?(attr, old, value)
-          end
+          save_changed_attribute(attr, value)
         end
 
         # Carry on.

data/lib/composite_primary_keys/attribute_methods/read.rb

@@ -1,18 +1,35 @@
 module ActiveRecord
   module AttributeMethods
     module Read
-      rails_read_attribute = instance_method(:read_attribute)
-      define_method(:read_attribute) do |attr_name|
+      def read_attribute(attr_name)
         if attr_name.kind_of?(Array)
           attr_name.map {|name| read_attribute(name)}.to_composite_keys
         else
-          rails_read_attribute.bind(self).(attr_name)
+          # If it's cached, just return it
+          # We use #[] first as a perf optimization for non-nil values. See https://gist.github.com/jonleighton/3552829.
+          name = attr_name.to_s
+          @attributes_cache[name] || @attributes_cache.fetch(name) {
+            column = @column_types_override[name] if @column_types_override
+            column ||= @column_types[name]
+
+            return @attributes.fetch(name) {
+              if name == 'id' && self.class.primary_key != name
+                read_attribute(self.class.primary_key)
+              end
+            } unless column
+
+            value = @attributes.fetch(name) {
+              return block_given? ? yield(name) : nil
+            }
+
+            if self.class.cache_attribute?(name)
+              @attributes_cache[name] = column.type_cast(value)
+            else
+              column.type_cast value
+            end
+          }
         end
       end
     end
   end
-end
-
-ActiveRecord::Base.class_eval do
-  alias :[] :read_attribute
-end
+end

data/lib/composite_primary_keys/attribute_methods/write.rb

@@ -1,8 +1,7 @@
 module ActiveRecord
   module AttributeMethods
     module Write
-      def write_attribute(attr_name, value)
-        # CPK
+      def write_attribute_with_type_cast(attr_name, value, type_cast_method)
         if attr_name.kind_of?(Array)
           value = [nil]*attr_name.length if value.nil?
           unless value.length == attr_name.length
@@ -18,22 +17,19 @@ module ActiveRecord
           @attributes_cache.delete(attr_name)
           column = column_for_attribute(attr_name)
 
-          unless column || @attributes.has_key?(attr_name)
-            ActiveSupport::Deprecation.warn(
-                "You're trying to create an attribute `#{attr_name}'. Writing arbitrary " \
-                "attributes on a model is deprecated. Please just use `attr_writer` etc."
-            )
+          # If we're dealing with a binary column, write the data to the cache
+          # so we don't attempt to typecast multiple times.
+          if column && column.binary?
+            @attributes_cache[attr_name] = value
+          end
+
+          if column || @attributes.has_key?(attr_name)
+            @attributes[attr_name] = send(type_cast_method, column, value)
+          else
+            raise ActiveModel::MissingAttributeError, "can't write unknown attribute `#{attr_name}'"
           end
-          @attributes[attr_name] = type_cast_attribute_for_write(column, value)
         end
       end
-      alias_method :raw_write_attribute, :write_attribute
     end
   end
 end
-
-ActiveRecord::Base.class_eval do
-  alias_method :raw_write_attribute, :write_attribute
-  alias :[]= :write_attribute
-  public :[]=
-end

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 9
+    TINY  = 10
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/fixtures/comment.rb

@@ -1,5 +1,7 @@
 class Comment < ActiveRecord::Base
   belongs_to :person, :polymorphic => true
   belongs_to :hack
+
+  enum :shown => [ :true, :false ]
 end
 

data/test/fixtures/db_definitions/mysql.sql

@@ -108,6 +108,7 @@ create table employees (
 create table comments (
     id int not null auto_increment,
     person_id int default null,
+    shown int default null,
     person_type varchar(100) default null,
     hack_id int default null,
     primary key (id)

data/test/fixtures/db_definitions/oracle.sql

@@ -116,6 +116,7 @@ create sequence comments_seq start with 1000;
 create table comments (
     id          number(11)   not null primary key,
     person_id   number(11)   default null,
+    shown       number(11)   default null,
     person_type varchar(100) default null,
     hack_id     number(11)   default null
 );

data/test/fixtures/db_definitions/postgresql.sql

@@ -110,6 +110,7 @@ create table employees (
 create table comments (
     id          serial not null,
     person_id   int          default null,
+    shown       int          default null,
     person_type varchar(100) default null,
     hack_id     int          default null,
     primary key (id)

data/test/fixtures/db_definitions/sqlite.sql

@@ -101,6 +101,7 @@ create table employees (
 create table comments (
     id integer not null primary key autoincrement,
     person_id int null,
+    shown int null,
     person_type varchar(100) null,
     hack_id int null
 );

data/test/fixtures/db_definitions/sqlserver.sql

@@ -119,6 +119,7 @@ go
 CREATE TABLE comments (
     id          [int] IDENTITY(1000,1) PRIMARY KEY NOT NULL,
     person_id   [int] NULL,
+    shown       [int] NULL,
     person_type varchar(100)      NULL,
     hack_id     [int] NULL
 );

data/test/test_enum.rb

@@ -0,0 +1,20 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestEnum < ActiveSupport::TestCase
+  fixtures :comments
+
+  def test_enum_was
+    comment = Comment.first
+    assert_nil comment.shown
+
+    comment.shown = :true
+    assert_equal 'true', comment.shown
+    assert_nil comment.shown_was
+
+    comment.save
+
+    comment.shown = :false
+    assert_equal 'false', comment.shown
+    assert_equal 'true', comment.shown_was
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.9
+  version: 7.0.10
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -177,6 +177,7 @@ files:
 - test/test_delete.rb
 - test/test_delete_all.rb
 - test/test_dup.rb
+- test/test_enum.rb
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
@@ -235,6 +236,7 @@ test_files:
 - test/test_delete.rb
 - test/test_delete_all.rb
 - test/test_dup.rb
+- test/test_enum.rb
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb