mumukit-randomizer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e93122f713ba49c9b158ce97cd16d1f7c8bdc0d8625f0db2c77e466b0516a98c
-  data.tar.gz: 3f9cb16111ec473e70573646add6039b99da3c1b110fbacd584cb7b6825c2b15
+  metadata.gz: 52ed83471259c6d36ec21acdbd96fcd1962b065ff8400ea106f6b284d5b698a0
+  data.tar.gz: fcefa5da889b330e0eeb5f3d60b239d09849faae09eb25d407bf9f990e90723b
 SHA512:
-  metadata.gz: 07d7b2c6ef4e30255e9a908c06b4aa3e40a09067e79b6a3f34c070803ecd6922880598d58dbd93352914f86c6ca4e9a0a222c7891078cde9a6202eb1f13c0fa7
-  data.tar.gz: 749247a7c4ab9a09585310cb9aa8edc72e05a94441162e4a22f3c7b32616fa6f3161930b437cb15bb692593755359998b0ba6eb74059d23d3d989038b5450eeb
+  metadata.gz: 33d9d7996dba267891953d64f1e54294fbd3f5a03fdc624a7876c25d8045dfe48297b553fdbd960c512c5f46f9a695e3c1934bceb3b6eb8853867882950e5fcb
+  data.tar.gz: a9b529943b5cf3b01653265074fd46c782a436fe70195bcb00a50a5577e2afc537df8c32311fee5e1ae72596436ecd61fec438239ca2e79330c171adcf96f4eb

data/lib/mumukit/randomizations/base.rb

@@ -8,4 +8,8 @@ class Mumukit::Randomizer::Randomization::Base
   def modulo(value, range)
     Random.new(value).rand(range)
   end
+
+  def evaluate(seed, values)
+    get seed
+  end
 end

data/lib/mumukit/randomizations/expression.rb

@@ -0,0 +1,22 @@
+class Mumukit::Randomizer::Randomization::Expression < Mumukit::Randomizer::Randomization::Base
+
+  def initialize(keisan_code)
+    Keisan::AST.parse keisan_code
+
+    @keisan_code = keisan_code
+    @calculator = new_calculator
+  rescue Keisan::Exceptions::BaseError => e
+    raise Mumukit::Randomizer::RandomizationFormatError, "Malformed randomization expression: #{e.message}. See docs here https://github.com/project-eutopia/keisan"
+  end
+
+  def new_calculator
+    Keisan::Calculator.new.tap do |calculator|
+      calculator.define_function! "to_s", proc {|x| x.to_s }
+      calculator.define_function! "to_i", proc {|x| x.to_i }
+    end
+  end
+
+  def evaluate(seed, values)
+    @calculator.evaluate(@keisan_code, {seed: seed}.merge(values.to_h))
+  end
+end

data/lib/mumukit/randomizations/randomization.rb

@@ -9,7 +9,8 @@ module Mumukit::Randomizer::Randomization
     case randomization[:type].to_sym
       when :one_of then Mumukit::Randomizer::Randomization::OneOf.new randomization[:value]
       when :range then Mumukit::Randomizer::Randomization::Range.new(*randomization[:value])
-      else raise 'Unsupported randomization kind'
+      when :expression then Mumukit::Randomizer::Randomization::Expression.new(*randomization[:value])
+      else raise Mumukit::Randomizer::RandomizationFormatError, 'Unsupported randomization kind'
     end
   end
 end

data/lib/mumukit/randomizations/range.rb

@@ -1,7 +1,7 @@
 class Mumukit::Randomizer::Randomization::Range < Mumukit::Randomizer::Randomization::Base
   def initialize(lower_bound, upper_bound)
-    raise 'lower bound must be Numeric' unless lower_bound.is_a?(Numeric)
-    raise 'upper bound must be Numeric' unless upper_bound.is_a?(Numeric)
+    raise Mumukit::Randomizer::RandomizationFormatError, 'lower bound must be Numeric' unless lower_bound.is_a?(Numeric)
+    raise Mumukit::Randomizer::RandomizationFormatError, 'upper bound must be Numeric' unless upper_bound.is_a?(Numeric)
     @choices = Range.new lower_bound, upper_bound
   end
 

data/lib/mumukit/randomizer/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   class Randomizer
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/lib/mumukit/randomizer.rb

@@ -5,21 +5,38 @@ module Mumukit
     end
 
     def with_seed(seed)
-      @randomizations.each_with_index.map { |(key, value), index| [key, value.get(seed + index)] }
+      values = []
+      @randomizations.each_with_index do |(key, value), index|
+        values.push([key, value.evaluate(seed + index, values)])
+      end
+      values
+    end
+
+    def randomized_values(seed)
+      with_seed(seed).to_h
     end
 
     def randomize!(field, seed)
-      with_seed(seed).inject(field) { |result, (replacee, replacer)| result.gsub "$#{replacee}", replacer.to_s }
+      with_seed(seed).inject(field) do |result, (replacee, replacer)|
+        result.gsub "$#{replacee}", replacer.to_s
+      end
     end
 
+    alias randomize randomize!
+
     def self.parse(randomizations)
       new randomizations.with_indifferent_access.transform_values { |it| Mumukit::Randomizer::Randomization.parse it }
     end
+
+    class RandomizationFormatError < StandardError
+    end
   end
 end
 
+require 'keisan'
 require_relative 'randomizations/randomization'
 require_relative 'randomizations/base'
 require_relative 'randomizations/one_of'
 require_relative 'randomizations/range'
+require_relative 'randomizations/expression'
 require_relative 'randomizer/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-randomizer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Julián Berbel Alt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: keisan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: 
 email:
 - julian@mumuki.org
@@ -76,6 +90,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mumukit/randomizations/base.rb
+- lib/mumukit/randomizations/expression.rb
 - lib/mumukit/randomizations/one_of.rb
 - lib/mumukit/randomizations/randomization.rb
 - lib/mumukit/randomizations/range.rb
@@ -100,8 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Library for randomizing parts of mumuki exercises