sandthorn 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f99d35485b8746cbbe8ea792d915d764344a689c
-  data.tar.gz: d3da0a1e657e55b9fdc283a4d549d1ea4c5c1a7b
+  metadata.gz: 10d8ea5557695337009c236ea93deaf0eef47d13
+  data.tar.gz: d9f2920cb7b31df316859f51ed76864a360b6ccd
 SHA512:
-  metadata.gz: 4c9b2225374dc3626f14ef756c011438c0347e9e4787f53a3d74161e49c6875d9bcc2418e0fa4574e69b4b86d39c05c0348a52b58e78f4402028816ae81aae4b
-  data.tar.gz: 7c56c84f45d5c352e669e874a050fd62557a7c764e459d546c429f6cd544f9dcd7a28be55e2d0f116b49b90c265ee2c23fb03034b4b34a3dce8f19aa87ea3d8d
+  metadata.gz: bf97fec50cc1c40ff231a1907a4e7e6a134338766329e7eadb69220047b06a3307a18fa1c703952ac497477d78a10480cc80504735d8239102fda77b7f1c895c
+  data.tar.gz: dd51c3758eb294f6f766f7b5fa5d7fc5fe31facdf76bc0eeaa95d44e5c55aae0d898cce785653cbda7104e733d7e201f46c50da430edba179cea9c2ab6c4bda7

data/Gemfile.lock

@@ -1,18 +1,11 @@
 PATH
   remote: .
   specs:
-    sandthorn (0.3.0)
-      dirty_hashy
+    sandthorn (0.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.4)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
     autotest-standalone (4.5.11)
     awesome_print (1.2.0)
     coderay (1.1.0)
@@ -23,14 +16,10 @@ GEM
       term-ansicolor
       thor
     diff-lcs (1.2.5)
-    dirty_hashy (0.2.1)
-      activesupport
     docile (1.1.3)
     gem-release (0.7.1)
-    i18n (0.6.9)
     method_source (0.8.2)
     mime-types (2.2)
-    minitest (4.7.5)
     multi_json (1.9.2)
     pg (0.17.1)
     pry (0.9.12.6)
@@ -65,9 +54,7 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.3)
     tins (1.1.0)
-    tzinfo (0.3.39)
     yard (0.8.7.4)
 
 PLATFORMS

data/lib/sandthorn/aggregate_root_base.rb

@@ -95,50 +95,52 @@ module Sandthorn
         end
 
         def aggregate_build events
-          first_event = events.first()
           current_aggregate_version = 0
-          if first_event[:event_name] == "aggregate_set_from_snapshot"
-            aggregate = first_event[:event_args][0]
+          if first_event_snapshot?(events)
+            aggregate = start_build_from_snapshot events 
             current_aggregate_version = aggregate.aggregate_originating_version
             events.shift
           else
-            new_args = events.first()[:event_args][:method_args]
-
-            if new_args.nil?
-              aggregate = new
-            else
-              aggregate = new *new_args
-            end
-            aggregate.send :aggregate_clear_current_event_version!
+            aggregate = start_build_from_new events
           end
-
-          attributes = {}
-          events.each do |event|
+          attributes = build_instance_vars_from_events events
+          current_aggregate_version = events.last[:aggregate_version] unless events.empty?
+          aggregate.send :clear_aggregate_events
+          aggregate.send :set_orginating_aggregate_version!, current_aggregate_version
+          aggregate.send :set_current_aggregate_version!, current_aggregate_version
+          aggregate.send :aggregate_initialize
+          aggregate.send :set_instance_variables!, attributes
+          aggregate
+        end
+        private
+        def build_instance_vars_from_events events
+          events.inject({}) do |instance_vars, event |
             event_args = event[:event_args]
             event_name = event[:event_name]
-
-            next if event_name == "aggregate_set_from_snapshot"
-            next if event_name == "instance_extended_as_aggregate"
-
             attribute_deltas = event_args[:attribute_deltas]
-
-            unless event[:aggregate_version].nil?
-              current_aggregate_version = event[:aggregate_version]
-            end
-
             unless attribute_deltas.nil?
               deltas = attribute_deltas.each_with_object({}) do |delta, acc|
                 acc[delta[:attribute_name]] = delta[:new_value]
               end
-
-              attributes.merge! deltas
+              instance_vars.merge! deltas
             end
+            instance_vars
           end
-          aggregate.send :clear_aggregate_events
-          aggregate.send :set_orginating_aggregate_version!, current_aggregate_version
-          aggregate.send :set_current_aggregate_version!, current_aggregate_version
-          aggregate.send :aggregate_initialize
-          aggregate.send :set_instance_variables!, attributes
+        end
+        def first_event_snapshot? events
+          events.first[:event_name].to_sym == :aggregate_set_from_snapshot
+        end
+        def start_build_from_snapshot events
+          snapshot = events.first[:event_args][0]
+        end
+        def start_build_from_new events
+          new_args = events.first[:event_args][:method_args]
+          if new_args.nil?
+            aggregate = new
+          else
+            aggregate = new *new_args
+          end
+          aggregate.send :aggregate_clear_current_event_version!
           aggregate
         end
       end

data/lib/sandthorn/aggregate_root_snapshot.rb

@@ -2,12 +2,14 @@ module Sandthorn
   module AggregateRootSnapshot
     attr_reader :aggregate_snapshot
 
-    def aggregate_snapshot!
-
-      if @aggregate_events.count > 0
-        raise "Can't take snapshot on object with unsaved events"
-      end
+    def snapshot
+      aggregate_snapshot!
+      save_snapshot
+      self
+    end
 
+    def aggregate_snapshot!
+      raise Errors::SnapshotError.new "Can't take snapshot on object with unsaved events" if @aggregate_events.count > 0
       @aggregate_snapshot = {
         :event_name => "aggregate_set_from_snapshot",
         :event_args => [self],
@@ -16,23 +18,10 @@ module Sandthorn
     end
 
     def save_snapshot
-      raise "No snapshot has been created!" unless @aggregate_snapshot
-      @aggregate_snapshot[:event_data] = Sandthorn.serialize @aggregate_snapshot[:event_args]
+      raise Errors::SnapshotError.new "No snapshot has been created!" unless aggregate_snapshot
+      @aggregate_snapshot[:event_data] = Sandthorn.serialize aggregate_snapshot[:event_args]
       @aggregate_snapshot[:event_args] = nil
-      Sandthorn.save_snapshot @aggregate_snapshot, @aggregate_id, self.class.name
-      @aggregate_snapshot = nil
-    end
-    private
-    def aggregate_create_event_when_extended
-      self.aggregate_snapshot!
-      vars = extract_relevant_aggregate_instance_variables
-      vars.each do |var_name|
-        value = instance_variable_get var_name
-        dump = Marshal.dump(value)
-        store_aggregate_instance_variable var_name, dump
-      end
-      #@aggregate_snapshot[:event_data] = Sandthorn.serialize @aggregate_snapshot[:event_args]
-      store_aggregate_event "instance_extended_as_aggregate", @aggregate_snapshot[:event_args]
+      Sandthorn.save_snapshot aggregate_snapshot, aggregate_id, self.class.name
       @aggregate_snapshot = nil
     end
   end

data/lib/sandthorn/errors.rb

@@ -4,5 +4,6 @@ module Sandthorn
     class AggregateNotFound < Error; end
     class ConcurrencyError < Error; end
     class ConfigurationError < Error; end
+    class SnapshotError < Error; end
   end
 end

data/lib/sandthorn/version.rb

@@ -1,3 +1,3 @@
 module Sandthorn
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/sandthorn.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 2.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
@@ -29,7 +30,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"  
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "sandthorn_driver_sequel", "~> 1.1"
-
-  spec.add_runtime_dependency "dirty_hashy"
-
 end

data/spec/aggregate_snapshot_spec.rb

@@ -211,10 +211,24 @@ describe 'when generating state on an aggregate root' do
 
 end
 
+describe Sandthorn::AggregateRootSnapshot do
+  let(:subject) { a_test_account.save.extend Sandthorn::AggregateRootSnapshot  }
+  context "when using :snapshot - method" do
+    it "should return self" do
+      expect(subject.snapshot).to eql subject
+    end
+    it "should raise SnapshotError if aggregate has unsaved events" do
+      subject.paid_with_visa_card_event 2000, ""
+      expect{subject.snapshot}.to raise_error Sandthorn::Errors::SnapshotError
+    end
+  end
+end
+
+
 describe 'when saving to repository' do
   let(:account) {a_test_account.extend Sandthorn::AggregateRootSnapshot}
   it 'should raise an error if trying to save before creating a snapshot' do
-    lambda {account.save_snapshot}.should raise_error (RuntimeError)
+    lambda {account.save_snapshot}.should raise_error (Sandthorn::Errors::SnapshotError)
   end
   it 'should not raise an error if snapshot was created' do
     account.save

data/spec/benchmark_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'sandthorn/aggregate_root_dirty_hashy'
 require 'benchmark'
 
 module Sandthorn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sandthorn
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Lars Krantz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,20 +165,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: dirty_hashy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Event sourcing gem
 email:
 - lars.krantz@alaz.se
@@ -203,7 +189,6 @@ files:
 - lib/sandthorn.rb
 - lib/sandthorn/aggregate_root.rb
 - lib/sandthorn/aggregate_root_base.rb
-- lib/sandthorn/aggregate_root_dirty_hashy.rb
 - lib/sandthorn/aggregate_root_marshal.rb
 - lib/sandthorn/aggregate_root_snapshot.rb
 - lib/sandthorn/errors.rb
@@ -233,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/sandthorn/aggregate_root_dirty_hashy.rb

@@ -1,38 +0,0 @@
-require "dirty_hashy"
-require "sandthorn/aggregate_root_base"
-
-module Sandthorn
-  module AggregateRoot
-    module DirtyHashy
-      include Sandthorn::AggregateRoot::Base
-
-      def aggregate_initialize *args
-        @hashy = ::DirtyHashy.new
-      end
-
-      def set_instance_variables! attribute
-        super attribute
-
-        extract_relevant_aggregate_instance_variables.each do |var|
-          next if var.to_s == "@hashy"
-          @hashy[var.to_s.delete("@")] = self.instance_variable_get("#{var}")
-        end
-        @hashy.clean_up!
-      end
-
-      def get_delta
-        extract_relevant_aggregate_instance_variables.each do |var|
-          next if var.to_s == "@hashy"
-          @hashy[var.to_s.delete("@")] = self.instance_variable_get("#{var}")
-        end
-        aggregate_attribute_deltas = []
-        @hashy.changes.each do |attribute|
-          aggregate_attribute_deltas << { :attribute_name => attribute[0], :old_value => attribute[1][0], :new_value => attribute[1][1]}
-        end
-        @hashy.clean_up!
-        aggregate_attribute_deltas
-      end
-
-    end
-  end
-end