ns-macro-processor 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfda59e0f1b9049b21ab6414b488109a9d7dff24
-  data.tar.gz: cfea9027782ecaa67a87d4d97f2710a86791d50d
+  metadata.gz: d4c6acbce70533c0ec4bb0401502331b160d627c
+  data.tar.gz: 36221f37910e0e2071ab17cb0d9d137e3f8e224b
 SHA512:
-  metadata.gz: f94af0efc77b90e3ed4a1b1675505f80f116fcaec23a0bd9e1984ce83575f23e8c0a9c07b6dfee504949aa335f4878bac804b30f2e2252b2c337da0a38e9f1ea
-  data.tar.gz: 685c9fcfdcc8dbc775513c851dc4e9e07ffbc271076eb06f10603ad0a64bc55c5f5163b0048c39a8842e729b03fbd7a1374644dc8fafa523eaf760d74295bc2d
+  metadata.gz: 563814813617135dd792b371f2bba02b0fef481336d03ae3ca69d838fa7ec96a0f7439ef85393cef55a32a15b3a21719e07b16dc2ebc6dd4c000d6f8d6d6ba17
+  data.tar.gz: 4aa822f7c63e5cd17bdbf73b27d286ebea08678f7be79b1046cc2e5f5430ac53a5385575ff7e8da99365fcf14b0f54e17c1c0f34e61ae17a5c1b235ed7d0f3f8

data/lib/ns_macro_processor.rb

@@ -0,0 +1,83 @@
+require_relative 'ns_macro_processor/processor_error'
+require_relative 'ns_macro_processor/syntax_error'
+require_relative 'ns_macro_processor/tokens'
+
+module NsMacroProcessor
+
+  class Processor
+
+    def initialize(params)
+      @params = params
+    end
+
+    def parse(text)
+      @tokens = Tokens.new(text)
+      @tokens.advance
+      result = words
+      expect(Tokens::EOF)
+      result
+    end
+
+    private
+
+    def words
+      result = []
+      while @tokens.peek != Tokens::EOF
+        result << word
+      end
+      result.join
+    end
+
+    def word
+      result = @tokens.peek
+      @tokens.advance
+      if result == '~' and accept('{')
+        @tokens.push_back(macro)
+        result = word
+      end
+      result
+    end
+
+    def macro
+      args = []
+      loop do
+        args << word
+        break if @tokens.peek == '}' || @tokens.peek == Tokens::EOF
+      end
+      expect('}')
+      execute(args.join.split(' '))
+    end
+
+    def execute(args)
+      if args[0] == 'include'
+        return lookup(:filestore).contents_of(args[1])
+      else
+        return lookup(args[0])
+      end
+    end
+
+    def lookup(field_name)
+      value = @params[field_name] || @params[field_name.to_sym]
+      raise ProcessorError.new(field_name) unless value
+      value
+    end
+
+    def accept(s)
+      if (@tokens.peek == s)
+        @tokens.advance
+        true
+      else
+        false
+      end
+    end
+
+    def expect(s)
+      return true if accept(s)
+      raise SyntaxError.new(s, @tokens.peek)
+      false
+    end
+
+  end
+
+end
+

data/lib/{processor_error.rb → ns_macro_processor/processor_error.rb}

@@ -1,4 +1,4 @@
-module MacroProcessor
+module NsMacroProcessor
 
   class ProcessorError < StandardError
     def initialize(field_name)

data/lib/{syntax_error.rb → ns_macro_processor/syntax_error.rb}

@@ -1,4 +1,4 @@
-module MacroProcessor
+module NsMacroProcessor
 
   class SyntaxError < StandardError
     def initialize(expected, actual)

data/lib/ns_macro_processor/tokens.rb

@@ -0,0 +1,63 @@
+module NsMacroProcessor
+
+  class Tokens
+
+    EOF = -1
+
+    def initialize(input)
+      @input = input
+    end
+
+    def advance
+      if @input.nil? || @input.empty?
+        @current = EOF
+        return
+      end
+      ix = 0
+      if whitespace?(@input[ix])
+        while ix < @input.length && whitespace?(@input[ix])
+          ix += 1
+        end
+        @current = ' '
+        @input = @input[ix..-1]
+        return
+      end
+      if ident_start?(@input[ix])
+        while ix < @input.length && ident?(@input[ix])
+          ix += 1
+        end
+        @current = @input[0, ix]
+        @input = @input[ix..-1]
+        return
+      end
+      @current = @input[0]
+      @input = @input[1..-1]
+    end
+
+    def peek
+      @current
+    end
+
+    def push_back(str)
+      @input = (@current == EOF) ? str + @input : str + @current + @input
+      advance
+    end
+
+    private
+
+    def ident_start?(ch)
+      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_/".include?(ch)
+    end
+
+    def ident?(ch)
+      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-/_".include?(ch)
+    end
+
+    def whitespace?(ch)
+      " \t\n\r".include?(ch)
+    end
+
+  end
+
+end
+

data/ns-macro-processor.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'ns-macro-processor'
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.licenses      = ['MIT']
   spec.authors       = ['Kevin Rutherford']
   spec.email         = ['kevin@rutherford-software.com']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ns-macro-processor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kevin Rutherford
@@ -35,10 +35,10 @@ files:
 - Gemfile
 - Gemfile.lock
 - Makefile
-- lib/macro_processor.rb
-- lib/processor_error.rb
-- lib/syntax_error.rb
-- lib/tokens.rb
+- lib/ns_macro_processor.rb
+- lib/ns_macro_processor/processor_error.rb
+- lib/ns_macro_processor/syntax_error.rb
+- lib/ns_macro_processor/tokens.rb
 - ns-macro-processor.gemspec
 homepage: https://github.com/kevinrutherford/ns-macro-processor
 licenses:

data/lib/macro_processor.rb

@@ -1,79 +0,0 @@
-require_relative './processor_error'
-require_relative './syntax_error'
-require_relative './tokens'
-
-class MacroProcessor
-
-  def initialize(params)
-    @params = params
-  end
-
-  def parse(text)
-    @tokens = Tokens.new(text)
-    @tokens.advance
-    result = words
-    expect(Tokens::EOF)
-    result
-  end
-
-  private
-
-  def words
-    result = []
-    while @tokens.peek != Tokens::EOF
-      result << word
-    end
-    result.join
-  end
-
-  def word
-    result = @tokens.peek
-    @tokens.advance
-    if result == '~' and accept('{')
-      @tokens.push_back(macro)
-      result = word
-    end
-    result
-  end
-
-  def macro
-    args = []
-    loop do
-      args << word
-      break if @tokens.peek == '}' || @tokens.peek == Tokens::EOF
-    end
-    expect('}')
-    execute(args.join.split(' '))
-  end
-
-  def execute(args)
-    if args[0] == 'include'
-      return lookup(:filestore).contents_of(args[1])
-    else
-      return lookup(args[0])
-    end
-  end
-
-  def lookup(field_name)
-    value = @params[field_name] || @params[field_name.to_sym]
-    raise ProcessorError.new(field_name) unless value
-    value
-  end
-
-  def accept(s)
-    if (@tokens.peek == s)
-      @tokens.advance
-      true
-    else
-      false
-    end
-  end
-
-  def expect(s)
-    return true if accept(s)
-    raise SyntaxError.new(s, @tokens.peek)
-    false
-  end
-
-end
-

data/lib/tokens.rb

@@ -1,59 +0,0 @@
-class Tokens
-
-  EOF = -1
-
-  def initialize(input)
-    @input = input
-  end
-
-  def advance
-    if @input.nil? || @input.empty?
-      @current = EOF
-      return
-    end
-    ix = 0
-    if whitespace?(@input[ix])
-      while ix < @input.length && whitespace?(@input[ix])
-        ix += 1
-      end
-      @current = ' '
-      @input = @input[ix..-1]
-      return
-    end
-    if ident_start?(@input[ix])
-      while ix < @input.length && ident?(@input[ix])
-        ix += 1
-      end
-      @current = @input[0, ix]
-      @input = @input[ix..-1]
-      return
-    end
-    @current = @input[0]
-    @input = @input[1..-1]
-  end
-
-  def peek
-    @current
-  end
-
-  def push_back(str)
-    @input = (@current == EOF) ? str + @input : str + @current + @input
-    advance
-  end
-
-  private
-
-  def ident_start?(ch)
-    "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_/".include?(ch)
-  end
-
-  def ident?(ch)
-    "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-/_".include?(ch)
-  end
-
-  def whitespace?(ch)
-    " \t\n\r".include?(ch)
-  end
-
-end
-