project_store 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3087678934a7bcf33d6b0e576c6a5b29a558868e
-  data.tar.gz: ce257a82ced7c0f41f97f551c9adf816205d7def
+  metadata.gz: 4561e136b9e24e46b8abb3d6d33b1edc06c65695
+  data.tar.gz: c499df5410a88f825c4c57392077d2c661585ae0
 SHA512:
-  metadata.gz: 143916329af9dd885edde500aa03986471580bb6f0e62a09a2b0430e27f938ea6da76b63253c41aab3782cdb235ed640d4cad704e39147814841a2c9921f612c
-  data.tar.gz: 2aff9a7266cb832348434d60a9af33772d1c96f31e103cd708d1d2a0b7accfc587ecd7984f9cd6659bd49d2f8c6c52965f0b78fa42f4f2e730c01ae39364a583
+  metadata.gz: 06bd6c5c3c74686ba3f2ccf5e01ae55baf0b473993d2e02577dbba9edbcc673f928a296b10c92655285aac05792a2adf66614e27276aa1d2d4d32666b66bdb55
+  data.tar.gz: 73cdbbc014d770edf8579be0be803f1bf170da9aa768c5edd15142bc199c385464ff7cbd01518439ac3e0aefcfb5782ec48f6101508072afe7dc91440d948af5

data/lib/project_store/base.rb

@@ -4,20 +4,21 @@ module ProjectStore
 
   class Base
 
+    include ProjectStore::Entity::Builder
     include ProjectStore::Editing
 
-    attr_accessor :continue_on_error, :decorators
+    attr_accessor :continue_on_error
     attr_reader :path, :project_entities, :entity_types, :stores, :logger
 
     def initialize(path)
       raise PSE, "Invalid store path '#{path}'!" unless valid_path? path
       @logger = ProjectStore.logger
       @path = File.expand_path path
-      @continue_on_error = false
+      self.continue_on_error = false
       @project_entities = {}
       @stores = {}
       @entity_types = {}
-      @decorators = {}
+      self.decorators = {}
     end
 
     def load_entities
@@ -31,7 +32,7 @@ module ProjectStore
               begin
                 logger.debug "Loading '#{entity_name}' entity."
                 entity = store[entity_name]
-                add_and_index_entity entity, store, entity_name
+                decorate_and_index_entity entity_name, entity, store
               rescue => e
                 if continue_on_error
                   logger.error "Invalid entity of type '#{entity_name}' in file '#{file}'"
@@ -51,23 +52,23 @@ module ProjectStore
       end
     end
 
+
     private
 
     def valid_path?(path)
       Dir.exist? path and File.readable? path and File.writable? path
     end
 
-    def add_and_index_entity(entity, store, entity_name)
-      entity.extend ProjectStore::Entity::Base
-      entity.name = entity_name
-      entity.basic_checks
-      logger.info "Found '#{entity.name}' of type '#{entity.type}'."
-      raise PSE, "Entity '#{entity.name}' already defined in file '#{project_entities[entity.name].backing_store.path}'" if project_entities[entity.name]
-      # Adds extra decorator
-      add_decorators entity
+    def decorate_and_index_entity(entity_name, entity, store)
+      setup_entity! entity_name, entity
       # Re-check the validity of the object now that it has been decorated
       entity.valid?(raise_exception: true)
+      index_entity(entity, store)
+    end
+
+    def index_entity(entity, store)
       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
       # Add to main hash entity name -> entity
@@ -78,23 +79,6 @@ module ProjectStore
     end
 
 
-    def add_decorators(entity)
-      [:_default, entity.type].each do |decorators_key|
-        case decorators[decorators_key]
-          when Array
-            decorators[decorators_key]
-          when NilClass
-            []
-          else
-            [decorators[decorators_key]]
-        end .each do |decorator|
-          entity.extend decorator
-          entity.mandatory_properties.concat decorator.mandatory_properties if decorator.respond_to? :mandatory_properties
-          logger.debug "Decorated entity '#{entity.name}' with '#{decorator}'"
-        end
-      end
-    end
-
   end
 
 

data/lib/project_store/entity/base.rb

@@ -8,12 +8,17 @@ module ProjectStore
       attr_reader :backing_store
 
       def backing_store=(store)
-        raise PSE, 'Cannot change the store for an entity' if @backing_store
+        raise PSE, 'Cannot change the store for an entity' if backing_store
         @backing_store = store
       end
 
       def save
-        ProjectStore.logger.info "Saving '#{name}' into '#{backing_store.path}'"
+        if backing_store.nil?
+          ProjectStore.logger.warn "No backing store specified for '#{name}'. Not saved!"
+          return false
+        end
+        valid? raise_exception: true
+        ProjectStore.logger.debug "Saving '#{name}' into '#{backing_store.path}'"
         backing_store.transaction do
           backing_store[name] = self
         end

data/lib/project_store/entity/builder.rb

@@ -0,0 +1,39 @@
+module ProjectStore
+  module Entity
+
+    module Builder
+
+      attr_accessor :decorators
+
+      def setup_entity!(entity_name, entity = {}, entity_type = nil)
+        entity.extend ProjectStore::Entity::Base
+        entity.name = entity_name
+        entity.type = entity_type unless entity_type.nil?
+        entity.basic_checks
+        ProjectStore.logger.info "New entity '#{entity.name}' of type '#{entity.type}'."
+        # Adds extra decorator
+        add_decorators entity
+        entity
+      end
+
+      def add_decorators(entity)
+        [:_default, entity.type].each do |decorator_name|
+          case decorators[decorator_name]
+            when Array
+              decorators[decorator_name]
+            when NilClass
+              []
+            else
+              [decorators[decorator_name]]
+          end .each do |decorator|
+            entity.extend decorator
+            entity.mandatory_properties.concat decorator.mandatory_properties if decorator.respond_to? :mandatory_properties
+            ProjectStore.logger.debug "Decorated entity '#{entity.name}' with '#{decorator}'"
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/project_store/version.rb

@@ -1,3 +1,3 @@
 module ProjectStore
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/lib/project_store.rb

@@ -16,5 +16,6 @@ require 'project_store/entity/property_binder'
 require 'project_store/entity/mandatory_properties'
 require 'project_store/entity/common_properties'
 require 'project_store/entity/base'
+require 'project_store/entity/builder'
 require 'project_store/editing'
 require 'project_store/base'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: project_store
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Laurent B.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - lib/project_store/base.rb
 - lib/project_store/editing.rb
 - lib/project_store/entity/base.rb
+- lib/project_store/entity/builder.rb
 - lib/project_store/entity/common_properties.rb
 - lib/project_store/entity/mandatory_properties.rb
 - lib/project_store/entity/property_binder.rb