event_sourced_record 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb56334d7517be8d0816a7f12b91a6c2daf32d6f
-  data.tar.gz: e7fc402917fad1bb62c5ab3aa25d3f750b824637
+  metadata.gz: b0ee2af5ab48feddf17d097471e7298e444b261f
+  data.tar.gz: 7b9d4960dfbaaae80abf9f93ed8e640cb1503d01
 SHA512:
-  metadata.gz: 7a26c10327b28148eb26819aeda00f56481bd528bedcddd37465b839fcd06da7d08893b99d1aa8821211b84e5491b306f86c02c46cbfce57a6f00f43ef6883e7
-  data.tar.gz: 2e0608be3b44eda77080c19edbc27d59f11272ffaccf09e433b17147b6bc883672e601d9fbef96746053112d2761ded6aeebd149ad984de58b0da1935e9b4bb8
+  metadata.gz: 3c596cb4d97f385ee2827a876f3d1ced7fc180ec80a03ea174aeafceb85269c42662190d486cdd426b6cf561372d3715b5743d1eea7bbea8500d61adb658acd2
+  data.tar.gz: b570432fd7e2db6d8fb072031d17475e7bc7579c5beaab175c5d4c752bbba7451700731ddde53f86a8761dc2d417b2a1d245e18236caf34c4de02fa26c5af9bf

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+[[[0.2.0]] - Feb 23 2015]
+
+* BUGFIX - allow multiple calculators (#11).
+* Included the configuration for the `data` column in the generated Event class
+  (#9).
+* Made Event instances immutable (#8).
+* Added `occurred_at` to generated events, which will be used by the calculator
+  for ordering events. If `occurred_at` is not defined, `created_at` will be
+  used instead (#6).

data/lib/event_sourced_record/calculator.rb

@@ -1,10 +1,10 @@
 class EventSourcedRecord::Calculator
   def self.events(*event_symbols)
-    @@event_symbols = event_symbols
+    @event_symbols = event_symbols
   end
 
   def self.event_classes
-    @@event_symbols.map { |sym| 
+    @event_symbols.map { |sym|
       Module.const_get(sym.to_s.singularize.camelize)
     }
   end
@@ -88,13 +88,21 @@ class EventSourcedRecord::Calculator
         conditions = {projection_name + '_id' => projection.id} if projection
       end
       conditions ? event_class.where(conditions).to_a : []
-    }.flatten.sort_by(&:created_at).reject { |evt|
+    }.flatten.sort_by{ |evt| occurrence_time(evt) }.reject { |evt|
       if last_event_time
-        evt.created_at > last_event_time
+        occurrence_time(evt) > last_event_time
       end
     }
   end
 
+  def occurrence_time(event)
+    if event.respond_to?(:occurred_at) && event.occurred_at
+      event.occurred_at
+    else
+      event.created_at
+    end
+  end
+
   def uuid_field
     projection_name + '_uuid'
   end

data/lib/event_sourced_record/event.rb

@@ -9,6 +9,7 @@ module EventSourcedRecord::Event
     model.after_initialize :ensure_data
     model.after_initialize :ensure_projection_uuid
     model.after_initialize :lock_event_type
+    model.before_validation :ensure_occurred_at, on: :create
     model.validates :event_type, presence: true
     model.validate :validate_corrent_event_type
     model.validate :validate_by_event_type
@@ -56,6 +57,10 @@ module EventSourcedRecord::Event
     @event_type_locked = true
   end
 
+  def ensure_occurred_at
+    self.occurred_at = Time.now unless occurred_at
+  end
+
   def method_missing(meth, *args, &block)
     if event_type_config && event_type_config.attributes.include?(meth)
       ensure_data

data/lib/event_sourced_record/version.rb

@@ -1,3 +1,3 @@
 module EventSourcedRecord
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/generators/event_sourced_record/event_sourced_record_generator.rb

@@ -13,7 +13,7 @@ class EventSourcedRecord::EventSourcedRecordGenerator < Rails::Generators::Named
   def create_event
     arguments = [
       "#{file_name}_uuid:string:index", "event_type:string", 
-      "data:text", "created_at:datetime"
+      "data:text", "created_at:datetime", "occurred_at:datetime"
     ].join(' ')
     generate "event_sourced_record:event", "#{file_name}_event #{arguments}"
   end

data/test/event_sourced_record/event_test.rb

@@ -119,4 +119,21 @@ class EventSourcedRecord::EventTest < MiniTest::Unit::TestCase
       event.touch
     end
   end
+
+  def test_occurred_at_is_set_if_not_specified
+    event = SubscriptionEvent.creation.create!(
+      bottles_per_shipment: 1, bottles_purchased: 6, user_id: 999
+    )
+
+    assert event.occurred_at
+  end
+
+  def test_occurred_at_can_be_specified
+    event = SubscriptionEvent.creation.new(
+      occurred_at: Time.new(2003, 1, 24, 11, 33), bottles_per_shipment: 1,
+      bottles_purchased: 6, user_id: 999
+    )
+
+    assert_equal(Time.new(2003, 1, 24, 11, 33), event.occurred_at)
+  end
 end

data/test/generators/event_generator_test.rb

@@ -16,6 +16,7 @@ class EventSourcedRecord::EventGeneratorTest < Rails::Generators::TestCase
       event_type:string
       data:text
       created_at:datetime
+      occurred_at:datetime
     )
   end
 
@@ -23,11 +24,13 @@ class EventSourcedRecord::EventGeneratorTest < Rails::Generators::TestCase
     ar_major_version = ActiveRecord::VERSION::MAJOR
     if ar_major_version >= 4
       assert @generate_calls['migration'].include?(
-        "create_subscription_events subscription_uuid:string:index event_type:string data:text created_at:datetime"
+        "create_subscription_events subscription_uuid:string:index event_type:string data:text created_at:datetime occurred_at:datetime"
       )
     else
       assert_migration("db/migrate/create_subscription_events.rb") do |contents|
         assert_match(/t.string :event_type/, contents)
+        assert_match(/t.datetime :created_at/, contents)
+        assert_match(/t.datetime :occurred_at/, contents)
       end
     end
   end

data/test/generators/event_sourced_record_generator_test.rb

@@ -20,7 +20,7 @@ class EventSourcedRecord::EventSourcedRecordGeneratorTest < Rails::Generators::T
 
   test "calls the event generator" do
     assert @generate_calls['event_sourced_record:event'].include?(
-      "shampoo_subscription_event shampoo_subscription_uuid:string:index event_type:string data:text created_at:datetime"
+      "shampoo_subscription_event shampoo_subscription_uuid:string:index event_type:string data:text created_at:datetime occurred_at:datetime"
     )
   end
 

data/test/test_helper.rb

@@ -38,6 +38,7 @@ silence_stream(STDOUT) do
       t.string   "event_type"
       t.text     "data"
       t.datetime "created_at"
+      t.datetime "occurred_at"
     end
 
     create_table "subscriptions", force: true do |t|
@@ -46,6 +47,19 @@ silence_stream(STDOUT) do
       t.integer "bottles_left"
       t.string  "uuid"
     end
+
+    create_table "bottle_events", force: true do |t|
+      t.string   "bottle_uuid"
+      t.string   "event_type"
+      t.text     "data"
+      t.datetime "created_at"
+    end
+
+    create_table "bottles", force: true do |t|
+      t.integer "volume"
+      t.decimal "cost_price"
+      t.string  "uuid"
+    end
   end
 end
 
@@ -90,3 +104,28 @@ class SubscriptionCalculator < EventSourcedRecord::Calculator
     @subscription.bottles_left -= shipment.num_bottles
   end
 end
+
+class BottleEvent < ActiveRecord::Base
+  include EventSourcedRecord::Event
+
+  serialize :data
+
+  event_type :purchase do
+    attributes :volume, :cost_price
+  end
+end
+
+class Bottle < ActiveRecord::Base
+  has_many :bottle_events
+
+  validates :uuid, uniqueness: true
+end
+
+class BottleCalculator < EventSourcedRecord::Calculator
+  events :bottle_events, :shipments
+
+  def advance_purchase(event)
+    @bottle.volume = event.volume
+    @bottle.cost_price = event.cost_price
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_sourced_record
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Francis Hwang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -160,6 +160,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - Getting_Started.md
 - LICENSE.txt