versioned_record 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 922578eddd43ab7241f9508f1e2b69df72348a78
-  data.tar.gz: b6016c21345c767d7ad00c5a8ff56655ec69af9e
+  metadata.gz: 60698c47669db53300faa0ac76472e2f2c6bf165
+  data.tar.gz: 2999d4a36edb3075cb52c7a87fc69362cbe8fbb6
 SHA512:
-  metadata.gz: 5f45e23784fb7e5924a0baedcf5b2efdd18eb8a5eaabeb4b8c5455c77c5f434e1ebd3706125978e78276af607b37fe75cfc726c17c4db7d5c2e5ce9097d09428
-  data.tar.gz: c1558526c1ba918b7741279b90cb60b5e4312f3585a53f8e8f9c84e64abef9695dd6d2907068ce3e42f43a021dd6fd26a6956583eec80f0fe9750b97a793b7c9
+  metadata.gz: 7d0636a118bfaef0caf890cbedadde46555b6e3da3fe1bc3c07f6cb2337db387c2ec46632e3cb904da4fd2bf7bb8c13283140eb8c9e8317f0f51e425c424b0bb
+  data.tar.gz: 2875b2175b8419f973562920f2b85f06a425b1eb73f4731e3a9c7b113c9a6b8ec45b104387e92bdcaf362f3fa307abf46c46e5552e50f69490063f93297a7334

data/lib/versioned_record/class_methods.rb

@@ -56,7 +56,7 @@ module VersionedRecord
     #     other_versions = person.versions.exclude(person)
     #
     def exclude(record)
-      where(id: record.id).where('version != ?', record.version)
+      where(id: record._id).where.not(version: record.version)
     end
   end
 end

data/lib/versioned_record/version.rb

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

data/lib/versioned_record.rb

@@ -82,7 +82,7 @@ module VersionedRecord
     #     person.versions.order(:version)
     #
     def versions
-      self.class.where(id: self.id)
+      self.class.where(id: self._id)
     end
 
     # Retrieve the current version of an object

data/spec/composite_belongs_to_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Catalog do
+  describe 'chained versioning' do
+    let(:catalog) { Catalog.create(name: 'Products 2013') }
+    let(:product) { VersionedProduct.create(name: 'Headphones', price: '200', catalog: catalog) }
+
+    let(:new_product) { product.build_version }
+    let(:new_catalog)     { new_product.catalog.build_version }
+
+    before do
+      new_catalog.name = 'Products 2014'
+      new_product.association(:catalog).writer(new_catalog)
+      new_product.save!
+    end
+
+    specify do
+      expect(new_product).to be_persisted
+      expect(new_product).to have(2).versions
+      expect(new_product.catalog).to eq(new_catalog)
+    end
+  end
+end
+

data/spec/{composite_belongs_to.rb → composite_has_many_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sale do
+describe VersionedProduct do
   let!(:versioned_product) { VersionedProduct.create(name: 'iPad', price: 100) }
   let!(:versioned_product_revision) { versioned_product.create_version!(name: 'iPad 2') }
 

data/spec/support/catalog.rb

@@ -0,0 +1,7 @@
+class Catalog < ActiveRecord::Base
+  include VersionedRecord
+
+  has_many :version_products, {
+    foreign_key: [:catalog_id, :catalog_version]
+  }
+end

data/spec/support/database.rb

@@ -10,6 +10,8 @@ ActiveRecord::Schema.define :version => 0 do
 
   create_table :versioned_products, versioned: true, force: true do |t|
     t.references :company
+    t.references :catalog
+    t.integer :catalog_version
     t.string :name
     t.decimal :price
   end
@@ -56,4 +58,8 @@ ActiveRecord::Schema.define :version => 0 do
     t.integer :versioned_product_version
     t.string :name
   end
+
+  create_table :catalogs, force: true, versioned: true do |t|
+    t.string :name
+  end
 end

data/spec/support/versioned_product.rb

@@ -8,6 +8,11 @@ class VersionedProduct < ActiveRecord::Base
   # Simple Belongs To
   has_many :comments
 
+  # Composite Belongs To where the related record is also versioned
+  belongs_to :catalog, {
+    foreign_key: [:catalog_id, :catalog_version]
+  }
+
   # Composite has many
   has_many :sales, {
     foreign_key: [:versioned_product_id, :versioned_product_version]

data/spec/version_class_methods_spec.rb

@@ -34,12 +34,15 @@ describe VersionedProduct do
   end
 
   describe 'scopes' do
-    let!(:first_version)  { VersionedProduct.create(name: 'Macbook Pro') }
-    let!(:second_version) { first_version.create_version!(name: 'Macbook Retina') }
+    let!(:a_v0) { VersionedProduct.create(name: 'Macbook Pro') }
+    let!(:a_v1) { a_v0.create_version!(name: 'Macbook Retina') }
+    let!(:a_v2) { a_v1.create_version!(name: 'Macbook Retina Sick') }
+    let!(:b_v0) { VersionedProduct.create(name: 'Macbook Air') }
+    let!(:b_v1) { b_v0.create_version!(name: 'Macbook Air 2') }
 
     describe '::find_current' do
       it 'finds the latest version' do
-        expect(VersionedProduct.find_current(first_version.id)).to eq(second_version)
+        expect(VersionedProduct.find_current(a_v0.id)).to eq(a_v2)
       end
 
       context 'where no matching record exists' do
@@ -51,19 +54,19 @@ describe VersionedProduct do
 
     describe '::current_versions' do
       it 'returns only the current version' do
-        expect(VersionedProduct.current_versions).to eq([second_version])
+        expect(VersionedProduct.current_versions).to eq([a_v2, b_v1])
       end
     end
 
     describe '::exclude_current' do
       it 'returns only the current version' do
-        expect(VersionedProduct.exclude_current).to eq([first_version])
+        expect(VersionedProduct.exclude_current.order(:id, :version)).to eq([a_v0, a_v1, b_v0])
       end
     end
 
     describe '::exclude' do
       it 'returns everything but the excluded record' do
-        expect(VersionedProduct.exclude(first_version)).to eq([second_version])
+        expect(b_v1.versions.exclude(b_v1)).to eq([b_v0])
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: versioned_record
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dan Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -175,13 +175,15 @@ files:
 - lib/versioned_record/connection_adapters/postgresql.rb
 - lib/versioned_record/version.rb
 - spec/association_preservation_spec.rb
-- spec/composite_belongs_to.rb
+- spec/composite_belongs_to_spec.rb
+- spec/composite_has_many_spec.rb
 - spec/composite_onesided_habtm_spec.rb
 - spec/has_one_spec.rb
 - spec/has_one_through_spec.rb
 - spec/simple_belongs_to_spec.rb
 - spec/simple_onesided_habtm_spec.rb
 - spec/spec_helper.rb
+- spec/support/catalog.rb
 - spec/support/comment.rb
 - spec/support/company.rb
 - spec/support/container.rb
@@ -222,13 +224,15 @@ specification_version: 4
 summary: Version ActiveRecord models using composite primary keys
 test_files:
 - spec/association_preservation_spec.rb
-- spec/composite_belongs_to.rb
+- spec/composite_belongs_to_spec.rb
+- spec/composite_has_many_spec.rb
 - spec/composite_onesided_habtm_spec.rb
 - spec/has_one_spec.rb
 - spec/has_one_through_spec.rb
 - spec/simple_belongs_to_spec.rb
 - spec/simple_onesided_habtm_spec.rb
 - spec/spec_helper.rb
+- spec/support/catalog.rb
 - spec/support/comment.rb
 - spec/support/company.rb
 - spec/support/container.rb