was 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 116f56df4be0366c5cefda0647c4a59f4300ad8f84b76e39c5c3563ef97abd82
-  data.tar.gz: e3b5304f1f46fac185b4a92ec1201c09bdfc864576332a33614a946606a31afc
+  metadata.gz: 95d42be52374816fe8a10ac34087752ff5a4255d426d454e0a15bb77586a2184
+  data.tar.gz: a64446e7c586129836c07b1b112f7b5e5db86f71cc4ed4bd711d4fcb593abc8d
 SHA512:
-  metadata.gz: 6ea32808ff515334b197f87ec7dfa8d3ed699b281cff0a041f88ef000884617498eb22a6ce90aec66ee793ef136b4f3939d371b5abff9b4f28b3a3dfbe880f75
-  data.tar.gz: 124c909b89e6ce6b9bb65064bc824c70d8489e9510915a722f8d82919d3e4818f2aebade83d2381f12c121591797eb5937ebaf7b61e05425b6ef93b9e6b12993
+  metadata.gz: 30adcbb6d298b3e972067edc741fd266eaef09f7639151cdcfeded444f3b34a75d54280902cb5e7a5c88d1437324c742c9b34b7771a576d1f4591b892e7c9368
+  data.tar.gz: 8a734c0a5ee2dd382e73060ab69b1c881a433f61e11565cbd668f7597d40cda84c4f0d19d497ffbdd80da5b6fc2e5040af8b4dd1c4c3377929e8c68bda6723dd

data/README.md

@@ -25,8 +25,8 @@ require "was"
 class ReportScore < WAS::Score
   maximum_score 1000
 
-  with "ExamScore",      weight: 0.75
-  with "PracticalScore", weight: 0.25
+  with :exam,     "ExamScore",      weight: 0.75
+  with :practical "PracticalScore", weight: 0.25
 end
 
 class ExamScore < WAS::Score
@@ -68,8 +68,8 @@ Omitting the `maximum_score` will return a composed percentage represented as a
 ```ruby
 # report_score.rb
 class ReportScore < WAS::Score
-  with "ExamScore",      weight: 0.75
-  with "PracticalScore", weight: 0.25
+  with :exam,     "ExamScore",      weight: 0.75
+  with :practical "PracticalScore", weight: 0.25
 end
 ```
 

data/lib/was/score.rb

@@ -10,21 +10,21 @@ module WAS
       @maximum_score || 1
     end
 
-    def self.with(klass, weight: 0)
-      klasses.merge!(klass => weight)
+    def self.with(name, class_name: klass, weight: 0)
+      scorers.merge!(name => { class_name: class_name, weight: weight })
     end
 
-    def self.klasses
-      @klasses ||= {}
+    def self.scorers
+      @scorers ||= {}
     end
 
     def self.weights
       {}.tap do |hash|
-        klasses.each do |klass, weight|
-          hash[klass_name_symbol(klass)] = { weight: weight }
-          if Object.const_get(klass).klasses.length > 0
-            hash[klass_name_symbol(klass)].merge!(
-              with: Object.const_get(klass).weights
+        scorers.each do |name, scorer|
+          hash[name] = { weight: scorer[:weight] }
+          if Object.const_get(scorer[:class_name]).scorers.length > 0
+            hash[name].merge!(
+              with: Object.const_get(scorer[:class_name]).weights
             )
           end
         end
@@ -40,16 +40,10 @@ module WAS
     end
 
     def calculation
-      self.class.klasses.sum do |klass, weight|
-        score = Object.const_get(klass).new(input[self.class.klass_name_symbol(klass)]).calculate
-        score * weight
+      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
-
-    private
-
-    def self.klass_name_symbol(klass)
-      klass[/(\w+)Score$/, 1].downcase.to_sym
-    end
   end
 end

data/lib/was/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: was
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Mark Connell