vedeu 0.0.29 → 0.0.30

data/lib/vedeu/support/parser.rb

@@ -17,7 +17,7 @@ module Vedeu
     def parse
       return nil if empty?
 
-      Composition.new(parsed_output) #.enqueue
+      Composition.enqueue(parsed_output)
     end
 
     private

data/lib/vedeu/support/terminal.rb

@@ -1,6 +1,5 @@
 require 'io/console'
 
-require_relative '../support/cursor'
 require_relative '../support/esc'
 
 module Vedeu
@@ -9,15 +8,15 @@ module Vedeu
     # :nocov:
     def open(&block)
       console.cooked do
-        output Esc.reset
-        output Esc.clear
-        output Cursor.hide
+        output Esc.string('reset')
+        output Esc.string('clear')
+        output Esc.string('hide_cursor')
 
         yield
       end if block_given?
     ensure
-      output Cursor.show
-      output Esc.reset
+      output Esc.string('show_cursor')
+      output Esc.string('reset')
       output Esc.clear_last_line
     end
     # :nocov:

data/lib/vedeu/support/wordwrap.rb

@@ -11,6 +11,7 @@ module Vedeu
 
     def reformat
       return pruned if prune?
+
       wordwrapped
     end
 
@@ -51,11 +52,13 @@ module Vedeu
     def pruned
       if value.size <= pruned_width
         value
+
       else
         [
           value.chomp.slice(0..pruned_width),
           '...'
         ].join
+
       end
     end
 

data/lib/vedeu/version.rb

@@ -1,3 +1,3 @@
 module Vedeu
-  VERSION = '0.0.29'
+  VERSION = '0.0.30'
 end

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

@@ -64,16 +64,16 @@ module Vedeu
         InterfaceRepository.create(name: 'enq2', width: 15, height: 2)
       end
 
-      it 'returns an Array' do
-        subject.must_be_instance_of(Array)
+      it 'returns an Composition' do
+        subject.must_be_instance_of(Composition)
       end
 
       it 'returns a collection of interfaces' do
-        subject.first.must_be_instance_of(Interface)
+        subject.interfaces.first.must_be_instance_of(Interface)
       end
 
       it 'enqueues the interfaces for rendering' do
-        subject.first.enqueued?.must_equal(true)
+        subject.interfaces.first.enqueued?.must_equal(true)
       end
     end
 

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

@@ -23,10 +23,14 @@ module Vedeu
       context 'when there is a single interface' do
         let(:interfaces) { { name: 'dummy' } }
 
-        it 'returns an Interface' do
+        it 'returns an Array' do
           subject.must_be_instance_of(Array)
         end
 
+        it 'returns a collection of Interface objects' do
+          subject.first.must_be_instance_of(Interface)
+        end
+
         it 'contains a single Interface object' do
           subject.size.must_equal(1)
         end

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

@@ -233,7 +233,7 @@ module Vedeu
       end
 
       it 'returns an String' do
-        subject.must_equal("{\"colour\":{\"foreground\":\"\\u001b[38;5;196m\",\"background\":\"\\u001b[48;5;16m\"},\"style\":\"\",\"name\":\"dummy\",\"lines\":[],\"y\":1,\"x\":1,\"z\":1,\"width\":7,\"height\":3,\"current\":\"\",\"cursor\":true}")
+        subject.must_equal("{\"colour\":{\"foreground\":\"\\u001b[38;5;196m\",\"background\":\"\\u001b[48;5;16m\"},\"style\":\"\",\"name\":\"dummy\",\"lines\":[],\"y\":1,\"x\":1,\"z\":1,\"width\":7,\"height\":3,\"cursor\":true}")
       end
     end
   end

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

@@ -8,9 +8,10 @@ module Vedeu
     let(:subject)            { described_instance }
     let(:attributes)         {
       {
+        model:  {},
         style:  'normal',
         colour: { foreground: '#ff0000', background: '#000000' },
-        stream: []
+        stream: [],
       }
     }
 
@@ -38,6 +39,14 @@ module Vedeu
       end
     end
 
+    describe '#model' do
+      let(:subject) { described_instance.model }
+
+      it 'has a model attribute' do
+        subject.must_be_instance_of(Hash)
+      end
+    end
+
     describe '#streams' do
       let(:subject) { described_instance.streams }
 

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

@@ -2,7 +2,38 @@ require_relative '../../../test_helper'
 require_relative '../../../../lib/vedeu/models/presentation'
 
 module Vedeu
+  class TestPresentation
+    include Presentation
+  end
+
   describe Presentation do
-    let(:described_module) { Presentation }
+    let(:described_module)   { Presentation }
+    let(:described_instance) { TestPresentation.new(attributes) }
+    let(:attributes) {
+      {
+        colour: {},
+        style:  ['bold', 'underline']
+      }
+    }
+
+    describe '#colour' do
+      let(:subject) { described_instance.colour }
+
+      it 'returns a Colour instance' do
+        subject.must_be_instance_of(Colour)
+      end
+    end
+
+    describe '#style' do
+      let(:subject) { described_instance.style }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'has a style attribute' do
+        subject.must_equal("\e[1m\e[4m")
+      end
+    end
   end
 end

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

@@ -3,8 +3,8 @@ require_relative '../../../../lib/vedeu/output/output'
 
 module Vedeu
   describe Output do
-    let(:described_class) { Output }
-    let(:output)          {}
+    let(:described_module) { Output }
+    let(:output)           {}
 
     before do
       InterfaceRepository.create({
@@ -18,16 +18,8 @@ module Vedeu
 
     after { InterfaceRepository.reset }
 
-    describe '#initialize' do
-      let(:subject) { described_class.new }
-
-      it 'returns an Output instance' do
-        subject.must_be_instance_of(Output)
-      end
-    end
-
     describe '.render' do
-      let(:subject) { described_class.render }
+      let(:subject) { described_module.render }
 
       it 'returns an Array' do
         subject.must_be_instance_of(Array)

data/test/lib/vedeu/repository/repository_test.rb

@@ -72,15 +72,6 @@ module Vedeu
       end
     end
 
-    describe '#delete' do
-      let(:subject) { described_class.delete(model) }
-      let(:model)   { @dummy }
-
-      it 'returns a Dummy' do
-        subject.must_be_instance_of(Dummy)
-      end
-    end
-
     describe '#reset' do
       let(:subject) { described_class.reset }
 

data/test/lib/vedeu/support/esc_test.rb

@@ -17,66 +17,6 @@ module Vedeu
       end
     end
 
-    describe '.blink' do
-      let(:subject) { described_class.blink }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[5m")
-      end
-    end
-
-    describe '.blink_off' do
-      let(:subject) { described_class.blink_off }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[25m")
-      end
-    end
-
-    describe '.bold' do
-      let(:subject) { described_class.bold }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[1m")
-      end
-    end
-
-    describe '.bold_off' do
-      let(:subject) { described_class.bold_off }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[21m")
-      end
-    end
-
-    describe '.clear' do
-      let(:subject) { described_class.clear }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[2J")
-      end
-    end
-
     describe '.clear_line' do
       let(:subject) { described_class.clear_line }
 
@@ -89,18 +29,6 @@ module Vedeu
       end
     end
 
-    describe '.esc' do
-      let(:subject) { described_class.esc }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[")
-      end
-    end
-
     describe '.foreground_colour' do
       let(:subject) { described_class.foreground_colour }
 
@@ -113,66 +41,6 @@ module Vedeu
       end
     end
 
-    describe '.negative' do
-      let(:subject) { described_class.negative }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[7m")
-      end
-    end
-
-    describe '.positive' do
-      let(:subject) { described_class.positive }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[27m")
-      end
-    end
-
-    describe '.normal' do
-      let(:subject) { described_class.normal }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[24m\e[21m\e[27m")
-      end
-    end
-
-    describe '.dim' do
-      let(:subject) { described_class.dim }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[2m")
-      end
-    end
-
-    describe '.reset' do
-      let(:subject) { described_class.reset }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[0m")
-      end
-    end
-
     describe '.set_position' do
       let(:subject) { described_class.set_position(y, x) }
       let(:y)       {}
@@ -194,8 +62,8 @@ module Vedeu
       end
     end
 
-    describe '.stylize' do
-      let(:subject) { described_class.stylize(style) }
+    describe '.string' do
+      let(:subject) { described_class.string(style) }
       let(:style)   {}
 
       it 'returns a String' do
@@ -320,29 +188,5 @@ module Vedeu
         end
       end
     end
-
-    describe '.underline' do
-      let(:subject) { described_class.underline }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[4m")
-      end
-    end
-
-    describe '.underline_off' do
-      let(:subject) { described_class.underline_off }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[24m")
-      end
-    end
   end
 end

data/vedeu.gemspec

@@ -25,9 +25,9 @@ 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'
+  spec.add_development_dependency 'ruby-prof',          '0.14.2'
   spec.add_development_dependency 'simplecov',          '0.8.2'
 
-  spec.add_dependency "oj"
-  spec.add_dependency "virtus"
+  spec.add_dependency "oj",     '2.9.8'
+  spec.add_dependency "virtus", '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,16 +126,16 @@ dependencies:
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -154,35 +154,34 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.8
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 description: 
 email:
 - gavinlaking@gmail.com
 executables:
-- composition
 - vedeu
 extensions: []
 extra_rdoc_files: []
@@ -195,16 +194,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/composition
 - bin/vedeu
-- examples/single_interface_app.rb
 - lib/vedeu.rb
 - lib/vedeu/application.rb
 - lib/vedeu/configuration.rb
 - lib/vedeu/input/input.rb
 - lib/vedeu/launcher.rb
 - lib/vedeu/models/background.rb
-- lib/vedeu/models/coercions.rb
 - lib/vedeu/models/colour.rb
 - lib/vedeu/models/command.rb
 - lib/vedeu/models/composition.rb
@@ -225,7 +221,6 @@ files:
 - lib/vedeu/repository/interface_repository.rb
 - lib/vedeu/repository/repository.rb
 - lib/vedeu/repository/storage.rb
-- lib/vedeu/support/cursor.rb
 - lib/vedeu/support/esc.rb
 - lib/vedeu/support/events.rb
 - lib/vedeu/support/exit.rb
@@ -264,7 +259,6 @@ files:
 - test/lib/vedeu/repository/interface_repository_test.rb
 - test/lib/vedeu/repository/repository_test.rb
 - test/lib/vedeu/repository/storage_test.rb
-- test/lib/vedeu/support/cursor_test.rb
 - test/lib/vedeu/support/esc_test.rb
 - test/lib/vedeu/support/events_test.rb
 - test/lib/vedeu/support/exit_test.rb
@@ -293,8 +287,6 @@ files:
 - test/support/json/int2_lin2_str3_styles.json
 - test/support/output_1.json
 - test/support/output_1.rb
-- test/support/output_2.json
-- test/support/output_2.rb
 - test/test_helper.rb
 - vedeu.gemspec
 homepage: http://www.gavinlaking.name/
@@ -347,7 +339,6 @@ test_files:
 - test/lib/vedeu/repository/interface_repository_test.rb
 - test/lib/vedeu/repository/repository_test.rb
 - test/lib/vedeu/repository/storage_test.rb
-- test/lib/vedeu/support/cursor_test.rb
 - test/lib/vedeu/support/esc_test.rb
 - test/lib/vedeu/support/events_test.rb
 - test/lib/vedeu/support/exit_test.rb
@@ -376,7 +367,5 @@ test_files:
 - test/support/json/int2_lin2_str3_styles.json
 - test/support/output_1.json
 - test/support/output_1.rb
-- test/support/output_2.json
-- test/support/output_2.rb
 - test/test_helper.rb
 has_rdoc: