entity_store 0.1.0 → 0.1.3

data/lib/entity_store/mongo_entity_store.rb

@@ -12,7 +12,7 @@ module EntityStore
 
     def open_store
       uri  = URI.parse(EntityStore.connection_profile)
-      connection = Connection.from_uri(EntityStore.connection_profile, :connect_timeout => connect_timeout, :safe => true)
+      connection = Connection.from_uri(EntityStore.connection_profile, :connect_timeout => connect_timeout)
       connection.db(uri.path.gsub(/^\//, ''))
     end
 
@@ -72,13 +72,14 @@ module EntityStore
     # Returns an object of the entity type
     def get_entity(id, raise_exception=false)
       if attrs = entities.find_one('_id' => BSON::ObjectId.from_string(id))
-        entity = get_type_constant(attrs['_type']).new(attrs['snapshot'] || {'id' => id, 'version' => attrs['version']})
+        entity = EntityStore.load_type(attrs['_type']).new(attrs['snapshot'] || {'id' => id, 'version' => attrs['version']})
 
         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
@@ -106,7 +107,7 @@ module EntityStore
 
       events.find(query, options).collect do |attrs|
         begin
-          get_type_constant(attrs['_type']).new(attrs)
+          EntityStore.load_type(attrs['_type']).new(attrs)
         rescue => e
           logger.error "Error loading type #{attrs['_type']}", e
           nil
@@ -114,8 +115,8 @@ module EntityStore
       end.select { |e| !e.nil? }
     end
 
-    def get_type_constant(type_name)
-      type_name.split('::').inject(Object) {|obj, name| obj.const_get(name) }
-    end
+    # def get_type_constant(type_name)
+    #   type_name.split('::').inject(Object) {|obj, name| obj.const_get(name) }
+    # end
   end
 end

data/lib/entity_store/version.rb

@@ -1,3 +1,3 @@
 module EntityStore
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.3".freeze
 end

data/lib/entity_store.rb

@@ -14,6 +14,7 @@ module EntityStore
   require 'entity_store/attributes'
 
   class << self
+
     def setup
       yield self
     end
@@ -48,6 +49,19 @@ module EntityStore
       @_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 type_loader
+        type_loader.call(type_name)
+      else
+        type_name.split('::').inject(Object) {|obj, name| obj.const_get(name) }
+      end
+    end
   end
 
 

data/spec/entity_store/mongo_entity_store_spec.rb

@@ -1,12 +1,5 @@
 require 'spec_helper'
 
-module Level1
-  module Level2
-    class MyClass
-    end
-  end
-end
-
 module MongoEntityStoreSpec
   class DummyEntity
     include Entity
@@ -103,15 +96,6 @@ describe MongoEntityStore do
     
   end
   
-  describe "get_type_constant" do
-    
-    subject { @store.get_type_constant('Level1::Level2::MyClass') }
-    
-    it "should be an Level1::Level2::MyClass" do
-      subject.should eq(Level1::Level2::MyClass)
-    end
-  end
-
   describe "#snapshot_entity" do
     before(:each) do
       @entity = MongoEntityStoreSpec::DummyEntity.new(:id => random_object_id, :version => random_integer, :name => random_string)

data/spec/entity_store_spec.rb

@@ -1,8 +1,34 @@
 require 'spec_helper'
 
+module Level1
+  module Level2
+    class MyClass
+    end
+    class AnotherClass
+    end
+  end
+end
+
 describe EntityStore do
-  describe ".setup" 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entity_store
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo