lib/fixtury/hooks.rb in fixtury-0.1.0.beta vs lib/fixtury/hooks.rb in fixtury-0.1.0.beta2

@@ -20,15 +20,18 @@
 
     end
 
     def fixtury(name)
       raise ArgumentError unless self.fixtury_dependencies.include?(name.to_s)
+      return nil unless ::Fixtury::Store.instance
 
       ::Fixtury::Store.instance.get(name)
     end
 
     def fixtury_loaded?(name)
+      return false unless ::Fixtury::Store.instance
+
       ::Fixtury::Store.instance.loaded?(name)
     end
 
     def fixtury_database_connections
       ActiveRecord::Base.connection_handler.connection_pool_list.map(&:connection)
@@ -68,9 +71,11 @@
 
       fixtury_database_connections.each(&:rollback_transaction)
     end
 
     def clear_expired_fixtury_fixtures!
+      return unless ::Fixtury::Store.instance
+
       ::Fixtury::Store.instance.clear_expired_references!
     end
 
     def load_all_fixtury_fixtures!
       fixtury_dependencies.each do |name|