calyx 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4116e94128a27a95985b8fa9780de2eabfec427c
-  data.tar.gz: 5b396249d4439e4a849b57ded682778e9b695be0
+  metadata.gz: 2bd547cabae5575236b9ef076d641c222365c207
+  data.tar.gz: 3a534687dc5371ade6bb88b06ff4059a20b25c7b
 SHA512:
-  metadata.gz: 1a48eb785e80d97e999cae3dfe9b254ebb68982dffe959e7d823bbdc73204b4baab96803a1a6693f1fddb80d5f6fb21c6350d43ffcf99967ccabc7cd11df7908
-  data.tar.gz: 8b83890ae677018d977e4cc3435ac414de947806af2fe912eeab12fee541ba0d3daf206989fc0f0a227c3987f5f3184f853e048cf36365384f9a9c27feda7887
+  metadata.gz: 86fdb69a40b9f57995da80c8318e38992b7588053c73824207ea058cf2262d3bc90fe87fea0e6f3e2967a0403239da2db70a14c799a2829ccddd2355e690f1af
+  data.tar.gz: 7252174f84e3edc72cf8e6e8dee901c4c2f8ba9b3aa746b3d62f577d48d620c8946efacdab01b6373c9afe18488c2b846abccc1f62c53e6258c3f6984acf266a

data/README.md

@@ -219,6 +219,25 @@ end
 # => "A pear."
 ```
 
+### Dynamically Constructing Rules
+
+Template expansions can be dynamically constructed at runtime by passing a context map of rules to the `#generate` method:
+
+```ruby
+class AppGreeting < Calyx::Grammar
+  start 'Hi {username}!', 'Welcome back {username}...', 'Hola {username}'
+end
+
+context = {
+  username: UserModel.username
+}
+
+greeting = AppGreeting.new
+greeting.generate(context)
+```
+
+__Note: This feature is still experimental, and the API may morph and change a bit as we try to figure out the best patterns for merging and combining grammars.__
+
 ## Roadmap
 
 Rough plan for stabilising the API and features for a `1.0` release.
@@ -226,13 +245,18 @@ Rough plan for stabilising the API and features for a `1.0` release.
 | Version | Features planned |
 |---------|------------------|
 | `0.6`   | ~~block constructor~~ |
-| `0.7`   | support for template context map passed to generate |
+| `0.7`   | ~~support for template context map passed to generate~~ |
 | `0.8`   | return grammar tree from evaluate/generate, with to_s being separate |
 | `0.9`   | support mixin/composition of rule sets rather than inheritance |
 | `0.10`  | support YAML format (and JSON?) |
 | `0.11`  | method missing metaclass API |
 | `1.0`   | API documentation |
 
+## Credits
+
+- [Mark Rickerby](https://github.com/maetl) (author and maintainer)
+- [Tariq Ali](https://github.com/tra38)
+
 ## License
 
 Calyx is open source and provided under the terms of the MIT license. Copyright (c) 2015 Mark Rickerby

data/lib/calyx.rb

@@ -24,19 +24,21 @@ module Calyx
       end
 
       def evaluate(context={})
+        duplicate_registry = Marshal.load(Marshal.dump(self))
+        duplicate_rules = duplicate_registry.rules
         context.each do |key, value|
-          if @rules.key?(key.to_sym)
+          if duplicate_rules.key?(key.to_sym)
             raise "Rule already declared in grammar: #{key}"
           end
 
-          @rules[key.to_sym] = if value.is_a?(Array)
-            Production::Choices.parse(value, self)
+          duplicate_rules[key.to_sym] = if value.is_a?(Array)
+            Production::Choices.parse(value, duplicate_registry)
           else
-            Production::Concat.parse(value.to_s, self)
+            Production::Concat.parse(value.to_s, duplicate_registry)
           end
         end
 
-        @rules[:start].evaluate
+        duplicate_rules[:start].evaluate
       end
 
       private

data/lib/calyx/version.rb

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

metadata

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