vedeu 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66de5c561798d7f28dc0aa984dd6e3017bf724ca
-  data.tar.gz: 5b1c164ab6fb207d0443b7d309563654c99132e8
+  metadata.gz: c6ed6d21f04e9b8b6f98a8d1afb25e8f020d92a6
+  data.tar.gz: f0d1c0b2cf28c40d11d975b839fe200d2a775b20
 SHA512:
-  metadata.gz: 018e9a0652410c0f0fb70e35ee06ba1d4a76557270fd3407a95b90bb4635658d7c739fe62a09950f4b955297b0eb804dc70a60619c8a2772885774925613e892
-  data.tar.gz: 601298baf82a2205887b9e78dcb997270ca502697768c96d7b975cbc607ac703984c0323949156fecf048678a0a24d8df3a9a940de83f098048c861a5f2e9a35
+  metadata.gz: 2c994a800613efaed9cc001808d496252e92e4cd697854ca2fbe6d73b052cf0be9ea12609e988d865776f48165aa17b930788169a34b8034534bdb782a578ad1
+  data.tar.gz: ed9a5b2ae734d278f040c83c91b498c1a853069efedec1c39e3c7e1aea18daf77a310f5c5444ddd416d3554db626f61d8f9fb32c98359966b454e8567690954a

data/features/step_definitions/vedeu_steps.rb

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

data/lib/vedeu/output/compositor.rb

@@ -1,6 +1,4 @@
 module Vedeu
-  class UndefinedInterface < StandardError; end
-
   class Compositor
     class << self
       def arrange(output = {})
@@ -26,62 +24,57 @@ module Vedeu
 
     def composition
       container = []
-      streams   = []
-
-      container << colour.set
 
-      if stream.size < height
-        remaining = height - stream.size
-        remaining.times { |i| stream << [''] }
-      end
+      pad_stream
 
       stream.each_with_index do |lines, index|
-        streams << clear(index)
+        line = [interface.colour.set, clear(index)]
 
         lines.each do |data|
-          streams << Directive.enact(interface, data)
+          line << Directive.enact(interface, data)
         end
 
-        container << streams.join
-        streams = []
-      end
+        line << interface.colour.reset << interface.cursor
 
-      container << colour.reset
-      container << cursor
+        container << line.join
+      end
 
       container
     end
 
+    def pad_stream
+      if stream.size < height
+        remaining = height - stream.size
+        remaining.times { |i| stream << [''] }
+      end
+    end
+
     def clear(index)
       [origin(index), (' ' * width), origin(index)].join
     end
 
     def origin(index)
-      geometry.origin(index)
+      interface.geometry.origin(index)
     end
 
     def height
-      geometry.height
+      interface.geometry.height
     end
 
     def width
-      geometry.width
+      interface.geometry.width
     end
 
-    def geometry
-      interface.geometry
-    end
-
-    def colour
-      interface.colour
-    end
-
-    def cursor
-      interface.cursor
+    def stream
+      @_stream ||= if @stream.is_a?(String)
+        [@stream.split("\n")]
+      else
+        @stream
+      end
     end
 
     def interface
-      @_interface ||= InterfaceRepository.find_by_name(@interface)
+      @_interface ||= InterfaceRepository.find(@interface)
     end
   end
 end

data/lib/vedeu/output/output.rb

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

data/lib/vedeu/repository/command.rb

@@ -1,6 +1,6 @@
 module Vedeu
   class Command
-    attr_accessor :id, :attributes, :name, :klass, :keyword, :keypress
+    attr_accessor :attributes, :name, :entity, :keyword, :keypress
 
     class << self
       def create(attributes = {})
@@ -11,7 +11,7 @@ module Vedeu
     def initialize(attributes = {})
       @attributes = attributes || {}
       @name       = attributes[:name]
-      @klass      = attributes[:klass]
+      @entity     = attributes[:entity]
       @keyword    = attributes.fetch(:options, {}).fetch(:keyword, '')
       @keypress   = attributes.fetch(:options, {}).fetch(:keypress, '')
     end
@@ -26,16 +26,16 @@ module Vedeu
     end
 
     def executable
-      proc { |*args| attributes[:klass].dispatch(*args) }
+      proc { |*args| attributes[:entity].dispatch(*args) }
     end
   end
 
   # :nocov:
   module ClassMethods
-    def command(name, klass, options = {})
+    def command(name, entity, options = {})
       command_name = name.is_a?(Symbol) ? name.to_s : name
 
-      Command.create({ name: command_name, klass: klass, options: options })
+      Command.create({ name: command_name, entity: entity, options: options })
     end
   end
 

data/lib/vedeu/repository/command_repository.rb

@@ -4,14 +4,14 @@ module Vedeu
 
     class << self
       def by_keypress(input)
-        query(klass, :keypress, input)
+        query(entity, :keypress, input)
       end
 
       def by_keyword(input)
-        query(klass, :keyword, input)
+        query(entity, :keyword, input)
       end
 
-      def klass
+      def entity
         Command
       end
     end

data/lib/vedeu/repository/dummy_command.rb

@@ -1,6 +1,6 @@
 module Vedeu
   class DummyCommand
-    attr_accessor :id
+    attr_accessor :name
 
     def self.dispatch(value = :dummy)
       value || :dummy

data/lib/vedeu/repository/dummy_interface.rb

@@ -1,5 +1,5 @@
 module Vedeu
   class DummyInterface
-    attr_accessor :id
+    attr_accessor :name
   end
 end

data/lib/vedeu/repository/interface.rb

@@ -2,7 +2,7 @@ module Vedeu
   class Interface
     include Queue
 
-    attr_accessor :id, :attributes, :active, :name, :cursor, :current
+    attr_accessor :attributes, :name, :cursor, :current
 
     class << self
       def create(attributes = {})
@@ -12,8 +12,6 @@ module Vedeu
 
     def initialize(attributes = {})
       @attributes = attributes || {}
-
-      @active     = false
       @name       = attributes[:name]
       @cursor     = attributes.fetch(:cursor, true)
       @current    = []
@@ -25,7 +23,7 @@ module Vedeu
       self
     end
 
-    def update
+    def refresh
       if enqueued?
         @current = dequeue
       elsif @current.empty?

data/lib/vedeu/repository/interface_repository.rb

@@ -1,39 +1,21 @@
 module Vedeu
+  class UndefinedInterface < StandardError; end
+
   class InterfaceRepository
     extend Repository
 
     class << self
-      def create(*args)
-        activate(super)
-      end
-
-      def activate(interface)
-        deactivate
-
-        all.map do |stored|
-          stored.active = true if stored == interface
-        end
-      end
-
-      def deactivate
-        all.map { |interface| interface.active = false }
-      end
-
-      def activated
-        query(klass, :active, true)
-      end
-
-      def find_by_name(value)
-        query(klass, :name, value).tap do |interface|
-          fail UndefinedInterface unless interface
-        end
+      def find(name)
+        result = super
+        raise UndefinedInterface unless result
+        result
       end
 
-      def update
-        all.map { |interface| interface.update }.compact
+      def refresh
+        all.map { |interface| interface.refresh }.compact
       end
 
-      def klass
+      def entity
         Interface
       end
     end

data/lib/vedeu/repository/repository.rb

@@ -4,16 +4,16 @@ module Vedeu
       @adaptor ||= Storage.new
     end
 
-    def find(id)
-      adaptor.find(klass, id)
+    def find(name)
+      adaptor.find(entity, name)
     end
 
     def all
-      adaptor.all(klass)
+      adaptor.all(entity)
     end
 
-    def query(klass, attribute, value)
-      adaptor.query(klass, attribute, value)
+    def query(entity, attribute, value)
+      adaptor.query(entity, attribute, value)
     end
 
     def create(model)
@@ -25,7 +25,7 @@ module Vedeu
     end
 
     def reset
-      adaptor.reset(klass)
+      adaptor.reset(entity)
     end
   end
 end

data/lib/vedeu/repository/storage.rb

@@ -1,34 +1,31 @@
 module Vedeu
   class Storage
     def initialize
-      @counter = 0
-      @map     = {}
+      @map = {}
     end
 
     def create(record)
-      @counter += 1
-      record.id ||= @counter
-      map_for(record)[record.id] = record
+      map_for(record)[record.name] = record
     end
 
     def delete(record)
-      map_for(record).delete(record.id)
+      map_for(record).delete(record.name)
     end
 
-    def reset(klass)
-      all(klass).map { |record| delete(record) }
+    def reset(entity)
+      all(entity).map { |record| delete(record) }
     end
 
-    def find(klass, id)
-      map_for_class(klass).fetch(id, nil)
+    def find(entity, name)
+      map_for_class(entity).fetch(name, nil)
     end
 
-    def all(klass)
-      map_for_class(klass).values
+    def all(entity)
+      map_for_class(entity).values
     end
 
-    def query(klass, attribute, value)
-      map_for_class(klass).select do |_, result|
+    def query(entity, attribute, value)
+      map_for_class(entity).select do |_, result|
         return result if result.send(attribute) == value
       end
 
@@ -37,8 +34,8 @@ module Vedeu
 
     private
 
-    def map_for_class(klass)
-      @map[klass.to_s.to_sym] ||= {}
+    def map_for_class(entity)
+      @map[entity.to_s.to_sym] ||= {}
     end
 
     def map_for(record)

data/lib/vedeu/version.rb

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

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

@@ -41,11 +41,8 @@ module Vedeu
         let(:composition) {
           [
             [
-              "\e[38;2;39m\e[48;2;49m",
-              "\e[1;1H               \e[1;1H",
-              "\e[2;1H               \e[2;1H",
-              "\e[38;2;39m\e[48;2;49m",
-              "\e[?25h"
+              "\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"
             ]
           ]
         }
@@ -65,11 +62,8 @@ module Vedeu
           let(:composition) {
             [
               [
-                "\e[38;2;39m\e[48;2;49m",
-                "\e[1;1H               \e[1;1HSome text...",
-                "\e[2;1H               \e[2;1H",
-                "\e[38;2;39m\e[48;2;49m",
-                "\e[?25h"
+                "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1HSome text...\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"
               ]
             ]
           }
@@ -89,11 +83,8 @@ module Vedeu
           let(:composition) {
             [
               [
-                "\e[38;2;39m\e[48;2;49m",
-                "\e[1;1H               \e[1;1HSome text...",
-                "\e[2;1H               \e[2;1HSome more tex...\e[0m",
-                "\e[38;2;39m\e[48;2;49m",
-                "\e[?25h"
+                "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1HSome text...\e[38;2;39m\e[48;2;49m\e[?25h",
+                "\e[38;2;39m\e[48;2;49m\e[2;1H               \e[2;1HSome more tex...\e[0m\e[38;2;39m\e[48;2;49m\e[?25h"
               ]
             ]
           }
@@ -115,11 +106,8 @@ module Vedeu
             let(:composition) {
               [
                 [
-                  "\e[38;2;39m\e[48;2;49m",
-                  "\e[1;1H               \e[1;1H\e[38;2;31m\e[48;2;47mSome text...\e[38;5;39m\e[48;5;49m",
-                  "\e[2;1H               \e[2;1H",
-                  "\e[38;2;39m\e[48;2;49m",
-                  "\e[?25h"
+                  "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1H\e[38;2;31m\e[48;2;47mSome text...\e[38;5;39m\e[48;5;49m\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"
                 ]
               ]
             }
@@ -139,11 +127,8 @@ module Vedeu
             let(:composition) {
               [
                 [
-                  "\e[38;2;39m\e[48;2;49m",
-                  "\e[1;1H               \e[1;1H\e[38;2;31m\e[48;2;47mSome text...",
-                  "\e[2;1H               \e[2;1H\e[38;2;34m\e[48;2;43mSome more tex...\e[0m",
-                  "\e[38;2;39m\e[48;2;49m",
-                  "\e[?25h"
+                  "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1H\e[38;2;31m\e[48;2;47mSome text...\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;34m\e[48;2;43mSome more tex...\e[0m\e[38;2;39m\e[48;2;49m\e[?25h"
                 ]
               ]
             }
@@ -160,11 +145,8 @@ module Vedeu
             let(:composition) {
               [
                 [
-                  "\e[38;2;39m\e[48;2;49m",
-                  "\e[1;1H               \e[1;1H\e[1mSome text...\e[21m",
-                  "\e[2;1H               \e[2;1H",
-                  "\e[38;2;39m\e[48;2;49m",
-                  "\e[?25h"
+                  "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1H\e[1mSome text...\e[21m\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"
                 ]
               ]
             }
@@ -184,11 +166,8 @@ module Vedeu
             let(:composition) {
               [
                 [
-                  "\e[38;2;39m\e[48;2;49m",
-                  "\e[1;1H               \e[1;1H\e[7mSome text...",
-                  "\e[2;1H               \e[2;1H\e[4mSome more tex...\e[0m",
-                  "\e[38;2;39m\e[48;2;49m",
-                  "\e[?25h"
+                  "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1H\e[7mSome text...\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[4mSome more tex...\e[0m\e[38;2;39m\e[48;2;49m\e[?25h"
                 ]
               ]
             }
@@ -204,11 +183,8 @@ module Vedeu
           let(:composition) {
             [
               [
-                "\e[38;2;39m\e[48;2;49m",
-                "\e[1;1H               \e[1;1HSome text...",
-                "\e[2;1H               \e[2;1H",
-                "\e[38;2;39m\e[48;2;49m",
-                "\e[?25h"
+                "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1HSome text...\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"
               ]
             ]
           }

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

@@ -7,10 +7,10 @@ module Vedeu
 
     before do
       Command.create({ name:    'apple',
-                       klass:   DummyCommand,
+                       entity:   DummyCommand,
                        options: { keypress: 'a', keyword: 'apple' } })
       Command.create({ name:    'banana',
-                       klass:   DummyCommand,
+                       entity:   DummyCommand,
                        options: { keypress: 'b', keyword: 'banana' } })
     end
 
@@ -66,8 +66,8 @@ module Vedeu
       end
     end
 
-    describe '.klass' do
-      let(:subject) { described_class.klass }
+    describe '.entity' do
+      let(:subject) { described_class.entity }
 
       it 'returns Command' do
         subject.must_equal(Command)

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

@@ -8,7 +8,7 @@ module Vedeu
     let(:attributes)         {
       {
         name:    'dummy',
-        klass:   DummyCommand,
+        entity:   DummyCommand,
         options: {
           keyword:  "dummy",
           keypress: "d"
@@ -29,7 +29,7 @@ module Vedeu
     end
 
     it 'sets an instance variable' do
-      subject.instance_variable_get('@klass').must_equal(DummyCommand)
+      subject.instance_variable_get('@entity').must_equal(DummyCommand)
     end
 
     it 'sets an instance variable' do

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

@@ -5,45 +5,29 @@ module Vedeu
     let(:described_class) { InterfaceRepository }
 
     before { Interface.create({ name: 'dummy' }) }
-
     after  { InterfaceRepository.reset }
 
-    describe '.activate' do
-      let(:subject)   { described_class.activate(interface) }
-      let(:interface) { 'dummy' }
-
-      it 'returns an Array' do
-        subject.must_be_instance_of(Array)
-      end
-    end
-
-    describe '.deactivate' do
-      let(:subject) { described_class.deactivate }
-
-      it 'returns an Array' do
-        subject.must_be_instance_of(Array)
-      end
-    end
-
-    describe '.activated' do
-      let(:subject) { described_class.activated }
+    describe '.find' do
+      let(:subject) { described_class.find(value) }
+      let(:value)   { 'dummy' }
 
-      it 'returns an Interface' do
-        subject.must_be_instance_of(Interface)
+      context 'when the interface exists' do
+        it 'returns an Interface' do
+          subject.must_be_instance_of(Interface)
+        end
       end
-    end
 
-    describe '.find_by_name' do
-      let(:subject) { described_class.find_by_name(value) }
-      let(:value)   { 'dummy' }
+      context 'when the interface does not exist' do
+        before { InterfaceRepository.reset }
 
-      it 'returns an Interface' do
-        subject.must_be_instance_of(Interface)
+        it 'raises an exception' do
+          proc { subject }.must_raise(UndefinedInterface)
+        end
       end
     end
 
-    describe '.update' do
-      let(:subject) { described_class.update }
+    describe '.refresh' do
+      let(:subject) { described_class.refresh }
 
       before { Compositor.stubs(:arrange) }
 
@@ -52,8 +36,8 @@ module Vedeu
       end
     end
 
-    describe '.klass' do
-      let(:subject) { described_class.klass }
+    describe '.entity' do
+      let(:subject) { described_class.entity }
 
       it 'returns an Interface' do
         subject.must_equal(Interface)

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

@@ -30,10 +30,6 @@ module Vedeu
       subject.instance_variable_get('@attributes').must_equal(attributes)
     end
 
-    it 'sets an instance variable' do
-      subject.instance_variable_get('@active').must_equal(false)
-    end
-
     it 'sets an instance variable' do
       subject.instance_variable_get('@name').must_equal('dummy')
     end
@@ -46,8 +42,8 @@ module Vedeu
       end
     end
 
-    describe '#update' do
-      let(:subject) { described_instance.update }
+    describe '#refresh' do
+      let(:subject) { described_instance.refresh }
 
       # it 'returns a Array' do
       #   subject.must_be_instance_of(Array)

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

@@ -2,17 +2,15 @@ require_relative '../../../test_helper'
 
 module Vedeu
   class Dummy
-    attr_accessor :id
-
     def name
-      "dummy"
+      'dummy'
     end
   end
 
   class DummyRepository
     extend Repository
 
-    def self.klass
+    def self.entity
       Dummy
     end
   end
@@ -37,8 +35,8 @@ module Vedeu
     end
 
     describe '#find' do
-      let(:subject) { described_class.find(id) }
-      let(:id)      { @dummy.id }
+      let(:subject)     { described_class.find(record_name) }
+      let(:record_name) { @dummy.name }
 
       it 'returns a Dummy' do
         subject.must_be_instance_of(Dummy)
@@ -54,10 +52,10 @@ module Vedeu
     end
 
     describe '#query' do
-      let(:subject)   { described_class.query(klass, attribute, value) }
-      let(:klass)     { Dummy }
+      let(:subject)   { described_class.query(entity, attribute, value) }
+      let(:entity)     { Dummy }
       let(:attribute) { :name }
-      let(:value)     { "dummy" }
+      let(:value)     { 'dummy' }
 
       it 'returns a Dummy' do
         subject.must_be_instance_of(Dummy)

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

@@ -5,16 +5,12 @@ module Vedeu
     let(:described_class) { Storage }
     let(:subject)         { described_class.new }
     let(:record)          { DummyCommand.new }
-    let(:klass)           {}
+    let(:entity)           {}
 
     it 'returns a Storage instance' do
       subject.must_be_instance_of(Storage)
     end
 
-    it 'sets an instance variable' do
-      subject.instance_variable_get('@counter').must_equal(0)
-    end
-
     it 'sets an instance variable' do
       subject.instance_variable_get('@map').must_equal({})
     end
@@ -36,7 +32,7 @@ module Vedeu
     end
 
     describe '#reset' do
-      let(:subject) { described_class.new.reset(klass) }
+      let(:subject) { described_class.new.reset(entity) }
 
       it 'returns an Array' do
         subject.must_be_instance_of(Array)
@@ -44,8 +40,8 @@ module Vedeu
     end
 
     describe '#find' do
-      let(:subject) { described_class.new.find(klass, id) }
-      let(:id)      { 'dummy' }
+      let(:subject)     { described_class.new.find(entity, record_name) }
+      let(:record_name) { 'dummy' }
 
       it 'returns a NilClass' do
         subject.must_be_instance_of(NilClass)
@@ -53,7 +49,7 @@ module Vedeu
     end
 
     describe '#all' do
-      let(:subject) { described_class.new.all(klass) }
+      let(:subject) { described_class.new.all(entity) }
 
       it 'returns an Array' do
         subject.must_be_instance_of(Array)
@@ -61,7 +57,7 @@ module Vedeu
     end
 
     describe '#query' do
-      let(:subject)   { described_class.new.query(klass, attribute, value) }
+      let(:subject)   { described_class.new.query(entity, attribute, value) }
       let(:attribute) {}
       let(:value)     {}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba