calyx 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bd547cabae5575236b9ef076d641c222365c207
-  data.tar.gz: 3a534687dc5371ade6bb88b06ff4059a20b25c7b
+  metadata.gz: 6e0af61453ee9d96b61daf9255a322023510eda0
+  data.tar.gz: 1beb02a6c87b667587fc3cae9e05852e52d253b1
 SHA512:
-  metadata.gz: 86fdb69a40b9f57995da80c8318e38992b7588053c73824207ea058cf2262d3bc90fe87fea0e6f3e2967a0403239da2db70a14c799a2829ccddd2355e690f1af
-  data.tar.gz: 7252174f84e3edc72cf8e6e8dee901c4c2f8ba9b3aa746b3d62f577d48d620c8946efacdab01b6373c9afe18488c2b846abccc1f62c53e6258c3f6984acf266a
+  metadata.gz: d844ef847d5a1e7fa00f75d252f666ad183740a39537ff0441df3def2e2768c2daff09399364e794a08c64e03ded3b06ddb1b9fce14fd72d8ec2edfe40b4ea39
+  data.tar.gz: e10899e3abac20855a2a10f616d53ffe75b2f72d9751503cf9e6a17d2e19595c28924ed289b01c1734f7d32e9d53065f83c391842e3680af7784acbb88aec6f2

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Mark Rickerby
+Copyright (c) 2015-2016 Editorial Technology <http://editorial.technology>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -114,7 +114,7 @@ end
 
 ### Random Sampling
 
-By default, the outcomes of generated rules are selected with Ruby’s built-in pseudorandom number generator (as seen in methods like `Kernel.rand` and `Array.sample`). To seed the random number generator, pass in a seed value (an integer) as the first argument to the constructor:
+By default, the outcomes of generated rules are selected with Ruby’s built-in pseudorandom number generator (as seen in methods like `Kernel.rand` and `Array.sample`). To seed the random number generator, pass in an integer seed value as the first argument to the constructor:
 
 ```ruby
 MyGrammar.new(12345)
@@ -259,6 +259,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 Mark Rickerby
+Calyx is open source and provided under the terms of the MIT license. Copyright (c) 2015-2016 [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.rb

@@ -7,8 +7,8 @@ module Calyx
         @rules = {}
       end
 
-      def start(*productions, &production)
-        @rules[:start] = construct_rule(productions)
+      def method_missing(name, *arguments)
+        rule(name, *arguments)
       end
 
       def rule(name, *productions, &production)
@@ -23,7 +23,7 @@ module Calyx
         @rules = rules.merge(registry.rules)
       end
 
-      def evaluate(context={})
+      def evaluate(start_symbol=:start, context={})
         duplicate_registry = Marshal.load(Marshal.dump(self))
         duplicate_rules = duplicate_registry.rules
         context.each do |key, value|
@@ -38,7 +38,7 @@ module Calyx
           end
         end
 
-        duplicate_rules[:start].evaluate
+        duplicate_rules[start_symbol].evaluate
       end
 
       private
@@ -58,7 +58,7 @@ module Calyx
       end
 
       def start(*productions, &production)
-        registry.start(*productions)
+        registry.rule(:start, *productions)
       end
 
       def rule(name, *productions, &production)
@@ -203,20 +203,19 @@ module Calyx
     end
 
     def initialize(seed=nil, &block)
-      @seed = seed
-      @seed = Time.new.to_i unless @seed
+      @seed = seed || Random.new_seed
       srand(@seed)
 
       if block_given?
         @registry = Registry.new
         @registry.instance_eval(&block)
       else
-        @registry = self.class.registry.clone
+        @registry = self.class.registry
       end
     end
 
     def generate(context={})
-      @registry.evaluate(context)
+      @registry.evaluate(:start, context)
     end
   end
 end

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.7.1'.freeze
+  VERSION = '0.7.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler