proinsias 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f864e3b025cb56524d7372d025e265c27611fc0d10f2c1b7b1885ee98d55c64
-  data.tar.gz: 23086741d2c15faf323c0bbb988d57a0a74e69b2fd01eed7e0de24e35423f44e
+  metadata.gz: 6b5403239c4f49400cae27fe6030b3f90537b58491f0a8ece5c10779d8144916
+  data.tar.gz: bdbad991e14a84d22be5eeec3011b02119d7e82e78ca7d6cb4e21934c3b5c3f3
 SHA512:
-  metadata.gz: 948bc496d0fbd1a3c50dd59e4b7a5f1b036b2a4649f91faf2e5323ef8a9fb3ac41295c2a105886ebd2ff5b679f76aa92eed64f437d8a739799dae6f416c3d7a5
-  data.tar.gz: 5960a8e0ed928edbecf6d4c9fb8a98e5649fc83a256aa1b88c2a3693f6effab96536ab820850fe8157e241e9a807ba0efe69ca77eb6664c038752020bb392611
+  metadata.gz: 69f88b67b14ca92c9ce86ecd79a9c751dfa75582f30fd96cbf563ab334aa79a14d88ed4f7a518fffdc84f7260a6f98eadf589834cf91367cb12c3f712511a59d
+  data.tar.gz: cb7d80f469d43e72dc743f4ea84a7893cc43fc4e6be43dce644f16bf52055bb404cc9ad913fda44d2ce5a3a554f2d2a6a89c245b43a93d0c50c28b61eda59a13

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    proinsias (1.0.1)
-      moory (~> 1.2.0)
+    proinsias (1.1.0)
+      moory (~> 1.2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
-    moory (1.2.0)
+    moory (1.2.6)
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
 
 PLATFORMS
   ruby
@@ -34,4 +34,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.2
+   1.16.3

data/lib/proinsias/parser/director.rb

@@ -4,11 +4,9 @@ module Proinsias
   class Director
     attr_accessor :consumer, :quarantine
 
-    DEFAULT_QUARANTINE = proc { |particle| 
-      fail "Received unexpected particle: #{particle}"
-    }
+    SKIP = proc {}
 
-    def initialize(consumer:, quarantine:DEFAULT_QUARANTINE)
+    def initialize(consumer:, quarantine:SKIP)
       @consumer   = consumer
       @quarantine = quarantine
     end
@@ -20,24 +18,31 @@ module Proinsias
     end
 
     def issue(particle)
-      if result = controller.issue(particle.role)
+      controller.understand?(particle.role) ?
+        distribute(particle) :
+        withdraw(particle)
+    end
+
+    private
+
+    def distribute(particle)
+      controller.issue(particle.role).tap do |result|
         forward(
           Directive.new(
-            particle:  particle,
+            particle: particle,
             commands: result
           )
         )
-      else
-        quarantine ?
-          quarantine.call(particle) : nil
       end
     end
 
-    private
-
     def forward(directive)
       consumer.call(directive) if consumer
     end
+
+    def withdraw(particle)
+      quarantine.call(particle)
+    end
   end
 
   Directive = Struct.new(:particle, :commands, keyword_init: true)

data/lib/proinsias/parser/parser.rb

@@ -3,25 +3,49 @@ require_relative './scanner'
 require_relative './director'
 
 module Proinsias
+  module NilExtension
+    refine NilClass do
+      def to_ast;end
+    end
+  end
+
   class Parser
+    attr_accessor :consumer, :quarantine
+
+    using NilExtension
+
     def Parser.one_shot(str)
       new.tap { |psr| psr.analyse(str) }
     end
 
+    SKIP = proc {}
+
+    def initialize(consumer:nil, quarantine:SKIP)
+      @consumer   = consumer
+      @quarantine = quarantine
+    end
+
     def analyse(str)
       str.each_char { |c| issue(c) }
     end
 
+    def issue(char)
+      scanner.issue(char)
+      forward
+    end
+
     def ast
-      assembly_line.product ?
-      assembly_line.product.to_ast :
-      nil
+      product.to_ast
+    end
+
+    def product
+      assembly_line.product
     end
-    
+
     private
 
-    def issue(char)
-      scanner.issue(char)
+    def forward
+      consumer.call(product) if product && consumer
     end
 
     def scanner
@@ -32,7 +56,8 @@ module Proinsias
 
     def director
       @director ||= Proinsias::Director.new(
-        consumer: assembly_line.method(:issue)
+        consumer:   assembly_line.method(:issue),
+        quarantine: quarantine
       )
     end
 

data/lib/proinsias/parser/scanner.rb

@@ -6,18 +6,14 @@ module Proinsias
       @consumer   = consumer
     end
 
-    def issue(char)
-      filter.issue(char)
-    end
-
     def filter
       @filter ||= Proinsias::Filter.create(
         consumer: method(:forward)
       )
     end
 
-    def translate(glyph)
-      Proinsias::Particle.from_glyph(glyph)
+    def issue(char)
+      filter.issue(char)
     end
 
     def forward(glyph)
@@ -25,5 +21,9 @@ module Proinsias
         translate(glyph)
       )
     end
+
+    def translate(glyph)
+      Proinsias::Particle.from_glyph(glyph)
+    end
   end
 end

data/lib/proinsias/version.rb

@@ -1,3 +1,3 @@
 module Proinsias
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/proinsias.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_dependency "moory", "~> 1.2.0"
+  spec.add_dependency "moory", "~>1.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proinsias
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam W. Grant
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.6
 description: 
 email:
 - adam_grnt@yahoo.co.uk
@@ -83,9 +83,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- examples/assemblyline.rb
-- examples/director.rb
-- examples/parentheses.rb
 - examples/parser.rb
 - examples/scanner.rb
 - lib/proinsias.rb
@@ -126,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Manipulate formulae of the Propositional Calculus.

data/examples/assemblyline.rb

@@ -1,15 +0,0 @@
-assembly_line = Proinsias::AssemblyLine.new
-
-director = Proinsias::Director.new(
-  consumer: assembly_line.method(:issue)
-)
-
-scanner = Proinsias::Scanner.new(
-  consumer:   director.method(:issue)
-)
-
-"p ⇒ q ⇒ r ⇒ s".each_char do |c|
-  scanner.issue(c)
-end
-
-pp assembly_line.product.to_ast

data/examples/director.rb

@@ -1,15 +0,0 @@
-trace = Array.new
-
-director = Proinsias::Director.new(
-  consumer: trace.method(:<<)
-)
-
-scanner = Proinsias::Scanner.new(
-  consumer:   director.method(:issue)
-)
-
-"p ≡ p ≡ true".each_char do |c|
-  scanner.issue(c)
-end
-
-pp trace

data/examples/parentheses.rb

@@ -1,15 +0,0 @@
-assembly_line = Proinsias::AssemblyLine.new
-
-director = Proinsias::Director.new(
-  consumer:   assembly_line.method(:issue)
-)
-
-scanner = Proinsias::Scanner.new(
-  consumer:   director.method(:issue)
-)
-
-"p ⇒ (q ≡ r) ≡ (p ⇒ q) ≡ (p ⇒ r)".each_char do |c|
-  scanner.issue(c)
-end
-
-pp assembly_line.product.to_ast