was 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35789d2f200b0436e67730bf7e2811cd61665f6bef985bc1f2cb091ed1797a5b
-  data.tar.gz: efd553a27afd03bb2da2443d80945239b7e22487dac6e850982d498ec32d5d01
+  metadata.gz: 32828b1a84ec32fd591c751dcb5df91f277af4d6bc840179b9070345f3345e24
+  data.tar.gz: 57bfb59c5ee299e3e0ed0376e44b4ad0c62f98ca23574cf366fc5f7461a1dd95
 SHA512:
-  metadata.gz: 630fc202315d1b3d90c28214f97d23ba66f7f5daba3a43651cf720d21a7ece94c6d2533715267933edc2f6b18f662301d71d6590c7d9db655aa30dbcc90703d6
-  data.tar.gz: 9e95ffaddcbae72fba82c4957b7ac20bb6db44bc219c6e13b445281799aafead6a9c722b0a7235975d737f877828da63dfc70e0284b65288e284e0245b54614a
+  metadata.gz: e006ec3f57273eafe64336a6ba55efc358bed7064a11be9ff67089a147b3683e8452c447d09caf59f306a573265ab52bc4f1fd411f25e5020b3773a55355df4d
+  data.tar.gz: 24f01eb4452fa8b691bbcf1c639cd16ae72d53f10920f2482281ef853ce0b0f9b792aea36c3a7498a2caf22f2ced4aecc3fa5f0e8bf46d9ee2d387c4234cbfeb

data/README.md

@@ -30,16 +30,25 @@ class ReportScore < WAS::Score
 end
 
 class ExamScore < WAS::Score
-  def calculation
-    return 1    if input == "A"
-    return 0.75 if input == "B"
-    return 0.5  if input == "C"
+  context :grade_a, score: 1 do |input|
+    input == "A"
+  end
+
+  context :grade_b, score: 0.75 do |input|
+    input == "B"
+  end
+
+  context :grade_c, score: 0.5 do |input|
+    input == "C"
+  end
+
+  context :flunk do
     0
   end
 end
 
 class PracticalScore < WAS::Score
-  def calculation
+  context :score do |input|
     input / 10.0
   end
 end

data/lib/was/score.rb

@@ -40,20 +40,51 @@ module WAS
       @input = input
     end
 
-    def calculate
-      calculation
+    def calculate(option = nil)
+      return calculation if option != :tree
+
+      calc = calculation(:tree)
+      tree = if calc.is_a?(Hash)
+        calc.merge({ max: self.class.max_score })
+      else
+        { score: calc }.merge({ max: self.class.max_score })
+      end
+
+      transform_scores_relative_to_max_score(tree)
     end
 
-    def calculation
+    def calculation(option = nil)
       if contexts?
         context_score_calculation
       else
-        nested_score_calcuation
+        nested_score_calcuation(option)
       end
     end
 
     private
 
+    def transform_scores_relative_to_max_score(tree, max_score = nil)
+      max_score = max_score || self.class.max_score
+      return tree if self.class.max_score == 1
+
+      tree.each do |key, value|
+        next if key != :with
+
+        value.each do |scorer, branch|
+          adjust_branch_score_and_max(branch, max_score)
+        end
+
+        value.transform_values! do |nested_tree|
+          transform_scores_relative_to_max_score(nested_tree, nested_tree[:max])
+        end
+      end
+    end
+
+    def adjust_branch_score_and_max(branch, max_score)
+      branch[:max]   = branch[:max] * max_score * branch[:weight]
+      branch[:score] = branch[:score] * branch[:max]
+    end
+
     def contexts?
       !!self.class.instance_variable_get("@contexts")
     end
@@ -61,16 +92,33 @@ module WAS
     def context_score_calculation
       self.class.instance_variable_get("@contexts").each do |context|
         output = context[:code].call(input)
-        next unless output
+        next if !output
         return context[:score] || output
       end
     end
 
-    def nested_score_calcuation
-      self.class.scorers.sum do |name, scorer|
+    def nested_score_calcuation(option)
+      if option == :tree
+        { score: sum, with: with_attribute }
+      else
+        sum
+      end
+    end
+
+    def sum
+      @sum ||= self.class.scorers.sum do |name, scorer|
         score = Object.const_get(scorer[:class_name]).new(input[name.to_sym]).calculate
         score * scorer[:weight]
       end * self.class.max_score
     end
+
+    def with_attribute
+      {}.tap do |with|
+        self.class.scorers.each do |name, scorer|
+          with[name] = Object.const_get(scorer[:class_name]).new(input[name.to_sym]).calculate(:tree)
+          with[name][:weight] = scorer[:weight]
+        end
+      end
+    end
   end
 end

data/lib/was/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WAS
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: was
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mark Connell
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies: []
 description: A simple gem/dsl for generating Weighted Average Score calculations.
 email: