fictive 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbcae9d32392a059f5bd147d25d81c8777107831
-  data.tar.gz: 149c43598f3649abd697c29a1ba87b3de1b0365f
+  metadata.gz: 07df70dcf2a31222db91cd582c21addbee6b877e
+  data.tar.gz: 14edd07192ae1f6bba9fd48046da469c28e03b03
 SHA512:
-  metadata.gz: 0097631f0c9eade4357be2c8ea70859de55c93a4d069c5a8a0dad7f3ee2a88776dfc97b97c756b269db534c20f252162d0aefff2b6e714672a0377e9fd8fe11b
-  data.tar.gz: 61185da18fb82a7650ad29ab17e85528382067a9a2828f6819fd489a2687825ae17c27e4b4e310233aec4441bd7ec75813882812836517b8c6c44749ac72bf3b
+  metadata.gz: 82c12bd352ef15873184cea36a65a7d4af81c03c227b705d4b6e978314152b615531cbe630f6bbc89fc10c19955f87a9301a00472a24e68f83bf6bbd15a7bc96
+  data.tar.gz: ed8fc5bd88d84960eca09dcf941f974c1fbe5c0f5f4c199eea6bb0f58b875c5d47a769429ccbf3567f5472808bf86267ab7e7672bfbb39ec6908a2fc456a2400

data/lib/fictive/text/compiler.rb

@@ -10,44 +10,61 @@ module Fictive
       def process
         @scanner = StringScanner.new(@input)
 
-        Fictive::Text::Node.new(*parse_fragment)
+        Fictive::Text::Node.new(*parse_fragments)
       end
 
       private
 
       attr_reader :scanner
 
+      def parse_fragments
+        fragments = []
+        fragments << parse_fragment while !scanner.eos?
+        fragments
+      end
+
       def parse_fragment
         concat_fragment = scanner.scan_until(/{/)
 
         if concat_fragment
-          [Fictive::Text::TextNode.new(concat_fragment.gsub(/{/, '')), parse_delimiter]
+          Fictive::Text::Node.new(Fictive::Text::TextNode.new(concat_fragment.gsub(/{/, '')), parse_substitution)
         else
-          fragment = scanner.scan(/.+/)
-          Fictive::Text::TextNode.new(fragment)
+          concat_before_directive = scanner.scan_until(/~/)
+
+          if concat_before_directive
+            Fictive::Text::Node.new(Fictive::Text::TextNode.new(concat_before_directive.gsub(/~/, '')), parse_directive)
+          else
+            fragment = scanner.scan(/.+/)
+            Fictive::Text::TextNode.new(fragment)
+          end
         end
       end
 
-      def parse_delimiter
-        if scanner.scan(/{/)
-          parse_tag
-        else
-          parse_substitution
-        end
+      def parse_directive
+        return parse_conditional if scanner.scan(/if/)
+
+        raise 'Invalid syntax'
       end
 
-      def parse_tag
-        scanner.skip(/\s+/)
+      def parse_substitution
+        scanner.skip(/\s/)
 
-        parse_conditional if scanner.scan(/if/)
+        if reference = scanner.scan(/[A-Za-z0-9_\-!]/)
+          Fictive::Text::ReferenceNode.new(reference, {})
+        else
+          raise 'Invalid syntax'
+        end
+
+        scanner.skip(/\s*}/)
       end
 
       def parse_conditional
         raise 'missing whitespace in conditional tag' unless scanner.scan(/\s+/)
 
         expression = parse_expression
-        scanner.skip(/}}/)
-        consequent = scanner.scan_until(/{{\/if}}/).gsub(/{{\/if}}/, '')
+        scanner.skip(/:/)
+        scanner.skip(/\s/)
+        consequent = scanner.scan_until(/~/).gsub(/~/, '')
 
         Fictive::Text::ConditionalNode.new(
           Fictive::Text::ExpressionNode.new(
@@ -60,10 +77,6 @@ module Fictive
       def parse_expression
         Fictive::Text::TrueNode.new if scanner.scan(/true/)
       end
-
-      def parse_substitution
-
-      end
     end
 
     class Node
@@ -88,6 +101,17 @@ module Fictive
       end
     end
 
+    class ReferenceNode
+      def initialize(reference, symbol_table)
+        @reference = reference
+        @symbol_table = symbol_table
+      end
+
+      def evaluate
+        @symbol_table.fetch(@reference)
+      end
+    end
+
     class ConditionalNode
       # TODO: decide on array or explicit parameter convention
       #       eg: initialize(condition, consequent, alternative)

data/lib/fictive/version.rb

@@ -1,3 +1,3 @@
 module Fictive
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fictive
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler