has_versions 0.3.0 → 0.4.0

data/lib/has_versions/reset/simple.rb

@@ -7,8 +7,8 @@ module HasVersions
 
     module Simple
       def reset!(version)
-        versioning_configuration.attributes.each do |name, options|
-          value = versioning_decode_value(version.snapshot[name], options)
+        versioning_configuration.attributes.each do |name|
+          value = versioning_decode_value(name, version.snapshot[name])
           __send__("#{name}=", value)
         end
         self

data/lib/has_versions/version.rb

@@ -1,4 +1,4 @@
 module HasVersions
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end
 

data/lib/has_versions/versioned.rb

@@ -1,5 +1,4 @@
 module HasVersions
-
   module Versioned
     extend ActiveSupport::Concern
 
@@ -12,7 +11,6 @@ module HasVersions
 
     module ClassMethods
       def has_versions(version_class, &block)
-
         self.versioning_configuration = HasVersions::Configuration.new(&block)
         self.version_class = version_class
       end
@@ -24,11 +22,9 @@ module HasVersions
 
     # generates a version from the current object
     def to_version
-      self.class.version_class.new.tap do |version|
+      version_class.new.tap do |version|
         version.snapshot = versioned_attributes
       end
     end
-
   end
-
 end

data/lib/has_versions/versioning_key.rb

@@ -5,4 +5,3 @@ module HasVersions
     autoload :UUID
   end
 end
-

data/lib/has_versions.rb

@@ -17,5 +17,15 @@ module HasVersions
   autoload :Reset
   autoload :VersioningKey
 
+  module Orm
+    extend ActiveSupport::Autoload
+
+    autoload :CassandraObject
+  end
+
   class VersioningError < StandardError; end
 end
+
+ActiveSupport.on_load :cassandra_object do
+  include HasVersions::Orm::CassandraObject
+end

data/spec/has_versions/apply_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 class ApplyingVersion < Version; end
 
@@ -15,7 +15,7 @@ describe ApplyingVersion do
   let (:patch3) { {name: ['foo2', 'foo3']}.with_indifferent_access }
 
   it 'should patch the snapshot' do
-    foo1.apply(patch1).snapshot.should have_key(:name).with_value('foo2')
+    foo1.apply(patch1).snapshot.should include(name: 'foo2')
   end
 
   it 'should raise on non-applying patch' do
@@ -23,11 +23,11 @@ describe ApplyingVersion do
   end
 
   it 'should apply patches adding attributes', :focus => true do
-    foo2.apply(patch2).snapshot.should have_key(:name).with_value('foo1')
-    foo2.apply(patch2).snapshot.should have_key(:stripey).with_value('socks')
+    foo2.apply(patch2).snapshot.should include(name: 'foo1')
+    foo2.apply(patch2).snapshot.should include(stripey: 'socks')
   end
 
   it 'should apply multiple patches' do
-    foo1.apply(patch1, patch3).snapshot.should have_key(:name).with_value('foo3')
+    foo1.apply(patch1, patch3).snapshot.should include(name: 'foo3')
   end
 end

data/spec/has_versions/configuration_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe 'Configuration' do
   subject do
@@ -11,23 +11,23 @@ describe 'Configuration' do
   end
 
   it 'should include specified attributes' do
-    subject.attributes.should have_key(:foo)
-    subject.attributes.should have_key(:bar)
+    subject.attributes.should include(:foo)
+    subject.attributes.should include(:bar)
   end
 
   it 'should set options on attributes' do
-    subject.attributes[:baz].should have_key(:type).with_value(:baz)
+    subject.attributes[:baz].should include(type: :baz)
   end
 
   it 'should allow indifferent access to attributes' do
-    subject.attributes.should have_key("foo")
+    subject.attributes.should include("foo")
   end
 
   it 'should include specified types' do
-    subject.types.should have_key(:baz)
+    subject.types.should include(:baz)
   end
 
   it 'should propagate type options to typed attributes' do
-    subject.attributes[:baz].should have_key(:expected).with_value(Hash)
+    subject.attributes[:baz].should include(expected: Hash)
   end
 end

data/spec/has_versions/diff_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 class DiffingVersion < Version; end
 
@@ -15,14 +15,14 @@ describe DiffingVersion do
   end
 
   it 'should return a patch when diffed with another version' do
-    foo.diff(foo2).should have_key(:name).with_value(['foo', 'foo2'])
+    foo.diff(foo2).should include(name: ['foo', 'foo2'])
   end
 
   it 'should include patches for attributes added' do
-    foo.diff(foo2).should have_key(:stripey).with_value([nil, 'socks'])
+    foo.diff(foo2).should include(stripey: [nil, 'socks'])
   end
 
   it 'should include patches for attributes deleted' do
-    foo.diff(foo2).should have_key(:argyle).with_value(['socks', nil])
+    foo.diff(foo2).should include(argyle: ['socks', nil])
   end
 end

data/spec/has_versions/merge/diff3_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe "Merge" do
+  describe "Diff3" do
+
+    it 'should behave like a 3-way merge' do
+      extend HasVersions::Merge::Diff3
+      
+      diff3('A','A','A').should == [true, 'A']
+      diff3('A','B','A').should == [true, 'B']
+      diff3('A','A','B').should == [true, 'B']
+      diff3('B','A','A').should == [true, 'A']
+      diff3('B','A','C').should == [false, ['A', 'C']]
+    end
+
+    it 'should take multiple theirs' do
+      extend HasVersions::Merge::Diff3
+
+      diff3('A','A',*['A','A']).should == [true, 'A']
+      diff3('A','A',*['B','B']).should == [true, 'B']
+      diff3('A','A',*['B','B']).should == [true, 'B']
+      diff3('A','A',*['A','B']).should == [false, ['A','B']]
+      diff3('A','A',*['B','C']).should == [false, ['B','C']]
+      diff3('A','B',*['C','D']).should == [false, ['C','D','B']]
+    end
+
+    it 'should handle _missing values'
+  end
+end

data/spec/has_versions/merge/merge_base_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe "Merge" do
+  describe "MergeBase" do
+    include HasVersions::Merge::MergeBase
+
+    it 'should find no bases for one version' do
+      v = MergingVersion.new
+      merge_bases([v]).should == []  
+    end
+
+    it 'should find merge base for a version and its parent' do
+      p1 = MergingVersion.new
+      v1 = MergingVersion.new
+      v1.parents = p1
+      merge_bases([v1, p1]).should == [p1]
+    end
+
+    it 'should find merge base for versions with multiple ancestors' do
+      p1 = MergingVersion.new
+      p2 = MergingVersion.new
+      v1 = MergingVersion.new
+      v1.parents = p1
+      p1.parents = p2
+      merge_bases([v1, p1]).should == [p1]
+    end
+
+    it 'should find merge base for two versions with the same parent' do
+      p1 = MergingVersion.new
+      v1 = MergingVersion.new
+      v2 = MergingVersion.new
+      v1.parents = v2.parents = [p1]
+      merge_bases([v1, v2]).should == [p1]
+    end
+
+    it 'should find merge base for multiple versions with different parents' do
+      p1, p2, v1, v2, v3 = *5.times.collect { MergingVersion.new }
+      p2.parents = [p1]
+      v1.parents = [p1]
+      v2.parents = [p2]
+      v3.parents = [v2]
+      merge_bases([v1, v2, v3]).should == [p1]
+    end
+    
+    it 'should find no base for versions with no common ancestry' do
+      v1 = MergingVersion.new
+      v2 = MergingVersion.new
+      merge_bases([v1, v2]).should == []  
+    end
+
+    #TODO this is broken
+    it 'should find multiple bases for versions with criss-cross ancestry' do
+      p1, p2, p3, v1, v2 = *5.times.collect { MergingVersion.new }
+      p2.parents = [p1]
+      p3.parents = [p1]
+      v1.parents = [p3, p2]
+      v2.parents = [p2, p3]
+      merge_bases([v1, v2]).should == [p2, p3]
+    end
+  end
+end

data/spec/has_versions/merge/octopus_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe HasVersions::Merge::Octopus do
+
+  it 'should only accept 3+ versions' do
+    expect { merge([MergingVersion.new]) }.to raise_error(HasVersions::MergeFailed)
+    expect { merge([MergingVersion.new]*2) }.to raise_error(HasVersions::MergeFailed)
+  end
+
+  it 'should merge identical versions' do
+    v1 = MergingVersion.new(name: 'foo1')
+    v2 = MergingVersion.new(name: 'foo1')
+    v3 = MergingVersion.new(name: 'foo1')
+    merge([v1, v2, v3]).resolution.snapshot.should include(name: 'foo1')
+  end
+
+  it 'should merge many versions' do
+    v1 = MergingVersion.new(name: 'foo1')
+    v2 = MergingVersion.new(name: 'foo1')
+    v3 = MergingVersion.new(name: 'foo1')
+    v4 = MergingVersion.new(name: 'foo1')
+    v5 = MergingVersion.new(name: 'foo1')
+    v6 = MergingVersion.new(name: 'foo1')
+    merge([v1, v2, v3, v4, v5, v6]).resolution.snapshot.should include(name: 'foo1')
+  end
+
+  it 'should detect conflicts' do
+    v1 = MergingVersion.new(name: 'foo1')
+    v2 = MergingVersion.new(name: 'foo2')
+    v3 = MergingVersion.new(name: 'foo3')
+    merge([v1, v2, v3]).conflicts.should include(name: ['foo1', 'foo2', 'foo3'])
+  end
+
+  it 'should merge ancestors cleanly' do
+    v1 = MergingVersion.new(name: 'foo1')
+    v2 = MergingVersion.new(name: 'foo2')
+    v3 = MergingVersion.new(name: 'foo3')
+
+    v3.parents = v2
+    v2.parents = v1
+    merge([v1, v2, v3]).conflicts.should be_empty
+    merge([v1, v2, v3]).resolution.snapshot.should include(name: 'foo3')
+  end
+
+  it 'should merge missing attributes' do
+    v1 = MergingVersion.new(name: 'foo1')
+    v2 = MergingVersion.new(name: 'foo1', socks: 'stripey')
+    v3 = MergingVersion.new(hat: 'silly')
+    merge([v1, v2, v3]).resolution.snapshot.should include(name: 'foo1', socks: 'stripey', hat: 'silly')
+  end
+
+  it 'should save the partial merge result' do
+    v1 = MergingVersion.new(name: 'foo1', socks: 'stripey')
+    v2 = MergingVersion.new(name: 'foo2', socks: 'argyle')
+    v3 = MergingVersion.new(name: 'foo3', socks: 'argyle')
+    p1 = MergingVersion.new(name: 'foo', socks: 'argyle')
+    v1.parents = v2.parents = v3.parents = p1
+    merge([v1, v2, v3]).conflicts.should include(name: ['foo1', 'foo2', 'foo3'])
+    merge([v1, v2, v3]).resolution.snapshot.should include(socks: 'stripey')
+  end
+
+  it 'should set parents' do
+    v1 = MergingVersion.new(name: 'foo1', socks: 'stripey')
+    v2 = MergingVersion.new(name: 'foo2', socks: 'argyle')
+    v3 = MergingVersion.new(name: 'foo3', socks: 'argyle')
+    merge([v1, v2, v3]).resolution.parents.should == [v1, v2, v3]
+  end
+
+  def merge(versions, options={})
+    s = HasVersions::Merge::Octopus.new(versions, options)
+    s.merge
+    s
+  end
+end

data/spec/has_versions/merge/three_way_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe HasVersions::Merge::ThreeWay do
+
+  it 'should only accept 2 versions' do
+    expect { merge([MergingVersion.new]) }.to raise_error(HasVersions::MergeFailed)
+    expect { merge([MergingVersion.new]*3) }.to raise_error(HasVersions::MergeFailed)
+  end
+
+  it 'should merge identical versions' do
+    v1 = MergingVersion.new(name: 'foo1')
+    v2 = MergingVersion.new(name: 'foo1')
+    merge([v1, v2]).resolution.snapshot.should include(name: 'foo1')
+  end
+
+  it 'should detect conflicts' do
+    v1 = MergingVersion.new(name: 'foo1')
+    v2 = MergingVersion.new(name: 'foo2')
+    merge([v1, v2]).conflicts.should include(name: ['foo1', 'foo2'])
+  end
+
+  it 'should merge ancestors cleanly' do
+    v1 = MergingVersion.new(name: 'foo1')
+    v2 = MergingVersion.new(name: 'foo2')
+
+    v2.parents = [v1]
+    merge([v1, v2]).conflicts.should be_empty
+    merge([v1, v2]).resolution.snapshot.should include(name: 'foo2')
+  end
+
+  it 'should merge missing attributes' do
+    v1 = MergingVersion.new(name: 'foo1')
+    v2 = MergingVersion.new(name: 'foo1', socks: 'stripey')
+    merge([v1, v2]).resolution.snapshot.should include(name: 'foo1', socks: 'stripey')
+  end
+
+  it 'should save the partial merge result' do
+    v1 = MergingVersion.new(name: 'foo1', socks: 'stripey')
+    v2 = MergingVersion.new(name: 'foo2', socks: 'argyle')
+    p1 = MergingVersion.new(name: 'foo', socks: 'argyle')
+    v1.parents = v2.parents = p1
+    merge([v1, v2]).conflicts.should include(name: ['foo1', 'foo2'])
+    merge([v1, v2]).resolution.snapshot.should include(socks: 'stripey')
+  end
+
+  it 'should set parents' do
+    v1 = MergingVersion.new(name: 'foo1', socks: 'stripey')
+    v2 = MergingVersion.new(name: 'foo2', socks: 'argyle')
+    merge([v1, v2]).resolution.parents.should == [v1, v2]
+  end
+
+  def merge(versions, options={})
+    s = HasVersions::Merge::ThreeWay.new(versions, options)
+    s.merge
+    s
+  end
+end

data/spec/has_versions/reset_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 class ResetObjectVersion < Version; end
 
@@ -12,7 +12,6 @@ class ResetObject
 
   has_versions(ResetObjectVersion) do
     attribute :name
-    attribute :set, expected: Set, decoder: lambda { |value| Set.new(value) }
   end
 end
 

data/spec/has_versions/stage_spec.rb

@@ -1,18 +1,17 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 class StagingObjectVersion < Version; end
 
-class StagingObject
-  include HasVersions::Versioned
-  include HasVersions::Stage
-
-  attr_accessor :name
-
-  has_versions(StagingObjectVersion) do
-    attribute :name
-  end
-end
-
-describe StagingObject do
-end
-
+# class StagingObject
+#   include HasVersions::Versioned
+#   include HasVersions::Stage
+# 
+#   attr_accessor :name
+# 
+#   has_versions(StagingObjectVersion) do
+#     attribute :name
+#   end
+# end
+# 
+# describe StagingObject do
+# end

data/spec/has_versions/versioned_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 class VersionedObject
   include HasVersions::Versioned
@@ -44,16 +44,16 @@ describe VersionedObject do
       v
     end
 
-    its(:versioned_attributes) { should have_key(:name).with_value('foo') }
+    its(:versioned_attributes) { should include(name: 'foo') }
 
     its(:to_version) { should be_a(VersionedObjectVersion) }
 
     it 'should set attributes in to_version' do
-      subject.to_version.snapshot.should have_key(:name).with_value('foo')
+      subject.to_version.snapshot.should include(name: 'foo')
     end
 
     it 'should encode attributes' do
-      subject.to_version.snapshot.should have_key(:time).with_value("02:43AM")
+      subject.to_version.snapshot.should include(time: "02:43AM")
     end
   end
 end

data/spec/has_versions/versioning_key_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe 'VersioningKey' do
   describe 'UUID' do

data/spec/spec_helper.rb

@@ -1,17 +1,16 @@
-require 'simplecov'
-SimpleCov.start do
-  add_filter '/spec/'
-  add_filter '/features/'
-end
+# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+# $LOAD_PATH.unshift(File.dirname(__FILE__))
+
+# p "#{$LOAD_PATH.inspect}"
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'has_versions'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each do |f| 
+  require f
+end
 
 RSpec.configure do |config|
   config.mock_with :rspec

data/spec/support/matchers/be_a_uuid.rb

@@ -5,4 +5,3 @@ RSpec::Matchers.define :be_a_uuid do |expected|
     actual =~ /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ # c14ba018-2f15-11e0-9a06-b6e5e5c60f13
   end
 end
-

data/spec/support/version.rb

@@ -5,3 +5,13 @@ class Version
     @snapshot = (snapshot || {}).with_indifferent_access
   end
 end
+
+class MergingVersion < Version
+  def parents
+    @parents || []
+  end
+
+  def parents=(parents)
+    @parents = Array(parents)
+  end
+end