wongi-engine 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf30142950fccfa0c3ecd20d55e5ac211c74c1fde464507725f262da6734f8b7
-  data.tar.gz: efd0a8acae7aef2510854d240e5fbe491ffcbf73986cd4e6d201cf662e912c0a
+  metadata.gz: 8d4c949466ca4e0cdc187b571ebc8d406ee36c06b135216355b791ecb20c78ab
+  data.tar.gz: 44b91d4d18f9fb1c7f87b8a837a67d8489e255803f68e25be87b636d620de113
 SHA512:
-  metadata.gz: ba4e0818dff5b8d61b693e8a2974c0e2fa531736459e95aa788b7a3b79c56c0be5c1a3d5e9edd36cd0c71ce55a0bce31b41f1d39e2515c057753df873f288318
-  data.tar.gz: b0e6d77fa743e6d74340bc75478ce0178a72ce7e99df7cf5cebe0d60438acd779627fb1f68652ecdd3904054784c385e8684245e54dc66de6485d7e66e1a7a7a
+  metadata.gz: 4a1534278af39a9a0449c812483706fe552ec72b63ef38d59eed3899e38c88c8988b5e6eed860fb43a24d0913b97819978034426fc9ac3e2f1b623fee1ae0c53
+  data.tar.gz: 9a7457a55a61cdd825b929d9aac2fd3a8f4b3b56609492c2dc124ea96dffd1348cdb23e957a404fec320eab12aeebbe3746c81d1f52e221cf6912761c458db8d

data/.github/workflows/test.yml

@@ -0,0 +1,24 @@
+name: Test
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ["3.1", "3.0", "2.7", "2.6", "jruby-head"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake

data/lib/wongi-engine/dsl/clause/aggregate.rb

@@ -8,7 +8,7 @@ module Wongi::Engine
         @map = options[:map]
         @function = options[:function]
         @assign = options[:assign]
-        @map ||= -> { _1.send(member) }
+        @map ||= ->(wme) { wme.send(member) }
         super
       end
 

data/lib/wongi-engine/dsl.rb

@@ -101,7 +101,7 @@ module Wongi::Engine::DSL
 
     clause :count
     body { |s, p, o, opts|
-      aggregate s, p, o, map: ->(_) { 1 }, function: -> { _1.inject(&:+) }, assign: opts[:assign]
+      aggregate s, p, o, map: ->(_) { 1 }, function: ->(collection) { collection.inject(&:+) }, assign: opts[:assign]
     }
 
     clause :assert, :dynamic

data/lib/wongi-engine/graph.rb

@@ -14,16 +14,12 @@ module Wongi::Engine
         return
       end
 
-      @io = io
+      io.puts "digraph {"
 
-      @io.puts "digraph {"
+      dump_alphas(io) unless opts[:alpha] == false
+      dump_betas(io, opts)
 
-      dump_alphas(opts) unless opts[:alpha] == false
-      dump_betas(opts)
-
-      @io.puts "}"
-    ensure
-      @io = nil
+      io.puts "}"
     end
 
     private
@@ -32,34 +28,34 @@ module Wongi::Engine
       h.to_s.gsub(/-/, '_')
     end
 
-    def dump_alphas(_opts)
-      @io.puts "subgraph cluster_alphas {"
+    def dump_alphas(io)
+      io.puts "subgraph cluster_alphas {"
       @rete.alphas.reject { |alpha| alpha.betas.empty? }.each do |alpha|
-        @io.puts "node#{print_hash alpha.object_id} [shape=box label=\"#{alpha.template.to_s.gsub(/"/, '"')}\"];"
+        io.puts "node#{print_hash alpha.object_id} [shape=box label=\"#{alpha.template.to_s.gsub(/"/, '"')}\"];"
       end
-      @io.puts "};"
+      io.puts "};"
     end
 
-    def dump_betas(opts)
-      dump_beta @rete.beta_top, opts
+    def dump_betas(io, opts)
+      dump_beta(io, @rete.beta_top, opts)
     end
 
-    def dump_beta(beta, opts)
+    def dump_beta(io, beta, opts)
       return if @seen_betas.include? beta
 
       @seen_betas << beta
-      @io.puts "node#{print_hash beta.object_id} [label=\"#{beta.class.name.split('::').last}\"];"
+      io.puts "node#{print_hash beta.object_id} [label=\"#{beta.class.name.split('::').last}\"];"
       if beta.is_a? NccNode
-        @io.puts "node#{print_hash beta.partner.object_id} -> node#{print_hash beta.object_id};"
-        @io.puts "{ rank=same; node#{print_hash beta.partner.object_id} node#{print_hash beta.object_id} }"
+        io.puts "node#{print_hash beta.partner.object_id} -> node#{print_hash beta.object_id};"
+        io.puts "{ rank=same; node#{print_hash beta.partner.object_id} node#{print_hash beta.object_id} }"
       end
       if beta.respond_to?(:alpha) && opts[:alpha] != false
         alpha = beta.alpha
-        @io.puts "node#{print_hash alpha.object_id} -> node#{print_hash beta.object_id};" if alpha
+        io.puts "node#{print_hash alpha.object_id} -> node#{print_hash beta.object_id};" if alpha
       end
       beta.children.each do |child|
-        @io.puts "node#{print_hash beta.object_id} -> node#{print_hash child.object_id};"
-        dump_beta child, opts
+        io.puts "node#{print_hash beta.object_id} -> node#{print_hash child.object_id};"
+        dump_beta(io, child, opts)
       end
     end
   end

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.3.7".freeze
+    VERSION = "0.3.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".hgtags"
 - ".rubocop.yml"