Merge pull request #60 from asobolev/master

Some Section dynamic refactoring + cache bug fix

Author: mpsonntag

+nix/Block.m

@@ -7,7 +7,7 @@
     end
 
     properties(Hidden)
-        metadataCache = nix.CacheStruct()
+        metadataCache
     end
 
     methods
@@ -19,6 +19,8 @@
             obj.add_dyn_relation('sources', @nix.Source);
             obj.add_dyn_relation('tags', @nix.Tag);
             obj.add_dyn_relation('multiTags', @nix.MultiTag);
+            
+            obj.metadataCache = nix.CacheStruct();
         end;
 
         % -----------------

+nix/Dynamic.m

@@ -53,14 +53,28 @@ function add_dyn_relation(obj, name, constructor)
             cache.Hidden = true;
             obj.(cacheAttr) = nix.CacheStruct();
 
+            % adds a proxy property
             rel = addprop(obj, name);
             rel.GetMethod = @get_method;
 
+            % same property but returns Map 
+            rel_map = addprop(obj, strcat(name, 'Map'));
+            rel_map.GetMethod = @get_as_map;
+            
             function val = get_method(obj)
                 [obj.(cacheAttr), val] = nix.Utils.fetchObjList(obj.updatedAt, ...
                     strcat(obj.alias, '::', name), obj.nix_handle, ...
                     obj.(cacheAttr), constructor);
-            end            
+            end
+            
+            function val = get_as_map(obj)
+                val = containers.Map();
+                props = obj.(name);
+
+                for i=1:length(props)
+                    val(props{i}.name) = cell2mat(props{i}.values);
+                end
+            end
         end
     end
 end

+nix/Section.m

@@ -1,83 +1,55 @@
-classdef Section < nix.Entity
+classdef Section < nix.NamedEntity
     %SECTION Metadata Section class
     %   NIX metadata section
 
+    properties (Access = protected)
+        % namespace reference for nix-mx functions
+        alias = 'Section'
+    end
+    
     properties(Hidden)
-        info
-        sectionsCache
         propsCache
     end;
 
     properties(Dependent)
-        name
-        type
-        id
-        repository
-        mapping
-        
-        sections
-        properties_cell
-        properties_map
+        allProperties
+        allPropertiesMap
     end;
 
     methods
         function obj = Section(h)
-           [email protected](h);
-           obj.info = nix_mx('Section::describe', obj.nix_handle);
-           
-           obj.sectionsCache.lastUpdate = 0;
-           obj.sectionsCache.data = {};
-           obj.propsCache.lastUpdate = 0;
-           obj.propsCache.data = {};           
-        end;
-        
-        function name = get.name(section)
-           name = section.info.name;
-        end;
-        
-        function id = get.id(section)
-           id = section.info.id;
-        end;
-        
-        function type = get.type(section)
-           type = section.info.type;
-        end;
-        
-        function repository = get.repository(section)
-           repository = section.info.repository;
-        end;
-        
-        function mapping = get.mapping(section)
-           mapping = section.info.mapping;
+            [email protected](h);
+            
+            % assign dynamic properties
+            obj.add_dyn_attr('repository', 'rw');
+            obj.add_dyn_attr('mapping', 'rw');
+            
+            % assign relations
+            obj.add_dyn_relation('sections', @nix.Section);
+            
+            obj.propsCache = nix.CacheStruct();
         end;
 
         function section = parent(obj)
-           sh = nix_mx('Section::parent', obj.nix_handle);
-           if sh ~= 0
-               section = nix.Section(sh);
-           else
-               section = {};
+           handle = nix_mx('Section::parent', obj.nix_handle);
+           section = {};
+           if handle ~= 0
+               section = nix.Section(handle);
            end;
         end;
 
         function section = link(obj)
-           sh = nix_mx('Section::link', obj.nix_handle);
-           if sh ~= 0
-               section = nix.Section(sh);
-           else
-               section = {};
+           handle = nix_mx('Section::link', obj.nix_handle);
+           section = {};
+           if handle ~= 0
+               section = nix.Section(handle);
            end;
         end;
 
         % ----------------
         % Section methods
         % ----------------
 
-        function sections = get.sections(obj)
-            [obj.sectionsCache, sections] = nix.Utils.fetchObjList(obj.updatedAt, ...
-                'Section::sections', obj.nix_handle, obj.sectionsCache, @nix.Section);
-        end
-        
         function retObj = open_section(obj, id_or_name)
             handle = nix_mx('Section::openSection', obj.nix_handle, id_or_name);
             retObj = {};
@@ -94,14 +66,14 @@
         % Property methods
         % ----------------
 
-        function props = get.properties_cell(obj)
+        function props = get.allProperties(obj)
             [obj.propsCache, props] = nix.Utils.fetchPropList(obj.updatedAt, ...
                 'Section::properties', obj.nix_handle, obj.propsCache);
         end
 
-        function p_map = get.properties_map(obj)
+        function p_map = get.allPropertiesMap(obj)
             p_map = containers.Map();
-            props = obj.properties_cell;
+            props = obj.allProperties;
 
             for i=1:length(props)
                 p_map(props{i}.name) = cell2mat(props{i}.values);

tests/TestSection.m

@@ -80,13 +80,15 @@
     f = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
     trial = f.sections{2}.sections{2}.sections{1};
 
-    assert(~isempty(trial.properties_cell));
+    assert(~isempty(trial.allProperties));
 
-    p1 = trial.properties_cell{1};
+    p1 = trial.allProperties{1};
     assert(strcmp(p1.name, 'ExperimentalCondition'));
     assert(p1.values{1} == 1);
 
-    assert(trial.properties_map('ExperimentalCondition') == p1.values{1});
+    assert(trial.allPropertiesMap('ExperimentalCondition') == p1.values{1});
 
-    assert(isempty(f.sections{3}.properties_cell));
+    disp(f.sections{3}.allProperties);
+    
+    assert(isempty(f.sections{3}.allProperties));
 end