sandthorn 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f39fd41916e13c8d9af482497da9774295644984
-  data.tar.gz: b3ae469f87f318a99d27f34049513cf35cae754d
+  metadata.gz: 692bd55290b3092568fa5d7ed3d18be9f4d8e581
+  data.tar.gz: 41f6b41d080e0b6b2304412a25a435a7c9979021
 SHA512:
-  metadata.gz: 2c3d769b134a6421cfe4164190726c9ce1448f06962ee24aee7aec32f14fc1cf7c4c6e5c2a6160c62a0c316f482e8d72709463c2ac3f0298e7584ab02f604011
-  data.tar.gz: d54a6d161c31dd38ff4bd03217035d35d2f445419d83c59caca649828b32543eaf9714ed8832b56f4262315fad95992936b778bdda52f602254103611067b6c2
+  metadata.gz: 764d97697a9b452ba6acdc82b13006c6c6b1118b481908c8a8e17c5b4acd3286009030e0ea5c74d584514cad2ee9f848d4ea8566cff5d9590c6c7c0f345682b0
+  data.tar.gz: c3a218cc83d50f65a319200293f7110ed2be7788af640a58ac94efbe439b9da824f3ce1049264c149589e54f556ba273e44d9e95a2a10bf81849267dce71693a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sandthorn (0.6.0)
+    sandthorn (0.7.0)
 
 GEM
   remote: https://rubygems.org/
@@ -22,7 +22,7 @@ GEM
     mime-types (2.4.3)
     multi_json (1.10.1)
     netrc (0.8.0)
-    pg (0.17.1)
+    pg (0.18.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -46,10 +46,10 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    sandthorn_driver_sequel (1.1.0)
+    sandthorn_driver_sequel (2.0.0)
       pg
-      sequel
-    sequel (4.15.0)
+      sequel (~> 4.17)
+    sequel (4.20.0)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -77,5 +77,5 @@ DEPENDENCIES
   rake
   rspec (~> 3.0)
   sandthorn!
-  sandthorn_driver_sequel (~> 1.1)
+  sandthorn_driver_sequel (~> 2.0)
   sqlite3

data/lib/sandthorn.rb

@@ -1,5 +1,6 @@
 require "sandthorn/version"
 require "sandthorn/errors"
+require "sandthorn/event"
 require "sandthorn/aggregate_root"
 require "sandthorn/event_stores"
 require 'yaml'
@@ -45,38 +46,42 @@ module Sandthorn
       SecureRandom.uuid
     end
 
-    def get_aggregate_events aggregate_id, aggregate_type
-      event_store_for(aggregate_type).get_aggregate_events aggregate_id, aggregate_type
+    def get_aggregate_events aggregate_type, aggregate_id
+      event_store_for(aggregate_type).get_aggregate_events aggregate_id
     end
 
-    def save_events aggregate_events, originating_aggregate_version, aggregate_id, aggregate_type
-      event_store_for(aggregate_type).save_events aggregate_events, originating_aggregate_version, aggregate_id, *aggregate_type
+    def save_events aggregate_events, aggregate_id, aggregate_type
+      event_store_for(aggregate_type).save_events aggregate_events, aggregate_id, *aggregate_type
     end
 
     def get_aggregate aggregate_id, aggregate_type
-      event_store_for(aggregate_type).get_aggregate aggregate_id, aggregate_type
+      event_store_for(aggregate_type).get_aggregate_events_from_snapshot aggregate_id
     end
 
-    def save_snapshot aggregate_snapshot, aggregate_id, aggregate_type
-      event_store_for(aggregate_type).save_snapshot aggregate_snapshot, aggregate_id, aggregate_type
+    def save_snapshot(
+        aggregate_type: missing_key(:aggregate_type),
+        aggregate_snapshot: missing_key(:aggregate_snapshot),
+        aggregate_id: missing_key(:aggregate_id)
+    )
+      event_store_for(aggregate_type).save_snapshot(aggregate_snapshot, aggregate_id)
     end
 
     def get_aggregate_list_by_type aggregate_type
-      event_store_for(aggregate_type).get_aggregate_list_by_typename aggregate_type
+      event_store_for(aggregate_type).get_aggregate_ids(aggregate_type: aggregate_type)
     end
 
     def get_events event_store: :default, aggregate_types: [], take: 0, after_sequence_number: 0
       event_store = find_event_store(event_store)
       events = event_store.get_events aggregate_types: aggregate_types, take: take, after_sequence_number: after_sequence_number
-      events.each do |event|
+      events.map do |event|
         event[:event_args] = deserialize event[:event_data]
         event.delete(:event_data)
+        Event.new(event)
       end
-      events
     end
 
     def obsolete_snapshots type_names: [], min_event_distance: 0
-      obsolete = event_stores.flat_map { |event_store| event_store.obsolete_snapshots(class_names: type_names, max_event_distance: min_event_distance) }
+      obsolete = event_stores.flat_map { |event_store| event_store.obsolete_snapshots(aggregate_types: type_names, max_event_distance: min_event_distance) }
       obsolete.map do |single_obsolete|
         type = Kernel.const_get single_obsolete[:aggregate_type]
         aggregate = type.aggregate_find(single_obsolete[:aggregate_id]).tap do |agg|
@@ -97,6 +102,10 @@ module Sandthorn
       end
     end
 
+    def missing_key(key)
+      raise ArgumentError, "missing keyword: #{key}"
+    end
+
     class Configuration
       extend Forwardable
 

data/lib/sandthorn/aggregate_root_base.rb

@@ -27,7 +27,6 @@ module Sandthorn
         unless aggregate_events.empty?
           Sandthorn.save_events(
             aggregate_events,
-            aggregate_originating_version,
             aggregate_id,
             self.class
           )

data/lib/sandthorn/aggregate_root_snapshot.rb

@@ -27,7 +27,7 @@ module Sandthorn
       end
       @aggregate_snapshot[:event_data] = Sandthorn.serialize @aggregate_snapshot[:event_args]
       @aggregate_snapshot[:event_args] = nil
-      Sandthorn.save_snapshot @aggregate_snapshot, @aggregate_id, self.class
+      Sandthorn.save_snapshot(aggregate_snapshot: @aggregate_snapshot, aggregate_id: @aggregate_id, aggregate_type: self.class)
       @aggregate_snapshot = nil
     end
     private
@@ -44,7 +44,7 @@ module Sandthorn
         .serialize aggregate_snapshot[:event_args]
 
       @aggregate_snapshot[:event_args] = nil
-      Sandthorn.save_snapshot aggregate_snapshot, aggregate_id, self.class.name
+      Sandthorn.save_snapshot aggregate_snapshot, aggregate_id
       @aggregate_snapshot = nil
     end
   end

data/lib/sandthorn/event.rb

@@ -0,0 +1,60 @@
+require 'delegate'
+
+module Sandthorn
+  class Event < SimpleDelegator
+    ATTRS = %i(
+      aggregate_id
+      aggregate_type
+      aggregate_version
+      timestamp
+      event_name
+      event_args
+      method_args
+      trace
+    )
+
+    ATTRS.each do |attr|
+      define_method(attr) do
+        self[attr]
+      end
+    end
+
+    def new_values
+      @changed_attributes ||= build_new_values
+    end
+
+    def attribute_deltas
+      @attribute_deltas ||= build_deltas
+    end
+
+    private
+
+    def build_deltas
+      raw_deltas.map { |delta| AttributeDelta.new(delta) }
+    end
+
+    def build_new_values
+      attribute_deltas.each_with_object({}) do |delta, changed|
+        changed[delta.attribute_name.to_sym] = delta.new_value
+      end
+    end
+
+    def raw_deltas
+      fetch(:event_args, {}).fetch(:attribute_deltas, [])
+    end
+
+    class AttributeDelta < SimpleDelegator
+      ATTRS = %i(
+        attribute_name
+        old_value
+        new_value
+      )
+
+      ATTRS.each do |attr|
+        define_method(attr) do
+          self[attr]
+        end
+      end
+    end
+  end
+end

data/lib/sandthorn/event_inspector.rb

@@ -46,7 +46,7 @@ module Sandthorn
     end
 
     def events_with_trace_info
-      saved = Sandthorn.get_aggregate_events self.aggregate_id, self.class 
+      saved = Sandthorn.get_aggregate_events(self.class, aggregate_id)
       unsaved = self.aggregate_events
       all = saved
         .concat(unsaved)

data/lib/sandthorn/version.rb

@@ -1,3 +1,3 @@
 module Sandthorn
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/sandthorn.gemspec

@@ -6,8 +6,8 @@ require 'sandthorn/version'
 Gem::Specification.new do |spec|
   spec.name          = "sandthorn"
   spec.version       = Sandthorn::VERSION
-  spec.authors       = ["Lars Krantz", "Morgan Hallgren"]
-  spec.email         = ["lars.krantz@alaz.se", "morgan.hallgren@gmail.com"]
+  spec.authors       = ["Lars Krantz", "Morgan Hallgren", "Jesper Josefsson"]
+  spec.email         = ["lars.krantz@alaz.se", "morgan.hallgren@gmail.com", "jesper.josefsson@gmail.com"]
   spec.description   = %q{Event sourcing gem}
   spec.summary       = %q{Event sourcing gem}
   spec.homepage      = ""
@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "autotest-standalone"
   spec.add_development_dependency "sqlite3"  
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "sandthorn_driver_sequel", "~> 1.1"
+  spec.add_development_dependency "sandthorn_driver_sequel", "~> 2.0"
 end

data/spec/event_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+module Sandthorn
+  describe Event do
+    let(:event_data) do
+      JSON.parse(
+      '{"aggregate_type":"SandthornProduct",
+          "aggregate_version":1,
+          "aggregate_id":"62d88e96-c551-4157-a837-1674e3f2698d",
+          "sequence_number":114,
+          "event_name":"new",
+          "timestamp":"2014-08-16 20:02:05 UTC",
+          "event_args":{"method_name":"new",
+          "method_args":[{"name":"Hahah",
+          "price":"50",
+          "stock_status":"outofstock"}],
+          "attribute_deltas":[{"attribute_name":"name",
+          "old_value":null,
+      "new_value":"Hahah"},
+          {"attribute_name":"price",
+          "old_value":null,
+      "new_value":50},
+          {"attribute_name":"stock_status",
+          "old_value":null,
+      "new_value":"outofstock"},
+          {"attribute_name":"active",
+          "old_value":null,
+      "new_value":true},
+          {"attribute_name":"on_sale",
+          "old_value":null,
+      "new_value":false},
+          {"attribute_name":"aggregate_id",
+          "old_value":null,
+      "new_value":"62d88e96-c551-4157-a837-1674e3f2698d"}]}}', symbolize_names: true)
+    end
+
+    let(:subject) { Event.new(event_data) }
+    describe "primitive attributes" do
+      attrs = %i(
+      aggregate_id
+      aggregate_type
+      aggregate_version
+      timestamp
+      event_name
+      event_args
+      method_args
+      trace
+      )
+
+      attrs.each do |attr|
+        it "has an accessor for #{attr}" do
+          expect(subject.send(attr)).to eq(subject[attr])
+        end
+      end
+    end
+
+    describe "#new_values" do
+      context "when given the value of an attribute that has changed" do
+        it "returns the new value" do
+          expect(subject.new_values[:name]).to eq("Hahah")
+        end
+      end
+
+      context "when given a non-existing attribute name" do
+        it "returns nil" do
+          expect(subject.new_values[:foo]).to be_nil
+        end
+      end
+    end
+
+    describe "#attributes_deltas" do
+      it "returns something enumerable" do
+        expect(subject.attribute_deltas).to respond_to(:each)
+      end
+
+      describe "a delta" do
+        let(:wrapped_delta) { subject.attribute_deltas.first }
+        let(:raw_delta) { subject[:event_args][:attribute_deltas].first }
+        describe "#attribute_name" do
+          it "has the same value as the raw hash" do
+            expect(wrapped_delta.attribute_name).to eq(raw_delta[:attribute_name])
+          end
+        end
+
+        describe "#new_value" do
+          it "has the same value as the raw hash" do
+            expect(wrapped_delta.new_value).to eq(raw_delta[:new_value])
+          end
+        end
+
+        describe "#old_value" do
+          it "has the same value as the raw hash" do
+            expect(wrapped_delta.old_value).to eq(raw_delta[:old_value])
+          end
+        end
+      end
+    end
+  end
+end

data/spec/sandthorn_spec.rb

@@ -52,4 +52,12 @@ describe Sandthorn do
       end
     end
   end
+
+  describe "::save_snapshot" do
+    context "when a keyword is missing" do
+      it "raises an ArgumentError" do
+        expect { Sandthorn.save_snapshot }.to raise_error(ArgumentError)
+      end
+    end
+  end
 end

metadata

@@ -1,184 +1,186 @@
 --- !ruby/object:Gem::Specification
 name: sandthorn
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Lars Krantz
 - Morgan Hallgren
+- Jesper Josefsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   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'
 - !ruby/object:Gem::Dependency
   name: pry
   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'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   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'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   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'
 - !ruby/object:Gem::Dependency
   name: autotest-standalone
   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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 - !ruby/object:Gem::Dependency
   name: coveralls
   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'
 - !ruby/object:Gem::Dependency
   name: sandthorn_driver_sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 description: Event sourcing gem
 email:
 - lars.krantz@alaz.se
 - morgan.hallgren@gmail.com
+- jesper.josefsson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".autotest"
-- ".gitignore"
-- ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .autotest
+- .gitignore
+- .rspec
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Gemfile.lock.old
@@ -192,6 +194,7 @@ files:
 - lib/sandthorn/aggregate_root_marshal.rb
 - lib/sandthorn/aggregate_root_snapshot.rb
 - lib/sandthorn/errors.rb
+- lib/sandthorn/event.rb
 - lib/sandthorn/event_inspector.rb
 - lib/sandthorn/event_stores.rb
 - lib/sandthorn/version.rb
@@ -204,6 +207,7 @@ files:
 - spec/db/sequel_driver.sqlite3_old
 - spec/different_driver_spec.rb
 - spec/event_inspector_spec.rb
+- spec/event_spec.rb
 - spec/event_stores_spec.rb
 - spec/get_events_spec.rb
 - spec/initialize_signature_change_spec.rb
@@ -221,17 +225,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Event sourcing gem
@@ -244,6 +248,7 @@ test_files:
 - spec/db/sequel_driver.sqlite3_old
 - spec/different_driver_spec.rb
 - spec/event_inspector_spec.rb
+- spec/event_spec.rb
 - spec/event_stores_spec.rb
 - spec/get_events_spec.rb
 - spec/initialize_signature_change_spec.rb