quby 5.0.0.pre3 → 5.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ff840130087f113cabb79c809f8046fd434993e436da3efedcc397597c43979
-  data.tar.gz: f8b6977b5802b86e676d06fa13771a70919acab2538dbfbfe8a2a5808211da78
+  metadata.gz: ddc10a44111cef2b40f5bdacb0e71087d785834eb1870318eb7c98f29cbbfb3e
+  data.tar.gz: 974ad9eca496310b69b7b6c1b99ddd4c37207b83f4bf4e34ab5b21b474792f61
 SHA512:
-  metadata.gz: 178d14bdac8b8fd8b2ac1e45cb6dfdd8b22c2d5270d51a832c6c01e5eb1207e4ad498a448ddb2908c55f029c6d9db35e1c507f473548112c72bfa45deb25a56e
-  data.tar.gz: c7ea63e6170b68d8b0fc48340a9f5db3333908e9fb08086a0557670b89c77e50f4010565692038f7acc8c5c53a03e312c3fdc8416a5515f28c5b157056b3b9c0
+  metadata.gz: 7e5cde14431489cb85d05cba333d6f4f3daca33d5859ebf7342a127f9a7807822d0376fb24f396799b0049c90d6a965da2827fb9b576af46854836032fbf1c3b
+  data.tar.gz: ed1786bc33ffb3c17ccc49cde2ae7afc6610ee52a57f709e669ebabec761af91c3633ffe75dd46951bb3b0fc447efe4211f5447033208afb32181dbaab33ef28

data/lib/quby/questionnaires/deserializer.rb

@@ -18,7 +18,7 @@ module Quby
           questionnaire.licensor = json.fetch("licensor")
           questionnaire.language = json.fetch("language").try(:to_sym)
           questionnaire.renderer_version = json.fetch("renderer_version")
-          questionnaire.last_update = json.fetch("last_update")
+          questionnaire.last_update = Time.zone.parse(json.fetch("last_update"))
           questionnaire.last_author = json.fetch("last_author")
           questionnaire.extra_css = json.fetch("extra_css")
           questionnaire.allow_switch_to_bulk = json.fetch("allow_switch_to_bulk")
@@ -371,7 +371,7 @@ module Quby
           y_categories: chart_json.fetch("y_categories"),
           y_range_categories: chart_json.fetch("y_range_categories"),
           chart_type: chart_json.fetch("chart_type"),
-          y_range: chart_json.fetch("y_range"),
+          y_range: deserialize_range(chart_json.fetch("y_range")),
           tick_interval: chart_json.fetch("tick_interval"),
           plotbands: chart_json.fetch("plotbands").map do |plotband_json|
             {
@@ -429,6 +429,11 @@ module Quby
           default_collapsed: attributes.fetch("default_collapsed"),
         )
       end
+
+      def self.deserialize_range(range_attributes)
+        return unless range_attributes
+        Range.new(range_attributes.fetch("begin"), range_attributes.fetch("end"), range_attributes.fetch("exclude_end"))
+      end
     end
   end
 end

data/lib/quby/questionnaires/entities/charting/line_chart.rb

@@ -41,17 +41,17 @@ module Quby
           def make_baseline_proc
             return unless @baseline
 
-            case value
+            case @baseline
             when Hash
               ->(age, gender) {
-                age_match = value.find { |age_range, _v| age && age_range === age }
-                hash_by_gender = (age_match&.last || value.stringify_keys["default"])
+                age_match = @baseline.find { |age_range, _v| age && age_range === age }
+                hash_by_gender = (age_match&.last || @baseline.stringify_keys["default"])
 
                 gender_match = hash_by_gender.find {|gender_key, _v| gender && gender_key.to_s == gender.to_s }
                 gender_match&.last || hash_by_gender.stringify_keys['default']
               }
             else
-              @chart.baseline = ->(age, gender) { value }
+              ->(age, gender) { @baseline }
             end
           end
         end

data/lib/quby/questionnaires/entities/score_calculation.rb

@@ -18,7 +18,7 @@ module Quby
           block
         end
 
-        def self.alert(*args, &block)
+        def self.alarm(*args, &block)
           block
         end
 

data/lib/quby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quby
-  VERSION = "5.0.0.pre3"
+  VERSION = "5.0.0.pre4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quby
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre3
+  version: 5.0.0.pre4
 platform: ruby
 authors:
 - Marten Veldthuis