vedeu 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f49a2565aad7f4e16195f4669892ace8f6d0f8c7
-  data.tar.gz: 04ddcf49ad7df1af4681bfbf0109af0f0da54037
+  metadata.gz: f52154b63c5d3fdf54cecda5b7937e995c505901
+  data.tar.gz: 65d02119eee86d923a1ab265260767ae2e475743
 SHA512:
-  metadata.gz: b6712ac5a5121704148d9afeb3a8ed7655e4b523f5b71f2d8d4fd477f4feff62b45ab61a598de0064491fc682698e9cc94a53587bf0c2f6ed16f633e07bb9914
-  data.tar.gz: 8bb9e432e9178e755b68771d51f3fbfcdd8a1eba33b4bf6ed4794dfbebb6c38a97ea44a031b12dd514902e255aef82972fc3b0b5f37706297fd42ccd26f845ae
+  metadata.gz: 77cab7109821b024cb2ffd7bfe4d705a6df42ced0b17f0c3805b9e183516ac0070bd5ed85eb3e5899ffdf83ea7d2eb054b6472a222b5afb2ac3f70c3edb82b47
+  data.tar.gz: fc489cc11f1671cfd6efff9df4d0b333c46da375f93f4bb3f9073f7ac5d45d5818008911d61c13907ef06df0b10fd4f6216a256e7cf48912f39aac1afec0f7ad

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.1
+ruby-2.1.2

data/Guardfile

@@ -1,4 +1,4 @@
-guard :minitest, all_after_pass: true do
+guard :minitest, all_after_pass: true, env: { 'no_simplecov' => true } do
   watch(%r{^test/(.*)_test\.rb})
   watch(%r{^lib/(.+)\.rb}) do |m|
     "test/lib/#{m[1]}_test.rb"

data/README.md

@@ -72,6 +72,20 @@ TODO: Write detailed documentation
 When we create the interface we define it's width, height, and origin (y, x).
 These numbers are based on the area available to the terminal. If the terminal is 80x25, then our interface can use all or some of this area.
 
+### On Composition
+
+    [                         # interface
+      [                       # stream
+        [                     # directive
+          34, 22              # position directive
+          :red, :black        # colour directive
+        ],
+
+        :directive,           # style directive
+
+        "Textual content..."  # stream data
+      ]
+    ]
 
 ## Contributing
 

data/lib/vedeu.rb

@@ -14,6 +14,7 @@ require_relative 'vedeu/output/position'
 require_relative 'vedeu/output/renderer'
 require_relative 'vedeu/output/style'
 require_relative 'vedeu/output/translator'
+require_relative 'vedeu/output/wordwrap'
 
 require_relative 'vedeu/interface/interfaces'
 require_relative 'vedeu/interface/interface'

data/lib/vedeu/interface/dummy.rb

@@ -5,5 +5,18 @@ module Vedeu
     # def input; end
 
     # def output; end
+
+    private
+
+    def options
+      {
+        geometry: {
+          y:      1,
+          x:      1,
+          width:  :auto,
+          height: :auto
+        }
+      }
+    end
   end
 end

data/lib/vedeu/interface/interface.rb

@@ -25,7 +25,7 @@ module Vedeu
     end
 
     def output(command)
-      Compositor.write(command, self)
+      Compositor.arrange(command, self)
     end
 
     def geometry

data/lib/vedeu/interface/interfaces.rb

@@ -3,14 +3,7 @@ module Vedeu
 
   module Interfaces
     extend self
-
-    def default
-      add(:dummy, Dummy)
-    end
-
-    def defined
-      interfaces.empty? ? nil : interfaces
-    end
+    attr_accessor :interfaces
 
     def define(&block)
       if block_given?
@@ -20,6 +13,14 @@ module Vedeu
       end
     end
 
+    def defined
+      interfaces.empty? ? nil : self
+    end
+
+    def default
+      add(:dummy, Dummy)
+    end
+
     def list
       interfaces.inspect
     end
@@ -27,7 +28,7 @@ module Vedeu
     def add(name, klass, options = {})
       if valid?(klass)
         interfaces[name] = Proc.new { klass.new(options) }
-        interfaces
+        self
       end
     end
 

data/lib/vedeu/output/colour.rb

@@ -2,6 +2,8 @@ module Vedeu
   class Colour
     class << self
       def define(pair = [])
+        return '' if pair.empty?
+
         new(pair).define
       end
       alias_method :set, :define

data/lib/vedeu/output/compositor.rb

@@ -1,10 +1,10 @@
 module Vedeu
   class Compositor
     class << self
-      def write(output = [], interface = Dummy)
+      def arrange(output = [], interface = Dummy)
         return if output.nil? || output.empty?
 
-        new(output, interface).write
+        new(output, interface).arrange
       end
     end
 
@@ -12,7 +12,7 @@ module Vedeu
       @output, @interface = output, interface
     end
 
-    def write
+    def arrange
       Renderer.write(composition)
     end
 
@@ -51,30 +51,10 @@ module Vedeu
       geometry.vy(index)
     end
 
-    def height
-      geometry.height
-    end
-
     def width
       geometry.width
     end
 
-    def y
-      geometry.y
-    end
-
-    def dy
-      geometry.dy
-    end
-
-    def x
-      geometry.x
-    end
-
-    def dx
-      geometry.dx
-    end
-
     def geometry
       interface.geometry
     end

data/lib/vedeu/output/directive.rb

@@ -3,32 +3,45 @@ module Vedeu
 
   class Directive
     class << self
-      def enact(directive)
-        new(directive).enact
+      def enact(directives = {})
+        new(directives).enact
       end
     end
 
-    def initialize(directive)
-      @directive = directive
+    def initialize(directives = {})
+      @directives = directives
     end
 
     def enact
-      raise InvalidDirective unless valid_directive?
+      [set_position, set_colour, set_style].join
+    end
 
-      return Style.set(directive) if directive.is_a?(Symbol)
+    private
 
-      if directive.is_a?(Array)
-        return Position.set(*directive) if directive.first.is_a?(Numeric)
-        return Colour.set(directive)    if directive.first.is_a?(Symbol)
-      end
+    attr_reader :directives
+
+    def set_position
+      Position.set(*position)
     end
 
-    private
+    def set_colour
+      Colour.set(colour)
+    end
 
-    attr_reader :directive
+    def set_style
+      Array(style).map { |s| Style.set(s) }.join
+    end
+
+    def position
+      directives.fetch(:position, [])
+    end
+
+    def colour
+      directives.fetch(:colour, [])
+    end
 
-    def valid_directive?
-      directive.is_a?(Array) || directive.is_a?(Symbol)
+    def style
+      directives.fetch(:style, [])
     end
   end
 end

data/lib/vedeu/output/geometry.rb

@@ -56,7 +56,12 @@ module Vedeu
     end
 
     def values
-      defaults.merge(@values)
+      defaults.merge(auto)
+    end
+
+    def auto
+      @values.delete_if { |k, v| k == :width  && v == :auto }
+      @values.delete_if { |k, v| k == :height && v == :auto }
     end
 
     def defaults

data/lib/vedeu/output/position.rb

@@ -1,13 +1,18 @@
 module Vedeu
   class Position
     class << self
-      def set(y = 0, x = 0)
+      def set(y = nil, x = nil)
+        return '' if y.nil? || x.nil?
+
         new(y, x).set
       end
-      alias_method :reset, :set
+
+      def reset
+        new(0, 0).set
+      end
     end
 
-    def initialize(y = 0, x = 0)
+    def initialize(y = nil, x = nil)
       @y, @x = y, x
     end
 

data/lib/vedeu/output/wordwrap.rb

@@ -0,0 +1,84 @@
+module Vedeu
+  class Wordwrap
+    class << self
+      def this(value, options = {})
+        new(value, options).reformat
+      end
+    end
+
+    def initialize(value, options = {})
+      @value, @options = value, options
+    end
+
+    def reformat
+      return pruned if prune?
+      wordwrapped
+    end
+
+    def wordwrapped
+      processed = []
+      value.split(/\n/).map do |unprocessed|
+        line_length = 0
+        reformatted = []
+
+        unprocessed.split(/\s/).map do |word|
+          word_length = word.length + 1
+
+          if (line_length += word_length) >= maximum_width
+            line_length = word_length
+            processed   << reformatted
+            reformatted = []
+          end
+
+          reformatted << word
+        end
+
+        processed << reformatted
+      end
+
+      output(processed)
+    end
+
+    private
+
+    attr_reader :value, :options
+
+    def output(paragraph)
+      paragraph.reduce([]) do |output, line|
+        output << line.join(' ')
+      end.join("\n")
+    end
+
+    def pruned
+      return value if value.size <= pruned_width
+      [
+        value.chomp.slice(0..pruned_width),
+        '...',
+        Esc.reset
+      ].join
+    end
+
+    def pruned_width
+      maximum_width - 3
+    end
+
+    def prune?
+      options.fetch(:prune)
+    end
+
+    def maximum_width
+      options.fetch(:width)
+    end
+
+    def options
+      defaults.merge!(@options)
+    end
+
+    def defaults
+      {
+        width: 70,
+        prune: false
+      }
+    end
+  end
+end

data/lib/vedeu/version.rb

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

data/test/lib/vedeu/application_test.rb

@@ -2,14 +2,24 @@ require_relative '../../test_helper'
 
 module Vedeu
   describe Application do
-    let(:described_class) { Application }
-    let(:instance)        { described_class.new(options) }
-    let(:options)         { {} }
+    let(:described_class)    { Application }
+    let(:described_instance) { described_class.new(options) }
+    let(:options)            { {} }
+
+    it { described_instance.must_be_instance_of(Application) }
 
     describe '.start' do
-      subject { described_class.start(options) }
+      let(:subject)    { described_class.start(options) }
+      let(:interfaces) { mock("Interfaces", event_loop: nil,
+                                            initial_state: nil) }
+
+      before do
+        Terminal.stubs(:open).yields(self)
+        Terminal.stubs(:close)
+        Interfaces.stubs(:defined).returns(interfaces)
+      end
 
-      it { skip }
+      it { subject.must_be_instance_of(NilClass) }
     end
   end
 end

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

@@ -2,21 +2,21 @@ require_relative '../../../test_helper'
 
 module Vedeu
   describe Dummy do
-    let(:described_class) { Dummy }
-    let(:instance)        { described_class.new }
+    let(:described_class)    { Dummy }
+    let(:described_instance) { described_class.new }
 
     describe '#initial_state' do
-      subject { instance.initial_state }
+      let(:subject) { described_instance.initial_state }
 
       it { subject.must_be_instance_of(NilClass) }
     end
 
     describe '#input' do
-      subject { instance.input }
+      let(:subject) { described_instance.input }
     end
 
     describe '#output' do
-      subject { instance.output }
+      let(:subject) { described_instance.output }
     end
   end
 end

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

@@ -9,31 +9,41 @@ module Vedeu
     it { described_instance.must_be_instance_of(Interface) }
 
     describe '#initial_state' do
-      subject { described_instance.initial_state }
+      let(:subject) { described_instance.initial_state }
 
       it { proc { subject }.must_raise(NotImplementedError) }
     end
 
     describe '#event_loop' do
-      subject { described_instance.event_loop }
+      let(:subject) { described_instance.event_loop }
 
       it { skip }
     end
 
     describe '#input' do
-      subject { described_instance.input }
+      let(:subject) { described_instance.input }
 
-      it { skip }
+      before do
+        Terminal.stubs(:input).returns('some input')
+        Commands.stubs(:execute).returns('some output')
+      end
+
+      it { subject.must_be_instance_of(String) }
     end
 
     describe '#output' do
-      subject { described_instance.output }
+      let(:subject) { described_instance.output(command) }
+      let(:command) { mock }
 
-      it { skip }
+      before { Compositor.stubs(:arrange).returns([]) }
+
+      it 'sends the output of the command to the compositor' do
+        subject.must_be_instance_of(Array)
+      end
     end
 
     describe '#geometry' do
-      subject { described_instance.geometry }
+      let(:subject) { described_instance.geometry }
 
       it { subject.must_be_instance_of(Geometry) }
     end