versioned_record 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 562b1ce360d24ed679ebdfb9f20b2c3759882a27
-  data.tar.gz: f1f2c1ce89911fcc4563aa66cf0061485b0d2783
+  metadata.gz: c493059288eb10618dae68cad6cfe6ee6e1d6689
+  data.tar.gz: 8f848574c1c10769c52e5030e9dbc72b16e61cb9
 SHA512:
-  metadata.gz: 233b14b9f0ce7f0d7a0800f555d8b41e00cfdfec1a702f5e0480aab639a87a23248d06fbb45e98b2ce32d98e72788261a94f225792e2ade35ad96985f2295d5c
-  data.tar.gz: 8dd8dc76db0e376cfb2345811c2eb0345d384fe2878aeb3070d0268910831d7ce68a875bfc9315dac3a7db40f655fe7a3bf539fdf7ad8458b1c98b4b6113bd2d
+  metadata.gz: eda3a71d69ac706b47fa48da5a67c33a53284ccd257aa3331c0dfde6833a2fe88cc31ca9edaa97710f4f13a1f1661fa08bf649f03cdc1cacdd5e69d527c95f4e
+  data.tar.gz: fb61bd1da7907c6578544a8b4044a840fffa76950fad1ab8e4c0ddd333fdfa0f804af94211c4b33ff2c552b78a1376798e85bd8b9806d3145bd112083753369c

data/lib/versioned_record/attribute_builder.rb

@@ -15,11 +15,22 @@ module VersionedRecord
     # @param [Hash] new_attrs are the attributes we are changing in this version
     def attributes(new_attrs)
       @new_attrs = new_attrs.symbolize_keys
-      attrs = @record.attributes.symbolize_keys.merge(@new_attrs.merge({
+      attrs = original_attributes.merge(@new_attrs.merge({
         is_current_version: true,
         id:                 @record.id,
         version:            @record.version + 1
       }))
     end
+
+    # The relevant attributes of the previous version
+    # i.e: the record we initialized this builder with
+    #
+    # @return Hash excluding created_at and updated_at keys
+    #
+    def original_attributes
+      @record.attributes.symbolize_keys.select do |(attr, _)|
+        !%i(created_at updated_at).include?(attr)
+      end
+    end
   end
 end

data/lib/versioned_record/version.rb

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

data/spec/attribute_builder_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe VersionedRecord::AttributeBuilder do
+  describe '#original_attributes' do
+    let(:creation_attrs) do
+      {
+        name: 'Foo',
+        price: 100,
+        company_id: 1,
+        catalog_id: 2,
+        catalog_version: 0
+      }
+    end
+
+    let(:record) { VersionedProduct.create!(creation_attrs) }
+    subject      { described_class.new(record) }
+
+    specify 'that original attributes does not include timestamps' do
+      expect(subject.original_attributes[:created_at]).to be_nil
+      expect(subject.original_attributes[:updated_at]).to be_nil
+    end
+
+    specify 'that the original attributes contain all relevant attributes' do
+      expect(subject.original_attributes).to eq(
+        creation_attrs.merge(id: record._id, version: 0, is_current_version: true)
+      )
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 require 'coveralls'
 Coveralls.wear!
 
-#require 'active_record'
 require 'versioned_record'
 require 'database_cleaner'
+require 'timecop'
 
 require 'byebug'
 

data/spec/support/database.rb

@@ -14,6 +14,7 @@ ActiveRecord::Schema.define :version => 0 do
     t.integer :catalog_version
     t.string :name
     t.decimal :price
+    t.timestamps
   end
 
   create_table :comments, force: true do |t|

data/spec/timestamps_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe VersionedProduct, :timestamps do
+  before               { Timecop.freeze(time1) }
+  after                { Timecop.return }
+  let(:time1)          { '2014-06-06 10:00'.to_time }
+  let(:company)        { Company.create(name: 'Acme Corp') }
+  let!(:first_version) { VersionedProduct.create(name: 'iPad', price: 100, company: company) }
+
+  specify { expect(first_version.created_at).to eq(time1.utc) }
+
+  describe 'creating a new version at a later time' do
+    before                { Timecop.freeze(time2) }
+    let(:time2)           { '2014-06-08 10:00'.to_time }
+    let!(:second_version) { first_version.create_version! }
+
+    specify { expect(first_version.created_at).to eq(time1.utc) }
+    specify { expect(second_version.created_at).to eq(time2.utc) }
+  end
+end
+
+
+

data/versioned_record.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "timecop"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: versioned_record
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dan Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Version ActiveRecord models using composite primary keys
 email:
 - daniel@codehire.com
@@ -175,6 +189,7 @@ files:
 - lib/versioned_record/connection_adapters/postgresql.rb
 - lib/versioned_record/version.rb
 - spec/association_preservation_spec.rb
+- spec/attribute_builder_spec.rb
 - spec/composite_belongs_to_spec.rb
 - spec/composite_has_many_spec.rb
 - spec/composite_onesided_habtm_spec.rb
@@ -197,6 +212,7 @@ files:
 - spec/support/tag.rb
 - spec/support/user.rb
 - spec/support/versioned_product.rb
+- spec/timestamps_spec.rb
 - spec/version_class_methods_spec.rb
 - spec/versions_spec.rb
 - versioned_record.gemspec
@@ -226,6 +242,7 @@ specification_version: 4
 summary: Version ActiveRecord models using composite primary keys
 test_files:
 - spec/association_preservation_spec.rb
+- spec/attribute_builder_spec.rb
 - spec/composite_belongs_to_spec.rb
 - spec/composite_has_many_spec.rb
 - spec/composite_onesided_habtm_spec.rb
@@ -248,6 +265,7 @@ test_files:
 - spec/support/tag.rb
 - spec/support/user.rb
 - spec/support/versioned_product.rb
+- spec/timestamps_spec.rb
 - spec/version_class_methods_spec.rb
 - spec/versions_spec.rb
 has_rdoc: