vedeu 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73c1296c50c2e542fe744337b953c07e2a14ee03
-  data.tar.gz: 55e5fa60d09ce7c65382a2ff664b79e717cb0228
+  metadata.gz: 2ea325bc6c7ebf8080510b64ab7529f2ed504b97
+  data.tar.gz: fe17337d4699b19d701442298095df4204a56c7f
 SHA512:
-  metadata.gz: 8816692395970fdb8a2b9003a625348cef3255c23c9340b56bfdb0297efbedbdc63d53f903caba320f7d94eb0f9f7f1834f4a4a721785a7b0e7142b377124952
-  data.tar.gz: 7f321725fa3838de38dfcfd1091dbbd66ee5bc6439d47322fc3075ebd249c6ca52218f21c83fa7edb091ad5562783083998df9b1d05d6e6ec45c8b64deec0183
+  metadata.gz: b9ce3531ba1d457e6f8f4b1ef8bd0d19211636edafba1dd2e6da80deaea6ef26404649df0dcb771ec6c74741b2aef312e1b9945bbe7542bac3229dd099f09641
+  data.tar.gz: ad41764646d32bb82b0603c53524663f2747719a4b9989aa0fa128bfeada4d2de3f87eb99b34de834e71d6d66d9e462017279357f2040c46d3aa7d68f5e22ca2

data/lib/vedeu/models/{interface_collection.rb → attributes/interface_collection.rb}

@@ -1,6 +1,6 @@
 require 'virtus'
 
-require_relative '../repository/interface_repository'
+require_relative '../../repository/interface_repository'
 
 module Vedeu
   class InterfaceCollection < Virtus::Attribute

data/lib/vedeu/models/{line_collection.rb → attributes/line_collection.rb}

@@ -1,7 +1,7 @@
 require 'virtus'
 
 require_relative 'collection'
-require_relative 'line'
+require_relative '../line'
 
 module Vedeu
   class LineCollection < Virtus::Attribute

data/lib/vedeu/models/{stream_collection.rb → attributes/stream_collection.rb}

@@ -1,7 +1,7 @@
 require 'virtus'
 
 require_relative 'collection'
-require_relative 'stream'
+require_relative '../stream'
 
 module Vedeu
   class StreamCollection < Virtus::Attribute

data/lib/vedeu/models/composition.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'virtus'
 
-require_relative 'interface_collection'
+require_relative 'attributes/interface_collection'
 
 module Vedeu
   class Composition
@@ -9,33 +9,14 @@ module Vedeu
 
     attribute :interfaces, InterfaceCollection
 
-    def self.enqueue(composition)
-      new(composition).enqueue
-    end
-
-    def enqueue
-      interfaces.map do |interface|
-        interface.enqueue(interface.to_s)
-        interface
-      end
-
-      self
-    end
-
     def to_json
-      json_attributes.to_json
+      {
+        interfaces: interfaces
+      }.to_json
     end
 
     def to_s
       interfaces.map(&:to_s).join
     end
-
-    private
-
-    def json_attributes
-      {
-        interfaces: interfaces
-      }
-    end
   end
 end

data/lib/vedeu/models/interface.rb

@@ -2,7 +2,7 @@ require 'json'
 require 'virtus'
 
 require_relative 'presentation'
-require_relative 'line_collection'
+require_relative 'attributes/line_collection'
 require_relative 'style'
 require_relative '../output/interface_renderer'
 require_relative '../support/coordinate'
@@ -28,6 +28,10 @@ module Vedeu
     attribute :cursor,  Boolean, default: true
     attribute :centred, Boolean, default: false
 
+    def enqueue
+      super(self.to_s)
+    end
+
     def origin(index = 0)
       geometry.origin(index)
     end
@@ -46,7 +50,18 @@ module Vedeu
     end
 
     def to_json(*args)
-      json_attributes.to_json
+      {
+        colour: colour,
+        style:  style_original,
+        name:   name,
+        lines:  lines,
+        y:      y,
+        x:      x,
+        z:      z,
+        width:  width,
+        height: height,
+        cursor: cursor
+      }.to_json
     end
 
     def to_s
@@ -67,21 +82,6 @@ module Vedeu
       InterfaceRenderer.clear(self)
     end
 
-    def json_attributes
-      {
-        colour: colour,
-        style:  style_original,
-        name:   name,
-        lines:  lines,
-        y:      y,
-        x:      x,
-        z:      z,
-        width:  width,
-        height: height,
-        cursor: cursor
-      }
-    end
-
     def geometry
       @_geometry ||= Coordinate.new(attributes)
     end

data/lib/vedeu/models/line.rb

@@ -2,7 +2,7 @@ require 'json'
 require 'virtus'
 
 require_relative 'presentation'
-require_relative 'stream_collection'
+require_relative 'attributes/stream_collection'
 require_relative 'style'
 
 module Vedeu
@@ -15,21 +15,15 @@ module Vedeu
     attribute :streams, StreamCollection
 
     def to_json
-      json_attributes.to_json
-    end
-
-    def to_s
-      [colour, style, streams].join
-    end
-
-    private
-
-    def json_attributes
       {
         colour:  colour,
         style:   style_original,
         streams: streams
-      }
+      }.to_json
+    end
+
+    def to_s
+      [colour, style, streams].join
     end
   end
 end

data/lib/vedeu/models/stream.rb

@@ -14,21 +14,15 @@ module Vedeu
     attribute :text, String, default: ''
 
     def to_json
-      json_attributes.to_json
-    end
-
-    def to_s(options = {})
-      [colour, style, text].join
-    end
-
-    private
-
-    def json_attributes
       {
         colour: colour,
         style:  style_original,
         text:   text
-      }
+      }.to_json
+    end
+
+    def to_s(options = {})
+      [colour, style, text].join
     end
   end
 end

data/lib/vedeu/output/interface_renderer.rb

@@ -38,23 +38,17 @@ module Vedeu
     end
 
     def clear_lines
-      height.times.inject([]) { |line, index| line << clear_line(index) }.join
+      interface.height.times.inject([]) do |line, index|
+        line << clear_line(index)
+      end.join
     end
 
     def clear_line(index)
-      origin(index) + (' ' * width) + origin(index)
+      origin(index) + (' ' * interface.width)
     end
 
     def origin(index)
       interface.origin(index)
     end
-
-    def height
-      interface.height
-    end
-
-    def width
-      interface.width
-    end
   end
 end

data/lib/vedeu/repository/command_repository.rb

@@ -21,11 +21,11 @@ module Vedeu
     private
 
     def by_keypress(input)
-      query(entity, :keypress, input) || false
+      query(entity, :keypress, input)
     end
 
     def by_keyword(input)
-      query(entity, :keyword, input) || false
+      query(entity, :keyword, input)
     end
   end
 end

data/lib/vedeu/repository/interface_repository.rb

@@ -13,9 +13,13 @@ module Vedeu
     end
 
     def find(name)
-      result = super
-      fail UndefinedInterface, "#{name.to_s} could not be found." unless result
-      result
+      if result = query(entity, :name, name)
+        result
+
+      else
+        fail UndefinedInterface, "#{name.to_s} could not be found."
+
+      end
     end
 
     def update(name, attributes = {})

data/lib/vedeu/repository/repository.rb

@@ -6,10 +6,6 @@ module Vedeu
       @adaptor ||= Storage.new
     end
 
-    def find(name)
-      adaptor.find(entity, name)
-    end
-
     def all
       adaptor.all(entity)
     end

data/lib/vedeu/repository/storage.rb

@@ -16,10 +16,6 @@ module Vedeu
       all(entity).map { |record| delete(record) }
     end
 
-    def find(entity, name)
-      map_for_class(entity).fetch(name, nil)
-    end
-
     def all(entity)
       map_for_class(entity).values
     end
@@ -31,7 +27,7 @@ module Vedeu
         return result if result.send(attribute) == value
       end
 
-      nil
+      false
     end
 
     private

data/lib/vedeu/support/compositor.rb

@@ -0,0 +1,25 @@
+require_relative '../models/composition'
+
+module Vedeu
+  class Compositor
+    def self.enqueue(attributes)
+      new(attributes).enqueue
+    end
+
+    def initialize(attributes)
+      @attributes = attributes
+    end
+
+    def enqueue
+      composition.interfaces.map { |interface| interface.enqueue }
+    end
+
+    private
+
+    attr_reader :attributes
+
+    def composition
+      @composition ||= Composition.new(attributes)
+    end
+  end
+end

data/lib/vedeu/support/coordinate.rb

@@ -21,80 +21,55 @@ module Vedeu
     end
 
     def terminal_height
-      fail OutOfBoundsError,
-        'Value must be greater than or equal to 1.' if @terminal_height < 1
+      fail_if_less_than_one(@terminal_height)
 
-      if @terminal_height > Terminal.height
-        fail OutOfBoundsError, 'Cannot set terminal_height to be ' \
-                               'greater than the actual terminal ' \
-                               'height.'
-      else
-        @terminal_height
-      end
+      fail_if_out_of_bounds('terminal_height',
+                            @terminal_height,
+                            Terminal.height)
+
+      @terminal_height
     end
 
     def height
-      fail OutOfBoundsError,
-        'Value must be greater than or equal to 1.' if @height < 1
+      fail_if_less_than_one(@height)
 
-      if @height > terminal_height
-        fail OutOfBoundsError, 'Cannot set height to be greater ' \
-                               'than the specified or actual '    \
-                               'terminal height.'
-      else
-        @height
-      end
+      fail_if_out_of_bounds('height', @height, terminal_height)
+
+      @height
     end
 
     def y
-      fail OutOfBoundsError,
-        'Value must be greater than or equal to 1.' if @y < 1
+      fail_if_less_than_one(@y)
 
-      if @y > terminal_height
-        fail OutOfBoundsError, 'Cannot set y position to be greater' \
-                               ' that the specified terminal height' \
-                               ' or actual terminal height.'
-      else
-        @y
-      end
+      fail_if_out_of_bounds('y', @y, terminal_height)
+
+      @y
     end
 
     def terminal_width
-      fail OutOfBoundsError,
-        'Value must be greater than or equal to 1.' if @terminal_width < 1
-      if @terminal_width > Terminal.width
-        fail OutOfBoundsError, 'Cannot set terminal_width to be '  \
-                               'greater than the actual terminal ' \
-                               'width.'
-      else
-        @terminal_width
-      end
+      fail_if_less_than_one(@terminal_width)
+
+      fail_if_out_of_bounds('terminal_width',
+                            @terminal_width,
+                            Terminal.width)
+
+      @terminal_width
     end
 
     def width
-      fail OutOfBoundsError,
-        'Value must be greater than or equal to 1.' if @width < 1
+      fail_if_less_than_one(@width)
 
-      if @width > terminal_width
-        fail OutOfBoundsError, 'Cannot set width to be greater ' \
-                               'than the specified or actual ' \
-                               'terminal width.'
-      else
-        @width
-      end
+      fail_if_out_of_bounds('width', @width, terminal_width)
+
+      @width
     end
 
     def x
-      fail OutOfBoundsError,
-        'Value must be greater than or equal to 1.' if @x < 1
+      fail_if_less_than_one(@x)
 
-      if @x > terminal_width
-        fail OutOfBoundsError, 'Cannot set x position to be greater' \
-                               ' that the specified terminal width' \
-                               ' or actual terminal width.'
-      else
-        @x
-      end
+      fail_if_out_of_bounds('x', @x, terminal_width)
+
+      @x
     end
 
     def centred
@@ -151,6 +126,18 @@ module Vedeu
 
     private
 
+    def fail_if_less_than_one(value)
+      fail OutOfBoundsError,
+        'Value must be greater than or equal to 1.' if value < 1
+    end
+
+    def fail_if_out_of_bounds(name, attribute, boundary)
+      if attribute > boundary
+        fail OutOfBoundsError,
+          "Cannot set #{name} to be outside the terminal visible area."
+      end
+    end
+
     def virtual_x
       left
     end

data/lib/vedeu/support/parser.rb

@@ -1,4 +1,4 @@
-require_relative '../models/composition'
+require_relative 'compositor'
 require_relative 'parsing/hash_parser'
 require_relative 'parsing/json_parser'
 
@@ -17,7 +17,7 @@ module Vedeu
     def parse
       return nil if empty?
 
-      Composition.enqueue(parsed_output)
+      Compositor.enqueue(parsed_output)
     end
 
     private

data/test/lib/vedeu/models/{collection_test.rb → attributes/collection_test.rb}

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/models/collection'
+require_relative '../../../../test_helper'
+require_relative '../../../../../lib/vedeu/models/attributes/collection'
 
 module Vedeu
   class TestClass

data/test/lib/vedeu/models/{interface_collection_test.rb → attributes/interface_collection_test.rb}

@@ -1,6 +1,6 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/models/interface_collection'
-require_relative '../../../../lib/vedeu/models/composition'
+require_relative '../../../../test_helper'
+require_relative '../../../../../lib/vedeu/models/attributes/interface_collection'
+require_relative '../../../../../lib/vedeu/models/composition'
 
 module Vedeu
   describe InterfaceCollection do

data/test/lib/vedeu/models/{line_collection_test.rb → attributes/line_collection_test.rb}

@@ -1,6 +1,6 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/models/line_collection'
-require_relative '../../../../lib/vedeu/models/interface'
+require_relative '../../../../test_helper'
+require_relative '../../../../../lib/vedeu/models/attributes/line_collection'
+require_relative '../../../../../lib/vedeu/models/interface'
 
 module Vedeu
   describe LineCollection do

data/test/lib/vedeu/models/{stream_collection_test.rb → attributes/stream_collection_test.rb}

@@ -1,6 +1,6 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/models/stream_collection'
-require_relative '../../../../lib/vedeu/models/line'
+require_relative '../../../../test_helper'
+require_relative '../../../../../lib/vedeu/models/attributes/stream_collection'
+require_relative '../../../../../lib/vedeu/models/line'
 
 module Vedeu
   describe StreamCollection do