calyx 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b083064b7b93a5747ec7833b4e3ca46394f8f45b
-  data.tar.gz: d87854cd9b134257987fef4febfae492a7665d3d
+  metadata.gz: b7beefadeb8e2f98a6c802a85dec4fb2ee9a81de
+  data.tar.gz: aeeb4015155d4ea728f0289fff21488fda88d37d
 SHA512:
-  metadata.gz: 267238c9ed8dedc16de8096c53fc362d16f77a25f60ac5f0eb475c304740a44a1530fa236a9cb30f2175da7e39b20729555376b9c18af5118ea83f01711e86ef
-  data.tar.gz: 1dabb4bc4cd57d42e2887039ced705b9e10c6347e22714414103a737e52c4096ac378db9a6320a6902ab5036691d341a68c13b781bdc8a10062c0ddfd2ef31e4
+  metadata.gz: ee1a4994645a80f6ceef3824f348653a9ac44eee32f127db31f457c4ca57c5e5ff26b5228109ba6f407d5ca7c3761d1632b3adcdfb65dd165e8b18d0d1dac24b
+  data.tar.gz: 3cd0f9955a377a9e97d4f62b1b2e2b5f256af0dd33089de81fa95d938f29633e0c771ba71d9fd581ed23f310d8edc29c18f4ad3b43b953fbeb905cf2ca100ac0

data/README.md

@@ -489,7 +489,9 @@ Rough plan for stabilising the API and features for a `1.0` release.
 | `0.9`   | ~~return grammar tree from `#evaluate`, with flattened string from `#generate` being separate~~ |
 | `0.10`  | ~~inject custom string functions for parameterised rules, transforms and mappings~~ |
 | `0.11`  | ~~support YAML format (and JSON?)~~ |
-| `1.0`   | ~~API documentation~~ |
+| `0.12`   | ~~API documentation~~ |
+| `0.13`   | ~~Support for unique rules~~ |
+| `0.14`   | Options config and ‘strict mode’ error handling |
 
 ## Credits
 
@@ -503,6 +505,6 @@ Rough plan for stabilising the API and features for a `1.0` release.
 
 ## License
 
-Calyx is open source and provided under the terms of the MIT license. Copyright (c) 2015-2016 [Editorial Technology](http://editorial.technology/).
+Calyx is open source and provided under the terms of the MIT license. Copyright (c) 2015-2017 [Editorial Technology](http://editorial.technology/).
 
 See the `LICENSE` file [included with the project distribution](https://github.com/maetl/calyx/blob/master/LICENSE) for more information.

data/lib/calyx/grammar.rb

@@ -98,16 +98,29 @@ module Calyx
     # Grammar rules can be constructed on the fly when the passed-in block is
     # evaluated.
     #
-    # @param [Numeric, Random] random
-    def initialize(random=Random.new, &block)
-      if random.is_a?(Numeric)
-        @random = Random.new(random)
+    # @param [Numeric, Random, Hash] options
+    def initialize(options={}, &block)
+      unless options.is_a?(Hash)
+        config_opts = {}
+        if options.is_a?(Numeric)
+          config_opts[:seed] = options
+        elsif options.is_a?(Random)
+          config_opts[:rng] = options
+        end
       else
-        @random = random
+        config_opts = options.dup
+      end
+
+      @random = if config_opts.key?(:seed)
+        Random.new(config_opts[:seed])
+      elsif config_opts.key?(:rng)
+        config_opts[:rng]
+      else
+        Random.new
       end
 
       if block_given?
-        @registry = Registry.new
+        @registry = Registry.new(config_opts)
         @registry.instance_eval(&block)
       else
         @registry = self.class.registry

data/lib/calyx/registry.rb

@@ -4,7 +4,8 @@ module Calyx
     attr_reader :rules, :transforms, :modifiers
 
     # Construct an empty registry.
-    def initialize
+    def initialize(options={})
+      @options = {}
       @rules = {}
       @transforms = {}
       @modifiers = Modifiers.new

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.13.0'.freeze
+  VERSION = '0.14.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler