entity_store 0.1.3 → 0.1.6

data/lib/entity_store/event_bus.rb

@@ -47,7 +47,7 @@ module EntityStore
       while event_data_objects.count > 0 do 
         event_data_objects.each do |event_data_object|
           begin
-            event = get_type_constant(event_data_object.type).new(event_data_object.attrs)
+            event = EntityStore.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}" }
           rescue => e
@@ -57,9 +57,5 @@ module EntityStore
         event_data_objects = external_store.get_events(event_data_objects.last.id, type, max_items)
       end
     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/external_store.rb

@@ -6,12 +6,7 @@ module EntityStore
     include Mongo
     
     def open_connection
-      @db ||= open_store
-    end
-    
-    def open_store
-      uri  = URI.parse(EntityStore.external_connection_profile)
-      Connection.from_uri(EntityStore.external_connection_profile).db(uri.path.gsub(/^\//, ''))
+      EntityStore.external_mongo_connection.db(EntityStore.external_db)
     end
     
     def collection

data/lib/entity_store/mongo_entity_store.rb

@@ -7,17 +7,7 @@ module EntityStore
     include Hatchet
 
     def open_connection
-      @db ||= open_store
-    end
-
-    def open_store
-      uri  = URI.parse(EntityStore.connection_profile)
-      connection = Connection.from_uri(EntityStore.connection_profile, :connect_timeout => connect_timeout)
-      connection.db(uri.path.gsub(/^\//, ''))
-    end
-
-    def connect_timeout
-      (ENV['ENTITY_STORE_CONNECT_TIMEOUT'] || '2').to_i
+      EntityStore.mongo_connection.db(EntityStore.entity_db)
     end
 
     def entities
@@ -72,7 +62,12 @@ 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 = EntityStore.load_type(attrs['_type']).new(attrs['snapshot'] || {'id' => id, 'version' => attrs['version']})
+        begin
+          entity = EntityStore.load_type(attrs['_type']).new(attrs['snapshot'] || {'id' => id, 'version' => attrs['version']})
+        rescue => e
+          logger.error "Error loading type #{attrs['_type']}", e
+          raise
+        end
 
         since_version = attrs['snapshot'] ? attrs['snapshot']['version'] : nil
 
@@ -115,8 +110,5 @@ 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
   end
 end

data/lib/entity_store/version.rb

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

data/lib/entity_store.rb

@@ -14,25 +14,15 @@ module EntityStore
   require 'entity_store/attributes'
 
   class << self
-
+    attr_reader :mongo_connection, :external_mongo_connection, :entity_db, :external_db
+    attr_accessor :connection_profile, :external_connection_profile
     def setup
       yield self
-    end
-
-    def connection_profile
-      @_connection_profile
-    end
-
-    def connection_profile=(value)
-      @_connection_profile = value
-    end
-
-    def external_connection_profile
-      @_external_connection_profile
-    end
 
-    def external_connection_profile=(value)
-      @_external_connection_profile = value
+      @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)
     end
     
     def event_subscribers
@@ -56,13 +46,24 @@ module EntityStore
     attr_accessor :type_loader
     
     def load_type(type_name)
-      if type_loader
-        type_loader.call(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
-  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
+    end
+  end
 
 end

data/spec/entity_store/external_store_spec.rb

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

data/spec/spec_helper.rb

@@ -20,6 +20,11 @@ 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
+
 def random_string
   (0...24).map{ ('a'..'z').to_a[rand(26)] }.join
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entity_store
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -123,3 +123,4 @@ test_files:
 - spec/entity_store/store_spec.rb
 - spec/entity_store_spec.rb
 - spec/spec_helper.rb
+has_rdoc: