lib/kriterion/object.rb in kriterion-0.0.1 vs lib/kriterion/object.rb in kriterion-0.1.0

@@ -1,34 +1,62 @@
 class Kriterion
   class Object
+    def initialize(data)
+      @compliance = data['compliance']
+    end
+
     def to_h(mode = :basic)
       raise 'Mode must be :basic or :full' unless %i[basic full].include? mode
       hash = {}
 
+      # Add all instance variables to the hash without the @ sign
       instance_variables.each do |v|
         hash[v.to_s.gsub(/^@/, '')] = instance_variable_get(v.to_s)
       end
 
       if mode == :basic
         hash.reject do |k, _v|
-          %w[
-            sections
-            items
-            resources
-            events
-          ].include? k
+          full_keys.include? k
         end
       elsif mode == :full
+        expandable_keys.each do |key|
+          hash[key.to_s] = send(key).map { |x| x.to_h(:full) }
+        end
         hash
       end
     end
 
+    def full_keys
+      %w[
+        sections
+        items
+        resources
+        events
+      ]
+    end
+
+    # Objects should deflault to not being expandable unless someone has
+    # specifided it
+    def expandable?
+      false
+    end
+
+    def expandable_keys
+      []
+    end
+
     def find_section(name)
       sections ? sections.select { |s| s.name == name }[0] : nil
     end
 
+    # Returns the cahced complicance value or calculates from scratch if
+    # required
     def compliance(objects)
+      # Returns cached value if it exists
+      return @compliance if @compliance
+
+      # Calculate compliance
       total         = objects.count
       compliant     = objects.count { |o| o.compliance['compliant'] }
       non_compliant = total - compliant
       percentage    = if total.zero?
                         0
@@ -43,8 +71,29 @@
           'compliant'     => compliant,
           'non_compliant' => non_compliant,
           'total'         => total
         }
       }
+    end
+
+    def flush_compliance!
+      @compliance = nil
+      # Flush the compliance of all children also
+      expandable_keys.each do |key|
+        send(key).each do |thing|
+          thing.flush_compliance!
+          yield(thing) if block_given?
+        end
+      end
+      yield(self) if block_given?
+      compliance
+    end
+
+    def primary_key
+      self.class.primary_key
+    end
+
+    def self.primary_key
+      :name
     end
   end
 end