calyx 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1318f87b80baddcf2bc2782a3c93b710912c78af
-  data.tar.gz: 30461744ff65201a6ecb2bacbdb5492bf60e0685
+  metadata.gz: 78e2075bb19864a35f97504f1d2afc2e09b186ab
+  data.tar.gz: 1e474a6d3bac3d62d5a8b25c5ad75ec724a95a44
 SHA512:
-  metadata.gz: 133902fc4013dd5d271a8dc01456e96f7776133cfdecb8deb21c805c7763b25c42bc9d403faa67aaf145e0981d10faa793aefae1f744381cba2cd6e753d6fff5
-  data.tar.gz: f480d4901162ce5eb2a9809b87dfcc87e7b5282e4c179332ec48f318ae9f90fd5abb82b72d45e85a0136084f761da0f3217fda3db72e8668cbb9178a18e6e6cc
+  metadata.gz: 8d4facec94b4ffd5c29bfb53d4f8cd6b0de4939d9937ed0853a15420246deeee0fb543ae210e6462b4b707f1c82bd9c462b54b427a8637bf35b7536bb3a4b842
+  data.tar.gz: fd89979f568bd4ec3bd3655dfcacddf405841766ed7bef6a32a8d2d7a0ce501aa3bbc4fa85e67a0455106701f50787c071afbd6f4a6eb02d091f46c9a67a2be7

data/README.md

@@ -299,7 +299,7 @@ Rough plan for stabilising the API and features for a `1.0` release.
 | `0.7`   | ~~support for template context map passed to generate~~ |
 | `0.8`   | ~~method missing metaclass API~~ |
 | `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.10`  | ~~inject custom string functions for parameterised rules, transforms and mappings~~ |
 | `0.11`  | support YAML format (and JSON?) |
 | `1.0`   | API documentation |
 

data/lib/calyx.rb

@@ -3,6 +3,7 @@ require 'calyx/grammar'
 require 'calyx/errors'
 require 'calyx/file_converter'
 require 'calyx/registry'
+require 'calyx/modifier'
 require 'calyx/production/memo'
 require 'calyx/production/choices'
 require 'calyx/production/concat'

data/lib/calyx/grammar.rb

@@ -5,6 +5,10 @@ module Calyx
         @registry ||= Registry.new
       end
 
+      def modifier(name)
+        registry.modifier(name)
+      end
+
       def mapping(name, pairs)
         registry.mapping(name, pairs)
       end

data/lib/calyx/modifier.rb

@@ -0,0 +1,17 @@
+module Calyx
+  class Modifier
+    def extend_with(name)
+      extend name
+    end
+
+    def transform(name, value)
+      if respond_to?(name)
+        send(name, value)
+      elsif value.respond_to?(name)
+        value.send(name)
+      else
+        value
+      end
+    end
+  end
+end

data/lib/calyx/registry.rb

@@ -1,25 +1,30 @@
 module Calyx
   class Registry
-    attr_reader :rules, :mappings
+    attr_reader :rules, :transforms
 
     def initialize
       @rules = {}
-      @mappings = {}
+      @transforms = {}
+      @modifier = Modifier.new
     end
 
     def method_missing(name, *arguments)
       rule(name, *arguments)
     end
 
+    def modifier(name)
+      @modifier.extend_with(name)
+    end
+
     def mapping(name, pairs)
-      mappings[name.to_sym] = construct_mapping(pairs)
+      transforms[name.to_sym] = construct_mapping(pairs)
     end
 
     def filter(name, callable=nil, &block)
       if block_given?
-        mappings[name.to_sym] = block
+        transforms[name.to_sym] = block
       else
-        mappings[name.to_sym] = callable
+        transforms[name.to_sym] = callable
       end
     end
 
@@ -32,12 +37,10 @@ module Calyx
     end
 
     def transform(name, value)
-      if value.respond_to?(name)
-        value.send(name)
-      elsif mappings.key?(name)
-        mappings[name].call(value)
+      if transforms.key?(name)
+        transforms[name].call(value)
       else
-        value
+        @modifier.transform(name, value)
       end
     end
 

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.10.3'.freeze
+  VERSION = '0.10.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - lib/calyx/errors.rb
 - lib/calyx/file_converter.rb
 - lib/calyx/grammar.rb
+- lib/calyx/modifier.rb
 - lib/calyx/production/choices.rb
 - lib/calyx/production/concat.rb
 - lib/calyx/production/expression.rb