vedeu 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f52154b63c5d3fdf54cecda5b7937e995c505901
-  data.tar.gz: 65d02119eee86d923a1ab265260767ae2e475743
+  metadata.gz: b55b3f6827a2162d61c3ba3893197cee7990149d
+  data.tar.gz: 98cc092488b3d8b9982168d967339209736de888
 SHA512:
-  metadata.gz: 77cab7109821b024cb2ffd7bfe4d705a6df42ced0b17f0c3805b9e183516ac0070bd5ed85eb3e5899ffdf83ea7d2eb054b6472a222b5afb2ac3f70c3edb82b47
-  data.tar.gz: fc489cc11f1671cfd6efff9df4d0b333c46da375f93f4bb3f9073f7ac5d45d5818008911d61c13907ef06df0b10fd4f6216a256e7cf48912f39aac1afec0f7ad
+  metadata.gz: 8bb473799314f117db0eb91f879954e319497e998dd561e173d53b5831706222eef7f6074543fe7516876bb813bc89e40d6dcc2b5a0624d86f8df497b1e84b91
+  data.tar.gz: 26f9a8f0072eee4c6639243de7eb2c57a8fa1a3807295cda06dc42f7d0338e53cd81bfe444e73dc13706565780990f695a1f842061650a340a310dbaf2c5bd36

data/examples/3_interfaces

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+
+-> { its -> { a } }
+trap('INT') { exit! }
+
+require 'vedeu'
+print Vedeu::Esc.clear
+
+geometry = {
+  geometry: {
+    y: 2,
+    x: 2,
+    width: 20,
+    height: 10
+  }
+}
+interface = Vedeu::Interface.new(geometry)
+Vedeu::Renderer.new(interface).clear_interface_rows
+
+geometry = {
+  geometry: {
+    y: 2,
+    x: 23,
+    width: 20,
+    height: 10
+  }
+}
+interface = Vedeu::Interface.new(geometry)
+Vedeu::Renderer.new(interface).clear_interface_rows
+
+geometry = {
+  geometry: {
+    y: 2,
+    x: 44,
+    width: 20,
+    height: 10
+  }
+}
+interface = Vedeu::Interface.new(geometry)
+Vedeu::Renderer.new(interface).clear_interface_rows
+
+print Vedeu::Esc.reset
+print Vedeu::Position.reset

data/examples/3_lines

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+
+-> { its -> { a } }
+trap('INT') { exit! }
+
+require 'vedeu'
+print Vedeu::Esc.clear
+
+geometry = {
+  geometry: {
+    y: 2,
+    x: 2,
+    width: 20,
+    height: 10
+  }
+}
+interface = Vedeu::Interface.new(geometry)
+
+Vedeu::Renderer.new(interface).write
+
+print Vedeu::Esc.reset
+print Vedeu::Position.reset

data/examples/composition

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+
+-> { its -> { a } }
+trap('INT') { exit! }
+
+require 'vedeu'
+
+# stream = [
+#   [
+#     [
+#       [],
+#       'Lorem ipsum dolor sit amet, consectetur adipiscing'
+#     ],[
+#       [],
+#       'elit. Cras sed ipsum ut purus imperdiet molestie'
+#     ],[
+#       [],
+#       'in id neque. Sed auctor venenatis ultrices. Morbi'
+#     ],[
+#       [],
+#       'ullamcorper libero et euismod malesuada. Aliquam'
+#     ],[
+#       [],
+#       'dignissim metus eget tellus condimentum, ac dictum'
+#     ],[
+#       [],
+#       'enim posuere. Curabitur posuere arcu elementum'
+#     ],[
+#       [],
+#       'rutrum pulvinar. Nullam et dui eu lectus'
+#     ],[
+#       [],
+#       'sollicitudin hendrerit eu at nibh. Cum sociis.'
+#     ]
+#   ]
+# ]
+
+stream = [
+  [
+    [[:underline, "test1"],
+    [[[:red, :black]], "test2"],
+    [[], "test3"]
+  ]
+]
+
+geometry  = { geometry: { y: 0, x: 0, width: 50, height: 15 } }
+interface = Vedeu::Interface.new(geometry)
+
+Vedeu::Compositor.write(stream, interface)
+
+print "\n"

data/lib/vedeu.rb

@@ -22,6 +22,7 @@ require_relative 'vedeu/interface/dummy'
 
 require_relative 'vedeu/process/commands'
 require_relative 'vedeu/process/command'
+require_relative 'vedeu/process/event_loop'
 require_relative 'vedeu/process/exit'
 
 require_relative 'vedeu/application'

data/lib/vedeu/application.rb

@@ -12,9 +12,9 @@ module Vedeu
 
     def main_sequence
       Terminal.open(options) do
-        initial_state
+        Interfaces.initial_state
 
-        event_loop
+        EventLoop.start
       end
     ensure
       Terminal.close
@@ -24,18 +24,6 @@ module Vedeu
 
     attr_reader :options
 
-    def event_loop
-      interfaces.event_loop
-    end
-
-    def initial_state
-      interfaces.initial_state
-    end
-
-    def interfaces
-      @interfaces ||= Interfaces.defined || Interfaces.default
-    end
-
     def options
       defaults.merge!(@options)
     end

data/lib/vedeu/interface/dummy.rb

@@ -1,22 +1,14 @@
 module Vedeu
   class Dummy < Interface
-    def initial_state; end
-
-    # def input; end
-
-    # def output; end
+    def initial_state
+    end
 
-    private
+    def input
+      super
+    end
 
-    def options
-      {
-        geometry: {
-          y:      1,
-          x:      1,
-          width:  :auto,
-          height: :auto
-        }
-      }
+    def output
+      super
     end
   end
 end

data/lib/vedeu/interface/interface.rb

@@ -10,16 +10,6 @@ module Vedeu
       raise NotImplementedError, 'Subclasses implement this method.'
     end
 
-    def event_loop
-      while true do
-        command = input
-
-        break if command == :stop
-
-        output(command)
-      end
-    end
-
     def input
       evaluate
     end
@@ -50,7 +40,12 @@ module Vedeu
 
     def defaults
       {
-        geometry: {}
+        geometry: {
+                    y:      1,
+                    x:      1,
+                    width:  :auto,
+                    height: :auto
+                  }
       }
     end
   end

data/lib/vedeu/interface/interfaces.rb

@@ -14,30 +14,28 @@ module Vedeu
     end
 
     def defined
-      interfaces.empty? ? nil : self
-    end
-
-    def default
-      add(:dummy, Dummy)
+      interfaces.empty? ? default : self
     end
 
     def list
       interfaces.inspect
     end
 
-    def add(name, klass, options = {})
-      if valid?(klass)
-        interfaces[name] = Proc.new { klass.new(options) }
-        self
-      end
+    def add(name, options = {}, klass = Dummy)
+      interfaces[name] = klass.new(options) if valid?(klass)
+      self
     end
 
     def initial_state
-      interfaces.values.map { |io| io.call.initial_state }
+      interfaces.values.map { |io| io.initial_state }
     end
 
-    def event_loop
-      interfaces.values.map { |io| io.call.event_loop }
+    def input
+      interfaces.values.map { |io| io.input }
+    end
+
+    def output(stream)
+      interfaces.values.map { |io| io.output(stream) }
     end
 
     private
@@ -47,6 +45,12 @@ module Vedeu
       true
     end
 
+    def default
+      add(:dummy)
+
+      self
+    end
+
     def interfaces
       @interfaces ||= {}
     end

data/lib/vedeu/output/compositor.rb

@@ -18,7 +18,7 @@ module Vedeu
 
     private
 
-    attr_reader :output, :interface
+    attr_reader :interface
 
     def composition
       container = []
@@ -26,12 +26,7 @@ module Vedeu
       output.map do |line|
         line.each_with_index do |stream, index|
           streams << clear_line(index)
-
-          if stream.is_a?(String)
-            streams << stream
-          else
-            streams << Directive.enact(stream)
-          end
+          streams << Directive.enact(stream)
         end
         container << streams.join
         streams = []
@@ -40,7 +35,7 @@ module Vedeu
     end
 
     def clear_line(index)
-      [position(vy(index), vx), (" " * width), position(vy(index), vx)].join
+      [position(vy(index), vx), (' ' * width), position(vy(index), vx)].join
     end
 
     def vx(index = 0)
@@ -62,5 +57,10 @@ module Vedeu
     def position(y, x)
       Position.set(y, x)
     end
+
+    def output
+      return @output.split if @output.is_a?(String)
+      @output
+    end
   end
 end

data/lib/vedeu/output/directive.rb

@@ -13,6 +13,7 @@ module Vedeu
     end
 
     def enact
+      return directives if string?
       [set_position, set_colour, set_style].join
     end
 
@@ -20,6 +21,10 @@ module Vedeu
 
     attr_reader :directives
 
+    def string?
+      directives.is_a?(String)
+    end
+
     def set_position
       Position.set(*position)
     end

data/lib/vedeu/process/commands.rb

@@ -29,7 +29,7 @@ module Vedeu
     end
 
     def commands
-      @commands ||= { 'exit' => Proc.new { Exit.dispatch } }
+      @commands ||= { :exit => Proc.new { Exit.dispatch } }
     end
   end
 end

data/lib/vedeu/process/event_loop.rb

@@ -0,0 +1,31 @@
+module Vedeu
+  class EventLoop
+    class << self
+      def start
+        new.start
+      end
+    end
+
+    def initialize
+      @running = true
+    end
+
+    def start
+      tick
+    end
+
+    def stop
+      @running = false
+    end
+
+    def tick
+      while @running do
+        command = Interfaces.defined.input
+
+        stop if command == "stop"
+
+        Interfaces.defined.output(command)
+      end
+    end
+  end
+end

data/lib/vedeu/version.rb

@@ -1,3 +1,3 @@
 module Vedeu
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/lib/vedeu/application_test.rb

@@ -9,14 +9,13 @@ module Vedeu
     it { described_instance.must_be_instance_of(Application) }
 
     describe '.start' do
-      let(:subject)    { described_class.start(options) }
-      let(:interfaces) { mock("Interfaces", event_loop: nil,
-                                            initial_state: nil) }
+      let(:subject) { described_class.start(options) }
 
       before do
         Terminal.stubs(:open).yields(self)
+        Interfaces.stubs(:initial_state)
+        EventLoop.stubs(:start)
         Terminal.stubs(:close)
-        Interfaces.stubs(:defined).returns(interfaces)
       end
 
       it { subject.must_be_instance_of(NilClass) }

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

@@ -14,12 +14,6 @@ module Vedeu
       it { proc { subject }.must_raise(NotImplementedError) }
     end
 
-    describe '#event_loop' do
-      let(:subject) { described_instance.event_loop }
-
-      it { skip }
-    end
-
     describe '#input' do
       let(:subject) { described_instance.input }
 

data/test/lib/vedeu/interface/interfaces_test.rb

@@ -14,6 +14,12 @@ module Vedeu
       let(:subject) { described_class.define }
 
       it { subject.must_be_instance_of(Module) }
+
+      context 'when a block is given' do
+        let(:subject) { described_class.define { :some_block } }
+
+        it { subject.must_be_instance_of(Symbol) }
+      end
     end
 
     describe '.defined' do
@@ -24,28 +30,20 @@ module Vedeu
       context 'when interfaces are not defined' do
         before { described_class.interfaces = {} }
 
-        it { subject.must_be_instance_of(NilClass) }
+        it 'adds the default interface and returns all interfaces' do
+          subject.must_be_instance_of(Module)
+        end
       end
 
-      context 'when no interfaces are defined' do
+      context 'when interfaces are defined' do
         before { described_class.interfaces = { mock: :interface } }
 
         it { subject.must_be_instance_of(Module) }
       end
     end
 
-    describe '.default' do
-      let(:subject) { described_class.default }
-
-      it { subject.must_be_instance_of(Module) }
-
-      it 'adds the dummy interface to the interface list' do
-        described_class.list.wont_be_empty
-      end
-    end
-
     describe '.add' do
-      let(:subject) { described_class.add(interface, klass, options) }
+      let(:subject)   { described_class.add(interface, options, klass) }
       let(:interface) {}
       let(:klass)     { DummyInterface }
       let(:options)   { {} }
@@ -70,16 +68,5 @@ module Vedeu
 
       it { subject.must_be_instance_of(Array) }
     end
-
-    describe '.event_loop' do
-      let(:subject) { described_class.event_loop }
-
-      before do
-        Terminal.stubs(:input)
-        Commands.stubs(:execute).returns(:stop)
-      end
-
-      it { subject.must_be_instance_of(Array) }
-    end
   end
 end

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

@@ -35,7 +35,7 @@ module Vedeu
       end
 
       context 'when the command exists' do
-        let(:command) { 'exit' }
+        let(:command) { :exit }
 
         before { Exit.stubs(:dispatch).returns(true) }
 
@@ -51,7 +51,7 @@ module Vedeu
 
     describe '.add' do
       let(:subject) { described_class.add(command_name, command_klass, args, options) }
-      let(:command_name)  { "some_name" }
+      let(:command_name)  { :some_name }
       let(:command_klass) { DummyCommand }
       let(:args)          { [] }
       let(:options)       { {} }

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

@@ -0,0 +1,20 @@
+require_relative '../../../test_helper'
+
+module Vedeu
+  describe EventLoop do
+    let(:described_class) { EventLoop }
+    let(:defined) { mock }
+
+    before do
+      Interfaces.stubs(:defined).returns(defined)
+      defined.stubs(:input).returns("stop")
+      defined.stubs(:output).returns(NilClass)
+    end
+
+    describe '.start' do
+      let(:subject) { described_class.start }
+
+      it { subject.must_be_instance_of(NilClass) }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,6 +152,9 @@ files:
 - README.md
 - Rakefile
 - bin/vedeu
+- examples/3_interfaces
+- examples/3_lines
+- examples/composition
 - lib/vedeu.rb
 - lib/vedeu/application.rb
 - lib/vedeu/interface/dummy.rb
@@ -172,6 +175,7 @@ files:
 - lib/vedeu/output/wordwrap.rb
 - lib/vedeu/process/command.rb
 - lib/vedeu/process/commands.rb
+- lib/vedeu/process/event_loop.rb
 - lib/vedeu/process/exit.rb
 - lib/vedeu/support/terminal.rb
 - lib/vedeu/version.rb
@@ -194,6 +198,7 @@ files:
 - test/lib/vedeu/output/wordwrap_test.rb
 - test/lib/vedeu/process/command_test.rb
 - test/lib/vedeu/process/commands_test.rb
+- test/lib/vedeu/process/event_loop_test.rb
 - test/lib/vedeu/process/exit_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/version_test.rb
@@ -243,7 +248,9 @@ test_files:
 - test/lib/vedeu/output/wordwrap_test.rb
 - test/lib/vedeu/process/command_test.rb
 - test/lib/vedeu/process/commands_test.rb
+- test/lib/vedeu/process/event_loop_test.rb
 - test/lib/vedeu/process/exit_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/version_test.rb
 - test/test_helper.rb
+has_rdoc: