quby-compiler 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c114222ce815660bdbff3a284c6893b8dc809760818d1839193fec984a1027e3
-  data.tar.gz: 8b7938ae820807e963178a251313a3f6a237a3103e0d9aab92539eb5a534cd51
+  metadata.gz: ed4f85aa0af92e39a7cf5186bc39ebfa3a597a9727ddcf46baa2907795f9448a
+  data.tar.gz: aafc346743a54a8e1eab829e9be774d533b2a5cf505fc2aae38f7ba4d074a38b
 SHA512:
-  metadata.gz: 65bba6e155ee6722e836054f584c8df708c1ef9e8a87d9cb560d8020c8c16b3dadfb17b59da4ec0df128f9236f4ff20a69705af6f456c11204f8195a3cb01c36
-  data.tar.gz: b9f974a3ab3e6da317397726cad05b3913cc12f81b912ef928fcec50ed9b994196a7404e99f18754abcf4632fab19aad5656e354021ce3573d6735d1a42b1af5
+  metadata.gz: 03f01c088abb8bf0241061b05caef5c0278e3bdb8e1ac41fbda66bdd1cf04c7f21bf5d273c63ddce3931faa96375425496be7a945de4dbfa59eb80a34bcf266d
+  data.tar.gz: 9b6eba420a82a1b5f603b00dbe81b07d2ff37b086d3e50058f58dcd41ca763410b11be577b8e94c3645d843f532e0a694c18162dd174955e874ab6d2d6be3e5b

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.5.2
+
+* Fix custom_methods for ruby 3
+
+# 0.5.1
+
+* Support for ruby 3.2
+* Switch from nokogumbo to nokogiri
+
 # 0.5.0
 
 * quby2.json BREAKING CHANGES!: 

data/lib/quby/compiler/dsl/calls_custom_methods.rb

@@ -11,9 +11,9 @@ module Quby
           super
         end
 
-        def method_missing(method_sym, *args, &block)
+        def method_missing(method_sym, *args, **kwargs, &block)
           if @custom_methods.key? method_sym
-            instance_exec(*args, &custom_methods[method_sym])
+            instance_exec(*args, **kwargs, &custom_methods[method_sym])
           else
             super
           end

data/lib/quby/compiler/dsl/panel_builder.rb

@@ -6,7 +6,6 @@ module Quby
   module Compiler
     module DSL
       class PanelBuilder < Base
-        attr_reader :title
         attr_reader :questionnaire
 
         def initialize(title, default_question_options: {}, **options)
@@ -37,7 +36,7 @@ module Quby
         end
 
         def video(*urls, **options)
-          video_html = video_tag *urls, **options
+          video_html = video_tag(*urls, **options)
           @panel.items << Entities::Text.new('', raw_content: video_html)
         end
 
@@ -66,9 +65,9 @@ module Quby
           table_builder.instance_eval(&block) if block
         end
 
-        def method_missing(method_sym, *args, &block)
+        def method_missing(method_sym, *args, **kwargs, &block)
           if @custom_methods.key? method_sym
-            instance_exec(*args, &@custom_methods[method_sym])
+            instance_exec(*args, **kwargs, &@custom_methods[method_sym])
           else
             super
           end

data/lib/quby/compiler/dsl/questionnaire_builder.rb

@@ -272,7 +272,7 @@ module Quby
         end
 
         def outcome_table(**table_options)
-          @questionnaire.add_outcome_table table_options
+          @questionnaire.add_outcome_table(**table_options)
         end
 
         private

data/lib/quby/compiler/dsl/questions/base.rb

@@ -5,9 +5,6 @@ module Quby
     module DSL
       module Questions
         class Base < ::Quby::Compiler::DSL::Base
-          attr_reader :key
-          attr_reader :title
-          attr_reader :type
           attr_reader :questionnaire
 
           def initialize(key, questionnaire:, **options)

data/lib/quby/compiler/entities/charting/chart.rb

@@ -49,10 +49,10 @@ module Quby
           attr_accessor :y_range_categories
 
           # @return [Symbol]
-          attr_accessor :chart_type
+          attr_reader :chart_type
 
           # @return [Range]
-          attr_accessor :y_range
+          attr_writer :y_range
 
           # @return [Float]
           attr_accessor :tick_interval

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

@@ -11,7 +11,7 @@ module Quby
           attr_accessor :y_label
 
           # @return [Symbol]
-          attr_accessor :tonality
+          attr_reader :tonality
 
           # @return [Proc]
           attr_accessor :baseline

data/lib/quby/compiler/entities/item.rb

@@ -10,7 +10,7 @@ module Quby
         include ActiveSupport::Callbacks
         define_callbacks :after_dsl_enhance
 
-        attr_accessor :presentation
+        attr_writer   :presentation
         attr_accessor :switch_cycle
 
         # Raw content may contain a raw HTML replacement for this item

data/lib/quby/compiler/entities/panel.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'quby/compiler/entities'
-
 module Quby
   module Compiler
     module Entities

data/lib/quby/compiler/entities/question.rb

@@ -12,7 +12,7 @@ module Quby
 
         # Standard attributes
         attr_accessor :key
-        validates :key, presence: true, 'quby/type': {is_a: Symbol}
+        validates :key, presence: true, 'quby/compiler/type': {is_a: Symbol}
         attr_accessor :sbg_key
         attr_accessor :questionnaire
         attr_accessor :title
@@ -50,10 +50,6 @@ module Quby
         attr_accessor :allow_blank_titles
         validates :allow_blank_titles, inclusion: {in: [true, false, nil], message: "must be boolean"}
 
-        # Minimum and maximum values for float and integer types
-        attr_accessor :minimum
-        attr_accessor :maximum
-
         # Whether the browser should autocomplete this question (off by default)
         attr_accessor :autocomplete
 
@@ -119,7 +115,7 @@ module Quby
         attr_accessor :table
 
         # In case of being displayed inside a table, amount of columns/rows to span
-        attr_accessor :col_span
+        attr_writer :col_span
         attr_accessor :row_span
 
         attr_accessor :default_invisible
@@ -127,7 +123,7 @@ module Quby
 
         # Slider only: where to place the sliding thing by default
         # Can have value :hidden for a hidden handle.
-        attr_accessor :default_position
+        attr_writer :default_position
 
         ##########################################################
 
@@ -237,8 +233,8 @@ module Quby
           # rubocop:disable SymbolName
           super.merge(
             key: key,
-            title: Quby::MarkdownParser.new(title).to_html,
-            description: Quby::MarkdownParser.new(description).to_html,
+            title: Quby::Compiler::MarkdownParser.new(title).to_html,
+            description: Quby::Compiler::MarkdownParser.new(description).to_html,
             type: type,
             size: size.presence && Integer(size), # 2022-11: 4k string and 7k integer
             hidden: hidden?,
@@ -293,10 +289,12 @@ module Quby
           @default_position || ((minimum + maximum) / half if minimum && maximum)
         end
 
+        # Minimum value for float and integer types, set by validation
         def minimum
           validations.find { |i| i[:type] == :minimum }.try(:fetch, :value)
         end
 
+        # Maximum value for float and integer types, set by validation
         def maximum
           validations.find { |i| i[:type] == :maximum }.try(:fetch, :value)
         end

data/lib/quby/compiler/entities/question_option.rb

@@ -68,7 +68,7 @@ module Quby
           {
             type: 'html',
             key: SecureRandom.uuid,
-            html: Quby::MarkdownParser.new(description).to_html
+            html: Quby::Compiler::MarkdownParser.new(description).to_html
           }
         end
 
@@ -79,7 +79,7 @@ module Quby
             value: value,
             description: question.type == :select \
               ? description
-              : Quby::MarkdownParser.new(description).to_html,
+              : Quby::Compiler::MarkdownParser.new(description).to_html,
             questions: questions,
             hidesQuestions: hides_questions,
             showsQuestions: shows_questions,

data/lib/quby/compiler/entities/questionnaire.rb

@@ -61,7 +61,7 @@ module Quby
         attr_accessor :description
         attr_accessor :outcome_description
         attr_accessor :short_description
-        attr_accessor :roqua_keys
+        attr_writer   :roqua_keys
         attr_accessor :sbg_key # not required to be unique
         attr_accessor :sbg_domains
         attr_accessor :versions
@@ -71,11 +71,11 @@ module Quby
         attr_accessor :score_calculations
         attr_accessor :default_answer_value
         attr_accessor :renderer_version
-        attr_accessor :leave_page_alert
+        attr_writer   :leave_page_alert
         attr_reader   :fields
         attr_accessor :extra_css
         attr_accessor :allow_switch_to_bulk
-        attr_accessor :license
+        attr_reader   :license
         attr_accessor :licensor
         attr_accessor :language
         attr_accessor :respondent_types
@@ -91,7 +91,7 @@ module Quby
         attr_accessor :validate_html
 
         attr_accessor :last_author
-        attr_accessor :allow_hotkeys # allow hotkeys for :all views, just :bulk views (default), or :none for never
+        attr_writer   :allow_hotkeys # allow hotkeys for :all views, just :bulk views (default), or :none for never
 
         attr_accessor :charts
 

data/lib/quby/compiler/entities/text.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'quby/compiler/entities/item'
-require 'quby/markdown_parser'
 
 module Quby
   module Compiler
@@ -36,7 +35,7 @@ module Quby
         end
 
         def text
-          @text ||= Quby::MarkdownParser.new(str).to_html
+          @text ||= Quby::Compiler::MarkdownParser.new(str).to_html
         end
 
         def key

data/lib/quby/{markdown_parser.rb → compiler/markdown_parser.rb}

@@ -4,7 +4,7 @@ require 'redcarpet'
 
 require 'quby/compiler/services/text_transformation'
 
-module Quby
+module Quby::Compiler
   class MarkdownParser
     include Quby::Compiler::Services::TextTransformation
 

data/lib/quby/compiler/outputs/roqua_serializer.rb

@@ -263,7 +263,7 @@ module Quby
         end
 
         def parse_markdown_and_strip_tags(markdown)
-          strip_tags_without_html_encode(Quby::MarkdownParser.new(markdown).to_html)
+          strip_tags_without_html_encode(Quby::Compiler::MarkdownParser.new(markdown).to_html)
         end
 
         def strip_tags_without_html_encode(html)

data/lib/quby/compiler/services/definition_validator.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'nokogumbo'
+require 'nokogiri'
 require 'active_model'
 require 'quby/compiler/entities/questionnaire'
 
@@ -27,9 +27,9 @@ module Quby
           validate_raw_content_items(questionnaire) if questionnaire.validate_html
         # Some compilation errors are Exceptions (pure syntax errors) and some StandardErrors (NameErrors)
         rescue Exception => exception # rubocop:disable Lint/RescueException
-          definition.errors.add(:sourcecode, {message: "Questionnaire error: #{definition.key}\n" \
-                                                       "#{exception.message}",
-                                              backtrace: exception.backtrace[0..20]})
+          definition.errors.add(:sourcecode, message: "Questionnaire error: #{definition.key}\n" \
+                                                      "#{exception.message}",
+                                             backtrace: exception.backtrace[0..20])
         end
 
         def validate_metadata(questionnaire)

data/lib/quby/compiler/services/quby_proxy.rb

@@ -294,12 +294,12 @@ module Quby
         end
 
         def strip_p_tag(text)
-          text.gsub /^<p>(.*)<\/p>\n?$/, '\1'
+          text.gsub(/^<p>(.*)<\/p>\n?$/, '\1')
         end
 
         def strip_question_number_slashes(quests)
           quests.transform_values! do |value|
-            value&.gsub /^(\s*\d+)\\/, '\1'
+            value&.gsub(/^(\s*\d+)\\/, '\1')
           end
         end
 

data/lib/quby/compiler/services/seed_diff.rb

@@ -77,7 +77,7 @@ module Quby
           else
             patch
           end
-        rescue Exception => e
+        rescue Exception
           puts "path: #{path}"
           raise
         end

data/lib/quby/{type_validator.rb → compiler/type_validator.rb}

@@ -1,7 +1,7 @@
 require 'active_model'
 
 # validates :key, 'quby/type': {is_a: Symbol}
-module Quby
+module Quby::Compiler
   class TypeValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
       return if value.is_a? options[:is_a]

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.0"
+    VERSION = "0.5.2"
   end
 end

data/lib/quby/compiler.rb

@@ -15,11 +15,9 @@ module Quby
   end
 end
 
-require 'quby/array_attribute_valid_validator'
-require 'quby/attribute_valid_validator'
-require 'quby/markdown_parser'
+require 'quby/compiler/markdown_parser'
 require 'quby/range_categories'
-require 'quby/type_validator'
+require 'quby/compiler/type_validator'
 
 require 'quby/compiler/instance'
 require 'quby/compiler/entities'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: nokogumbo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -156,8 +142,6 @@ files:
 - config/locales/rails-i18n/en.yml
 - config/locales/rails-i18n/nl.yml
 - exe/quby-compile
-- lib/quby/array_attribute_valid_validator.rb
-- lib/quby/attribute_valid_validator.rb
 - lib/quby/compiler.rb
 - lib/quby/compiler/dsl.rb
 - lib/quby/compiler/dsl/base.rb
@@ -224,6 +208,7 @@ files:
 - lib/quby/compiler/entities/version.rb
 - lib/quby/compiler/entities/visibility_rule.rb
 - lib/quby/compiler/instance.rb
+- lib/quby/compiler/markdown_parser.rb
 - lib/quby/compiler/output.rb
 - lib/quby/compiler/outputs.rb
 - lib/quby/compiler/outputs/quby_frontend_v1_serializer.rb
@@ -234,12 +219,11 @@ files:
 - lib/quby/compiler/services/quby_proxy.rb
 - lib/quby/compiler/services/seed_diff.rb
 - lib/quby/compiler/services/text_transformation.rb
+- lib/quby/compiler/type_validator.rb
 - lib/quby/compiler/version.rb
-- lib/quby/markdown_parser.rb
 - lib/quby/range_categories.rb
 - lib/quby/settings.rb
 - lib/quby/text_transformation.rb
-- lib/quby/type_validator.rb
 homepage: https://gitlab.roqua.nl/roqua/quby-compiler
 licenses:
 - MIT
@@ -260,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Quby::Compiler compiles a DSL for questionnaires to JSON

data/lib/quby/array_attribute_valid_validator.rb

@@ -1,15 +0,0 @@
-require 'active_model'
-
-module Quby
-  class ArrayAttributeValidValidator < ActiveModel::EachValidator
-    def validate_each(record, attribute, value)
-      value&.each&.with_index do |element, index|
-        if !element.respond_to?(:valid?)
-          record.errors.add(attribute, "element ##{index} does not respond_to valid?")
-        elsif !element.valid?
-          record.errors.add(attribute, "element ##{index} #{element.errors.full_messages.join(', ')}")
-        end
-      end
-    end
-  end
-end

data/lib/quby/attribute_valid_validator.rb

@@ -1,14 +0,0 @@
-require 'active_model'
-
-module Quby
-  class AttributeValidValidator < ActiveModel::EachValidator
-    def validate_each(record, attribute, value)
-      return if value.blank?
-      if value.respond_to?(:valid?)
-        record.errors.add(attribute, value.errors.full_messages.join(', ')) unless value.valid?
-      else
-        record.errors.add(attribute, 'does not respond_to valid?')
-      end
-    end
-  end
-end