fbe 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d25c37b43cfba051943236b5a62e33f24e64569c638cabe65aff2a9bca5823dd
-  data.tar.gz: 99870b5a82826ea29fee426e357c6cf51533ad480c14a7b46a8a408a238b4a91
+  metadata.gz: 8edc085f571054934f0175c084473ad75477dc2c591a4dfbe20bd85bd00ab364
+  data.tar.gz: 1792731b5d49d6b1a4a2d0c5671cb9dca05843e4af8a7cc7df64bddeb97525bd
 SHA512:
-  metadata.gz: 64c1b1d1be331458fe3c34a99a80c81f5bf2e77a6e7b378d1269d5c421024e049b61cdf5651ccd435b7a1233eb8d315e8e39f8d04091cbcf813468e1417b94e0
-  data.tar.gz: b2feba50e12a9b157b09cbea421f87c97d50201afc0da2619f144f1b6963937718ffdf4fc050995d8c8b7c38798955989bb7b4dcf6d14f0c525c451c8002e738
+  metadata.gz: 6eaee3b757f8140044a2162f936a92b5b0b259f2e3995fc3032c6a529a9e2d77021506c09ff7910b0272a70b520189ef9f651e0b630f3d63918d400ccb3a6f16
+  data.tar.gz: 62504126787332608ab3a5a178c3946f52bf184e2ff7de2c9fca0b74f208f56437d50c944ff71a67169a66d27d9544c298e322ad320591ddae34c65c76941c49

data/lib/fbe/award.rb

@@ -145,31 +145,31 @@ class Fbe::Award
       when :total
         'total'
       when :if
-        "if #{to_str(@operands[0])} then #{to_str(@operands[1])} else #{to_str(@operands[2])}"
+        "if #{to_p(@operands[0])} then #{to_p(@operands[1])} else #{to_p(@operands[2])}"
       when :eq
-        "#{to_str(@operands[0])} == #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} == #{to_p(@operands[1])}"
       when :lt
-        "#{to_str(@operands[0])} < #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} < #{to_p(@operands[1])}"
       when :lte
-        "#{to_str(@operands[0])} ≤ #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} ≤ #{to_p(@operands[1])}"
       when :gt
-        "#{to_str(@operands[0])} > #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} > #{to_p(@operands[1])}"
       when :gte
-        "#{to_str(@operands[0])} ≥ #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} ≥ #{to_p(@operands[1])}"
       when :div
-        "#{to_str(@operands[0])} ÷ #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} ÷ #{to_p(@operands[1])}"
       when :times
-        "#{to_str(@operands[0])} × #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} × #{to_p(@operands[1])}"
       when :plus
-        "#{to_str(@operands[0])} + #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} + #{to_p(@operands[1])}"
       when :minus
-        "#{to_str(@operands[0])} - #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} - #{to_p(@operands[1])}"
       when :max
-        "maximum of #{to_str(@operands[0])} and #{to_str(@operands[1])}"
+        "maximum of #{to_p(@operands[0])} and #{to_p(@operands[1])}"
       when :min
-        "minimum of #{to_str(@operands[0])} and #{to_str(@operands[1])}"
+        "minimum of #{to_p(@operands[0])} and #{to_p(@operands[1])}"
       when :between
-        "at least #{to_str(@operands[0])} and at most #{to_str(@operands[1])}"
+        "at least #{to_p(@operands[0])} and at most #{to_p(@operands[1])}"
       else
         raise "Unknown term '#{@op}'"
       end
@@ -184,25 +184,42 @@ class Fbe::Award
           raise "Failure in #{o}: #{e.message}"
         end
       when :explain
-        policy.intro(to_str(@operands[0]))
+        policy.intro(to_p(@operands[0]))
       when :in
-        policy.line("assume that #{to_str(@operands[0])} is #{to_str(@operands[1])}")
+        policy.line("assume that #{to_p(@operands[0])} is #{to_p(@operands[1])}")
       when :let
-        policy.line("let #{to_str(@operands[0])} be equal to #{to_str(@operands[1])}")
+        policy.line("let #{to_p(@operands[0])} be equal to #{to_p(@operands[1])}")
       when :set
-        policy.line("set #{to_str(@operands[0])} to #{to_str(@operands[1])}")
+        policy.line("set #{to_p(@operands[0])} to #{to_p(@operands[1])}")
       when :give
-        policy.line("award #{to_str(@operands[0])}")
+        policy.line("award #{to_p(@operands[0])}")
       else
         raise "Unknown term '#{@op}'"
       end
     end
 
-    def to_str(any)
-      if any.is_a?(PTerm)
+    def to_p(any)
+      case any
+      when PTerm
         any.to_s
-      elsif any.is_a?(Symbol)
-        "_#{any}_"
+      when Symbol
+        s = any.to_s
+        subs = {
+          0 => '₀',
+          1 => '₁',
+          2 => '₂',
+          3 => '₃',
+          4 => '₄',
+          5 => '₅',
+          6 => '₆',
+          7 => '₇',
+          8 => '₈',
+          9 => '₉'
+        }
+        s.gsub!(/([a-z]+)([0-9])/) { |_| "#{Regexp.last_match[1]}#{subs[Regexp.last_match[2].to_i]}" }
+        "_#{s.gsub('_', '\\_')}_"
+      when Integer, Float
+        "**#{any}**"
       else
         any
       end
@@ -256,7 +273,11 @@ class Fbe::Award
     end
 
     def markdown
-      "#{@intro}. Here it how it's calculated: First, #{@lines.join('. Then, ')}."
+      pars = []
+      pars << "#{@intro}." unless @intro.empty?
+      pars << 'Here is how it\'s calculated:'
+      pars += @lines.each_with_index.map { |t, i| "#{i.zero? ? 'First' : 'Then'}, #{t}." }
+      pars.join(' ').gsub('. Then, award ', ', and award ')
     end
   end
 end

data/lib/fbe.rb

@@ -27,5 +27,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.19'
+  VERSION = '0.0.20'
 end

data/test/fbe/test_award.rb

@@ -67,7 +67,7 @@ class TestAward < Minitest::Test
     md = a.policy.markdown
     [
       'First, assume that _hours_ is hours',
-      'Then, award _b2_'
+      ', and award _b₂_'
     ].each { |t| assert(md.include?(t), md) }
   end
 
@@ -83,4 +83,18 @@ class TestAward < Minitest::Test
       assert_equal(v, a.bill.points, q)
     end
   end
+
+  def test_some_policies
+    {
+      '(award (let x 25) (set z (plus x 1)) (give z "..."))' =>
+        'First, let _x_ be equal to **25**. Then, set _z_ to _x_ + **1**, and award _z_.'
+      # '(award (let x 25) (give x "..."))' =>
+      #   'The amount is **25**.',
+      # '(award (let x -5) (give x "..."))' =>
+      #   'The amount is **-5**.',
+    }.each do |q, t|
+      md = Fbe::Award.new(q).policy.markdown
+      assert(md.include?(t), md)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace