event_source 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee1cbda051411a8b9d9c84b228c5df06057e083e
-  data.tar.gz: c9a86adbf893660447e89097d112d4e8aad24d02
+  metadata.gz: eb914b34c5ac365c2393fe93faf8d60127c110b0
+  data.tar.gz: 936b70c31f5cd44aa650b035c02344aa20bdccbd
 SHA512:
-  metadata.gz: 9d86e6e6708c8bf374d2ad2f428d04f1a4262404bd521c8843de89beb7a573df418c6607407eb1b2c5aff0004ac462bc13b2647e526b8dce5a8ec7862248893e
-  data.tar.gz: 6d69660476cdaef751795d2afb0d47623157239c0e1eaf8a9fd2f845c1e0f376e052ae670d491ca9834f2c8bad25fde8861337c5d1a7cee3584ba87c3c8a6346
+  metadata.gz: 5e73db02567fe3240d8958235adac8884a9f5d4bb1783fed344be05b2cf279f834017f0d4d31798fe1cf603fd62b6a1f06ba24914188e2d595b6dd2b9142f0a0
+  data.tar.gz: 83da293f76c79226baafc460beb0394c7e922bde23fed2775dbbae8c87846e5bca764e0adeff7bd1dd317fe62c011e13ee66ab4d0c1f2028199b07cb4531752f

data/lib/event_source/entity.rb

@@ -10,44 +10,39 @@ module EventSource
             end
 
             def rebuild(uid, events)
+                @rebuilding = true
                 return self.create(uid) if events.length == 0
 
                 entity = self.new
                 entity.send(:uid=, uid)
 
                 events.each do |e|
-                    data = JSON.parse(e.data)
-                    data.keys.each do |attr|
-                        entity.send("#{attr}=", data[attr])
-                    end
+                    entity.send(e.name, *(e.get_args))
                 end
+                @rebuilding = false
 
                 entity
             end
 
             def on_event(name, &block)
                 self.send(:define_method, name) do |*args|
-                    returnValue = block.call(args.unshift(self))
-                    entity_events << EventSource::Event.create(name, self)
+                    block_args = [self] + args
+                    returnValue = block.call(block_args)
+                    return if @rebuilding
+
+                    entity_events << EventSource::Event.create(name, self, args)
 
                     # if repo is nil, that's because this isn't being executed in the context of a
                     # transaction and the result won't be saved
                     repo = EventSource::EntityRepository.current
-                    repo.entities << self if repo
+                    repo.add(self) if repo
 
                     returnValue
                 end
             end
         end
 
-        attr_reader :uid,
-                    :entity_changes
-
-        def set(attr_name, &block)
-            val = block.call
-            @entity_changes[attr_name.to_sym] = val
-            self.send("#{attr_name}=", val)
-        end
+        attr_reader :uid
 
         def entity_events
             @events ||= Array.new
@@ -61,7 +56,9 @@ module EventSource
         private
 
         def initialize
-            @entity_changes = Hash.new
+            if defined? on_initialized
+                on_initialized
+            end
         end
 
         def uid=(new_uid)

data/lib/event_source/event.rb

@@ -12,13 +12,17 @@ module EventSource
                 event
             end
 
-            def create(name, entity)
+            def create(name, entity, args)
                 event = self.new
-                event.send(:new_from_entity, name, entity)
+                event.send(:new_from_entity, name, entity, args)
                 event
             end
         end
 
+        def get_args
+            JSON.parse(data)
+        end
+
         def save
             raise CannotSaveRebuiltEvent if @is_rebuilt
             EventSource::EventRepository.current.save(self)
@@ -26,10 +30,10 @@ module EventSource
 
         private
 
-        def new_from_entity(name, entity)
+        def new_from_entity(name, entity, args)
             @name = name.to_s
             @entity_id = entity.uid
-            @data = entity.entity_changes.to_json
+            @data = args.to_json
             @created_at = Time.now
             @entity_type = entity.class.to_s.underscore
 

data/lib/event_source/version.rb

@@ -1,3 +1,3 @@
 module EventSource
-    Version = '0.1.2'
+    Version = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_source
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Louis Salin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec