sequent 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1582cc8d34049b1e10ed9c90391e3e7167c1ff
-  data.tar.gz: 5960fdac4834a4bb4f96b1643e6885da90f79587
+  metadata.gz: 06ef0bc6b614da70a42d8318cd2c4e135f263dc9
+  data.tar.gz: 00e06d5d6126eaef0a31a191b36872553be04e19
 SHA512:
-  metadata.gz: 6f8ac133e7cbf158f48fe175527b4093c961b3637ea4a5b04d8373caeb2915dbc0ffede971c4f2a6a5d34bbc470e8cd3d9991ebaac784afd73ec610212f94be6
-  data.tar.gz: 1fdbf2610073c2731dfda81416a39c6d40eed6cdf4eed05ab0ac5c5813078d68c82a8a28bd8338c0ed06ef98ef0f2bc9f098c185ce6af4967e6f9ce9a900b6e1
+  metadata.gz: d399fbc756aabc8ea5e8a81629c59b5fbe322c36e6597f8bd30112941dfd1185e7621b6ea9b90d8fef64756fb05f0f06c03b9b383ec89ec727a0ef5eaa20fec6
+  data.tar.gz: c4820f86874017e0f8c44e634d81de5bdf7c5e0f983bdba5173502104180c7351a9d4e8ee567ac79261b7451c4ad4e5003f21b0f0f5a22ef38c30480401f0c64

data/lib/sequent/core/command.rb

@@ -10,7 +10,6 @@ module Sequent
     # Base command
     class BaseCommand
       include ActiveModel::Validations,
-              ActiveModel::Serializers::JSON,
               Sequent::Core::Helpers::Copyable,
               Sequent::Core::Helpers::AttributeSupport,
               Sequent::Core::Helpers::UuidHelper,
@@ -21,8 +20,6 @@ module Sequent
 
       attrs created_at: DateTime
 
-      self.include_root_in_json = false
-
       def initialize(args = {})
         update_all_attributes args
         @created_at = DateTime.now

data/lib/sequent/core/command_record.rb

@@ -1,15 +1,12 @@
 require 'active_record'
+require_relative 'sequent_oj'
+
 module Sequent
   module Core
-    # For storing Sequent::Core::Command in the database using active_record
-    class CommandRecord < ActiveRecord::Base
-
-      self.table_name = "command_records"
-
-      validates_presence_of :command_type, :command_json
 
+    module SerializesCommand
       def command
-        args = JSON.parse(command_json)
+        args = Sequent::Core::Oj.strict_load(command_json)
         Class.const_get(command_type.to_sym).deserialize_from_json(args)
       end
 
@@ -19,8 +16,18 @@ module Sequent
         self.organization_id = command.organization_id if command.respond_to? :organization_id
         self.user_id = command.user_id if command.respond_to? :user_id
         self.command_type = command.class.name
-        self.command_json = command.to_json.to_s
+        self.command_json = Sequent::Core::Oj.dump(command.attributes)
       end
     end
+
+    # For storing Sequent::Core::Command in the database using active_record
+    class CommandRecord < ActiveRecord::Base
+      include SerializesCommand
+
+      self.table_name = "command_records"
+
+      validates_presence_of :command_type, :command_json
+
+    end
   end
 end

data/lib/sequent/core/core.rb

@@ -1,3 +1,4 @@
+require_relative 'sequent_oj'
 require_relative 'helpers/helpers'
 require_relative 'record_sessions/record_sessions'
 require_relative 'transactions/transactions'

data/lib/sequent/core/event.rb

@@ -10,10 +10,8 @@ module Sequent
       include Sequent::Core::Helpers::StringSupport,
               Sequent::Core::Helpers::EqualSupport,
               Sequent::Core::Helpers::AttributeSupport,
-              Sequent::Core::Helpers::Copyable,
-              ActiveModel::Serializers::JSON
+              Sequent::Core::Helpers::Copyable
       attrs aggregate_id: String, sequence_number: Integer, created_at: DateTime
-      self.include_root_in_json = false
 
       def initialize(args = {})
         update_all_attributes args
@@ -24,14 +22,22 @@ module Sequent
 
       def payload
         result = {}
-        instance_variables.reject { |k| payload_variables.include?(k.to_s) }.each do |k|
+        instance_variables
+          .reject { |k| payload_variables.include?(k) }
+          .select { |k| self.class.types.keys.include?(to_attribute_name(k))}
+          .each do |k|
           result[k.to_s[1 .. -1].to_sym] = instance_variable_get(k)
         end
         result
       end
       protected
       def payload_variables
-        %w{@aggregate_id @sequence_number @created_at @underscored}
+        %i{@aggregate_id @sequence_number @created_at}
+      end
+
+      private
+      def to_attribute_name(instance_variable_name)
+        instance_variable_name[1 .. -1].to_sym
       end
 
     end
@@ -47,7 +53,7 @@ module Sequent
 
       protected
       def payload_variables
-        super << "@organization_id"
+        super << :"@organization_id"
       end
 
     end

data/lib/sequent/core/event_record.rb

@@ -1,21 +1,14 @@
-require 'oj'
 require 'active_record'
+require_relative 'sequent_oj'
 
 module Sequent
   module Core
-    class EventRecord < ActiveRecord::Base
-
-      self.table_name = "event_records"
-
-      belongs_to :command_record
-
-      validates_presence_of :aggregate_id, :sequence_number, :event_type, :event_json
-      validates_numericality_of :sequence_number
 
+    module SerializesEvent
 
       def event
-        payload = Oj.strict_load(event_json)
-        Class.const_get(event_type.to_sym).deserialize_from_json(payload)
+        payload = Sequent::Core::Oj.strict_load(self.event_json)
+        Class.const_get(self.event_type.to_sym).deserialize_from_json(payload)
       end
 
       def event=(event)
@@ -24,11 +17,25 @@ module Sequent
         self.organization_id = event.organization_id if event.respond_to?(:organization_id)
         self.event_type = event.class.name
         self.created_at = event.created_at
-        self.event_json = event.to_json.to_s
+        self.event_json = Sequent::Core::Oj.dump(event.attributes)
       end
 
     end
 
+    class EventRecord < ActiveRecord::Base
+      include SerializesEvent
+
+      self.table_name = "event_records"
+
+      belongs_to :command_record
+
+      validates_presence_of :aggregate_id, :sequence_number, :event_type, :event_json
+      validates_numericality_of :sequence_number
+
+
+
+    end
+
   end
 end
 

data/lib/sequent/core/event_store.rb

@@ -1,5 +1,5 @@
-require 'oj'
 require_relative 'event_record'
+require_relative 'sequent_oj'
 
 module Sequent
   module Core
@@ -50,7 +50,7 @@ module Sequent
         event_types = {}
         @record_class.connection.select_all("select event_type, event_json from #{@record_class.table_name} where aggregate_id = '#{aggregate_id}' order by sequence_number asc").map! do |event_hash|
           event_type = event_hash["event_type"]
-          event_json = Oj.strict_load(event_hash["event_json"])
+          event_json = Sequent::Core::Oj.strict_load(event_hash["event_json"])
           unless event_types.has_key?(event_type)
             event_types[event_type] = Class.const_get(event_type.to_sym)
           end
@@ -67,7 +67,7 @@ module Sequent
         event_types = {}
         event_stream.each do |event_hash|
           event_type = event_hash["event_type"]
-          payload = Oj.strict_load(event_hash["event_json"])
+          payload = Sequent::Core::Oj.strict_load(event_hash["event_json"])
           unless event_types.has_key?(event_type)
             event_types[event_type] = Class.const_get(event_type.to_sym)
           end

data/lib/sequent/core/helpers/association_validator.rb

@@ -24,7 +24,7 @@ module Sequent
             next unless association # since ruby 2.0...?
             value = record.instance_variable_get("@#{association.to_s}")
             if value && incorrect_type?(value, record, association)
-              record.errors[association] = "is not of type #{record.attributes[association]}"
+              record.errors[association] = "is not of type #{record.class.types[association]}"
             elsif value && value.kind_of?(Array)
               item_type = record.class.type_for(association).item_type
               record.errors[association] = "is invalid" if all_valid?(value, item_type)
@@ -37,7 +37,7 @@ module Sequent
         private
 
         def incorrect_type?(value, record, association)
-          !value.kind_of?(Array) && record.respond_to?(:attributes) && !value.kind_of?(record.attributes[association])
+          !value.kind_of?(Array) && record.class.respond_to?(:types) && !value.kind_of?(record.class.types[association])
         end
 
         def all_valid?(value, item_type)

data/lib/sequent/core/helpers/attribute_support.rb

@@ -109,9 +109,17 @@ EOS
         end
 
 
-        # needed for active module JSON serialization
         def attributes
-          self.class.types
+          hash = HashWithIndifferentAccess.new
+          self.class.types.each do |name, _|
+            value = self.instance_variable_get("@#{name}")
+            hash[name] = if value.respond_to?(:attributes)
+                           value.attributes
+                         else
+                           value
+                         end
+          end
+          hash
         end
 
         def validation_errors(prefix = nil)

data/lib/sequent/core/helpers/param_support.rb

@@ -14,7 +14,7 @@ module Sequent
           def from_params(params = {})
             result = allocate
             params = HashWithIndifferentAccess.new(params)
-            result.attributes.each do |attribute, type|
+            result.class.types.each do |attribute, type|
               value = params[attribute]
 
               next if value.blank?

data/lib/sequent/core/helpers/type_conversion_support.rb

@@ -10,7 +10,7 @@ module Sequent
       module TypeConversionSupport
         def parse_attrs_to_correct_types
           the_copy = dup
-          the_copy.attributes.each do |name, type|
+          the_copy.class.types.each do |name, type|
             raw_value = the_copy.send("#{name}")
             next if raw_value.nil?
             if raw_value.respond_to?(:parse_attrs_to_correct_types)

data/lib/sequent/core/sequent_oj.rb

@@ -0,0 +1,20 @@
+require 'oj'
+
+module Sequent
+  module Core
+    # small wrapper class to centralize oj and its settings.
+    class Oj
+
+      ::Oj.default_options={mode: :compat}
+
+      def self.strict_load(json)
+        ::Oj.strict_load(json, {})
+      end
+
+      def self.dump(obj)
+        ::Oj.dump(obj)
+      end
+
+    end
+  end
+end

data/lib/sequent/core/value_object.rb

@@ -31,14 +31,10 @@ module Sequent
               Sequent::Core::Helpers::Copyable,
               Sequent::Core::Helpers::AttributeSupport,
               Sequent::Core::Helpers::ParamSupport,
-              ActiveModel::Serializers::JSON,
               ActiveModel::Validations
       include Sequent::Core::Helpers::TypeConversionSupport
 
-      self.include_root_in_json=false
-
       def initialize(args = {})
-        @errors = ActiveModel::Errors.new(self)
         update_all_attributes args
       end
 

data/lib/sequent/test/command_handler_helpers.rb

@@ -61,12 +61,12 @@ module Sequent
 
         private
         def serialize_events(events)
-          events.map { |event| [event.class.name.to_sym, event.to_json] }
+          events.map { |event| [event.class.name.to_sym, Sequent::Core::Oj.dump(event)] }
         end
 
         def deserialize_events(events)
           events.map do |type, json|
-            Class.const_get(type).deserialize_from_json(JSON.parse(json))
+            Class.const_get(type).deserialize_from_json(Sequent::Core::Oj.strict_load(json))
           end
         end
 
@@ -87,7 +87,7 @@ module Sequent
       def then_events *events
         @event_store.stored_events.map(&:class).should == events.map(&:class)
         @event_store.stored_events.zip(events).each do |actual, expected|
-          JSON.parse(actual.payload.to_json).should == JSON.parse(expected.payload.to_json) if expected
+          Sequent::Core::Oj.strict_load(Sequent::Core::Oj.dump(actual.payload)).should == Sequent::Core::Oj.strict_load(Sequent::Core::Oj.dump(expected.payload)) if expected
         end
       end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Sequent
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequent
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Lars Vonk
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -110,6 +110,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
 description: Sequent is a CQRS and event sourcing framework for Ruby.
 email:
 - lars.vonk@gmail.com
@@ -152,6 +166,7 @@ files:
 - lib/sequent/core/record_sessions/active_record_session.rb
 - lib/sequent/core/record_sessions/record_sessions.rb
 - lib/sequent/core/record_sessions/replay_events_session.rb
+- lib/sequent/core/sequent_oj.rb
 - lib/sequent/core/tenant_event_store.rb
 - lib/sequent/core/transactions/active_record_transaction_provider.rb
 - lib/sequent/core/transactions/no_transactions.rb
@@ -188,4 +203,3 @@ signing_key:
 specification_version: 4
 summary: Event sourcing framework for Ruby
 test_files: []
-has_rdoc: