project_store 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 069f462f4419f33504821ad4e4527e9814aff1b2
-  data.tar.gz: 517da8414736801a1116e59d12ac87f0fa4eeadc
+  metadata.gz: 68bf885a3948fba46055ea4b967e0ac9d313cc67
+  data.tar.gz: bba7870f3eda812689c6fa811549c8511285d5e1
 SHA512:
-  metadata.gz: c2c7277e4dfd2c7a339ddaed06803909ede5e891bd146930b26bf4e228faa463e6c548682bd077398b20d7638c01dfadf995940716daa685790b6553c63b46b9
-  data.tar.gz: ad9249bea80bfeccbacaeb7a513f9d0c99f5fdea1a6bbd8bdeb941f88fa2a5fc0f1418b13ebe85b3be40f9255e8af9e5d3e98def447d5bac16d8233e1e40093e
+  metadata.gz: 952a0808722a918c1b8c9a01c604d5818e4a66c2ecff42fc631311dd2b174f3be8f1e0aef34b5a36c4ab7ef864dee6021788573ae3909452a100a9cff4ab4339
+  data.tar.gz: ddf6e3cb95f019dee1a593c44a992be6ec194300fcf2f0c108f08821dbbacbf5c7debfade8690c1fc7bcd6e0982da49f8768ed6e43afe0f39de0b384c9c8bef1

data/lib/project_store/base.rb

@@ -21,7 +21,7 @@ module ProjectStore
       self.decorators = {}
     end
 
-    def load_entities
+    def load_entities(&block)
       Dir.glob(File.join(path, '*.yaml')).each do |file|
         logger.debug "Found store file '#{file}'"
         begin
@@ -32,15 +32,14 @@ module ProjectStore
               begin
                 logger.debug "Loading '#{entity_name}' entity."
                 entity = store[entity_name]
-                yield entity if block_given?
-                decorate_and_index_entity entity_name, entity, store
+                decorate_and_index_entity entity_name, entity, store, &block
               rescue => e
                 if continue_on_error
-                  logger.error "Invalid entity '#{entity_name}' in file '#{file}'"
+                  logger.warn "Invalid entity '#{entity_name}' in file '#{file}'"
                   logger.debug "#{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}"
                 else
                   logger.debug "#{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}"
-                  raise PSE, "Invalid entity '#{entity_name}' in file '#{file}'"
+                  raise PSE, "Invalid entity '#{entity_name}' in file '#{file}' (#{e.message})"
                 end
               end
             end
@@ -60,10 +59,10 @@ module ProjectStore
       Dir.exist? path and File.readable? path and File.writable? path
     end
 
-    def decorate_and_index_entity(entity_name, entity, store)
-      setup_entity! entity_name, entity
+    def decorate_and_index_entity(entity_name, entity, store, &block)
+      setup_entity! entity_name, entity, &block
       # Re-check the validity of the object now that it has been decorated
-      entity.valid?(raise_exception: true)
+      entity.valid_to_load?(raise_exception: true)
       index_entity(entity, store)
     end
 

data/lib/project_store/editing.rb

@@ -27,21 +27,23 @@ module ProjectStore
       tmp_file = Tempfile.new([self.class.name, '.yaml']).path
       begin
         FileUtils.copy file, tmp_file
-        edit_file tmp_file, &block
-        begin
+        edit_file tmp_file
+        # begin
           store = YAML::Store.new(tmp_file)
           store.transaction do
-            store.roots.each do |entity_type|
-              store[entity_type]
+            store.roots.each do |entity_name|
+              entity = store[entity_name]
+              setup_entity! entity_name, entity, &block
+              entity.valid_to_save? raise_exception: true
             end
           end
           FileUtils.copy tmp_file, file
           logger.info "File '#{file}' updated successfully."
           file
-        rescue => e
-          logger.debug "#{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}"
-          raise PSE, 'Invalid modifications. Aborted !'
-        end
+        # rescue => e
+        #   logger.debug "#{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}"
+        #   raise PSE, 'Invalid modifications. Aborted !'
+        # end
       ensure
         File.unlink tmp_file
       end

data/lib/project_store/entity/base.rb

@@ -17,17 +17,36 @@ module ProjectStore
           ProjectStore.logger.warn "No backing store specified for '#{name}'. Not saved!"
           return false
         end
-        valid? raise_exception: true
+        valid_to_save? raise_exception: true
         ProjectStore.logger.debug "Saving '#{name}' into '#{backing_store.path}'"
         backing_store.transaction do
           backing_store[name] = self
         end
       end
 
-      def valid?(raise_exception: false)
+      def valid_to_load?(raise_exception: false)
         mandatory_properties.each do |mandatory_property|
           unless self[mandatory_property]
-            raise_exception ? raise(PSE, "Invalid entity '#{name}'. Missing '#{mandatory_property}' property") : false
+            if raise_exception then
+              raise(PSE, "Invalid entity '#{name}'. Missing '#{mandatory_property}' property")
+            else
+              ProjectStore.logger.warn "Invalid entity '#{name}'. Missing '#{mandatory_property}' property"
+              false
+            end
+          end
+        end
+        true
+      end
+
+      def valid_to_save?(raise_exception: false)
+        mandatory_properties.each do |mandatory_property|
+          unless self[mandatory_property]
+            if raise_exception then
+              raise(PSE, "Invalid entity '#{name}'. Missing '#{mandatory_property}' property")
+            else
+              ProjectStore.logger.warn "Invalid entity '#{name}'. Missing '#{mandatory_property}' property"
+              false
+            end
           end
         end
         true
@@ -41,11 +60,11 @@ module ProjectStore
         raise PSE, 'Invalid entity. Missing name' unless name
         raise PSE, 'Invalid entity. You should not specify a name as it would not be taken in account' if self[:name]
 
-        [:backing_store, :basic_checks, :save, :internal_type, :mandatory_properties, :valid?].each do |forbidden_name|
+        [:backing_store, :basic_checks, :save, :internal_type, :mandatory_properties, :valid_to_load?].each do |forbidden_name|
           raise PSE, "Invalid entity '#{name}'. Forbidden '#{forbidden_name}' property" if self[forbidden_name]
         end
 
-        valid?(raise_exception: true)
+        valid_to_load?(raise_exception: true)
       end
 
     end

data/lib/project_store/entity/builder.rb

@@ -13,6 +13,7 @@ module ProjectStore
         ProjectStore.logger.info "New entity '#{entity.name}' of type '#{entity.type}'."
         # Adds extra decorator
         add_decorators entity
+        yield entity if block_given?
         entity
       end
 

data/lib/project_store/version.rb

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

metadata

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