fbe 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8edc085f571054934f0175c084473ad75477dc2c591a4dfbe20bd85bd00ab364
-  data.tar.gz: 1792731b5d49d6b1a4a2d0c5671cb9dca05843e4af8a7cc7df64bddeb97525bd
+  metadata.gz: a57f0e5f562ad6ac7400355614f0af933b2130470759a877d34ea35878a4e52c
+  data.tar.gz: 0c93b9b7d1de5cf6f2c5bac41f71b663e19d7c1af667f5e6a41c53a361392afc
 SHA512:
-  metadata.gz: 6eaee3b757f8140044a2162f936a92b5b0b259f2e3995fc3032c6a529a9e2d77021506c09ff7910b0272a70b520189ef9f651e0b630f3d63918d400ccb3a6f16
-  data.tar.gz: 62504126787332608ab3a5a178c3946f52bf184e2ff7de2c9fca0b74f208f56437d50c944ff71a67169a66d27d9544c298e322ad320591ddae34c65c76941c49
+  metadata.gz: 1ec9cb12e7388c4260e9740255af73d8993e5b05abb0ee613bde3ee87e140a9b4b2bb1177c3dd14025e2a83c3eb3f87e8f5b84293f2b52256491860dd67b0807
+  data.tar.gz: e11c60c5bedc1abe4eb68702285c8a76f08c03e3b3e76a3dbf01f8ab514a1c024e1af0f1b38408cff5b5e7d370e011e5da1fee7d9c11e0be50d8e0ccd641de89

data/lib/fbe/award.rb

@@ -67,6 +67,12 @@ class Fbe::Award
         rescue StandardError => e
           raise "Failure in #{o}: #{e.message}"
         end
+      when :aka
+        @operands[0..-2].each do |o|
+          o.bill_to(bill)
+        rescue StandardError => e
+          raise "Failure in #{o}: #{e.message}"
+        end
       when :let, :set
         bill.set(@operands[0], to_val(@operands[1], bill))
       when :give
@@ -147,7 +153,7 @@ class Fbe::Award
       when :if
         "if #{to_p(@operands[0])} then #{to_p(@operands[1])} else #{to_p(@operands[2])}"
       when :eq
-        "#{to_p(@operands[0])} == #{to_p(@operands[1])}"
+        "#{to_p(@operands[0])} = #{to_p(@operands[1])}"
       when :lt
         "#{to_p(@operands[0])} < #{to_p(@operands[1])}"
       when :lte
@@ -183,12 +189,21 @@ class Fbe::Award
         rescue StandardError => e
           raise "Failure in #{o}: #{e.message}"
         end
+      when :aka
+        @operands[0..-2].each do |o|
+          o.publish_to(policy)
+        rescue StandardError => e
+          raise "Failure in #{o}: #{e.message}"
+        end
+        policy.revert(@operands.size - 1)
+        policy.line(to_p(@operands[@operands.size - 1]))
       when :explain
         policy.intro(to_p(@operands[0]))
       when :in
         policy.line("assume that #{to_p(@operands[0])} is #{to_p(@operands[1])}")
       when :let
         policy.line("let #{to_p(@operands[0])} be equal to #{to_p(@operands[1])}")
+        policy.let(@operands[0], @operands[1])
       when :set
         policy.line("set #{to_p(@operands[0])} to #{to_p(@operands[1])}")
       when :give
@@ -217,7 +232,7 @@ class Fbe::Award
           9 => '₉'
         }
         s.gsub!(/([a-z]+)([0-9])/) { |_| "#{Regexp.last_match[1]}#{subs[Regexp.last_match[2].to_i]}" }
-        "_#{s.gsub('_', '\\_')}_"
+        "_#{s.gsub('_', '-')}_"
       when Integer, Float
         "**#{any}**"
       else
@@ -262,6 +277,11 @@ class Fbe::Award
     def initialize
       @lines = []
       @intro = ''
+      @lets = {}
+    end
+
+    def revert(num)
+      @lines.slice!(-num, num)
     end
 
     def intro(text)
@@ -269,14 +289,23 @@ class Fbe::Award
     end
 
     def line(line)
+      line = line.gsub(/\$\{([a-z_0-9]+)\}/) { |_x| @lets[Regexp.last_match[1].to_sym] }
       @lines << line
     end
 
+    def let(key, value)
+      @lets[key] = value
+    end
+
     def markdown
       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}." }
+      if @lines.size == 1
+        pars << "Just #{@lines.first}."
+      else
+        pars += @lines.each_with_index.map { |t, i| "#{i.zero? ? 'First' : 'Then'}, #{t}." }
+      end
       pars.join(' ').gsub('. Then, award ', ', and award ')
     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.20'
+  VERSION = '0.0.21'
 end

data/test/fbe/test_award.rb

@@ -40,8 +40,11 @@ class TestAward < Minitest::Test
         (let max 36)
         (let basis 30)
         (give basis "as a basis")
-        (set b1 (if (lt hours max) 10 0))
-        (give b1 "for resolving the bug in ${hours} (<${max}) hours")
+        (let fee 10)
+        (aka
+          (set b1 (if (lt hours max) fee 0))
+          (give b1 "for resolving the bug in ${hours} (<${max}) hours")
+          "add ${+fee} if it was resolved in less than ${max} hours")
         (set days (div hours 24))
         (set b2 (times days -1))
         (let worst -20)
@@ -86,12 +89,10 @@ class TestAward < Minitest::Test
 
   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**.',
+      '(award (let x_a 25) (set z (plus x_a 1)) (give z "..."))' =>
+        'First, let _x-a_ be equal to **25**. Then, set _z_ to _x-a_ + **1**, and award _z_.',
+      '(award (aka (let x 17) (give x "hey") "add ${x} when necessary"))' =>
+        'Just add 17 when necessary'
     }.each do |q, t|
       md = Fbe::Award.new(q).policy.markdown
       assert(md.include?(t), md)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Yegor Bugayenko