calyx 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f131c3c4d9ce8acaa598a0f6e32b92f13da5c566
-  data.tar.gz: c4e81bf0f753c605946c77c4943c28f1358632b2
+  metadata.gz: e95edf8bf75786d7a458d5618358a672b1b45b98
+  data.tar.gz: 432df67afb18be349d2fe7d1ee99d9f296f98c22
 SHA512:
-  metadata.gz: 12a3d0964f80866aae48ae67036b6e97afb1ef3d89ca005bfbcbd6a8df7f55d2400cb8774ded7f2fbefd6b64b0e8da3b9201ade2c3599670918a2fba0f9c6f29
-  data.tar.gz: 6bd0062c621e001f28322484dd4dd7f9762a5e12de07fbbe26500a1b9fd03655099b22ec036046c96163b479f381c37be5fb711e5eacb9efd511a983538e982e
+  metadata.gz: 44e91eaf7bc772408fe8bf840d0e1f15554aba7db941b72113a52e856012512d3e8482e092de9d221a3d092b7f22835a0b488bc940ec46375cad3aa0696eccdd
+  data.tar.gz: 7afd950288f64d1ab80c79caeb1177f6c9349b1b4b3c9f383a084d5d69f07b53715b338897641a500c6a5133c1b32ee91ee6ac5c2a840d5849f9e357f3244483

data/README.md

@@ -1,6 +1,6 @@
 # Calyx
 
-[![Gem Version](http://img.shields.io/gem/v/yarrow.svg)](https://rubygems.org/gems/calyx)
+[![Gem Version](http://img.shields.io/gem/v/calyx.svg)](https://rubygems.org/gems/calyx)
 [![Build Status](https://travis-ci.org/maetl/calyx.svg?branch=master)](https://travis-ci.org/maetl/calyx)
 
 Calyx provides a simple API for generating text with declarative recursive grammars.
@@ -13,7 +13,7 @@ Calyx provides a simple API for generating text with declarative recursive gramm
 gem install calyx
 ```
 
-## Gemfile
+### Gemfile
 
 ```
 gem 'calyx'
@@ -46,7 +46,11 @@ class HelloWorld < Calyx::Grammar
   start '{greeting} world.'
   rule :greeting, 'Hello', 'Hi', 'Hey', 'Yo'
 end
+```
+
+Each time `#generate` runs, it evaluates the tree and randomly selects variations of rules to construct a resulting string.
 
+```ruby
 hello = HelloWorld.new
 
 hello.generate
@@ -210,7 +214,7 @@ Rough plan for stabilising the API and features for a `1.0` release.
 
 | Version | Features planned |
 |---------|------------------|
-| `0.6`   | block constructor |
+| `0.6`   | ~~block constructor~~ |
 | `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 |

data/calyx.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 3.4'
 end

data/lib/calyx.rb

@@ -13,11 +13,7 @@ module Calyx
         @rules[name.to_sym] = construct_rule(productions)
       end
 
-      def []=(symbol, production)
-        @rules[symbol] = production
-      end
-
-      def [](symbol)
+      def expand(symbol)
         @rules[symbol]
       end
 
@@ -25,6 +21,10 @@ module Calyx
         @rules.merge!(rules.to_h)
       end
 
+      def evaluate
+        @rules[:start].evaluate
+      end
+
       def to_h
         @rules
       end
@@ -64,13 +64,13 @@ module Calyx
 
     module Production
       class NonTerminal
-        def initialize(expansion, registry)
-          @expansion = expansion.to_sym
+        def initialize(symbol, registry)
+          @symbol = symbol.to_sym
           @registry = registry
         end
 
         def evaluate
-          @registry[@expansion].evaluate
+          @registry.expand(@symbol).evaluate
         end
       end
 
@@ -204,7 +204,7 @@ module Calyx
     end
 
     def generate
-      @registry[:start].evaluate
+      @registry.evaluate
     end
   end
 end

data/lib/calyx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 description: Calyx provides a simple API for generating text with declarative recursive
   grammars.
 email: