has_versions 0.3.0 → 0.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_versions
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-16 00:00:00.000000000 -07:00
-default_executable: 
+date: 2011-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &17221640 !ruby/object:Gem::Requirement
+  requirement: &70120472609720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17221640
+  version_requirements: *70120472609720
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &17220920 !ruby/object:Gem::Requirement
+  requirement: &70120472608780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17220920
+  version_requirements: *70120472608780
 - !ruby/object:Gem::Dependency
   name: simple_uuid
-  requirement: &17220260 !ruby/object:Gem::Requirement
+  requirement: &70120472607900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17220260
+  version_requirements: *70120472607900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17219620 !ruby/object:Gem::Requirement
+  requirement: &70120472607200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *17219620
+  version_requirements: *70120472607200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &17219060 !ruby/object:Gem::Requirement
+  requirement: &70120472606420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,21 +65,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *17219060
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: &17218360 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *17218360
+  version_requirements: *70120472606420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17217740 !ruby/object:Gem::Requirement
+  requirement: &70120472605360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,40 +76,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17217740
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &17217060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.8
-  type: :development
-  prerelease: false
-  version_requirements: *17217060
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: &17216340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.8
-  type: :development
-  prerelease: false
-  version_requirements: *17216340
-- !ruby/object:Gem::Dependency
-  name: roodi
-  requirement: &17215620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: *17215620
+  version_requirements: *70120472605360
 description: ActiveModel versioning
 email:
 - grantr@gmail.com
@@ -152,10 +107,17 @@ files:
 - lib/has_versions/diff.rb
 - lib/has_versions/diff/simple.rb
 - lib/has_versions/merge.rb
-- lib/has_versions/merge/stupid.rb
+- lib/has_versions/merge/always_conflicted.rb
+- lib/has_versions/merge/base.rb
+- lib/has_versions/merge/choose_first.rb
+- lib/has_versions/merge/diff3.rb
+- lib/has_versions/merge/fast_forward.rb
+- lib/has_versions/merge/merge_base.rb
+- lib/has_versions/merge/octopus.rb
+- lib/has_versions/merge/three_way.rb
+- lib/has_versions/orm/cassandra_object.rb
 - lib/has_versions/reset.rb
 - lib/has_versions/reset/simple.rb
-- lib/has_versions/stage.rb
 - lib/has_versions/version.rb
 - lib/has_versions/versioned.rb
 - lib/has_versions/versioning_key.rb
@@ -163,16 +125,17 @@ files:
 - spec/has_versions/apply_spec.rb
 - spec/has_versions/configuration_spec.rb
 - spec/has_versions/diff_spec.rb
-- spec/has_versions/merge_spec.rb
+- spec/has_versions/merge/diff3_spec.rb
+- spec/has_versions/merge/merge_base_spec.rb
+- spec/has_versions/merge/octopus_spec.rb
+- spec/has_versions/merge/three_way_spec.rb
 - spec/has_versions/reset_spec.rb
 - spec/has_versions/stage_spec.rb
 - spec/has_versions/versioned_spec.rb
 - spec/has_versions/versioning_key_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/be_a_uuid.rb
-- spec/support/matchers/have_key.rb
 - spec/support/version.rb
-has_rdoc: true
 homepage: ''
 licenses:
 - MIT
@@ -194,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: has_versions
-rubygems_version: 1.6.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ActiveModel versioning
@@ -205,12 +168,14 @@ test_files:
 - spec/has_versions/apply_spec.rb
 - spec/has_versions/configuration_spec.rb
 - spec/has_versions/diff_spec.rb
-- spec/has_versions/merge_spec.rb
+- spec/has_versions/merge/diff3_spec.rb
+- spec/has_versions/merge/merge_base_spec.rb
+- spec/has_versions/merge/octopus_spec.rb
+- spec/has_versions/merge/three_way_spec.rb
 - spec/has_versions/reset_spec.rb
 - spec/has_versions/stage_spec.rb
 - spec/has_versions/versioned_spec.rb
 - spec/has_versions/versioning_key_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/be_a_uuid.rb
-- spec/support/matchers/have_key.rb
 - spec/support/version.rb

data/lib/has_versions/merge/stupid.rb

@@ -1,44 +0,0 @@
-module HasVersions
-  module Merge
-
-    # takes a list of versions and attempts to merge them with the current version.
-    # returns the merged version if successful
-    # raises MergeConflict if failed
-    #
-    # Doesn't attempt to determine common ancestry. The merge base is always the current version (self).
-    # Since there is no ancestry, conflict resolution is conservative. Any conflicting values generate a conflict.
-    #
-    # In general merging more than 1 version will generate a conflict.
-    module Stupid
-      include Diff3
-
-      def merge(*versions)
-        merged_version = self.class.new
-        merged_version.snapshot = snapshot.dup
-
-        # get the full list of attributes in each version and the merge base (self)
-        attributes = (versions.collect { |v| v.snapshot.keys }.flatten + snapshot.keys).uniq
-        conflicts = HashWithIndifferentAccess.new
-
-        # do 3-way merge on each attribute
-        attributes.each do |key|
-          theirs = versions.collect { |v| v.snapshot[key] }
-          clean, result = diff3(snapshot[key], snapshot[key], *theirs)
-
-          if clean
-            puts "clean: #{result.inspect}"
-            merged_version.snapshot[key] = result
-          else
-            conflicts[key] = result
-          end
-        end
-
-        # raise if conflicts is not empty
-        raise MergeConflict.new(conflicts, merged_version), conflicts.inspect unless conflicts.empty?
-        merged_version
-      end
-
-    end
-
-  end
-end

data/lib/has_versions/stage.rb

@@ -1,121 +0,0 @@
-#TODO this should move to a contrib gem
-module HasVersions
-  module Stage
-    # stage versions onto an object, returning true or false if there are conflicts.
-    # extends the object and each versioned attribute with methods to retrieve status, conflicts, and original value.
-    # extends the object with a resolution and conflicted/modified attribute lists
-    #
-    #TODO should this be part of the plugin?
-
-    def stage(*versions)
-      original = to_version
-
-      # try merging 
-      begin
-        merge_result = original.merge(*versions)
-        conflicts = HashWithIndifferentAccess.new
-      # if merge fails, get the conflicts and result
-      rescue MergeConflict => e
-        conflicts = e.conflicts
-        merge_result = e.result
-      end
-
-      reset!(merge_result)
-
-      stage_extend_self(versions, conflicts, original, merge_result)
-      stage_extend_attributes(conflicts, original)
-
-      conflicts.empty?
-    end
-    # devang also wants an api that is similar to the old one, with pending objects, and old values in the attributes.
-    # we can implement something that attaches a non-updated object in pending, with all the old apis
-
-    private
-
-    def stage_extend_self(staged, conflicts, original, merge_result)
-      # extend self with StagedAttribute and set conflicts and original
-      self.extend(StagedAttribute)
-      self.conflicts = conflicts
-      self.original = self.class.new.reset!(original) #TODO should this be a clone or new? should it inherit the key or id or other attributes?
-
-      # extend self with Staged and set the proper values
-      self.extend(Staged)
-      self.staged = staged
-      self.resolution = merge_result
-      # modified attributes is the conflicted keys plus the modified keys
-      self.modified_attributes = (conflicts.keys + original.diff(merge_result).keys).uniq
-    end
-
-    def stage_extend_attributes(conflicts, original)
-      # for each attribute, extend with StagedAttribute and set proper values
-      versioned_attributes.each do |key, value|
-        v.extend(StagedAttribute)
-        v.conflicts = conflicts[key] || []
-        v.original = original.snapshot[key]
-      end
-    end
-
-  end
-  
-  # included in attributes of staged objects
-  module StagedAttribute
-
-    def conflicted?
-      !@conflicts.empty?
-    end
-
-    def modified?
-      @original != self
-    end
-
-    def conflicts
-      @conflicts
-    end
-
-    def conflicts=(conflicts)
-      @conflicts = conflicts
-    end
-
-    def original
-      @original
-    end
-
-    def original=(original)
-      @original = original
-    end
-  end
-
-  # included in staged objects
-  # TODO maybe this should be included in the class up front
-  module Staged
-
-    def staged
-      @staged
-    end
-
-    def staged=(staged)
-      @staged = staged
-    end
-
-    def resolution
-      @resolution
-    end
-
-    def resolution=(resolution)
-      @resolution = resolution
-    end
-
-    def modified_attributes
-      @modified_attributes
-    end
-
-    def modified_attributes=(modified_attributes)
-      @modified_attributes = modified_attributes
-    end
-
-    def conflicted_attributes
-      @conflicts.keys
-    end
-  end
-
-end

data/spec/has_versions/merge_spec.rb

@@ -1,67 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-class MergingVersion < Version; end
-
-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
-  end
-
-  describe "Stupid" do
-    class MergingVersion
-      include HasVersions::Merge::Stupid
-    end
-
-    let (:foo1) { MergingVersion.new(name: 'foo1') }
-    let (:foo2) { MergingVersion.new(name: 'foo2') }
-    let (:foo3) { MergingVersion.new(name: 'foo3') }
-    let (:socks) { MergingVersion.new(stripey: 'socks') }
-
-    it 'should merge a version into another' do
-      foo1.merge(foo2).snapshot.should have_key(:name).with_value('foo2')
-    end
-
-    it 'should merge non-conflicting versions' # but it doesn't, because it can't merge more than one version (when ours == base)
-
-    it 'should raise when versions conflict' do
-      expect { foo1.merge(foo2, foo3) }.to raise_error(HasVersions::MergeConflict)
-    end
-
-    it 'should put the conflicts in the MergeConflict exception' do
-      begin
-        foo1.merge(foo2, foo3)
-      rescue HasVersions::MergeConflict => e
-        e.conflicts.should have_key(:name).with_value(['foo2', 'foo3'])
-      end
-    end
-
-    it 'should put the merge result in the MergeConflict exception' do
-      begin
-        foo1.merge(foo2, foo3)
-      rescue HasVersions::MergeConflict => e
-        e.result.snapshot.should have_key(:name).with_value('foo1')
-      end
-    end
-  end
-end
-

data/spec/support/matchers/have_key.rb

@@ -1,25 +0,0 @@
-require 'rspec/expectations'
-
-RSpec::Matchers.define :have_key do |first|
-  match do |actual|
-    if @second
-      actual.has_key?(first) && actual[first] == @second
-    else
-      actual.has_key?(first)
-    end
-  end
-
-  chain :with_value do |second|
-    @second = second
-  end
-
-  failure_message_for_should do |actual|
-    if @second
-      %(expected #{actual.inspect} to have key "#{first.inspect}" with value #{@second.inspect})
-    else
-      %(expected #{actual.inspect} to have key "#{first.inspect}")
-    end
-  end
-
-end
-