versioned_record 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60698c47669db53300faa0ac76472e2f2c6bf165
-  data.tar.gz: 2999d4a36edb3075cb52c7a87fc69362cbe8fbb6
+  metadata.gz: 562b1ce360d24ed679ebdfb9f20b2c3759882a27
+  data.tar.gz: f1f2c1ce89911fcc4563aa66cf0061485b0d2783
 SHA512:
-  metadata.gz: 7d0636a118bfaef0caf890cbedadde46555b6e3da3fe1bc3c07f6cb2337db387c2ec46632e3cb904da4fd2bf7bb8c13283140eb8c9e8317f0f51e425c424b0bb
-  data.tar.gz: 2875b2175b8419f973562920f2b85f06a425b1eb73f4731e3a9c7b113c9a6b8ec45b104387e92bdcaf362f3fa307abf46c46e5552e50f69490063f93297a7334
+  metadata.gz: 233b14b9f0ce7f0d7a0800f555d8b41e00cfdfec1a702f5e0480aab639a87a23248d06fbb45e98b2ce32d98e72788261a94f225792e2ade35ad96985f2295d5c
+  data.tar.gz: 8dd8dc76db0e376cfb2345811c2eb0345d384fe2878aeb3070d0268910831d7ce68a875bfc9315dac3a7db40f655fe7a3bf539fdf7ad8458b1c98b4b6113bd2d

data/README.md

@@ -113,7 +113,6 @@ Right now, only PostgreSQL has been tested. MySQL may or may not work but if you
 ## Limitations
 
 * Does not currently work with ActiveRecord 4.1+
-* Polymorphic belongs to does not work on versioned records
 * HABTM where models on _both_ sides are versioned have not been tested
 
 

data/lib/versioned_record/composite_predicates.rb

@@ -33,29 +33,43 @@ module VersionedRecord
         eq_predicates = [ association_fields[0].eq(fields[0]) ]
         case association.reflection.macro
           when :belongs_to
-            # We don't handle Polymorphic associations at this stage
-            if !association.options[:polymorphic]
-              if association.reflection.klass.versioned?
-                eq_predicates << association_table[:is_current_version].eq(true)
-              end
-            end
+            add_belongs_to_predicates!(eq_predicates, association_table)
           when :has_and_belongs_to_many
-            if association.reflection.klass.versioned?
-              if association.reflection.klass.table_name == association_table.name
-                eq_predicates << association_table[:is_current_version].eq(true)
-              end
-            end
+            add_habtm_predicates!(eq_predicates, association, association_table)
           when :has_many, :has_one
-            if association.reflection.klass.versioned?
-              if association.reflection.klass.table_name == association_table.name
-                eq_predicates << association_table[:is_current_version].eq(true)
-              end
-            end
+            add_has_x_predicates!(eq_predicates, association, association_table)
         end
         cpk_and_predicate(eq_predicates)
       else
         super
       end
     end
+
+    private
+      def add_belongs_to_predicates!(predicates, association_table)
+        if self.klass.versioned?
+          add_current_version_constraint!(predicates, association_table)
+        end
+      end
+
+      def add_habtm_predicates!(predicates, association, association_table)
+        if self.klass.versioned?
+          if association.reflection.klass.table_name == association_table.name
+            add_current_version_constraint!(predicates, association_table)
+          end
+        end
+      end
+
+      def add_has_x_predicates!(predicates, association, association_table)
+        if association.reflection.klass.versioned?
+          if association.reflection.klass.table_name == association_table.name
+            add_current_version_constraint!(predicates, association_table)
+          end
+        end
+      end
+
+      def add_current_version_constraint!(predicates, association_table)
+        predicates << association_table[:is_current_version].eq(true)
+      end
   end
 end

data/lib/versioned_record/version.rb

@@ -1,3 +1,3 @@
 module VersionedRecord
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/simple_belongs_to_polymorphic_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe User do
+  let(:company) { Company.create!(name: 'Google') }
+  let(:user)    { User.create!(name: 'Lauren', entity: company) }
+
+  specify 'that the company is set as the entity' do
+    expect(user.entity).to eq(company)
+  end
+
+  describe 'a new version of the company is created' do
+    let!(:new_company) { company.create_version!(name: 'Google World Domination') }
+
+    specify 'that the company is still set as the entity' do
+      expect(user.reload.entity).to eq(new_company)
+    end
+  end
+end

data/spec/support/company.rb

@@ -1,3 +1,4 @@
 class Company < ActiveRecord::Base
-  has_many :users
+  include VersionedRecord
+  has_many :users, as: :entity
 end

data/spec/support/database.rb

@@ -4,7 +4,7 @@ ActiveRecord::Base.establish_connection(dbconfig[env]['postgresql'])
 
 ActiveRecord::Schema.define :version => 0 do
 
-  create_table :companies, force: true do |t|
+  create_table :companies, force: true, versioned: true do |t|
     t.string :name
   end
 
@@ -62,4 +62,9 @@ ActiveRecord::Schema.define :version => 0 do
   create_table :catalogs, force: true, versioned: true do |t|
     t.string :name
   end
+
+  create_table :users, force: true do |t|
+    t.references :company, polymorphic: true
+    t.string :name
+  end
 end

data/spec/support/user.rb

@@ -0,0 +1,3 @@
+class User < ActiveRecord::Base
+  belongs_to :entity, polymorphic: true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: versioned_record
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Dan Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -180,6 +180,7 @@ files:
 - spec/composite_onesided_habtm_spec.rb
 - spec/has_one_spec.rb
 - spec/has_one_through_spec.rb
+- spec/simple_belongs_to_polymorphic_spec.rb
 - spec/simple_belongs_to_spec.rb
 - spec/simple_onesided_habtm_spec.rb
 - spec/spec_helper.rb
@@ -194,6 +195,7 @@ files:
 - spec/support/package.rb
 - spec/support/sale.rb
 - spec/support/tag.rb
+- spec/support/user.rb
 - spec/support/versioned_product.rb
 - spec/version_class_methods_spec.rb
 - spec/versions_spec.rb
@@ -229,6 +231,7 @@ test_files:
 - spec/composite_onesided_habtm_spec.rb
 - spec/has_one_spec.rb
 - spec/has_one_through_spec.rb
+- spec/simple_belongs_to_polymorphic_spec.rb
 - spec/simple_belongs_to_spec.rb
 - spec/simple_onesided_habtm_spec.rb
 - spec/spec_helper.rb
@@ -243,6 +246,7 @@ test_files:
 - spec/support/package.rb
 - spec/support/sale.rb
 - spec/support/tag.rb
+- spec/support/user.rb
 - spec/support/versioned_product.rb
 - spec/version_class_methods_spec.rb
 - spec/versions_spec.rb