entity_store 0.1.6 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTNjMDA0M2EyMWNmMWM5Y2U1NDc2MjMwOWU0NWQ5Mjk0ZWFlYjUxOA==
+  data.tar.gz: !binary |-
+    ZWMzNDEzNTYzYzU4ZjE1ZjVjOGNkZTJhMjQxMWMzOWUwNTllOGUwNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MThjMmU5N2RhMzVjMjRkMGJmNDFjOTMxNjU5OWI5MzU3NWJkYzI5NDM4OTJm
+    ZjJjNzg3M2I4ZWJhMmIzMzUwYWFjOGU1Njk4OWMxY2Q0ZDA5ZGUyZjIzNGUz
+    MmQyMDE5YzgyOTFhZDI4Y2RlYzQzZDQ4M2Y3Yjg3YjYyNTdjNTU=
+  data.tar.gz: !binary |-
+    NDE3ODdjNGI2MzJiYzlhZDk0OTA2NzkwOTBlM2I1OGNmYWRhMjBlMTAyZjIw
+    ZTk0NmFmYTZmZWJjZTI3MmQzNDJkNmFlY2JhN2VkZWIzNGYzY2I2NTUxMDU1
+    ZTdlY2NkMjk4ZmU1MjExNmYwZjM5Yjk2N2Y4YzE1ZmQ3M2M0ZWQ=

data/lib/entity_store.rb

@@ -1,68 +1,29 @@
 module EntityStore
 
-  require 'hatchet'
-  require 'entity_store/entity'
-  require 'entity_store/entity_value'
-  require 'entity_store/event'
-  require 'entity_store/store'
-  require 'entity_store/external_store'
-  require 'entity_store/event_data_object'
-  require 'entity_store/mongo_entity_store'
-  require 'entity_store/event_bus'
-  require 'entity_store/not_found'
-  require 'entity_store/hash_serialization'
-  require 'entity_store/attributes'
+  require_relative 'entity_store/logging'
+  require_relative 'entity_store/config'
+  require_relative 'entity_store/entity'
+  require_relative 'entity_store/entity_value'
+  require_relative 'entity_store/event'
+  require_relative 'entity_store/store'
+  require_relative 'entity_store/event_data_object'
+  require_relative 'entity_store/event_bus'
+  require_relative 'entity_store/not_found'
+  require_relative 'entity_store/hash_serialization'
+  require_relative 'entity_store/attributes'
+
+  if defined?(Mongo)
+    require_relative 'entity_store/mongo_entity_store'
+    require_relative 'entity_store/external_store'
+  end
 
   class << self
-    attr_reader :mongo_connection, :external_mongo_connection, :entity_db, :external_db
-    attr_accessor :connection_profile, :external_connection_profile
     def setup
-      yield self
-
-      @mongo_connection = open_store(@connection_profile)
-      @entity_db = extract_db(@connection_profile)
-      @external_mongo_connection = open_store(@external_connection_profile)
-      @external_db = extract_db(@external_connection_profile)
+      yield EntityStore::Config.setup
     end
     
     def event_subscribers
-      @_event_subscribers ||=[]
-    end
-    
-    # Public - indicates the version increment that is used to 
-    # decided whether a snapshot of an entity should be created when it's saved
-    def snapshot_threshold
-      @_snapshot_threshold ||= 10
-    end
-
-    def snapshot_threshold=(value)
-      @_snapshot_threshold = value
-    end
-
-    # Allows config to pass in a lambda or Proc to use as the type loader in place
-    # of the default. 
-    # Original use case was migration of entity classes to new module namespace when 
-    # extracting to a shared library
-    attr_accessor :type_loader
-    
-    def load_type(type_name)
-      if EntityStore.type_loader
-        EntityStore.type_loader.call(type_name)
-      else
-        type_name.split('::').inject(Object) {|obj, name| obj.const_get(name) }
-      end
-    end
-
-    def open_store(url)
-      Mongo::MongoClient.from_uri(url, :connect_timeout => connect_timeout)
-    end
-
-    def extract_db(url)
-      URI.parse(url).path.gsub(/^\//, '')
-    end
-
-    def connect_timeout
-      (ENV['ENTITY_STORE_CONNECT_TIMEOUT'] || '2').to_i
+      EntityStore::Config.event_subscribers
     end
   end
 

data/lib/entity_store/config.rb

@@ -0,0 +1,53 @@
+module EntityStore
+  module Config
+    class << self
+      # Stores
+      attr_accessor :store, :feed_store
+
+      # Allows config to pass in a lambda or Proc to use as the type loader in place
+      # of the default. 
+      # Original use case was migration of entity classes to new module namespace when 
+      # extracting to a shared library
+      attr_accessor :type_loader
+
+      # Logger can be assigned
+      attr_accessor :logger
+
+      def setup
+        yield self
+
+        raise StandardError.new("store not assigned") unless store
+        store.open 
+        feed_store.open if feed_store
+      end
+      
+      def event_subscribers
+        @_event_subscribers ||=[]
+      end
+      
+      # Public - indicates the version increment that is used to 
+      # decided whether a snapshot of an entity should be created when it's saved
+      def snapshot_threshold
+        @_snapshot_threshold ||= 10
+      end
+
+      def snapshot_threshold=(value)
+        @_snapshot_threshold = value
+      end
+
+      
+      def load_type(type_name)
+        if EntityStore::Config.type_loader
+          EntityStore::Config.type_loader.call(type_name)
+        else
+          type_name.split('::').inject(Object) {|obj, name| obj.const_get(name) }
+        end
+      end
+
+      def connect_timeout
+        (ENV['ENTITY_STORE_CONNECT_TIMEOUT'] || '2').to_i
+      end
+    end
+
+  end
+end

data/lib/entity_store/entity.rb

@@ -1,7 +1,5 @@
 module EntityStore
   module Entity
-    include Hatchet
-    
     attr_accessor :id
     
     def self.included(klass)

data/lib/entity_store/event.rb

@@ -24,8 +24,17 @@ module EntityStore
         class_eval do
           names.each do |name|
             define_method "#{name}=" do |value|
-              require 'time'
-              instance_variable_set("@#{name}", value.kind_of?(String) ? Time.parse(value) : value)
+              if value.kind_of?(String)
+                # implementing parsing here rather than using std-lib Time.parse to 
+                # allow portability across platforms
+                parts = /(?:(\d+))-(?:(\d+))-(?:(\d+))\s(?:(\d+)):(?:(\d+)):(?:(\d+))\s(?:(.+))/.match(value)
+                offset = parts[7].gsub(/\d{4}/) do |m| m.scan(/../).join(":") end
+                new_value = Time.new(parts[1].to_i, parts[2].to_i, parts[3].to_i, parts[4].to_i, parts[5].to_i, parts[6].to_i, offset)
+              else
+                new_value = value
+              end
+
+              instance_variable_set "@#{name}", new_value
             end
             define_method name do
               instance_variable_get "@#{name}"

data/lib/entity_store/event_bus.rb

@@ -1,18 +1,16 @@
 module EntityStore
   class EventBus
-    include Hatchet
+    include Logging
 
     def publish(entity_type, event)
-      publish_externally entity_type, event
-
-      logger.debug { "publishing #{event.inspect}" }
+      publish_to_feed entity_type, event
 
       subscribers_to(event.receiver_name).each do |s|
         begin
           s.new.send(event.receiver_name, event)
-          logger.debug { "called #{s.name}##{event.receiver_name} with #{event.inspect}" }
+          log_debug { "called #{s.name}##{event.receiver_name} with #{event.inspect}" }
         rescue => e
-          logger.error "#{e.message} when calling #{s.name}##{event.receiver_name} with #{event.inspect}", e
+          log_error "#{e.message} when calling #{s.name}##{event.receiver_name} with #{event.inspect}", e
         end
       end
     end
@@ -22,15 +20,15 @@ module EntityStore
     end
 
     def subscribers
-      EntityStore.event_subscribers
+      EntityStore::Config.event_subscribers
     end
 
-    def publish_externally(entity_type, event)
-      external_store.add_event(entity_type, event)
+    def publish_to_feed(entity_type, event)
+      feed_store.add_event(entity_type, event) if feed_store
     end
 
-    def external_store
-      @_external_store ||= ExternalStore.new
+    def feed_store
+      EntityStore::Config.feed_store
     end
 
     # Public - replay events of a given type to a given subscriber
@@ -42,19 +40,19 @@ module EntityStore
     # Returns nothing
     def replay(since, type, subscriber)
       max_items = 100
-      event_data_objects = external_store.get_events(since, type, max_items)
+      event_data_objects = feed_store.get_events(since, type, max_items)
 
       while event_data_objects.count > 0 do 
         event_data_objects.each do |event_data_object|
           begin
-            event = EntityStore.load_type(event_data_object.type).new(event_data_object.attrs)
+            event = EntityStore::Config.load_type(event_data_object.type).new(event_data_object.attrs)
             subscriber.new.send(event.receiver_name, event)
-            logger.info { "replayed #{event.inspect} to #{subscriber.name}##{event.receiver_name}" }
+            log_info { "replayed #{event.inspect} to #{subscriber.name}##{event.receiver_name}" }
           rescue => e
-            logger.error "#{e.message} when replaying #{event_data_object.inspect} to #{subscriber}", e         
+            log_error "#{e.message} when replaying #{event_data_object.inspect} to #{subscriber}", e
           end
         end
-        event_data_objects = external_store.get_events(event_data_objects.last.id, type, max_items)
+        event_data_objects = feed_store.get_events(event_data_objects.last.id, type, max_items)
       end
     end
   end

data/lib/entity_store/external_store.rb

@@ -4,9 +4,22 @@ require 'uri'
 module EntityStore
   class ExternalStore
     include Mongo
-    
+
+    class << self
+      attr_accessor :connection_profile
+      attr_writer :connect_timeout
+
+      def connection
+        @_connection ||= Mongo::MongoClient.from_uri(ExternalStore.connection_profile, :connect_timeout => EntityStore::Config.connect_timeout)
+      end
+
+      def database
+        URI.parse(ExternalStore.connection_profile).path.gsub(/^\//, '')
+      end
+    end
+
     def open_connection
-      EntityStore.external_mongo_connection.db(EntityStore.external_db)
+      ExternalStore.connection.db(ExternalStore.database)
     end
     
     def collection

data/lib/entity_store/hash_serialization.rb

@@ -9,15 +9,19 @@ module EntityStore
     # did use flatten but this came a-cropper when the attribute value was an array
     def attributes
       attrs = {}
-      public_methods
-        .select { |m| m =~ /\w\=$/ }
-        .select { |m| respond_to?(m.to_s.chop) }
-        .collect { |m| m.to_s.chop.to_sym }
+      attribute_methods
         .collect { |m| [m, attribute_value(send(m))] }
         .each do |item| attrs[item[0]] = item[1] end
       attrs
     end
 
+    def attribute_methods
+      public_methods
+        .select { |m| m =~ /\w\=$/ }
+        .collect { |m| m.to_s.chop.to_sym }
+        .select { |m| respond_to?(m) }
+    end
+
     def attribute_value(value)
       if value.respond_to?(:attributes)
         value.attributes

data/lib/entity_store/logging.rb

@@ -0,0 +1,17 @@
+module EntityStore
+  module Logging
+
+    [:debug, :info, :warn].each do |level|
+      define_method("log_#{level}") do |message=nil, &block|
+        Config.logger.send(level, message || block) if Config.logger
+      end
+    end
+
+    def log_error(message, exception)
+      if Config.logger
+        Config.logger.error message
+        Config.logger.error exception.backtrace
+      end
+    end
+  end
+end

data/lib/entity_store/mongo_entity_store.rb

@@ -4,18 +4,38 @@ require 'uri'
 module EntityStore
   class MongoEntityStore
     include Mongo
-    include Hatchet
+    include Logging
 
-    def open_connection
-      EntityStore.mongo_connection.db(EntityStore.entity_db)
+    class << self
+      attr_accessor :connection_profile
+      attr_writer :connect_timeout
+
+      def connection
+        @_connection ||= Mongo::MongoClient.from_uri(MongoEntityStore.connection_profile, :connect_timeout => EntityStore::Config.connect_timeout)
+      end
+
+      def database
+        URI.parse(MongoEntityStore.connection_profile).path.gsub(/^\//, '')
+      end
+    end
+
+    def open
+      MongoEntityStore.connection.db(MongoEntityStore.database)
     end
 
     def entities
-      @entities_collection ||= open_connection['entities']
+      @entities_collection ||= open['entities']
     end
 
     def events
-      @events_collection ||= open_connection['entity_events']
+      @events_collection ||= open['entity_events']
+    end
+
+    def clear
+      entities.drop
+      @entities_collection = nil
+      events.drop
+      @events_collection = nil
     end
 
     def ensure_indexes
@@ -63,24 +83,13 @@ module EntityStore
     def get_entity(id, raise_exception=false)
       if attrs = entities.find_one('_id' => BSON::ObjectId.from_string(id))
         begin
-          entity = EntityStore.load_type(attrs['_type']).new(attrs['snapshot'] || {'id' => id, 'version' => attrs['version']})
+          entity_type = EntityStore::Config.load_type(attrs['_type'])
+          entity = entity_type.new(attrs['snapshot'] || {'id' => id, 'version' => attrs['version']})
         rescue => e
-          logger.error "Error loading type #{attrs['_type']}", e
+          log_error "Error loading type #{attrs['_type']}", e
           raise
         end
-
-        since_version = attrs['snapshot'] ? attrs['snapshot']['version'] : nil
-
-        get_events(id, since_version).each do |event| 
-          begin
-            event.apply(entity) 
-            logger.debug { "Applied #{event.inspect} to #{id}" }
-          rescue => e
-            logger.error "Failed to apply #{event.class.name} #{event.attributes} to #{id} with #{e.inspect}", e
-          end
-          entity.version = event.entity_version
-        end
-
+        
         entity
       else
         raise NotFound.new(id) if raise_exception
@@ -102,9 +111,9 @@ module EntityStore
 
       events.find(query, options).collect do |attrs|
         begin
-          EntityStore.load_type(attrs['_type']).new(attrs)
+          EntityStore::Config.load_type(attrs['_type']).new(attrs)
         rescue => e
-          logger.error "Error loading type #{attrs['_type']}", e
+          log_error "Error loading type #{attrs['_type']}", e
           nil
         end
       end.select { |e| !e.nil? }

data/lib/entity_store/store.rb

@@ -1,9 +1,9 @@
 module EntityStore
   class Store
-    include Hatchet
+    include Logging
 
     def storage_client
-      @_storage_client ||= MongoEntityStore.new
+      @_storage_client ||= EntityStore::Config.store
     end
 
     def add(entity)
@@ -31,16 +31,16 @@ module EntityStore
           entity.id = storage_client.add_entity(entity)
         end
         add_events(entity)
-        snapshot_entity(entity) if entity.version % EntityStore.snapshot_threshold == 0
+        snapshot_entity(entity) if entity.version % Config.snapshot_threshold == 0
       end
       entity
     rescue => e
-      logger.error { "Store#do_save error: #{e.inspect} - #{entity.inspect}" }
+      log_error "Store#do_save error: #{e.inspect} - #{entity.inspect}", e
       raise e
     end
 
     def snapshot_entity(entity)
-      logger.info { "Store#snapshot_entity : Snapshotting #{entity.id}"}
+      log_info { "Store#snapshot_entity : Snapshotting #{entity.id}"}
       storage_client.snapshot_entity(entity)
     end
 
@@ -64,6 +64,17 @@ module EntityStore
 
     def get(id, raise_exception=false)
       if entity = storage_client.get_entity(id, raise_exception)
+
+        storage_client.get_events(id, entity.version).each do |event| 
+          begin
+            event.apply(entity) 
+            log_debug { "Applied #{event.inspect} to #{id}" }
+          rescue => e
+            log_error "Failed to apply #{event.class.name} #{event.attributes} to #{id} with #{e.inspect}", e
+          end
+          entity.version = event.entity_version
+        end
+
         # assign this entity loader to allow lazy loading of related entities
         entity.related_entity_loader = self
       end
@@ -74,8 +85,7 @@ module EntityStore
     #
     # Returns nothing
     def clear_all
-      storage_client.entities.drop
-      storage_client.events.drop
+      storage_client.clear
       @_storage_client = nil
     end
 

data/lib/entity_store/version.rb

@@ -1,3 +1,3 @@
 module EntityStore
-  VERSION = "0.1.6".freeze
+  VERSION = "0.2.0".freeze
 end

data/spec/entity_store/config_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module Level1
+  module Level2
+    class MyClass
+    end
+    class AnotherClass
+    end
+  end
+end
+
+describe EntityStore::Config do
+
+  describe "load_type" do
+    
+    subject { EntityStore::Config.load_type('Level1::Level2::MyClass') }
+    
+    it "should be an Level1::Level2::MyClass" do
+      subject.should eq(Level1::Level2::MyClass)
+    end
+
+    context "when type_loader set" do
+      before(:each) do
+        EntityStore::Config.type_loader = lambda { |type_name|
+          Level1::Level2::AnotherClass
+        }
+      end
+
+      it "should return the result of that type loader" do
+        subject.should eq(Level1::Level2::AnotherClass)
+      end
+
+      after(:each) do
+        EntityStore::Config.type_loader = nil
+      end
+    end
+  end
+end

data/spec/entity_store/event_bus_spec.rb

@@ -23,7 +23,7 @@ describe EventBus do
       DummySubscriber.stub(:new) { @subscriber }
       @subscriber_class2 = mock("SubscriberClass", :instance_methods => ['bilge'], :name => "SubscriberClass")
       @event_bus.stub(:subscribers).and_return([DummySubscriber, @subscriber_class2])
-      @event_bus.stub(:publish_externally)
+      @event_bus.stub(:publish_to_feed)
     end
     
     subject { @event_bus.publish(@entity_type, @event) }
@@ -37,21 +37,21 @@ describe EventBus do
       subject
     end
     it "publishes event to the external event push" do
-      @event_bus.should_receive(:publish_externally).with(@entity_type, @event)
+      @event_bus.should_receive(:publish_to_feed).with(@entity_type, @event)
       subject
     end
   end
   
-  describe ".publish_externally" do
+  describe ".publish_to_feed" do
     before(:each) do
-      @external_store = mock(ExternalStore)
-      @event_bus.stub(:external_store) { @external_store }
+      @feed_store = mock(ExternalStore)
+      @event_bus.stub(:feed_store) { @feed_store }
     end
     
-    subject { @event_bus.publish_externally @entity_type, @event }
+    subject { @event_bus.publish_to_feed @entity_type, @event }
     
     it "should publish to the external store" do
-      @external_store.should_receive(:add_event).with(@entity_type, @event)
+      @feed_store.should_receive(:add_event).with(@entity_type, @event)
       subject
     end
   end
@@ -63,18 +63,18 @@ describe EventBus do
       @subscriber = mock("Subscriber", :dummy_event => true)
       DummySubscriber.stub(:new) { @subscriber }
 
-      @external_store = mock(ExternalStore)
+      @feed_store = mock(ExternalStore)
       @id = random_object_id
-      @external_store.stub(:get_events) { |since| since == @id ? [] : [
+      @feed_store.stub(:get_events) { |since| since == @id ? [] : [
         EventDataObject.new('_id' => @id, '_type' => DummyEvent.name, 'name' => random_string) 
       ]}
-      @event_bus.stub(:external_store) { @external_store }
+      @event_bus.stub(:feed_store) { @feed_store }
     end 
 
     subject { @event_bus.replay(@since, @type, DummySubscriber) }
 
     it "gets the events for that period" do
-      @external_store.should_receive(:get_events).with(@since, @type, 100)
+      @feed_store.should_receive(:get_events).with(@since, @type, 100)
       subject
     end
     it "publishes them to the subscriber" do

data/spec/entity_store/external_store_spec.rb

@@ -12,6 +12,7 @@ end
 
 describe ExternalStore do
   before(:each) do
+    ExternalStore.connection_profile = "mongodb://localhost/external_store_default"
     ExternalStore.new.collection.drop
     @store = ExternalStore.new
   end

data/spec/entity_store/mongo_entity_store_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module MongoEntityStoreSpec
   class DummyEntity
-    include Entity
+    include EntityStore::Entity
 
     attr_accessor :name, :description
 
@@ -11,7 +11,7 @@ end
 
 describe MongoEntityStore do
   before(:each) do
-    EntityStore.connection_profile = "mongodb://localhost/entity_store_default"
+    MongoEntityStore.connection_profile = "mongodb://localhost/entity_store_default"
     @store = MongoEntityStore.new
   end
 
@@ -19,7 +19,7 @@ describe MongoEntityStore do
     before(:each) do
       @id = random_object_id
       @attrs = { 
-        '_type' => "MongoEntityStoreSpec::DummyEntity", 
+        '_type' => MongoEntityStoreSpec::DummyEntity.name, 
         'version' => @version = random_integer
       }
       @entity = MongoEntityStoreSpec::DummyEntity.new
@@ -42,18 +42,6 @@ describe MongoEntityStore do
       MongoEntityStoreSpec::DummyEntity.should_receive(:new).with({'id' => @id, 'version' => @version})
       subject
     end
-    it "should retrieve it's events" do
-      @store.should_receive(:get_events).with(@id, nil)
-      subject
-    end
-    it "should apply each event to the entity" do
-      @events.each do |event| event.should_receive(:apply).with(@entity) end
-      subject
-    end
-    it "should set the entity version to that of the last event" do
-      subject
-      @entity.version.should eq(@events.last.entity_version)
-    end
     it "should return the entity" do
       subject.should eq(@entity)
     end
@@ -68,10 +56,6 @@ describe MongoEntityStore do
         MongoEntityStoreSpec::DummyEntity.should_receive(:new).with(@attrs['snapshot'])
         subject
       end
-      it "should load the events since the snapshot version" do
-         @store.should_receive(:get_events).with(@id, @snapshot_version)
-         subject
-      end
     end
   end
 

data/spec/entity_store/store_spec.rb

@@ -80,7 +80,7 @@ describe Store do
     context "when entity has related entities loaded" do
       before(:each) do
         @entity = DummyEntityForStore.new(:id => random_string)
-        @entity.version = random_integer * EntityStore.snapshot_threshold + 1
+        @entity.version = random_integer * EntityStore::Config.snapshot_threshold + 1
         @store = Store.new
         @related_entity = mock('Entity')
         @entity.stub(:loaded_related_entities) { [ @related_entity ] }
@@ -104,7 +104,7 @@ describe Store do
     before(:each) do
       @new_id = random_string
       @entity = DummyEntityForStore.new(:id => random_string)
-      @entity.version = random_integer * EntityStore.snapshot_threshold
+      @entity.version = random_integer * EntityStore::Config.snapshot_threshold
       @storage_client = mock("StorageClient", :save_entity => true)
       @store = Store.new
       @store.stub(:add_events)
@@ -161,7 +161,7 @@ describe Store do
 
     context "when entity version is commensurate with snapshotting" do
       before(:each) do
-        @entity.version = random_integer * EntityStore.snapshot_threshold - 1
+        @entity.version = random_integer * EntityStore::Config.snapshot_threshold - 1
       end
 
       it "should snapshot the entity" do
@@ -175,9 +175,12 @@ describe Store do
   describe "#get" do
     before(:each) do
       @id = random_integer
-      @entity = DummyEntityForStore.new
+      @entity = DummyEntityForStore.new(id: random_string, version: random_integer)
       DummyEntityForStore.stub(:new).and_return(@entity)
-      @events = [mock("Event", :apply => true), mock("Event", :apply => true)]
+      @events = [
+        mock("Event", apply: true, entity_version: @entity.version + 1), 
+        mock("Event", apply: true, entity_version: @entity.version + 2)
+      ]
 
       @storage_client = mock("StorageClient", :get_entity => @entity, :get_events => @events)
       @store = Store.new
@@ -197,5 +200,17 @@ describe Store do
     it "should return a ride" do
       subject.should eq(@entity)
     end
+    it "should retrieve it's events" do
+      @storage_client.should_receive(:get_events).with(@id, @entity.version)
+      subject
+    end
+    it "should apply each event to the entity" do
+      @events.each do |event| event.should_receive(:apply).with(@entity) end
+      subject
+    end
+    it "should set the entity version to that of the last event" do
+      subject
+      @entity.version.should eq(@events.last.entity_version)
+    end
   end
 end

data/spec/entity_store_spec.rb

@@ -1,34 +1 @@
-require 'spec_helper'
-
-module Level1
-  module Level2
-    class MyClass
-    end
-    class AnotherClass
-    end
-  end
-end
-
-describe EntityStore do
-
-  describe "load_type" do
-    
-    subject { EntityStore.load_type('Level1::Level2::MyClass') }
-    
-    it "should be an Level1::Level2::MyClass" do
-      subject.should eq(Level1::Level2::MyClass)
-    end
-
-    context "when type_loader set" do
-      before(:each) do
-        EntityStore.type_loader = lambda { |type_name|
-          Level1::Level2::AnotherClass
-        }
-      end
-
-      it "should return the result of that type loader" do
-        subject.should eq(Level1::Level2::AnotherClass)
-      end
-    end
-  end
-end
+require 'spec_helper'

data/spec/spec_helper.rb

@@ -1,29 +1,18 @@
 require 'rake'
 require 'rspec'
+require 'mongo'
 require "#{Rake.application.original_dir}/lib/entity_store"
 
 RSpec.configure do |config|
   config.color_enabled = true
 end
 
-Hatchet.configure do |config|
-  # Reset the logging configuration
-  config.reset!
-  config.level :error
-  # Use the format without time, etc so we don't duplicate it
-  config.formatter = Hatchet::SimpleFormatter.new
-  # Set up a STDOUT appender
-  config.appenders << Hatchet::LoggerAppender.new do |appender|
-    appender.logger = Logger.new(STDOUT)
-  end
-end
-
 include EntityStore
 
-EntityStore.setup do |config|
-  config.connection_profile = "mongodb://localhost/entity_store_test" 
-  config.external_connection_profile = "mongodb://localhost/external_entity_store_test" 
-end
+require 'logger'
+logger = ::Logger.new(STDOUT)
+logger.level = ::Logger::ERROR
+EntityStore::Config.logger = logger
 
 def random_string
   (0...24).map{ ('a'..'z').to_a[rand(26)] }.join

metadata

@@ -1,52 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: entity_store
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Adam Bird
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-03-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: hatchet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,12 +20,11 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.20
-description: Event sourced entity store with a Mongo body
+description: Event sourced entity store with a replaceable body
 email: adam.bird@gmail.com
 executables: []
 extensions: []
@@ -74,12 +39,14 @@ files:
 - lib/entity_store/event_data_object.rb
 - lib/entity_store/external_store.rb
 - lib/entity_store/hash_serialization.rb
+- lib/entity_store/logging.rb
 - lib/entity_store/mongo_entity_store.rb
 - lib/entity_store/not_found.rb
 - lib/entity_store/store.rb
 - lib/entity_store/version.rb
 - lib/entity_store.rb
 - lib/tasks/entity_store.rake
+- spec/entity_store/config_spec.rb
 - spec/entity_store/entity_spec.rb
 - spec/entity_store/entity_value_spec.rb
 - spec/entity_store/event_bus_spec.rb
@@ -91,29 +58,29 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/adambird/entity_store
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Event sourced entity store with a Mongo body
+specification_version: 4
+summary: Event sourced entity store with a replaceable body
 test_files:
+- spec/entity_store/config_spec.rb
 - spec/entity_store/entity_spec.rb
 - spec/entity_store/entity_value_spec.rb
 - spec/entity_store/event_bus_spec.rb
@@ -123,4 +90,3 @@ test_files:
 - spec/entity_store/store_spec.rb
 - spec/entity_store_spec.rb
 - spec/spec_helper.rb
-has_rdoc: