calyx 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e95edf8bf75786d7a458d5618358a672b1b45b98
-  data.tar.gz: 432df67afb18be349d2fe7d1ee99d9f296f98c22
+  metadata.gz: 4116e94128a27a95985b8fa9780de2eabfec427c
+  data.tar.gz: 5b396249d4439e4a849b57ded682778e9b695be0
 SHA512:
-  metadata.gz: 44e91eaf7bc772408fe8bf840d0e1f15554aba7db941b72113a52e856012512d3e8482e092de9d221a3d092b7f22835a0b488bc940ec46375cad3aa0696eccdd
-  data.tar.gz: 7afd950288f64d1ab80c79caeb1177f6c9349b1b4b3c9f383a084d5d69f07b53715b338897641a500c6a5133c1b32ee91ee6ac5c2a840d5849f9e357f3244483
+  metadata.gz: 1a48eb785e80d97e999cae3dfe9b254ebb68982dffe959e7d823bbdc73204b4baab96803a1a6693f1fddb80d5f6fb21c6350d43ffcf99967ccabc7cd11df7908
+  data.tar.gz: 8b83890ae677018d977e4cc3435ac414de947806af2fe912eeab12fee541ba0d3daf206989fc0f0a227c3987f5f3184f853e048cf36365384f9a9c27feda7887

data/README.md

@@ -90,7 +90,7 @@ class HelloWorld < Calyx::Grammar
 end
 ```
 
-Nesting and hierarchy can be manipulated to balance consistency with variation. The exact same word atoms can be combined in different ways to produce strikingly different resulting texts.
+Nesting and hierarchy can be manipulated to balance consistency with novelty. The exact same word atoms can be combined in a variety of ways to produce strikingly different resulting texts.
 
 ```ruby
 module HelloWorld
@@ -114,7 +114,18 @@ end
 
 ### Random Sampling
 
-By default, the outcomes of generated rules are selected with Ruby’s built-in random number generator (as seen in methods like `Kernel.rand` and `Array.sample`). If you want to supply a weighted probability list, you can pass in arrays to the rule constructor, with the first argument being the template text string and the second argument being a float representing the probability between `0` and `1` of this choice being selected.
+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:
+
+```ruby
+MyGrammar.new(12345)
+Calyx::Grammar.new(12345, &rules)
+```
+
+When a seed value isn’t supplied, `Time.new.to_i` is used as the default seed, which makes each run of the generator relatively unique.
+
+### Weighted Selection
+
+If you want to supply a weighted probability list, you can pass in arrays to the rule constructor, with the first argument being the template text string and the second argument being a float representing the probability between `0` and `1` of this choice being selected.
 
 For example, you can model the triangular distribution produced by rolling 2d6:
 

data/lib/calyx.rb

@@ -1,6 +1,8 @@
 module Calyx
   class Grammar
     class Registry
+      attr_reader :rules
+
       def initialize
         @rules = {}
       end
@@ -17,16 +19,24 @@ module Calyx
         @rules[symbol]
       end
 
-      def combine(rules)
-        @rules.merge!(rules.to_h)
+      def combine(registry)
+        @rules = rules.merge(registry.rules)
       end
 
-      def evaluate
-        @rules[:start].evaluate
-      end
+      def evaluate(context={})
+        context.each do |key, value|
+          if @rules.key?(key.to_sym)
+            raise "Rule already declared in grammar: #{key}"
+          end
 
-      def to_h
-        @rules
+          @rules[key.to_sym] = if value.is_a?(Array)
+            Production::Choices.parse(value, self)
+          else
+            Production::Concat.parse(value.to_s, self)
+          end
+        end
+
+        @rules[:start].evaluate
       end
 
       private
@@ -53,8 +63,8 @@ module Calyx
         registry.rule(name, *productions)
       end
 
-      def inherit_registry(rules)
-        registry.combine(rules) unless rules.nil?
+      def inherit_registry(child_registry)
+        registry.combine(child_registry) unless child_registry.nil?
       end
 
       def inherited(subclass)
@@ -199,12 +209,12 @@ module Calyx
         @registry = Registry.new
         @registry.instance_eval(&block)
       else
-        @registry = self.class.registry
+        @registry = self.class.registry.clone
       end
     end
 
-    def generate
-      @registry.evaluate
+    def generate(context={})
+      @registry.evaluate(context)
     end
   end
 end

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler