vedeu 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6ed6d21f04e9b8b6f98a8d1afb25e8f020d92a6
-  data.tar.gz: f0d1c0b2cf28c40d11d975b839fe200d2a775b20
+  metadata.gz: 9e848f5366e26266f101ad5e5fb0c3e0e724fc7f
+  data.tar.gz: e611d426fecc958f335acb8fc54c5a4d697e6638
 SHA512:
-  metadata.gz: 2c994a800613efaed9cc001808d496252e92e4cd697854ca2fbe6d73b052cf0be9ea12609e988d865776f48165aa17b930788169a34b8034534bdb782a578ad1
-  data.tar.gz: ed9a5b2ae734d278f040c83c91b498c1a853069efedec1c39e3c7e1aea18daf77a310f5c5444ddd416d3554db626f61d8f9fb32c98359966b454e8567690954a
+  metadata.gz: 165c47a59cfb6f52a3237c00b459c0aa0d38b8e797a3e8665c4686418da37aac4fc035f51aaee6e12e0c269fa04e276be15187acfa6b2546e692643726b0136c
+  data.tar.gz: 8e8e62514882dcfc5e71a6a4e425e3ac7633adc66ffae289e131535959751ac01a6a80a73712c399ed2c556e6441f510805f72cbf1ed1441f84df89173b83102

data/features/step_definitions/vedeu_steps.rb

@@ -1,9 +1,9 @@
 Given(/^the interface "(.*?)" is defined$/) do |interface|
-  Vedeu::Interface.create({ name: interface, entity: Vedeu::DummyInterface, options: {} })
+  Vedeu::InterfaceRepository.create({ name: interface, entity: Vedeu::DummyInterface, options: {} })
 end
 
 Given(/^the command "(.*?)" is defined$/) do |command|
-  Vedeu::Command.create({ name: command, entity: Vedeu::DummyCommand, options: { keyword: command } })
+  Vedeu::CommandRepository.create({ name: command, entity: Vedeu::DummyCommand, options: { keyword: command } })
 end
 
 When(/^the input "(.*?)" is entered$/) do |input|

data/lib/vedeu.rb

@@ -1,6 +1,8 @@
 require 'date'
 require 'logger'
 require 'io/console'
+require 'virtus'
+require 'yajl'
 
 require_relative 'vedeu/input/input'
 
@@ -16,6 +18,7 @@ require_relative 'vedeu/output/cursor'
 require_relative 'vedeu/output/directive'
 require_relative 'vedeu/output/foreground'
 require_relative 'vedeu/output/geometry'
+require_relative 'vedeu/output/layer'
 require_relative 'vedeu/output/esc'
 require_relative 'vedeu/output/colour'
 require_relative 'vedeu/output/output'
@@ -50,6 +53,12 @@ module Vedeu
   end
   # :nocov:
 
+  # :nocov:
+  def self.included(receiver)
+    receiver.extend(ClassMethods)
+  end
+  # :nocov:
+
   private
 
   # :nocov:

data/lib/vedeu/input/input.rb

@@ -1,12 +1,6 @@
 module Vedeu
-  class Input
-    class << self
-      def capture
-        new.capture
-      end
-    end
-
-    def initialize; end
+  module Input
+    extend self
 
     def capture
       Queue.enqueue(input)

data/lib/vedeu/output/geometry.rb

@@ -8,11 +8,6 @@ module Vedeu
       Position.set(vy(index), vx)
     end
 
-    def z
-      values[:z]
-    end
-    alias_method :layer, :z
-
     def y
       values[:y]
     end
@@ -72,7 +67,6 @@ module Vedeu
       {
         width:  Terminal.width,
         height: Terminal.height,
-        z:      0,
         y:      1,
         x:      1
       }

data/lib/vedeu/output/layer.rb

@@ -0,0 +1,9 @@
+module Vedeu
+  class Layer
+    attr_reader :index
+
+    def initialize(index = 0)
+      @index = index || 0
+    end
+  end
+end

data/lib/vedeu/output/output.rb

@@ -9,8 +9,8 @@ module Vedeu
     def initialize; end
 
     def render
-      InterfaceRepository.refresh.map do |interface|
-        interface.map { |stream| Terminal.output(stream) if stream }
+      InterfaceRepository.refresh.each do |interface|
+        interface.each { |stream| Terminal.output(stream) if stream }
       end
     end
   end

data/lib/vedeu/output/position.rb

@@ -12,7 +12,7 @@ module Vedeu
       end
     end
 
-    def initialize(y = nil, x = nil)
+    def initialize(y = 1, x = 1)
       @y, @x = y, x
     end
 
@@ -23,5 +23,13 @@ module Vedeu
     private
 
     attr_accessor :y, :x
+
+    def y
+      @y == 0 ? 1 : @y
+    end
+
+    def x
+      @x == 0 ? 1 : @x
+    end
   end
 end

data/lib/vedeu/output/style.rb

@@ -12,19 +12,19 @@ module Vedeu
 
     def set
       case style
-      when :blink       then Esc.blink
-      when :blink_off   then Esc.blink_off
-      when :bold        then Esc.bold
-      when :bold_off    then Esc.bold_off
-      when :clear       then Esc.clear
-      when :hide_cursor then Cursor.hide
-      when :inverse     then Esc.inverse
-      when :negative    then Esc.negative
-      when :positive    then Esc.positive
-      when :reset       then Esc.reset
-      when :normal      then Esc.reset
-      when :show_cursor then Cursor.show
-      when :underline   then Esc.underline
+      when :blink         then Esc.blink
+      when :blink_off     then Esc.blink_off
+      when :bold          then Esc.bold
+      when :bold_off      then Esc.bold_off
+      when :clear         then Esc.clear
+      when :hide_cursor   then Cursor.hide
+      when :inverse       then Esc.inverse
+      when :negative      then Esc.negative
+      when :positive      then Esc.positive
+      when :reset         then Esc.reset
+      when :normal        then Esc.reset
+      when :show_cursor   then Cursor.show
+      when :underline     then Esc.underline
       when :underline_off then Esc.underline_off
       else
         ''

data/lib/vedeu/repository/command.rb

@@ -2,12 +2,6 @@ module Vedeu
   class Command
     attr_accessor :attributes, :name, :entity, :keyword, :keypress
 
-    class << self
-      def create(attributes = {})
-        new(attributes).create
-      end
-    end
-
     def initialize(attributes = {})
       @attributes = attributes || {}
       @name       = attributes[:name]
@@ -16,11 +10,6 @@ module Vedeu
       @keypress   = attributes.fetch(:options, {}).fetch(:keypress, '')
     end
 
-    def create
-      CommandRepository.create(self)
-      self
-    end
-
     def execute(args = [])
       executable.call(*args)
     end
@@ -29,18 +18,4 @@ module Vedeu
       proc { |*args| attributes[:entity].dispatch(*args) }
     end
   end
-
-  # :nocov:
-  module ClassMethods
-    def command(name, entity, options = {})
-      command_name = name.is_a?(Symbol) ? name.to_s : name
-
-      Command.create({ name: command_name, entity: entity, options: options })
-    end
-  end
-
-  def self.included(receiver)
-    receiver.extend(ClassMethods)
-  end
-  # :nocov:
 end

data/lib/vedeu/repository/command_repository.rb

@@ -1,19 +1,36 @@
 module Vedeu
-  class CommandRepository
+  module CommandRepository
     extend Repository
+    extend self
 
-    class << self
-      def by_keypress(input)
-        query(entity, :keypress, input)
-      end
+    def by_keypress(input)
+      query(entity, :keypress, input)
+    end
+
+    def by_keyword(input)
+      query(entity, :keyword, input)
+    end
+
+    def create(attributes)
+      super(Command.new(attributes))
+    end
+
+    def entity
+      Command
+    end
+  end
 
-      def by_keyword(input)
-        query(entity, :keyword, input)
-      end
+  # :nocov:
+  module ClassMethods
+    def command(name, entity, options = {})
+      command_name = name.is_a?(Symbol) ? name.to_s : name
 
-      def entity
-        Command
-      end
+      CommandRepository.create({
+        name:    command_name,
+        entity:  entity,
+        options: options
+      })
     end
   end
+  # :nocov:
 end

data/lib/vedeu/repository/interface.rb

@@ -4,12 +4,6 @@ module Vedeu
 
     attr_accessor :attributes, :name, :cursor, :current
 
-    class << self
-      def create(attributes = {})
-        new(attributes).create
-      end
-    end
-
     def initialize(attributes = {})
       @attributes = attributes || {}
       @name       = attributes[:name]
@@ -17,12 +11,6 @@ module Vedeu
       @current    = []
     end
 
-    def create
-      InterfaceRepository.create(self)
-
-      self
-    end
-
     def refresh
       if enqueued?
         @current = dequeue
@@ -47,10 +35,18 @@ module Vedeu
       @cursor ? Cursor.show : Cursor.hide
     end
 
+    def layer
+      @layer ||= Layer.new(layer_attr).index
+    end
+
     private
 
     def initial_state
-      { name => Array.new(geometry.height) { [""] } }
+      { name => Array.new(geometry.height) { [''] } }
+    end
+
+    def layer_attr
+      attributes.fetch(:layer, 0)
     end
 
     def foreground
@@ -61,18 +57,4 @@ module Vedeu
       attributes[:bg] || attributes[:background]
     end
   end
-
-  # :nocov:
-  module ClassMethods
-    def interface(name, options = {})
-      interface_name = name.is_a?(Symbol) ? name.to_s : name
-
-      Interface.create({ name: interface_name }.merge!(options))
-    end
-  end
-
-  def self.included(receiver)
-    receiver.extend(ClassMethods)
-  end
-  # :nocov:
 end

data/lib/vedeu/repository/interface_repository.rb

@@ -1,23 +1,42 @@
 module Vedeu
   class UndefinedInterface < StandardError; end
 
-  class InterfaceRepository
+  module InterfaceRepository
     extend Repository
+    extend self
 
-    class << self
-      def find(name)
-        result = super
-        raise UndefinedInterface unless result
-        result
-      end
+    def create(attributes = {})
+      super(Interface.new(attributes))
+    end
+
+    def find(name)
+      result = super
+      raise UndefinedInterface unless result
+      result
+    end
+
+    def refresh
+      by_layer.map { |interface| interface.refresh }.compact
+    end
+
+    def by_layer
+      all.sort_by { |interface| interface.layer }
+    end
+
+    def entity
+      Interface
+    end
+  end
 
-      def refresh
-        all.map { |interface| interface.refresh }.compact
-      end
+  # :nocov:
+  module ClassMethods
+    def interface(name, options = {})
+      interface_name = name.is_a?(Symbol) ? name.to_s : name
 
-      def entity
-        Interface
-      end
+      InterfaceRepository.create({
+        name: interface_name
+      }.merge!(options))
     end
   end
+  # :nocov:
 end

data/lib/vedeu/version.rb

@@ -1,3 +1,3 @@
 module Vedeu
-  VERSION = '0.0.21'
+  VERSION = '0.0.22'
 end

data/test/lib/vedeu/input/input_test.rb

@@ -2,25 +2,23 @@ require_relative '../../../test_helper'
 
 module Vedeu
   describe Input do
-    let(:described_class) { Input }
-    let(:input)           { '' }
-    let(:subject)         { described_class.new }
+    let(:described_module) { Input }
+    let(:input)            { 'input' }
 
-    before { Terminal.stubs(:input).returns(input) }
-
-    it 'return an Input instance' do
-      subject.must_be_instance_of(Input)
+    before do
+      Terminal.stubs(:input).returns(input)
+      Queue.stubs(:enqueue).returns([input])
     end
 
     describe '.capture' do
-      let(:subject) { described_class.capture }
+      let(:subject) { described_module.capture }
 
       it 'returns an Array' do
         subject.must_be_instance_of(Array)
       end
 
-      it 'returns the entered characters' do
-        subject.wont_be_empty
+      it 'returns the enqueue input' do
+        subject.must_equal([input])
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Vedeu
     let(:composition)        {}
 
     before do
-      Interface.create({ name: 'dummy', width: 15, height: 2 })
+      InterfaceRepository.create({ name: 'dummy', width: 15, height: 2 })
     end
 
     after do
@@ -93,6 +93,22 @@ module Vedeu
             subject.must_equal(composition)
           end
         end
+
+        context 'but is a string containing new-lines' do
+          let(:stream)      { "Some text...\nSome more text..." }
+          let(:composition) {
+            [
+              [
+                "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1HSome text...Some more tex...\e[0m\e[38;2;39m\e[48;2;49m\e[?25h",
+                "\e[38;2;39m\e[48;2;49m\e[2;1H               \e[2;1H\e[38;2;39m\e[48;2;49m\e[?25h"
+              ]
+            ]
+          }
+
+          it 'returns the enqueued composition' do
+            subject.must_equal(composition)
+          end
+        end
       end
 
       context 'when styled' do

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

@@ -15,28 +15,6 @@ module Vedeu
       described_instance.must_be_instance_of(Geometry)
     end
 
-    describe '#z' do
-      let(:subject) { described_instance.z }
-
-      it 'returns a Fixnum' do
-        subject.must_be_instance_of(Fixnum)
-      end
-
-      context 'using a value' do
-        let(:values) { { z: 2 } }
-
-        it 'returns the value' do
-          subject.must_equal(2)
-        end
-      end
-
-      context 'using the default' do
-        it 'returns the default' do
-          subject.must_equal(0)
-        end
-      end
-    end
-
     describe '#y' do
       let(:subject) { described_instance.y }
 

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

@@ -0,0 +1,35 @@
+require_relative '../../../test_helper'
+
+module Vedeu
+  describe Layer do
+    let(:described_class)    { Layer }
+    let(:described_instance) { described_class.new(index) }
+    let(:index)              {}
+
+    it 'returns a Layer instance' do
+      described_instance.must_be_instance_of(Layer)
+    end
+
+    describe '#index' do
+      let(:subject) { described_instance.index }
+
+      it 'returns a Fixnum' do
+        subject.must_be_instance_of(Fixnum)
+      end
+
+      context 'using a index' do
+        let(:index) { 2 }
+
+        it 'returns the index' do
+          subject.must_equal(2)
+        end
+      end
+
+      context 'using the default' do
+        it 'returns the default' do
+          subject.must_equal(0)
+        end
+      end
+    end
+  end
+end

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

@@ -4,9 +4,11 @@ module Vedeu
   describe Output do
     let(:described_class) { Output }
     let(:subject)         { described_class.new }
+    let(:output)          {}
 
     before do
-      Interface.create({ name: 'dummy', width: 10, height: 2, cursor: true })
+      InterfaceRepository.create({ name: 'dummy', width: 15, height: 2, cursor: true })
+      Terminal.stubs(:output).returns(output)
     end
 
     after { InterfaceRepository.reset }
@@ -17,6 +19,34 @@ module Vedeu
 
     describe '.render' do
       let(:subject) { described_class.render }
+
+      context 'when the interfaces have content' do
+        let(:output) {
+          [
+            [
+              "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1HTesting Outpu...\e[0m\e[38;2;39m\e[48;2;49m\e[?25h",
+              "\e[38;2;39m\e[48;2;49m\e[2;1H               \e[2;1H\e[38;2;39m\e[48;2;49m\e[?25h"
+            ]
+          ]
+        }
+
+        before { Compositor.arrange({ 'dummy' => 'Testing Output.render' }) }
+
+        it { subject.must_equal(output) }
+      end
+
+      context 'when the interfaces have no content' do
+        let(:output) {
+          [
+            [
+              "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1H\e[38;2;39m\e[48;2;49m\e[?25h",
+              "\e[38;2;39m\e[48;2;49m\e[2;1H               \e[2;1H\e[38;2;39m\e[48;2;49m\e[?25h"
+            ]
+          ]
+        }
+
+        it { subject.must_equal(output) }
+      end
     end
   end
 end

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

@@ -64,6 +64,14 @@ module Vedeu
         end
       end
 
+      context 'when the style is negative' do
+        let(:style) { :negative }
+
+        it 'returns an escape sequence' do
+          subject.must_equal("\e[7m")
+        end
+      end
+
       context 'when the style is inverse' do
         let(:style) { :inverse }
 

data/test/lib/vedeu/process/process_test.rb

@@ -16,11 +16,12 @@ module Vedeu
       let(:command) { Command.new }
 
       before do
-        Interface.create({ name: 'dummy' })
+        InterfaceRepository.create({ name: 'dummy', width: 15, height: 2 })
         Queue.stubs(:dequeue).returns(input)
         CommandRepository.stubs(:by_keypress).returns(command)
         CommandRepository.stubs(:by_keyword).returns(command)
         command.stubs(:execute).returns(result)
+        Compositor.stubs(:arrange).returns([])
       end
 
       after do

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

@@ -3,20 +3,26 @@ require_relative '../../../test_helper'
 module Vedeu
   describe CommandRepository do
     let(:described_class) { CommandRepository }
-    let(:input)           { }
+    let(:input)           {}
 
     before do
-      Command.create({ name:    'apple',
-                       entity:   DummyCommand,
-                       options: { keypress: 'a', keyword: 'apple' } })
-      Command.create({ name:    'banana',
-                       entity:   DummyCommand,
-                       options: { keypress: 'b', keyword: 'banana' } })
+      CommandRepository.create({ name:    'apple',
+                                 entity:  DummyCommand,
+                                 options: {
+                                            keypress: 'a',
+                                            keyword:  'apple'
+                                          }
+                               })
+      CommandRepository.create({ name:    'banana',
+                                 entity:  DummyCommand,
+                                 options: {
+                                            keypress: 'b',
+                                            keyword:  'banana'
+                                          }
+                               })
     end
 
-    after do
-      CommandRepository.reset
-    end
+    after { CommandRepository.reset }
 
     describe '.by_keypress' do
       let(:subject) { described_class.by_keypress(input) }

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

@@ -40,14 +40,6 @@ module Vedeu
       subject.instance_variable_get('@keypress').must_equal('d')
     end
 
-    describe '#create' do
-      let(:subject) { described_class.create(attributes) }
-
-      it 'returns a Command instance' do
-        subject.must_be_instance_of(Command)
-      end
-    end
-
     describe '#execute' do
       let(:subject) { described_instance.execute(args) }
       let(:args)    { [] }

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

@@ -4,7 +4,7 @@ module Vedeu
   describe InterfaceRepository do
     let(:described_class) { InterfaceRepository }
 
-    before { Interface.create({ name: 'dummy' }) }
+    before { InterfaceRepository.create({ name: 'dummy', width: 15, height: 2 }) }
     after  { InterfaceRepository.reset }
 
     describe '.find' do
@@ -43,5 +43,25 @@ module Vedeu
         subject.must_equal(Interface)
       end
     end
+
+    describe '.by_layer' do
+      let(:subject) { described_class.by_layer }
+
+      before do
+        InterfaceRepository.reset
+        @case_a = InterfaceRepository.create({ name: 'a', width: 15, height: 2, layer: 1 })
+        @case_b = InterfaceRepository.create({ name: 'b', width: 15, height: 2, layer: 0 })
+        @case_c = InterfaceRepository.create({ name: 'c', width: 15, height: 2, layer: 2 })
+      end
+      after  { InterfaceRepository.reset }
+
+      it 'returns an Array' do
+        subject.must_be_instance_of(Array)
+      end
+
+      it 'returns the collection in order they should be drawn' do
+        subject.must_equal([@case_b, @case_a, @case_c])
+      end
+    end
   end
 end

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

@@ -8,8 +8,8 @@ module Vedeu
     let(:attributes)         {
       {
         name:   'dummy',
-        width:  10,
-        height: 5,
+        width:  15,
+        height: 2,
         x:      1,
         y:      1,
         fg:     :red,
@@ -19,7 +19,7 @@ module Vedeu
     }
     let(:result)             {}
 
-    before { Interface.create(attributes) }
+    before { InterfaceRepository.create(attributes) }
     after  { InterfaceRepository.reset }
 
     it 'returns an Interface instance' do
@@ -34,14 +34,6 @@ module Vedeu
       subject.instance_variable_get('@name').must_equal('dummy')
     end
 
-    describe '#create' do
-      let(:subject) { described_class.create(attributes) }
-
-      it 'returns an Interface' do
-        subject.must_be_instance_of(Interface)
-      end
-    end
-
     describe '#refresh' do
       let(:subject) { described_instance.refresh }
 

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

@@ -140,7 +140,7 @@ module Vedeu
       end
 
       it 'returns an escape sequence' do
-        subject.must_equal("\e[0;1H                                                                                \e[0;1H")
+        subject.must_equal("\e[1;1H                                                                                \e[1;1H")
       end
     end
 

data/vedeu.gemspec

@@ -30,4 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake',               '10.3.2'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov',          '0.8.2'
+
+  spec.add_dependency "virtus"
+  spec.add_dependency "yajl-ruby"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -192,6 +192,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - gavinlaking@gmail.com
@@ -236,6 +264,7 @@ files:
 - lib/vedeu/output/esc.rb
 - lib/vedeu/output/foreground.rb
 - lib/vedeu/output/geometry.rb
+- lib/vedeu/output/layer.rb
 - lib/vedeu/output/output.rb
 - lib/vedeu/output/position.rb
 - lib/vedeu/output/style.rb
@@ -267,6 +296,7 @@ files:
 - test/lib/vedeu/output/esc_test.rb
 - test/lib/vedeu/output/foreground_test.rb
 - test/lib/vedeu/output/geometry_test.rb
+- test/lib/vedeu/output/layer_test.rb
 - test/lib/vedeu/output/output_test.rb
 - test/lib/vedeu/output/position_test.rb
 - test/lib/vedeu/output/style_test.rb
@@ -330,6 +360,7 @@ test_files:
 - test/lib/vedeu/output/esc_test.rb
 - test/lib/vedeu/output/foreground_test.rb
 - test/lib/vedeu/output/geometry_test.rb
+- test/lib/vedeu/output/layer_test.rb
 - test/lib/vedeu/output/output_test.rb
 - test/lib/vedeu/output/position_test.rb
 - test/lib/vedeu/output/style_test.rb