vedeu 0.4.60 → 0.4.61

data/test/lib/vedeu/templating/template_test.rb

@@ -33,9 +33,10 @@ module Vedeu
         end
 
         context 'when the path exists' do
-          let(:path) { 'test/support/templates/inline.erb' }
+          let(:path) { 'test/support/templates/plain.erb' }
+          let(:expected) { "This is a test.\n" }
 
-          it { subject.must_equal("This is a test.\n") }
+          it { subject.must_equal(expected) }
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.4.60
+  version: 0.4.61
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -275,6 +275,9 @@ files:
 - lib/vedeu/bindings/system.rb
 - lib/vedeu/bindings/visibility.rb
 - lib/vedeu/bootstrap.rb
+- lib/vedeu/borders/border.rb
+- lib/vedeu/borders/borders.rb
+- lib/vedeu/borders/render_border.rb
 - lib/vedeu/buffers/buffer.rb
 - lib/vedeu/buffers/buffers.rb
 - lib/vedeu/buffers/display_buffer.rb
@@ -398,8 +401,6 @@ files:
 - lib/vedeu/null/geometry.rb
 - lib/vedeu/null/interface.rb
 - lib/vedeu/null/menu.rb
-- lib/vedeu/output/border.rb
-- lib/vedeu/output/borders.rb
 - lib/vedeu/output/clear/named_group.rb
 - lib/vedeu/output/clear/named_interface.rb
 - lib/vedeu/output/compressor.rb
@@ -409,7 +410,6 @@ files:
 - lib/vedeu/output/presentation.rb
 - lib/vedeu/output/refresh.rb
 - lib/vedeu/output/refresh_group.rb
-- lib/vedeu/output/render_border.rb
 - lib/vedeu/output/renderers.rb
 - lib/vedeu/output/renderers/escape_sequence.rb
 - lib/vedeu/output/renderers/file.rb
@@ -434,9 +434,12 @@ files:
 - lib/vedeu/repositories/registerable.rb
 - lib/vedeu/repositories/repository.rb
 - lib/vedeu/repositories/store.rb
+- lib/vedeu/templating/all.rb
+- lib/vedeu/templating/decoder.rb
 - lib/vedeu/templating/directive.rb
+- lib/vedeu/templating/encoder.rb
 - lib/vedeu/templating/helpers.rb
-- lib/vedeu/templating/preprocessor.rb
+- lib/vedeu/templating/post_processor.rb
 - lib/vedeu/templating/template.rb
 - lib/vedeu/terminal.rb
 - lib/vedeu/terminal_mode.rb
@@ -457,6 +460,9 @@ files:
 - test/lib/vedeu/bindings/system_test.rb
 - test/lib/vedeu/bindings/visibility_test.rb
 - test/lib/vedeu/bootstrap_test.rb
+- test/lib/vedeu/borders/border_test.rb
+- test/lib/vedeu/borders/borders_test.rb
+- test/lib/vedeu/borders/render_border_test.rb
 - test/lib/vedeu/buffers/buffer_test.rb
 - test/lib/vedeu/buffers/buffers_test.rb
 - test/lib/vedeu/buffers/display_buffer_test.rb
@@ -547,8 +553,6 @@ files:
 - test/lib/vedeu/null/geometry_test.rb
 - test/lib/vedeu/null/interface_test.rb
 - test/lib/vedeu/null/menu_test.rb
-- test/lib/vedeu/output/border_test.rb
-- test/lib/vedeu/output/borders_test.rb
 - test/lib/vedeu/output/clear/named_group_test.rb
 - test/lib/vedeu/output/clear/named_interface_test.rb
 - test/lib/vedeu/output/compressor_test.rb
@@ -558,8 +562,6 @@ files:
 - test/lib/vedeu/output/presentation_test.rb
 - test/lib/vedeu/output/refresh_group_test.rb
 - test/lib/vedeu/output/refresh_test.rb
-- test/lib/vedeu/output/render_border_test.rb
-- test/lib/vedeu/output/renderers/all_test.rb
 - test/lib/vedeu/output/renderers/escape_sequence_test.rb
 - test/lib/vedeu/output/renderers/file_test.rb
 - test/lib/vedeu/output/renderers/html_test.rb
@@ -568,6 +570,7 @@ files:
 - test/lib/vedeu/output/renderers/renderer_options_test.rb
 - test/lib/vedeu/output/renderers/terminal_test.rb
 - test/lib/vedeu/output/renderers/text_test.rb
+- test/lib/vedeu/output/renderers_test.rb
 - test/lib/vedeu/output/style_test.rb
 - test/lib/vedeu/output/text_test.rb
 - test/lib/vedeu/output/viewport_test.rb
@@ -582,9 +585,11 @@ files:
 - test/lib/vedeu/repositories/registerable_test.rb
 - test/lib/vedeu/repositories/repository_test.rb
 - test/lib/vedeu/repositories/store_test.rb
+- test/lib/vedeu/templating/decoder_test.rb
 - test/lib/vedeu/templating/directive_test.rb
+- test/lib/vedeu/templating/encoder_test.rb
 - test/lib/vedeu/templating/helpers_test.rb
-- test/lib/vedeu/templating/preprocessor_test.rb
+- test/lib/vedeu/templating/post_processor_test.rb
 - test/lib/vedeu/templating/template_test.rb
 - test/lib/vedeu/terminal_mode_test.rb
 - test/lib/vedeu/terminal_test.rb
@@ -594,7 +599,7 @@ files:
 - test/support/all_seeds.sh
 - test/support/helpers/model_test_class.rb
 - test/support/stats.sh
-- test/support/templates/inline.erb
+- test/support/templates/plain.erb
 - test/support/templates/simple_stuff.erb
 - test/test_helper.rb
 - vedeu.gemspec
@@ -637,6 +642,9 @@ test_files:
 - test/lib/vedeu/bindings/system_test.rb
 - test/lib/vedeu/bindings/visibility_test.rb
 - test/lib/vedeu/bootstrap_test.rb
+- test/lib/vedeu/borders/border_test.rb
+- test/lib/vedeu/borders/borders_test.rb
+- test/lib/vedeu/borders/render_border_test.rb
 - test/lib/vedeu/buffers/buffer_test.rb
 - test/lib/vedeu/buffers/buffers_test.rb
 - test/lib/vedeu/buffers/display_buffer_test.rb
@@ -727,8 +735,6 @@ test_files:
 - test/lib/vedeu/null/geometry_test.rb
 - test/lib/vedeu/null/interface_test.rb
 - test/lib/vedeu/null/menu_test.rb
-- test/lib/vedeu/output/border_test.rb
-- test/lib/vedeu/output/borders_test.rb
 - test/lib/vedeu/output/clear/named_group_test.rb
 - test/lib/vedeu/output/clear/named_interface_test.rb
 - test/lib/vedeu/output/compressor_test.rb
@@ -738,8 +744,6 @@ test_files:
 - test/lib/vedeu/output/presentation_test.rb
 - test/lib/vedeu/output/refresh_group_test.rb
 - test/lib/vedeu/output/refresh_test.rb
-- test/lib/vedeu/output/render_border_test.rb
-- test/lib/vedeu/output/renderers/all_test.rb
 - test/lib/vedeu/output/renderers/escape_sequence_test.rb
 - test/lib/vedeu/output/renderers/file_test.rb
 - test/lib/vedeu/output/renderers/html_test.rb
@@ -748,6 +752,7 @@ test_files:
 - test/lib/vedeu/output/renderers/renderer_options_test.rb
 - test/lib/vedeu/output/renderers/terminal_test.rb
 - test/lib/vedeu/output/renderers/text_test.rb
+- test/lib/vedeu/output/renderers_test.rb
 - test/lib/vedeu/output/style_test.rb
 - test/lib/vedeu/output/text_test.rb
 - test/lib/vedeu/output/viewport_test.rb
@@ -762,9 +767,11 @@ test_files:
 - test/lib/vedeu/repositories/registerable_test.rb
 - test/lib/vedeu/repositories/repository_test.rb
 - test/lib/vedeu/repositories/store_test.rb
+- test/lib/vedeu/templating/decoder_test.rb
 - test/lib/vedeu/templating/directive_test.rb
+- test/lib/vedeu/templating/encoder_test.rb
 - test/lib/vedeu/templating/helpers_test.rb
-- test/lib/vedeu/templating/preprocessor_test.rb
+- test/lib/vedeu/templating/post_processor_test.rb
 - test/lib/vedeu/templating/template_test.rb
 - test/lib/vedeu/terminal_mode_test.rb
 - test/lib/vedeu/terminal_test.rb
@@ -774,7 +781,7 @@ test_files:
 - test/support/all_seeds.sh
 - test/support/helpers/model_test_class.rb
 - test/support/stats.sh
-- test/support/templates/inline.erb
+- test/support/templates/plain.erb
 - test/support/templates/simple_stuff.erb
 - test/test_helper.rb
 has_rdoc: 

data/lib/vedeu/templating/preprocessor.rb

@@ -1,81 +0,0 @@
-module Vedeu
-
-  # Provides means to use templates with Vedeu.
-  module Templating
-
-    # preprocess
-    #   takes a line at a time
-    #   splits line into component parts e.g. text1, ruby, text1
-    #     takes text1, adds to JSON stream
-    #     processes ruby, adding to a new JSON stream
-    #     takes text2, adds to a JSON stream
-    #
-    # process
-    #   converts JSON streams into line/stream objects with correct attributes
-    #
-    # Pre-processes a template, to convert all lines and lines with directives
-    # into Vedeu::Streams.
-    #
-    class Preprocessor
-
-      # @param lines [Array<String>]
-      # @return [Array<Vedeu::Stream>]
-      def self.process(lines)
-        new(lines).process
-      end
-
-      # Returns a new instance of Vedeu::Templating::Preprocessor.
-      #
-      # @param lines [Array<String>]
-      # @return [Vedeu::Templating::Preprocessor]
-      def initialize(lines)
-        @lines = lines
-      end
-
-      # @return [Array<Vedeu::Stream>]
-      def process
-        lines.each_with_object([]) do |line, acc|
-          if line =~ markers?
-            code = line.gsub(markers, '').chomp
-
-            acc << Directive.process(code)
-
-          else
-            acc << Vedeu::Stream.new(value: line.chomp)
-
-          end
-          acc
-        end
-      end
-
-      protected
-
-      # @!attribute [r] lines
-      # @return [Array<String>]
-      attr_reader :lines
-
-      private
-
-      # Return a pattern to remove directive markers and spaces.
-      #
-      # @example
-      #   line containing {{ or }}
-      #
-      # @return [Regexp]
-      def markers
-        /({{\s*|\s*}})/
-      end
-
-      # @example
-      #   line contains {{ or }}
-      #
-      # @return [Regexp]
-      def markers?
-        /^\s*({{)(.*?)(}})$/
-      end
-
-    end # Preprocessor
-
-  end # Templating
-
-end # Vedeu