calyx 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27169df4f2bd509b5032e94a52faf2a66caac896
-  data.tar.gz: de708f687c780fb782d9dee7857afabc1fd64e92
+  metadata.gz: 129a9b8ddec5530b5f427780572e1e0a3a667bd4
+  data.tar.gz: 445ce73db118256bbf9ad748b82421235bb8573d
 SHA512:
-  metadata.gz: 9a4a39f5d884dbec68f98dd861196b877139398c95549a3c01892c199f26e698680d028128fe6a009192851dba2be636ada636aec2a3b5acac3409b73c8c0e92
-  data.tar.gz: 3a31249994903e00bb8ec895eed7929a7343e1736e5d2750d400ed69a4980ff6be7f5b100ff051ceb64820a5f51295729debc9a0bc0d87b514b8eaafcbfa0318
+  metadata.gz: 5b31b154440e67f0bde8ba9cd49784aece4ffa971a3b15731f83b05696f44e4db3fc43cdf78ffba990c962c46ac7d71c4964339133a43c202bd651a9066113bd
+  data.tar.gz: 3aded7ee2f7104244b0d47dc0a06a98607f32bdc05e17a1eabf153b1595cca60e17f708cbc2873eb09bb27b16ec6bb445980f23c3b679a76feb669ecb1bcd601

data/README.md

@@ -493,7 +493,9 @@ Rough plan for stabilising the API and features for a `1.0` release.
 | `0.11`  | ~~support YAML format (and JSON?)~~ |
 | `0.12`   | ~~API documentation~~ |
 | `0.13`   | ~~Support for unique rules~~ |
-| `0.14`   | Options config and ‘strict mode’ error handling |
+| `0.14`   | ~~Support for Ruby 2.4~~ |
+| `0.15`   | Options config and ‘strict mode’ error handling |
+| `0.16`   | Improve representation of weighted probability selection |
 
 ## Credits
 

data/lib/calyx/errors.rb

@@ -10,7 +10,7 @@ module Calyx
     #
     #   grammar.evaluate
     #   # => Calyx::Errors::MissingRule: :blank is not registered
-    class MissingRule < RuntimeError;
+    class MissingRule < RuntimeError
       def initialize(msg)
         super(":#{msg} is not registered")
       end

data/lib/calyx/grammar.rb

@@ -138,7 +138,7 @@ module Calyx
 
       @registry.evaluate(start_symbol, @random, rules_map).flatten.reject do |obj|
         obj.is_a?(Symbol)
-      end.join(''.freeze)
+      end.join
     end
 
     # Produces a syntax tree of nested list nodes as an output of the grammar.

data/lib/calyx/production/expression.rb

@@ -20,7 +20,7 @@ module Calyx
       # @param [Random] random
       # @return [Array]
       def evaluate(random)
-        terminal = @production.evaluate(random).flatten.reject { |o| o.is_a?(Symbol) }.join(''.freeze)
+        terminal = @production.evaluate(random).flatten.reject { |o| o.is_a?(Symbol) }.join
         expression = @methods.reduce(terminal) do |value, method|
           @registry.transform(method, value)
         end

data/lib/calyx/production/non_terminal.rb

@@ -18,7 +18,12 @@ module Calyx
       # @param [Random] random
       # @return [Array]
       def evaluate(random)
-        [@symbol, @registry.expand(@symbol).evaluate(random)]
+        expansion = @registry.expand(@symbol)
+        if expansion.nil?
+          raise Errors::MissingRule.new(@symbol)
+        else
+          [@symbol, expansion.evaluate(random)]
+        end
       end
     end
   end

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.14.1'.freeze
+  VERSION = '0.14.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler