vedeu 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 661482d026960734c10b12e030206f9570fe369a
-  data.tar.gz: 021507e23ec529f132e3da33e03ab7e537fa9e76
+  metadata.gz: 3f1858b317f4c614c4171d5d1032e7f512f093a6
+  data.tar.gz: b33301029f63c79baeef259eac052cd109634415
 SHA512:
-  metadata.gz: fe71eb666f8f5a6353e6b76b945498c6407c8d83a797e5bbcaf2ceb4b7e9f698e85db442afdfde87c04b151af13b187fd3f8ec4e3aa7adb9daa9b60a202bc1bf
-  data.tar.gz: c14259a37b32d99a84dda5d989cff126b3e9365f1dfd3d1e30abb725d9b1c58f7b07232243b811600ccdfadf810d6e3cef032c6b93132e478cd6dc22b771c4af
+  metadata.gz: cd006607dbf4753ca9a488298d6054e68db1425a4807ad058cbbc4c3d779b45ae030f9e4ca7d4b1db611c12ac70abfb44cc6b81d2f523ba09a916649a64181e5
+  data.tar.gz: be1a3ab07377b3385f7d0b2611989edc59c6cb84b6ecfeecf40e2b843c2dd4a344a67e3ab153bfc9b6e9dd2a3de75dae407ecdd3b11cf52dde47240660f82e59

data/deps.md

@@ -8,6 +8,8 @@ Application
   Process
   Terminal
 
+Builder
+
 ClearInterface
 
 Collection
@@ -17,6 +19,10 @@ Colour
 
 Command
 
+CommandBuilder
+  Builder
+  CommandRepository
+
 CommandRepository
   Command
   Repository
@@ -29,29 +35,27 @@ Compositor
 
 Configuration
 
-Coordinate
+Geometry
   Esc
   Terminal
 
 Esc
   Translator
 
-EventRepository
+Events
 
 Exit
-  EventRepository
 
 HashParser
   TextAdaptor
 
 Input
-  EventRepository
   Queue
   Terminal
 
 Interface
   ClearInterface
-  Coordinate
+  Geometry
   LineCollection
   Presentation
   Queue
@@ -59,6 +63,11 @@ Interface
   Style
   Terminal
 
+InterfaceBuilder
+  Builder
+  Geometry
+  InterfaceRepository
+
 InterfaceCollection
   InterfaceRepository
 
@@ -141,19 +150,23 @@ Orphans
 Template - orphaned
 Wordwrap - orphaned
 Menu     - orphaned
-
 Exit     - orphaned
-  EventRepository
-
 
 ----------------------------------------------------------------------
 Grouped
 ----------------------------------------------------------------------
 
+CommandBuilder
+  Builder
+
+InterfaceBuilder
+  Builder
+  Geometry
+  InterfaceRepository
+
 Launcher
   Application
     Input
-      EventRepository
       Queue
       Terminal
         Esc
@@ -162,7 +175,7 @@ Launcher
       InterfaceRepository
         Interface
           ClearInterface
-          Coordinate
+          Geometry
             Esc
               Translator
             Terminal
@@ -218,7 +231,7 @@ Launcher
               InterfaceRepository
                 Interface
                   ClearInterface
-                  Coordinate
+                  Geometry
                     Esc
                       Translator
                     Terminal

data/lib/vedeu/input/input.rb

@@ -1,6 +1,6 @@
 require_relative '../support/queue'
 require_relative '../support/terminal'
-require_relative '../repository/event_repository'
+require_relative '../../vedeu'
 
 module Vedeu
   class Input
@@ -9,7 +9,7 @@ module Vedeu
     end
 
     def capture
-      EventRepository.trigger(:_keypress_, keypress)
+      Vedeu.trigger(:_keypress_, keypress)
 
       Queue.enqueue(keypress)
     end

data/lib/vedeu/launcher.rb

@@ -19,6 +19,8 @@ module Vedeu
     def execute!
       $stdin, $stdout, $stderr = @stdin, @stdout, @stderr
 
+      $stderr.reopen("logs/vedeu.log", "w")
+
       Application.start(configuration)
 
       @exit_code = 0

data/lib/vedeu/models/builders/builder.rb

@@ -0,0 +1,41 @@
+module Vedeu
+  class Builder
+    def self.build(name, &block)
+      new(name).build(&block)
+    end
+
+    def initialize(name)
+      @name = name.to_s
+    end
+
+    def build(&block)
+      self.instance_eval(&block)
+
+      repository.create(attributes)
+    end
+
+    def repository
+      fail StandardError, 'Subclasses implement this.'
+    end
+
+    private
+
+    attr_reader :name
+
+    def attributes
+      user_attributes.merge!(overrides)
+    end
+
+    def overrides
+      {}
+    end
+
+    def user_attributes
+      @attributes ||= { name: name }
+    end
+
+    def method_missing(method_name, arg, &block)
+      user_attributes[method_name] = arg
+    end
+  end
+end

data/lib/vedeu/models/builders/command_builder.rb

@@ -1,31 +1,10 @@
+require_relative 'builder'
 require_relative '../../repository/command_repository'
 
 module Vedeu
-  class CommandBuilder
-    def self.build(name, &block)
-      new(name).build(&block)
-    end
-
-    def initialize(name)
-      @name = name.to_s
-    end
-
-    def build(&block)
-      self.instance_eval(&block)
-
-      CommandRepository.create(attributes)
-    end
-
-    private
-
-    attr_reader :name
-
-    def attributes
-      @attributes ||= { name: name }
-    end
-
-    def method_missing(method_name, arg, &block)
-      attributes[method_name] = arg
+  class CommandBuilder < Builder
+    def repository
+      CommandRepository
     end
   end
 end

data/lib/vedeu/models/builders/interface_builder.rb

@@ -1,31 +1,15 @@
-require_relative '../colour'
-require_relative '../../support/coordinate'
+require_relative 'builder'
+require_relative '../../support/geometry'
 require_relative '../../repository/interface_repository'
 
 module Vedeu
-  class InterfaceBuilder
-    def self.build(name, &block)
-      new(name).build(&block)
-    end
-
-    def initialize(name)
-      @name = name.to_s
-    end
-
-    def build(&block)
-      self.instance_eval(&block)
-
-      InterfaceRepository.create(attributes)
+  class InterfaceBuilder < Builder
+    def repository
+      InterfaceRepository
     end
 
     private
 
-    attr_reader :name
-
-    def attributes
-      user_attributes.merge!(overrides)
-    end
-
     def overrides
       @overrides = if user_attributes[:centred] == true
         { x: geometry.left, y: geometry.top }
@@ -35,16 +19,12 @@ module Vedeu
     end
 
     def geometry
-      @_geometry ||= Coordinate.new({
+      @_geometry ||= Geometry.new({
         height: user_attributes[:height],
         width:  user_attributes[:width],
       })
     end
 
-    def user_attributes
-      @attributes ||= { name: name, centred: false }
-    end
-
     def method_missing(method_name, arg, &block)
       user_attributes[method_name] = arg
     end

data/lib/vedeu/models/interface.rb

@@ -6,7 +6,7 @@ require_relative 'presentation'
 require_relative 'style'
 require_relative '../output/clear_interface'
 require_relative '../output/render_interface'
-require_relative '../support/coordinate'
+require_relative '../support/geometry'
 require_relative '../support/queue'
 require_relative '../support/terminal'
 
@@ -33,7 +33,7 @@ module Vedeu
     end
 
     def geometry
-      @_geometry ||= Coordinate.new(attributes)
+      @_geometry ||= Geometry.new(attributes)
     end
 
     def origin(index = 0)

data/lib/vedeu/output/clear_interface.rb

@@ -9,9 +9,9 @@ module Vedeu
     end
 
     def clear
-      interface.height.times.inject([interface.colour.to_s]) do |line, index|
+      interface_lines.inject([colours]) do |line, index|
         line << interface.origin(index)
-        line << (' ' * interface.width)
+        line << ' ' * interface.width
         line << interface.origin(index)
       end.join
     end
@@ -19,5 +19,13 @@ module Vedeu
     private
 
     attr_reader :interface
+
+    def colours
+      interface.colour.to_s
+    end
+
+    def interface_lines
+      interface.height.times
+    end
   end
 end

data/lib/vedeu/parsing/text_adaptor.rb

@@ -2,8 +2,8 @@ module Vedeu
   class TextAdaptor
     # Convert a block of text into a collection of lines.
     #
-    # @param text [String] a block of text containing new line (\n)
-    #   characters.
+    # @param text [String|Array] a block of text containing new line (\n)
+    #   characters, or a collection of strings.
     #
     # @return [Array]
     def self.adapt(text)
@@ -25,7 +25,11 @@ module Vedeu
     attr_reader :text
 
     def lines
-      text.split(/\n/)
+      if text.is_a?(::Array)
+        text
+      else
+        text.split(/\n/)
+      end
     end
 
     def no_content?

data/lib/vedeu/repository/command_repository.rb

@@ -10,10 +10,6 @@ module Vedeu
       by_keypress(input) || by_keyword(input)
     end
 
-    def create(attributes)
-      super(entity.new(attributes))
-    end
-
     def entity
       Command
     end
@@ -21,11 +17,15 @@ module Vedeu
     private
 
     def by_keypress(input)
-      query(entity, :keypress, input)
+      query(:keypress, input)
+    rescue EntityNotFound
+      false
     end
 
     def by_keyword(input)
-      query(entity, :keyword, input)
+      query(:keyword, input)
+    rescue EntityNotFound
+      false
     end
   end
 end

data/lib/vedeu/repository/interface_repository.rb

@@ -2,31 +2,15 @@ require_relative '../models/interface'
 require_relative 'repository'
 
 module Vedeu
-  class UndefinedInterface < StandardError; end
-
   module InterfaceRepository
     extend Repository
     extend self
 
-    def create(attributes = {})
-      super(entity.new(attributes))
-    end
-
-    def find(name)
-      if result = query(entity, :name, name)
-        result
-
-      else
-        fail UndefinedInterface, "#{name.to_s} could not be found."
-
-      end
-    end
-
     def update(name, attributes = {})
-      interface = find(name)
+      interface = query(:name, name)
       interface.attributes = attributes
       interface
-    rescue UndefinedInterface
+    rescue EntityNotFound
       create(attributes)
     end
 

data/lib/vedeu/repository/repository.rb

@@ -1,25 +1,41 @@
 require_relative 'storage'
 
 module Vedeu
+  EntityNotFound = Class.new(StandardError)
+
   module Repository
-    def adaptor
-      @adaptor ||= Storage.new
+    extend self
+
+    def create(attributes)
+      storage.create(entity, attributes)
     end
 
     def all
-      adaptor.all(entity)
+      storage.all(entity)
     end
 
-    def query(entity, attribute, value)
-      adaptor.query(entity, attribute, value)
-    end
+    def query(attribute, value)
+      if result = storage.query(entity, attribute, value)
+        result
 
-    def create(model)
-      adaptor.create(model)
+      else
+        fail EntityNotFound, "#{entity.to_s} could not be found."
+
+      end
     end
 
     def reset
-      adaptor.reset(entity)
+      storage.reset(entity)
+    end
+
+    def entity
+      fail StandardError, 'The extending module implements this.'
+    end
+
+    private
+
+    def storage
+      @storage ||= Storage.new
     end
   end
 end

data/lib/vedeu/repository/storage.rb

@@ -1,45 +1,40 @@
 module Vedeu
   class Storage
     def initialize
-      @map = {}
+      @store = {}
     end
 
-    def create(record)
-      map_for(record)[record.name] = record
+    def create(entity, attributes)
+      entities(entity)
+        .store(attributes[:name], entity.new(attributes))
     end
 
-    def delete(record)
-      map_for(record).delete(record.name)
-    end
+    def all(entity = nil)
+      return entities unless entity
 
-    def reset(entity)
-      all(entity).map { |record| delete(record) }
-    end
-
-    def all(entity)
-      map_for_class(entity).values
+      entities(entity).values
     end
 
     def query(entity, attribute, value)
       return false if value.nil? || value.empty?
 
-      map_for_class(entity).select do |_, result|
+      entities(entity).select do |name, result|
         return result if result.send(attribute) == value
       end
 
       false
     end
 
-    private
+    def reset(entity)
+      store[entity.to_s] = {}
+    end
 
-    attr_reader :map
+    private
 
-    def map_for_class(entity)
-      map[entity.to_s.to_sym] ||= {}
-    end
+    attr_reader :store
 
-    def map_for(record)
-      map_for_class(record.class)
+    def entities(entity)
+      store[entity.to_s] ||= {}
     end
   end
 end

data/lib/vedeu/support/events.rb

@@ -0,0 +1,58 @@
+module Vedeu
+  class Events
+    def initialize(&block)
+      @handlers = Hash.new { |h, k| h[k] = [] }
+
+      log("Events#initialize " \
+          "self: #{self.object_id}")
+
+      self.instance_eval(&block) if block_given?
+
+      self
+    end
+
+    def add(object, &block)
+      log("Events#add " \
+          "self: #{self.object_id}" \
+          "menu: #{object.object_id}")
+
+      @self_before_instance_eval = eval "self", block.binding
+
+      self.instance_eval(&block)
+    end
+
+    def on(event, &block)
+      log("Events#on " \
+          "self:  #{self.object_id} " \
+          "block: #{block.object_id} " \
+          "event: #{event.inspect}")
+      handlers[event] << block
+    end
+
+    def trigger(event, *args)
+      handlers[event].each do |handler|
+        log("Events#trigger " \
+            "self:    #{self.object_id} " \
+            "handler: #{handler.object_id} " \
+            "event:   #{event.inspect}")
+        handler.call(*args)
+      end
+    end
+
+    def method_missing(method, *args, &block)
+      @self_before_instance_eval.send method, *args, &block
+    end
+
+    private
+
+    attr_reader :handlers
+
+    def log(message)
+      Vedeu.trigger(:_log_, message) if debug?
+    end
+
+    def debug?
+      false
+    end
+  end
+end

data/lib/vedeu/support/exit.rb

@@ -1,9 +1,9 @@
-require_relative '../repository/event_repository'
+require_relative '../../vedeu'
 
 module Vedeu
   class Exit
     def self.dispatch
-      EventRepository.trigger(:_exit_)
+      Vedeu.trigger(:_exit_)
     end
   end
 end

data/lib/vedeu/support/{coordinate.rb → geometry.rb}

@@ -4,7 +4,7 @@ require_relative 'terminal'
 module Vedeu
   class OutOfBoundsError < StandardError; end
 
-  class Coordinate
+  class Geometry
     def initialize(attrs = {})
       @attrs           = attrs
       @height          = attrs.fetch(:height)

data/lib/vedeu/support/menu.rb

@@ -1,9 +1,29 @@
+require_relative '../../vedeu'
+require_relative 'events'
+
 module Vedeu
   class Menu
     def initialize(collection)
       @collection = collection
       @current    = 0
       @selected   = nil
+      @events     = events
+    end
+
+    def events
+      @_events ||= Vedeu.events.add(self) do
+        on(:menu_next)     { next_item     }
+        on(:menu_prev)     { prev_item     }
+        on(:menu_top)      { top_item      }
+        on(:menu_bottom)   { bottom_item   }
+        on(:menu_select)   { select_item   }
+        on(:menu_deselect) { deselect_item }
+
+        on(:menu_selected) { selected_item }
+        on(:menu_current)  { current_item  }
+        on(:menu_items)    { items         }
+        on(:menu_render)   { render        }
+      end
     end
 
     def current
@@ -64,32 +84,40 @@ module Vedeu
       lines
     end
 
-    def top
+    def top_item
       @current = 0
+
+      self
     end
 
-    def bottom
+    def bottom_item
       @current = last
+
+      self
     end
 
-    def next
+    def next_item
       @current += 1 if @current < last
 
       self
     end
 
-    def prev
+    def prev_item
       @current -= 1 if @current > 0
 
       self
     end
 
-    def select
+    def select_item
       @selected = @current
+
+      self
     end
 
-    def deselect
+    def deselect_item
       @selected = nil
+
+      self
     end
 
     def last

data/lib/vedeu/support/terminal.rb

@@ -1,6 +1,6 @@
 require 'io/console'
 
-require_relative '../support/esc'
+require_relative 'esc'
 
 module Vedeu
   module Terminal