project_store 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68bf885a3948fba46055ea4b967e0ac9d313cc67
-  data.tar.gz: bba7870f3eda812689c6fa811549c8511285d5e1
+  metadata.gz: c1df2bd03938b69e30dbefa75c4b66b4be402b1b
+  data.tar.gz: 1fa4346552c9729c76a8b4371d32a26e93eb2b63
 SHA512:
-  metadata.gz: 952a0808722a918c1b8c9a01c604d5818e4a66c2ecff42fc631311dd2b174f3be8f1e0aef34b5a36c4ab7ef864dee6021788573ae3909452a100a9cff4ab4339
-  data.tar.gz: ddf6e3cb95f019dee1a593c44a992be6ec194300fcf2f0c108f08821dbbacbf5c7debfade8690c1fc7bcd6e0982da49f8768ed6e43afe0f39de0b384c9c8bef1
+  metadata.gz: b347a01141464333148c7e745c0449a82e0776efcdaa6d43c8b58944c75a7dffc98ab64c4448b999844dea820ac00bffd83fd4d25f57fdae706ac3b1ad44ebd6
+  data.tar.gz: 65c1bf127f43b87a9fa16398d4ab2b139f2946fba2bee9822577c8a82d972802e7baba9d85aa63ba7611d5cf7c91ddffab006bb26b0896293d0339aaeff52ca6

data/lib/project_store/base.rb

@@ -8,7 +8,7 @@ module ProjectStore
     include ProjectStore::Editing
 
     attr_accessor :continue_on_error
-    attr_reader :path, :project_entities, :entity_types, :stores, :logger
+    attr_reader :path, :project_entities, :entity_types, :files, :logger
 
     def initialize(path)
       raise PSE, "Invalid store path '#{path}'!" unless valid_path? path
@@ -16,7 +16,7 @@ module ProjectStore
       @path = File.expand_path path
       self.continue_on_error = false
       @project_entities = {}
-      @stores = {}
+      @files = {}
       @entity_types = {}
       self.decorators = {}
     end
@@ -26,7 +26,7 @@ module ProjectStore
         logger.debug "Found store file '#{file}'"
         begin
           store = YAML::Store.new(file)
-          stores[store] ||= []
+          files[store] ||= []
           store.transaction(true) do
             store.roots.each do |entity_name|
               begin
@@ -34,12 +34,14 @@ module ProjectStore
                 entity = store[entity_name]
                 decorate_and_index_entity entity_name, entity, store, &block
               rescue => e
+                msg = "Invalid entity '#{entity_name}' in file '#{file}' (#{e.message})"
+                dbg_msg = "#{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}"
                 if continue_on_error
-                  logger.warn "Invalid entity '#{entity_name}' in file '#{file}'"
-                  logger.debug "#{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}"
+                  logger.warn msg
+                  logger.debug dbg_msg
                 else
-                  logger.debug "#{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}"
-                  raise PSE, "Invalid entity '#{entity_name}' in file '#{file}' (#{e.message})"
+                  logger.debug dbg_msg
+                  raise PSE, msg
                 end
               end
             end
@@ -55,6 +57,10 @@ module ProjectStore
 
     private
 
+    def reset
+      [project_entities, files, entity_types].each { |list| list.clear}
+    end
+
     def valid_path?(path)
       Dir.exist? path and File.readable? path and File.writable? path
     end
@@ -70,7 +76,7 @@ module ProjectStore
       entity.backing_store = store
       raise PSE, "Entity '#{entity.name}' already defined in file '#{project_entities[entity.name].backing_store.path}'" if project_entities[entity.name]
       # Add to the store index store -> entity list
-      stores[store] << entity
+      files[store] << entity
       # Add to main hash entity name -> entity
       project_entities[entity.name] = entity
       # Add to type hash  entity type -> entity list
@@ -79,6 +85,7 @@ module ProjectStore
     end
 
 
+
   end
 
 

data/lib/project_store/version.rb

@@ -1,3 +1,3 @@
 module ProjectStore
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: project_store
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Laurent B.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler