project_store 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c2e72891eb775947a8f1c05d3497a27bbb6dbc2
-  data.tar.gz: 158ffc592cbd96c26a32b68c6e879bfead9d8859
+  metadata.gz: 050ec32cc6b6e2ead81816487f0ee4abd535336c
+  data.tar.gz: e5badf7ed14f1de29c4eae3cd9c6b384678f16cf
 SHA512:
-  metadata.gz: 87398cace0fc49f20fed9e7621c28931f824582050f9c19b8e9500101cf2bfcad238a69413fd09d1aa82ee0d226e39cbef8c3804d03e4dc3156fce6270f1fa2d
-  data.tar.gz: 5965f8f86736626cb19591e6e2c0cc65565956649429619a086c52ef53d879ecbdf9377b4541bc9bcce464b7ce0553698e8f8d9517b22a477616ddcd7fe648c7
+  metadata.gz: e3193091b55fb7133b968e46abe5b7ae065521106d1a3956a06b005a028da53a9e4e930917410a1e85bf3b374d7e65daea5a36793c4b37793930265c5c150c86
+  data.tar.gz: 89495629dcd16bdb23b43181d5ce48df9b84102195476db86d85b1f67a3c174f3e93b740f829a59b24627c770b644d9c0083cbe6929911ceeda758335ac43563

data/lib/project_store.rb

@@ -12,7 +12,7 @@ module ProjectStore
 
 end
 
-require 'project_store/entity/properties_binder'
+require 'project_store/entity/property_binder'
 require 'project_store/entity/mandatory_properties'
 require 'project_store/entity/common_properties'
 require 'project_store/entity/base'

data/lib/project_store/base.rb

@@ -65,6 +65,8 @@ module ProjectStore
       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
+      # Re-check the validity of the object now that it has been decorated
+      entity.valid?(raise_exception: true)
       entity.backing_store = store
       # Add to the store index store -> entity list
       stores[store] << entity
@@ -87,6 +89,7 @@ module ProjectStore
             [decorators[decorators_key]]
         end .each do |decorator|
           entity.extend decorator
+          entity.mandatory_properties.concat decorator.mandatory_properties
           logger.debug "Decorated entity '#{entity.name}' with '#{decorator}'"
         end
       end

data/lib/project_store/entity/base.rb

@@ -19,15 +19,28 @@ module ProjectStore
         end
       end
 
+      def valid?(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
+          end
+        end
+        true
+      end
+
+      def mandatory_properties
+        @mandatory_properties ||= [:type]
+      end
 
       def basic_checks
         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]
-        raise PSE, "Invalid entity '#{name}'. Missing type" unless type
-        raise PSE, "Invalid entity '#{name}'. Forbidden 'backing_store' entry" if self[:backing_store]
-        raise PSE, "Invalid entity '#{name}'. Forbidden 'basic_checks' entry" if self[:basic_checks]
-        raise PSE, "Invalid entity '#{name}'. Forbidden 'save' entry" if self[:save]
-        raise PSE, "Invalid entity '#{name}'. Forbidden 'internal_type' entry" if self[:internal_type]
+
+        [:backing_store, :basic_checks, :save, :internal_type, :mandatory_properties, :valid?].each do |forbidden_name|
+          raise PSE, "Invalid entity '#{name}'. Forbidden '#{forbidden_name}' property" if self[forbidden_name]
+        end
+
+        valid?(raise_exception: true)
       end
 
     end

data/lib/project_store/entity/property_binder.rb

@@ -0,0 +1,48 @@
+module ProjectStore
+  module Entity
+
+    module PropertyBinder
+
+      def yaml_accessor(*yaml_properties)
+        yaml_properties.each do |yaml_property|
+          yaml_reader yaml_property
+          yaml_writer yaml_property
+        end
+      end
+
+      def yaml_reader(*yaml_properties)
+        yaml_properties.each do |yaml_property|
+          self.class_eval do
+            define_method yaml_property do
+              self[yaml_property]
+            end
+          end
+        end
+      end
+
+      def yaml_writer(*yaml_properties)
+        yaml_properties.each do |yaml_property|
+          self.class_eval do
+            define_method "#{yaml_property}=" do |val|
+              self[yaml_property] = val
+            end
+          end
+        end
+      end
+
+      def mandatory_properties
+        @mandatory_properties ||= []
+      end
+
+      def mandatory_property(*properties)
+        properties.each do |property|
+          mandatory_properties << property
+        end
+      end
+
+
+
+    end
+
+  end
+end

data/lib/project_store/version.rb

@@ -1,3 +1,3 @@
 module ProjectStore
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: project_store
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Laurent B.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ files:
 - lib/project_store/entity/base.rb
 - lib/project_store/entity/common_properties.rb
 - lib/project_store/entity/mandatory_properties.rb
-- lib/project_store/entity/properties_binder.rb
+- lib/project_store/entity/property_binder.rb
 - lib/project_store/error.rb
 - lib/project_store/initializer.rb
 - lib/project_store/utils/basic_logger.rb

data/lib/project_store/entity/properties_binder.rb

@@ -1,36 +0,0 @@
-module ProjectStore
-  module Entity
-
-    module PropertyBinder
-
-      def yaml_accessor(*args)
-        args.each do |arg|
-          yaml_reader arg
-          yaml_writer arg
-        end
-      end
-
-      def yaml_reader(*args)
-        args.each do |arg|
-          self.class_eval do
-            define_method arg do
-              self[arg]
-            end
-          end
-        end
-      end
-
-      def yaml_writer(*args)
-        args.each do |arg|
-          self.class_eval do
-            define_method "#{arg}=" do |val|
-              self[arg] = val
-            end
-          end
-        end
-      end
-
-    end
-
-  end
-end