vedeu 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4ccb72c3982e068887e6d1ac1e7dab94bfd25a9
-  data.tar.gz: a92614c47e5b02740ed486f0ea76bf3c3bbb8b67
+  metadata.gz: 831514463a8bea83f3e218ddd59dccc347049e34
+  data.tar.gz: 2e6f495bc8b2bed85942a4335ff3b3bca86b07dd
 SHA512:
-  metadata.gz: 056459bd4d73d522448bb43214420a255edf99dd58e3c5fc11d9b85da885a63badc6cc66e9cc5965e8815979f8d8e2cac846cef39154399dc4917e77bf93b375
-  data.tar.gz: e503cbc2ef1e1714c1993b37490c0d8d2ebc1fef012ed707018051ec7dc1927f9f8d71bea4882d89484d67a0bbb85a3889cb0d5f0328952bb5dffcd91a26adbc
+  metadata.gz: 9de37b9db1bc093309b4465f0ca3104b29ff9e2870b3a0eca008a9040e2c3317063ea74f4b67436a32dc952310f7314e05751fade11f0f7532ba18fc7757499f
+  data.tar.gz: 0d681db9caef7bebfbb5fcb01b48f3a4890ef8d62d8594c8efb496d7a7c8189ca1f46a02a3794d5775a4ba56696feedddb0760727900f219467860fa7c7377b3

data/deps.md

@@ -7,11 +7,6 @@ Application
   Process
   Terminal
 
-Builder
-  Geometry
-  Interface
-  Persistence
-
 ClearInterface
 
 Collection
@@ -44,16 +39,21 @@ Input
 
 Interface
   ClearInterface
+  Colour
   Geometry
   LineCollection
-  Presentation
   Queue
   RenderInterface
   Style
   Terminal
 
 InterfaceCollection
-  Persistence
+  InterfaceStore
+
+InterfaceTemplate
+  Geometry
+  Interface
+  InterfaceStore
 
 JSONParser
 
@@ -62,7 +62,7 @@ Launcher
   Configuration
 
 Line
-  Presentation
+  Colour
   StreamCollection
   Style
 
@@ -81,12 +81,9 @@ Parser
   JSONParser
   MenuParser
 
-Persistence
+InterfaceStore
   Interface
 
-Presentation
-  Colour
-
 Process
   Parser
   Queue
@@ -97,7 +94,7 @@ RenderInterface
   ClearInterface
 
 Stream
-  Presentation
+  Colour
   Style
 
 StreamCollection
@@ -132,10 +129,10 @@ Menu     - orphaned
 Grouped
 ----------------------------------------------------------------------
 
-Builder
+InterfaceTemplate
   Interface
   Geometry
-  Persistence
+  InterfaceStore
 
 Launcher
   Application
@@ -148,9 +145,12 @@ Launcher
       Parser
         Composition
           InterfaceCollection
-            Persistence
+            InterfaceStore
               Interface
                 ClearInterface
+                Colour
+                  Esc
+                    Translator
                 Geometry
                   Esc
                     Translator
@@ -160,27 +160,22 @@ Launcher
                 LineCollection
                   Collection
                   Line
-                    Presentation
-                      Colour
-                        Esc
-                          Translator
+                    Colour
+                      Esc
+                        Translator
                     StreamCollection
                       Collection
                       Stream
-                        Presentation
-                          Colour
-                            Esc
-                              Translator
+                        Colour
+                          Esc
+                            Translator
                         Style
                           Esc
                             Translator
                     Style
                       Esc
                         Translator
-                Presentation
-                  Colour
-                    Esc
-                      Translator
+
                 Queue
                 RenderInterface
                   ClearInterface

data/lib/vedeu.rb

@@ -1,13 +1,15 @@
 require 'vedeu/instrumentation'
-require 'vedeu/support/builder'
+require 'vedeu/support/interface_template'
 require 'vedeu/support/events'
-require 'vedeu/support/persistence'
+require 'vedeu/support/interface_store'
 
 require 'vedeu/support/geometry'
 require 'vedeu/support/menu'
 require 'vedeu/output/view'
 require 'vedeu/launcher'
 
+# Todo: mutation (events)
+
 module Vedeu
   # :nocov:
   def self.debug?
@@ -18,7 +20,7 @@ module Vedeu
 
   module API
     def interface(name, &block)
-      Builder.build(name, &block)
+      InterfaceTemplate.save(name, &block)
     end
 
     def on(name, delay = 0, &block)
@@ -32,7 +34,7 @@ module Vedeu
     alias_method :run, :trigger
 
     def view(name)
-      Persistence.query(name)
+      InterfaceStore.query(name)
     end
   end
 

data/lib/vedeu/instrumentation.rb

@@ -1,6 +1,5 @@
 require 'date'
 require 'logger'
-# require 'ruby-prof'
 
 require 'vedeu'
 
@@ -30,35 +29,6 @@ module Vedeu
       end
     end
 
-    # class Profile
-    #   def self.call(filename = 'profile.html', &block)
-    #     new(filename).profile(&block)
-    #   end
-
-    #   def initialize(filename)
-    #     @filename = filename
-    #   end
-
-    #   def profile(&block)
-    #     RubyProf.start
-
-    #     yield
-
-    #     result = RubyProf.stop.eliminate_methods!([/^Array/, /^Hash/])
-
-    #     File.open(filename, 'w') do |file|
-    #       RubyProf::CallStackPrinter.new(result).print(file)
-    #       RubyProf::GraphPrinter.new(result).print(file)
-    #     end
-    #   end
-
-    #   private
-
-    #   def filename
-    #     Vedeu.root_path + '/tmp/' + @filename
-    #   end
-    # end
-
     class Trace
       def self.call(options = {})
         new(options).trace

data/lib/vedeu/models/attributes/interface_collection.rb

@@ -1,6 +1,8 @@
 require 'virtus'
 
-require 'vedeu/support/persistence'
+require 'vedeu/support/interface_store'
+
+# Todo: mutation (persistence)
 
 module Vedeu
   class InterfaceCollection < Virtus::Attribute
@@ -8,7 +10,7 @@ module Vedeu
       return [] if values.nil? || values.empty?
 
       [values].flatten.map do |value|
-        Persistence.update(value.fetch(:name, nil), value)
+        InterfaceStore.update(value.fetch(:name, nil), value)
       end
     end
   end

data/lib/vedeu/models/colour.rb

@@ -1,46 +1,32 @@
-require 'json'
 require 'virtus'
 
 require 'vedeu/support/esc'
 
 module Vedeu
-  class Colour
-    include Virtus.model
-
-    attribute :foreground, String, default: ''
-    attribute :background, String, default: ''
-
-    def foreground
-      @fg ||= Esc.foreground_colour(css_foreground)
-    end
+  class Background < Virtus::Attribute
+    def coerce(value)
+      return '' if value.nil? || value.empty?
 
-    def background
-      @bg ||= Esc.background_colour(css_background)
+      Esc.background_colour(value)
     end
+  end
 
-    def to_json(*args)
-      as_hash.to_json
-    end
+  class Foreground < Virtus::Attribute
+    def coerce(value)
+      return '' if value.nil? || value.empty?
 
-    def to_s
-      foreground + background
+      Esc.foreground_colour(value)
     end
+  end
 
-    private
-
-    def as_hash
-      {
-        foreground: css_foreground,
-        background: css_background,
-      }
-    end
+  class Colour
+    include Virtus.model
 
-    def css_foreground
-      @foreground
-    end
+    attribute :foreground, Foreground, default: ''
+    attribute :background, Background, default: ''
 
-    def css_background
-      @background
+    def to_s
+      foreground + background
     end
   end
 end

data/lib/vedeu/models/composition.rb

@@ -1,8 +1,9 @@
-require 'json'
 require 'virtus'
 
 require 'vedeu/models/attributes/interface_collection'
 
+# Todo: mutation (interfaces)
+
 module Vedeu
   class Composition
     include Virtus.model
@@ -14,13 +15,7 @@ module Vedeu
     end
 
     def enqueue
-      interfaces.map { |interface| interface.enqueue }
-    end
-
-    def to_json
-      {
-        interfaces: interfaces
-      }.to_json
+      interfaces.map(&:enqueue)
     end
 
     def to_s

data/lib/vedeu/models/interface.rb

@@ -1,9 +1,8 @@
-require 'json'
 require 'virtus'
 
 require 'vedeu'
 require 'vedeu/models/attributes/line_collection'
-require 'vedeu/models/presentation'
+require 'vedeu/models/colour'
 require 'vedeu/models/style'
 require 'vedeu/output/clear_interface'
 require 'vedeu/output/render_interface'
@@ -11,15 +10,17 @@ require 'vedeu/support/geometry'
 require 'vedeu/support/queue'
 require 'vedeu/support/terminal'
 
+# Todo: mutation (events, current)
+
 module Vedeu
   class Interface
     include Vedeu::Queue
     include Virtus.model
-    include Presentation
-    include Style
 
     attribute :name,    String
     attribute :lines,   LineCollection
+    attribute :colour,  Colour,  default: Colour.new
+    attribute :style,   Style,   default: ''
     attribute :y,       Integer, default: 1
     attribute :x,       Integer, default: 1
     attribute :width,   Integer, default: Terminal.width
@@ -27,12 +28,14 @@ module Vedeu
     attribute :current, String,  default: ''
     attribute :cursor,  Boolean, default: true
     attribute :centred, Boolean, default: false
-    attribute :delay,   Float,   default: 0.0
+    attribute :delay,   Float,   default: 0
 
     def initialize(attributes = {})
-      Vedeu.events.on(:refresh, attributes[:delay]) { refresh }
-
       super
+
+      Vedeu.events.on(:refresh, self.delay) { refresh }
+
+      self
     end
 
     def clear
@@ -67,20 +70,6 @@ module Vedeu
       self.current
     end
 
-    def to_json(*args)
-      {
-        colour: colour,
-        style:  style_original,
-        name:   name,
-        lines:  lines,
-        y:      y,
-        x:      x,
-        width:  width,
-        height: height,
-        cursor: cursor
-      }.to_json
-    end
-
     def to_s
       RenderInterface.call(self)
     end

data/lib/vedeu/models/line.rb

@@ -1,26 +1,17 @@
-require 'json'
 require 'virtus'
 
 require 'vedeu/models/attributes/stream_collection'
-require 'vedeu/models/presentation'
+require 'vedeu/models/colour'
 require 'vedeu/models/style'
 
 module Vedeu
   class Line
     include Virtus.model
-    include Presentation
-    include Style
 
+    attribute :colour,  Colour, default: Colour.new
     attribute :model,   Hash
     attribute :streams, StreamCollection
-
-    def to_json
-      {
-        colour:  colour,
-        style:   style_original,
-        streams: streams
-      }.to_json
-    end
+    attribute :style,   Style,  default: ''
 
     def to_s
       [colour, style, streams].join

data/lib/vedeu/models/stream.rb

@@ -1,24 +1,15 @@
-require 'json'
 require 'virtus'
 
-require 'vedeu/models/presentation'
+require 'vedeu/models/colour'
 require 'vedeu/models/style'
 
 module Vedeu
   class Stream
     include Virtus.model
-    include Presentation
-    include Style
 
-    attribute :text, String, default: ''
-
-    def to_json
-      {
-        colour: colour,
-        style:  style_original,
-        text:   text
-      }.to_json
-    end
+    attribute :colour, Colour, default: Colour.new
+    attribute :style,  Style,  default: ''
+    attribute :text,   String, default: ''
 
     def to_s(options = {})
       [colour, style, text].join

data/lib/vedeu/models/style.rb

@@ -1,31 +1,19 @@
+require 'virtus'
+
 require 'vedeu/support/esc'
 
 module Vedeu
-  module Style
-    def style
-      @_style ||= if no_style?
-        ''
-
-      else
-        @style.map { |s| Esc.string(s) }.join
+  class Style < Virtus::Attribute
+    def coerce(value_or_values)
+      return '' if value_or_values.nil? || value_or_values.empty?
 
-      end
-    end
-
-    def style_original
-      @_original ||= if no_style?
-        ''
+      if value_or_values.is_a?(::Array)
+        value_or_values.map { |s| Esc.string(s) }.join
 
       else
-        @style
+        Esc.string(value_or_values)
 
       end
     end
-
-    private
-
-    def no_style?
-      @style.nil? || @style.empty?
-    end
   end
 end

data/lib/vedeu/output/erb_parser.rb

@@ -16,7 +16,12 @@ module Vedeu
 
     def parse
       {
-        interfaces: [{ name: interface, lines: TextAdaptor.adapt(erb_output) }]
+        interfaces: [
+          {
+            name:  interface,
+            lines: TextAdaptor.adapt(erb_output)
+          }
+        ]
       }
     end
 

data/lib/vedeu/output/render_interface.rb

@@ -34,18 +34,20 @@ module Vedeu
             if (line_length += stream.text.size) >= width
               remainder = width - line_length
 
-              new_stream = Stream.new(text:   truncate(stream.text, remainder),
-                                      style:  stream.style,
-                                      colour: stream.colour)
-              processed_streams << new_stream
+              processed_streams << Stream.new(
+                                    text:   truncate(stream.text, remainder),
+                                    style:  stream.style,
+                                    colour: stream.colour)
+
             else
               processed_streams << stream
+
             end
           end
 
-          new_line = Line.new(streams: processed_streams,
-                              style:   line.style,
-                              colour:  line.colour)
+          Line.new(streams: processed_streams,
+                   style:   line.style,
+                   colour:  line.colour)
         end
       end
     end

data/lib/vedeu/output/view.rb

@@ -38,9 +38,3 @@ module Vedeu
     end
   end
 end
-
-# ERBParser:  { :interface, :path, :object }
-# RawParser: { 'interface_name' => String|Array }
-#             { :interface_name  => String|Array }
-# JSONParser: output (string which is converted into a hash)
-# MenuParser: ['interface_name', Vedeu::Menu instance]

data/lib/vedeu/support/events.rb

@@ -1,3 +1,5 @@
+# Todo: mutation (events)
+
 module Vedeu
   class Events
     def initialize(&block)

data/lib/vedeu/support/helpers.rb

@@ -1,6 +1,8 @@
 require 'vedeu/support/esc'
 require 'vedeu/models/colour'
 
+# Todo: style method (actually whole thing)
+
 module Vedeu
   module Helpers
     def foreground(value, &block)

data/lib/vedeu/support/{persistence.rb → interface_store.rb}

@@ -1,27 +1,31 @@
 require 'vedeu/models/interface'
 
+# Todo: mutation (persistence)
+
 module Vedeu
   EntityNotFound = Class.new(StandardError)
 
-  module Persistence
+  module InterfaceStore
     extend self
 
     def update(name, attributes = {})
       interface = query(name)
       interface.attributes = attributes
       interface
+
     rescue EntityNotFound
       create(attributes)
+
     end
 
     def create(attributes)
       storage.store(attributes[:name], Interface.new(attributes))
     end
 
-    def query(value)
-      storage.select do |name, result|
-        return result if name == value
-      end unless value.nil? || value.empty?
+    def query(interface_name)
+      storage.select do |name, interface|
+        return interface if name == interface_name
+      end unless interface_name.nil? || interface_name.empty?
 
       fail EntityNotFound, "Interface could not be found."
     end

data/lib/vedeu/support/{builder.rb → interface_template.rb}

@@ -1,20 +1,20 @@
 require 'vedeu/support/geometry'
-require 'vedeu/support/persistence'
+require 'vedeu/support/interface_store'
 
 module Vedeu
-  class Builder
-    def self.build(name, &block)
-      new(name).build(&block)
+  class InterfaceTemplate
+    def self.save(name, &block)
+      new(name).save(&block)
     end
 
     def initialize(name)
       @name = name.to_s
     end
 
-    def build(&block)
+    def save(&block)
       self.instance_eval(&block)
 
-      Persistence.create(attributes)
+      InterfaceStore.create(attributes)
     end
 
     private

data/lib/vedeu/support/menu.rb

@@ -1,6 +1,8 @@
 require 'vedeu'
 require 'vedeu/support/events'
 
+# Todo: mutation (events, menu)
+
 module Vedeu
   class Menu
     def initialize(collection)

data/lib/vedeu/support/queue.rb

@@ -1,3 +1,5 @@
+# Todo: mutation (queue)
+
 module Vedeu
   module Queue
     extend self
@@ -13,7 +15,7 @@ module Vedeu
     end
 
     def enqueued?
-      store.size > 0
+      store.any?
     end
 
     def reset

data/test/lib/vedeu/models/attributes/interface_collection_test.rb

@@ -1,11 +1,11 @@
 require 'test_helper'
-require 'vedeu/models/attributes/interface_collection'
 require 'vedeu/models/composition'
+require 'vedeu/models/attributes/interface_collection'
 
 module Vedeu
   describe InterfaceCollection do
     describe '#coerce' do
-      before { Persistence.reset }
+      before { InterfaceStore.reset }
 
       it 'returns an empty collection when there are no interfaces' do
         composition = Composition.new

data/test/lib/vedeu/models/colour_test.rb

@@ -27,39 +27,6 @@ module Vedeu
       end
     end
 
-    describe '#to_json' do
-      it 'returns the model as JSON' do
-        Colour.new({
-          foreground: '#ff0000',
-          background: '#000000'
-        }).to_json.must_equal(
-          "{\"foreground\":\"#ff0000\",\"background\":\"#000000\"}"
-        )
-      end
-
-      it 'returns an escape sequence when the foreground is missing' do
-        Colour.new({
-          background: '#000000'
-        }).to_json.must_equal(
-          "{\"foreground\":\"\",\"background\":\"#000000\"}"
-        )
-      end
-
-      it 'returns an escape sequence when the background is missing' do
-        Colour.new({
-          foreground: '#ff0000',
-        }).to_json.must_equal(
-          "{\"foreground\":\"#ff0000\",\"background\":\"\"}"
-        )
-      end
-
-      it 'returns an empty string when both are missing' do
-        Colour.new.to_json.must_equal(
-          "{\"foreground\":\"\",\"background\":\"\"}"
-        )
-      end
-    end
-
     describe '#to_s' do
       it 'returns an escape sequence' do
         Colour.new({

data/test/lib/vedeu/models/composition_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 require 'vedeu/models/composition'
-require 'vedeu/support/persistence'
+require 'vedeu/support/interface_store'
 
 module Vedeu
   describe Composition do
@@ -31,10 +31,10 @@ module Vedeu
         }
 
         Composition.enqueue(attributes)
-        Persistence
+        InterfaceStore
           .query('Composition.enqueue_1').dequeue
           .must_match(/bd459118e6175689e4394e242debc2ae/)
-        Persistence
+        InterfaceStore
           .query('Composition.enqueue_2').dequeue
           .must_match(/837acb2cb2ea3ef359257851142a7830/)
       end
@@ -56,29 +56,9 @@ module Vedeu
       end
     end
 
-    describe '#to_json' do
-      it 'returns the model as JSON' do
-        attributes = {
-          interfaces: [
-            {
-              name: 'Composition#to_json',
-              width: 5,
-              height: 5,
-              colour: {
-                foreground: '#ffff33',
-                background: '#ffff77'
-              }
-            }
-          ]
-        }
-
-        Composition.new(attributes).to_json.must_equal("{\"interfaces\":[{\"colour\":{\"foreground\":\"\#ffff33\",\"background\":\"\#ffff77\"},\"style\":\"\",\"name\":\"Composition#to_json\",\"lines\":[],\"y\":1,\"x\":1,\"width\":5,\"height\":5,\"cursor\":true}]}")
-      end
-    end
-
     describe '#to_s' do
       it 'returns the stringified content for a single interface, single line, single stream' do
-        Persistence.create({ name: 'int1_lin1_str1', y: 3, x: 3, width: 15, height: 3 })
+        InterfaceStore.create({ name: 'int1_lin1_str1', y: 3, x: 3, width: 15, height: 3 })
         json = File.read('test/support/json/int1_lin1_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -91,7 +71,7 @@ module Vedeu
       end
 
       it 'returns the stringified content for a single interface, single line, multiple streams' do
-        Persistence.create({ name: 'int1_lin1_str3', y: 3, x: 3, width: 30, height: 3 })
+        InterfaceStore.create({ name: 'int1_lin1_str3', y: 3, x: 3, width: 30, height: 3 })
         json = File.read('test/support/json/int1_lin1_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -104,7 +84,7 @@ module Vedeu
       end
 
       it 'returns the stringified content for a single interface, multiple lines, single stream' do
-        Persistence.create({ name: 'int1_lin2_str1', y: 3, x: 3, width: 15, height: 3 })
+        InterfaceStore.create({ name: 'int1_lin2_str1', y: 3, x: 3, width: 15, height: 3 })
         json = File.read('test/support/json/int1_lin2_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -118,7 +98,7 @@ module Vedeu
       end
 
       it 'returns the stringified content for a single interface, multiple lines, multiple streams' do
-        Persistence.create({ name: 'int1_lin2_str3', y: 3, x: 3, width: 30, height: 3 })
+        InterfaceStore.create({ name: 'int1_lin2_str3', y: 3, x: 3, width: 30, height: 3 })
         json = File.read('test/support/json/int1_lin2_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -134,7 +114,7 @@ module Vedeu
       it 'returns the stringified content for a single interface, multiple lines, multiple streams, streams contain styles' do
         json = File.read('test/support/json/int1_lin2_str3_styles.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
-        Persistence.create({ name: 'int1_lin2_str3_styles', y: 3, x: 3, width: 30, height: 3 })
+        InterfaceStore.create({ name: 'int1_lin2_str3_styles', y: 3, x: 3, width: 30, height: 3 })
 
         Composition.new(attributes).to_s.must_equal(
           "\e[3;3H                              \e[3;3H" \
@@ -145,8 +125,8 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, single line, single stream' do
-        Persistence.create({ name: 'int2_lin1_str1_1', y: 3, x: 3, width: 15, height: 3 })
-        Persistence.create({ name: 'int2_lin1_str1_2', y: 6, x: 6, width: 15, height: 3 })
+        InterfaceStore.create({ name: 'int2_lin1_str1_1', y: 3, x: 3, width: 15, height: 3 })
+        InterfaceStore.create({ name: 'int2_lin1_str1_2', y: 6, x: 6, width: 15, height: 3 })
         json = File.read('test/support/json/int2_lin1_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -163,8 +143,8 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, single line, multiple streams' do
-        Persistence.create({ name: 'int2_lin1_str3_1', y: 3, x: 3, width: 30, height: 3 })
-        Persistence.create({ name: 'int2_lin1_str3_2', y: 6, x: 6, width: 30, height: 3 })
+        InterfaceStore.create({ name: 'int2_lin1_str3_1', y: 3, x: 3, width: 30, height: 3 })
+        InterfaceStore.create({ name: 'int2_lin1_str3_2', y: 6, x: 6, width: 30, height: 3 })
         json = File.read('test/support/json/int2_lin1_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -181,8 +161,8 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, multiple lines, single stream' do
-        Persistence.create({ name: 'int2_lin2_str1_1', y: 3, x: 3, width: 15, height: 3 })
-        Persistence.create({ name: 'int2_lin2_str1_2', y: 6, x: 6, width: 15, height: 3 })
+        InterfaceStore.create({ name: 'int2_lin2_str1_1', y: 3, x: 3, width: 15, height: 3 })
+        InterfaceStore.create({ name: 'int2_lin2_str1_2', y: 6, x: 6, width: 15, height: 3 })
         json = File.read('test/support/json/int2_lin2_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -201,8 +181,8 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, multiple lines, multiple streams' do
-        Persistence.create({ name: 'int2_lin2_str3_1', y: 3, x: 3, width: 30, height: 3 })
-        Persistence.create({ name: 'int2_lin2_str3_2', y: 6, x: 6, width: 30, height: 3 })
+        InterfaceStore.create({ name: 'int2_lin2_str3_1', y: 3, x: 3, width: 30, height: 3 })
+        InterfaceStore.create({ name: 'int2_lin2_str3_2', y: 6, x: 6, width: 30, height: 3 })
         json = File.read('test/support/json/int2_lin2_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -221,8 +201,8 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, multiple lines, multiple streams, streams contain styles' do
-        Persistence.create({ name: 'int2_lin2_str3_styles_1', y: 3, x: 3, width: 30, height: 3 })
-        Persistence.create({ name: 'int2_lin2_str3_styles_2', y: 6, x: 6, width: 30, height: 3 })
+        InterfaceStore.create({ name: 'int2_lin2_str3_styles_1', y: 3, x: 3, width: 30, height: 3 })
+        InterfaceStore.create({ name: 'int2_lin2_str3_styles_2', y: 6, x: 6, width: 30, height: 3 })
         json = File.read('test/support/json/int2_lin2_str3_styles.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 

data/test/lib/vedeu/models/interface_test.rb

@@ -212,20 +212,5 @@ module Vedeu
         )
       end
     end
-
-    describe '#to_json' do
-      it 'returns an String' do
-        Interface.new({
-          name:   '#to_json',
-          lines:  [],
-          colour: {
-            foreground: '#ff0000',
-            background: '#000000'
-          },
-          width:  3,
-          height: 3
-        }).to_json.must_equal("{\"colour\":{\"foreground\":\"#ff0000\",\"background\":\"#000000\"},\"style\":\"\",\"name\":\"#to_json\",\"lines\":[],\"y\":1,\"x\":1,\"width\":3,\"height\":3,\"cursor\":true}")
-      end
-    end
   end
 end

data/test/lib/vedeu/models/line_test.rb

@@ -27,12 +27,6 @@ module Vedeu
       line.streams.must_equal([])
     end
 
-    describe '#to_json' do
-      it 'returns a String' do
-        line.to_json.must_equal("{\"colour\":{\"foreground\":\"#ff0000\",\"background\":\"#000000\"},\"style\":[\"normal\"],\"streams\":[]}")
-      end
-    end
-
     describe '#to_s' do
       it 'returns a String' do
         line.to_s.must_equal(

data/test/lib/vedeu/models/stream_test.rb

@@ -35,11 +35,5 @@ module Vedeu
         )
       end
     end
-
-    describe '#to_json' do
-      it 'returns a String' do
-        stream.to_json.must_equal("{\"colour\":{\"foreground\":\"#ff0000\",\"background\":\"#000000\"},\"style\":[\"normal\"],\"text\":\"Some text\"}")
-      end
-    end
   end
 end

data/test/lib/vedeu/models/style_test.rb

@@ -1,11 +1,11 @@
 require 'test_helper'
-require 'vedeu/models/presentation'
 require 'vedeu/models/style'
 
 module Vedeu
   class TestStyle
-    include Presentation
-    include Style
+    include Virtus.model
+
+    attribute :style, Style
   end
 
   describe Style do
@@ -45,42 +45,5 @@ module Vedeu
         model.style.must_equal('')
       end
     end
-
-    describe '#style_original' do
-      it 'returns an escape sequence for a single style' do
-        model = TestStyle.new(style: 'normal')
-        model.style_original.must_equal(['normal'])
-      end
-
-      it 'returns an escape sequence for multiple styles' do
-        model = TestStyle.new(style: ['normal', 'underline'])
-        model.style_original.must_equal(['normal', 'underline'])
-      end
-
-      it 'returns an empty string for an unknown style' do
-        model = TestStyle.new(style: 'unknown')
-        model.style_original.must_equal(['unknown'])
-      end
-
-      it 'has a style attribute' do
-        model = TestStyle.new(style: ['normal'])
-        model.style_original.must_equal(['normal'])
-      end
-
-      it 'returns an empty string for empty or nil' do
-        model = TestStyle.new(style: '')
-        model.style_original.must_equal([''])
-      end
-
-      it 'returns an empty string for empty or nil' do
-        model = TestStyle.new(style: nil)
-        model.style_original.must_equal('')
-      end
-
-      it 'returns an empty string for empty or nil' do
-        model = TestStyle.new(style: [])
-        model.style_original.must_equal('')
-      end
-    end
   end
 end

data/test/lib/vedeu/output/clear_interface_test.rb

@@ -1,11 +1,11 @@
 require 'test_helper'
 require 'vedeu/output/clear_interface'
 require 'vedeu/models/interface'
-require 'vedeu/support/persistence'
+require 'vedeu/support/interface_store'
 
 module Vedeu
   describe ClearInterface do
-    before { Persistence.reset }
+    before { InterfaceStore.reset }
 
     describe '.call' do
       it 'returns the escape sequence to clear the whole interface' do

data/test/lib/vedeu/output/render_interface_test.rb

@@ -1,11 +1,11 @@
 require 'test_helper'
 require 'vedeu/output/render_interface'
 require 'vedeu/models/interface'
-require 'vedeu/support/persistence'
+require 'vedeu/support/interface_store'
 
 module Vedeu
   describe RenderInterface do
-    before { Persistence.reset }
+    before { InterfaceStore.reset }
 
     describe '.call' do
       it 'returns the content for the interface' do

data/test/lib/vedeu/support/{persistence_test.rb → interface_store_test.rb}

@@ -1,50 +1,50 @@
 require 'test_helper'
-require 'vedeu/support/persistence'
+require 'vedeu/support/interface_store'
 
 module Vedeu
-  describe Persistence do
-    before { Persistence.reset }
+  describe InterfaceStore do
+    before { InterfaceStore.reset }
 
     describe '.update' do
       it 'returns an Interface' do
-        Persistence.update('dummy', { name: 'dumber' })
+        InterfaceStore.update('dummy', { name: 'dumber' })
           .must_be_instance_of(Interface)
       end
 
       it 'updates and returns the existing interface when the interface exists' do
-        Persistence.update('dummy', { name: 'dumber' }).name
+        InterfaceStore.update('dummy', { name: 'dumber' }).name
           .must_equal('dumber')
       end
 
       it 'returns a new interface when the interface does not exist' do
-        Persistence.update('dummy', { name: 'dumber' }).name
+        InterfaceStore.update('dummy', { name: 'dumber' }).name
           .must_equal('dumber')
       end
     end
 
     describe '#create' do
       it 'creates and returns the stored record' do
-        Persistence.create({ name: 'dummy' })
+        InterfaceStore.create({ name: 'dummy' })
           .must_be_instance_of(Interface)
       end
     end
 
     describe '#query' do
       it 'returns the record when found' do
-        Persistence.create({ name: 'hydrogen' })
+        InterfaceStore.create({ name: 'hydrogen' })
 
-        Persistence.query('hydrogen').name.must_equal('hydrogen')
+        InterfaceStore.query('hydrogen').name.must_equal('hydrogen')
       end
 
       it 'raises an exception when the record cannot be found' do
-        proc { Persistence.query('dummy') }.must_raise(EntityNotFound)
+        proc { InterfaceStore.query('dummy') }.must_raise(EntityNotFound)
       end
     end
 
     describe '#reset' do
       it 'deletes all records stored' do
-        Persistence.create({ name: 'dumb' })
-        Persistence.reset.must_equal({})
+        InterfaceStore.create({ name: 'dumb' })
+        InterfaceStore.reset.must_equal({})
       end
     end
   end

data/test/lib/vedeu/support/{builder_test.rb → interface_template_test.rb}

@@ -1,10 +1,10 @@
 require 'test_helper'
-require 'vedeu/support/builder'
+require 'vedeu/support/interface_template'
 
 module Vedeu
-  describe Builder do
+  describe InterfaceTemplate do
     it 'creates and stores a new interface' do
-      interface = Builder.build('widget') do
+      interface = InterfaceTemplate.save('widget') do
                     colour  foreground: '#ff0000', background: '#5f0000'
                     cursor  false
                     width   10
@@ -16,7 +16,7 @@ module Vedeu
 
     it 'overrides x and y when centred is true' do
       IO.console.stub :winsize, [10, 40] do
-        interface = Builder.build('widget') do
+        interface = InterfaceTemplate.save('widget') do
                       colour  foreground: '#ff0000', background: '#5f0000'
                       cursor  false
                       centred true
@@ -31,7 +31,7 @@ module Vedeu
     end
 
     it 'uses x and y when centred is false' do
-      interface = Builder.build('widget') do
+      interface = InterfaceTemplate.save('widget') do
                     colour  foreground: '#ff0000', background: '#5f0000'
                     cursor  false
                     centred false
@@ -46,14 +46,14 @@ module Vedeu
 
     it 'allows interfaces to share behaviour' do
       IO.console.stub :winsize, [10, 40] do
-        main =    Builder.build('main') do
+        main =    InterfaceTemplate.save('main') do
                     colour  foreground: '#ff0000', background: '#000000'
                     cursor  false
                     centred true
                     width   10
                     height  2
                   end
-        status =  Builder.build('status') do
+        status =  InterfaceTemplate.save('status') do
                     colour  foreground: 'aadd00', background: '#4040cc'
                     cursor  true
                     centred true

data/vedeu.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'vedeu'
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}
@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mocha',              '1.1.0'
   spec.add_development_dependency 'pry',                '0.10.0'
   spec.add_development_dependency 'rake',               '10.3.2'
-  spec.add_development_dependency 'ruby-prof',          '0.15.1'
   spec.add_development_dependency 'simplecov',          '0.9.0'
 
   spec.add_dependency 'virtus', '1.0.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,20 +122,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 10.3.2
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.15.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +183,6 @@ files:
 - lib/vedeu/models/composition.rb
 - lib/vedeu/models/interface.rb
 - lib/vedeu/models/line.rb
-- lib/vedeu/models/presentation.rb
 - lib/vedeu/models/stream.rb
 - lib/vedeu/models/style.rb
 - lib/vedeu/output/clear_interface.rb
@@ -208,14 +193,14 @@ files:
 - lib/vedeu/output/render_interface.rb
 - lib/vedeu/output/text_adaptor.rb
 - lib/vedeu/output/view.rb
-- lib/vedeu/support/builder.rb
 - lib/vedeu/support/esc.rb
 - lib/vedeu/support/events.rb
 - lib/vedeu/support/geometry.rb
 - lib/vedeu/support/helpers.rb
 - lib/vedeu/support/input.rb
+- lib/vedeu/support/interface_store.rb
+- lib/vedeu/support/interface_template.rb
 - lib/vedeu/support/menu.rb
-- lib/vedeu/support/persistence.rb
 - lib/vedeu/support/queue.rb
 - lib/vedeu/support/terminal.rb
 - lib/vedeu/support/translator.rb
@@ -232,7 +217,6 @@ files:
 - test/lib/vedeu/models/composition_test.rb
 - test/lib/vedeu/models/interface_test.rb
 - test/lib/vedeu/models/line_test.rb
-- test/lib/vedeu/models/presentation_test.rb
 - test/lib/vedeu/models/stream_test.rb
 - test/lib/vedeu/models/style_test.rb
 - test/lib/vedeu/output/clear_interface_test.rb
@@ -243,14 +227,14 @@ files:
 - test/lib/vedeu/output/render_interface_test.rb
 - test/lib/vedeu/output/text_adaptor_test.rb
 - test/lib/vedeu/output/view_test.rb
-- test/lib/vedeu/support/builder_test.rb
 - test/lib/vedeu/support/esc_test.rb
 - test/lib/vedeu/support/events_test.rb
 - test/lib/vedeu/support/geometry_test.rb
 - test/lib/vedeu/support/helpers_test.rb
 - test/lib/vedeu/support/input_test.rb
+- test/lib/vedeu/support/interface_store_test.rb
+- test/lib/vedeu/support/interface_template_test.rb
 - test/lib/vedeu/support/menu_test.rb
-- test/lib/vedeu/support/persistence_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/support/translator_test.rb
@@ -312,7 +296,6 @@ test_files:
 - test/lib/vedeu/models/composition_test.rb
 - test/lib/vedeu/models/interface_test.rb
 - test/lib/vedeu/models/line_test.rb
-- test/lib/vedeu/models/presentation_test.rb
 - test/lib/vedeu/models/stream_test.rb
 - test/lib/vedeu/models/style_test.rb
 - test/lib/vedeu/output/clear_interface_test.rb
@@ -323,14 +306,14 @@ test_files:
 - test/lib/vedeu/output/render_interface_test.rb
 - test/lib/vedeu/output/text_adaptor_test.rb
 - test/lib/vedeu/output/view_test.rb
-- test/lib/vedeu/support/builder_test.rb
 - test/lib/vedeu/support/esc_test.rb
 - test/lib/vedeu/support/events_test.rb
 - test/lib/vedeu/support/geometry_test.rb
 - test/lib/vedeu/support/helpers_test.rb
 - test/lib/vedeu/support/input_test.rb
+- test/lib/vedeu/support/interface_store_test.rb
+- test/lib/vedeu/support/interface_template_test.rb
 - test/lib/vedeu/support/menu_test.rb
-- test/lib/vedeu/support/persistence_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/support/translator_test.rb

data/lib/vedeu/models/presentation.rb

@@ -1,12 +0,0 @@
-require 'virtus'
-
-require 'vedeu/models/colour'
-
-module Vedeu
-  module Presentation
-    include Virtus.module
-
-    attribute :colour, Colour,       default: Colour.new
-    attribute :style,  Array[String]
-  end
-end

data/test/lib/vedeu/models/presentation_test.rb

@@ -1,32 +0,0 @@
-require 'test_helper'
-require 'vedeu/models/presentation'
-
-module Vedeu
-  class TestPresentation
-    include Presentation
-  end
-
-  describe Presentation do
-    let(:presentation) {
-      TestPresentation.new({
-        colour: {
-          foreground: '#ff0000',
-          background: '#333333'
-        },
-        style: ['bold', 'underline']
-      })
-    }
-
-    describe '#colour' do
-      it 'returns a Colour instance' do
-        presentation.colour.must_be_instance_of(Colour)
-      end
-    end
-
-    describe '#style' do
-      it 'has a style attribute' do
-        presentation.style.must_equal(['bold', 'underline'])
-      end
-    end
-  end
-end