vedeu 0.8.13 → 0.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 002c233933994a1c074caa09713374413fb3ec7e
-  data.tar.gz: f083bf135c2d9307329af03198159f73ecc88548
+  metadata.gz: 34e3c347f479d6c178f4aacae2dd5cee4018d555
+  data.tar.gz: 92cb71dfedee65fb74c2808c843bea8222802808
 SHA512:
-  metadata.gz: a0c4f251a4537d4907ec3b9b1eea499be60b8be212fc8544e3ce7beef9eaff3b33ed8d5ef73cd0dc6ad85965a88f77aa0f7dd06336bb2f5718db33e0dabfaa3e
-  data.tar.gz: 86f69b80ad1db0b0df5ef2bce701c33e6f09e8d57ab9784331f1cca01b3eb48781992ce61d451915b9caf0557564a8ec91d451bed3ba27b3187803907c486f78
+  metadata.gz: 338a4fd459b7f6d89e56e3247921aa215069b5bf30b947084fbd55c5aec2a42d44cecaf6d8a4a5ca7e38fd0084b5908239bffe9a760c444476ff336e1c51ef16
+  data.tar.gz: a84a360d6c8f4153ca61aa89ea819178d866d9e9d4b306b23da5a9da57bba8146840155b24626a24108bd1a3a6addcdde33a93c0b8582379933a1462ab7f83a2

data/.rubocop.yml

@@ -41,6 +41,9 @@ Style/EmptyLinesAroundClassBody:
 Style/EmptyLinesAroundModuleBody:
   EnforcedStyle: empty_lines
 
+Style/ExtraSpacing:
+  Enabled: false
+
 # Style/GlobalVars:
 #   AllowedVariables: [$LIB_DIR]
 

data/lib/vedeu/buffers/empty.rb

@@ -57,8 +57,7 @@ module Vedeu
       def empty
         Array.new(height) do |h|
           Array.new(width) do |w|
-            position = Vedeu::Geometries::Position.new((y + h), (x + w))
-            Vedeu::Cells::Empty.new(name: name, position: position)
+            Vedeu::Cells::Empty.new(name: name, position: [(y + h), (x + w)])
           end
         end
       end

data/lib/vedeu/buffers/view.rb

@@ -48,7 +48,9 @@ module Vedeu
       #   Vedeu::Cells::Char]
       # @return [Vedeu::Buffers::View]
       def update(value_or_values)
-        Array(value_or_values).flatten.each { |value| write(value) }
+        Array(value_or_values).flatten.each do |value|
+          write(value) if positionable?(value)
+        end
 
         self
       end
@@ -61,6 +63,12 @@ module Vedeu
 
       private
 
+      # @param value [void]
+      # @return [Fixnum]
+      def column(value)
+        Vedeu::Point.coerce(value: value.position.x, min: bx, max: bxn).value
+      end
+
       # @return [Array<Vedeu::Cells::Empty>]
       def current
         @current ||= Vedeu::Buffers::Empty.new(height: bordered_height,
@@ -82,31 +90,10 @@ module Vedeu
         @_geometry ||= Vedeu.geometries.by_name(name)
       end
 
-      # Returns a boolean indicating the value has a position
-      # attribute and is within the terminal boundary.
-      #
       # @param value [void]
-      # @return [Boolean]
-      def valid?(value)
-        positionable?(value)       &&
-        valid_y?(value.position.y) &&
-        valid_x?(value.position.x)
-      end
-
-      # Returns a boolean indicating whether the x position of the
-      # value object is valid for this geometry.
-      #
-      # @return [Boolean]
-      def valid_x?(x)
-        Vedeu::Point.valid?(value: x, min: bx, max: bxn)
-      end
-
-      # Returns a boolean indicating whether the y position of the
-      # value object is valid for this geometry.
-      #
-      # @return [Boolean]
-      def valid_y?(y)
-        Vedeu::Point.valid?(value: y, min: by, max: byn)
+      # @return [Fixnum]
+      def row(value)
+        Vedeu::Point.coerce(value: value.position.y, min: by, max: byn).value
       end
 
       # Write the value into the respective cell as defined by the
@@ -115,7 +102,7 @@ module Vedeu
       # @param value [void]
       # @return [NilClass|void]
       def write(value)
-        current[value.position.y][value.position.x] = value if valid?(value)
+        current[row(value)][column(value)] = value
       end
 
     end # View

data/lib/vedeu/cells/border.rb

@@ -12,7 +12,6 @@ module Vedeu
     class Border < Vedeu::Cells::Empty
 
       extend Forwardable
-      include Vedeu::Presentation
 
       def_delegators :geometry,
                      :x,

data/lib/vedeu/cells/empty.rb

@@ -38,10 +38,7 @@ module Vedeu
       # @param other [void]
       # @return [Boolean]
       def eql?(other)
-        self.class.equal?(other.class) &&
-          position == other.position &&
-          value    == other.value &&
-          colour   == other.colour
+        self.class.equal?(other.class) && position == other.position
       end
       alias == eql?
 

data/lib/vedeu/coercers/editor_lines.rb

@@ -17,7 +17,7 @@ module Vedeu
         if coerced?
           klass.new(value.lines)
 
-        elsif value.is_a?(Array)
+        elsif array?(value)
           collection = value.map do |line|
             Vedeu::Editor::Line.coerce(line)
           end

data/lib/vedeu/coercers/page.rb

@@ -20,10 +20,10 @@ module Vedeu
         elsif value.is_a?(Vedeu::Models::Row)
           klass.new([value])
 
-        elsif value.is_a?(Array) && value.empty?
+        elsif array?(value) && value.empty?
           klass.new([Vedeu::Models::Row.coerce(value)])
 
-        elsif value.is_a?(Array) || value.is_a?(Vedeu::Buffers::View)
+        elsif array?(value) || value.is_a?(Vedeu::Buffers::View)
           values = value.map { |v| Vedeu::Models::Row.coerce(v) }
 
           klass.new(values)

data/lib/vedeu/coercers/position.rb

@@ -20,7 +20,7 @@ module Vedeu
         elsif tuple?
           klass.new(*value)
 
-        elsif hash?
+        elsif hash?(value)
           klass.new(value.fetch(:y, 1), value.fetch(:x, 1))
 
         elsif numeric?(value)
@@ -34,11 +34,6 @@ module Vedeu
 
       private
 
-      # @return [Boolean]
-      def hash?
-        value.is_a?(Hash)
-      end
-
       # @return [Class]
       def klass
         Vedeu::Geometries::Position
@@ -47,7 +42,7 @@ module Vedeu
       # @macro raise_fatal
       # @return [Boolean]
       def tuple?
-        return false unless value.is_a?(Array)
+        return false unless array?(value)
         return true  if value.size == 2
 
         raise Vedeu::Error::Fatal,

data/lib/vedeu/coercers/row.rb

@@ -16,7 +16,7 @@ module Vedeu
         if coerced?
           value
 
-        elsif value.is_a?(Array)
+        elsif array?(value)
           klass.new(value.compact)
 
         elsif value.nil?

data/lib/vedeu/coercers/style.rb

@@ -19,7 +19,7 @@ module Vedeu
         if coerced?
           value
 
-        elsif value.is_a?(Hash)
+        elsif hash?(value)
           if present?(value[:style])
             if value[:style].is_a?(klass)
               value[:style]

data/lib/vedeu/common.rb

@@ -17,6 +17,14 @@ module Vedeu
       !present?(variable)
     end
 
+    # Returns a boolean indicating whether the value is an Array.
+    #
+    # @param value [Array|void]
+    # @return [Boolean]
+    def array?(value)
+      value.is_a?(Array)
+    end
+
     # Returns a boolean indicating the value was a boolean.
     #
     # @param value [void]

data/lib/vedeu/configuration/api.rb

@@ -243,7 +243,7 @@ module Vedeu
 
       # Log specific message types except those given. A complete list
       # of message types can be found at
-      # {Vedeu::Logging::Log.message_types}.
+      # {Vedeu::Configuration.log_types}.
       #
       #   Vedeu.configure do
       #     log_except :debug, :event
@@ -262,7 +262,7 @@ module Vedeu
       end
 
       # Only log specific message types. A complete list of message
-      # types can be found at {Vedeu::Logging::Log.message_types}.
+      # types can be found at {Vedeu::Configuration.log_types}.
       #
       #   Vedeu.configure do
       #     log_only :debug, :event

data/lib/vedeu/configuration/configuration.rb

@@ -180,12 +180,54 @@ module Vedeu
 
       # @return [Array<Symbol>]
       def log_except
-        instance.options[:log_except] || []
+        instance.options[:log_except]
       end
 
       # @return [Array<Symbol>]
       def log_only
-        instance.options[:log_only] || []
+        instance.options[:log_only]
+      end
+
+      # The defined message types for Vedeu with their respective
+      # colours. When used, produces a log entry of the format:
+      #
+      #     [type] message
+      #
+      # The 'type' will be shown as the first colour defined in the
+      # value array, whilst the 'message' will be shown using the
+      # last colour.
+      #
+      # @return [Hash<Symbol => Array<Symbol>>]
+      def log_types
+        {
+          blue:     [:light_blue,    :blue],
+          buffer:   [:light_green,   :green],
+          compress: [:white,         :light_grey],
+          config:   [:light_blue,    :blue],
+          create:   [:light_cyan,    :cyan],
+          cursor:   [:light_green,   :green],
+          cyan:     [:light_cyan,    :cyan],
+          debug:    [:white,         :light_grey],
+          drb:      [:light_blue,    :blue],
+          dsl:      [:light_blue,    :blue],
+          editor:   [:light_blue,    :blue],
+          error:    [:light_red,     :red],
+          event:    [:light_magenta, :magenta],
+          green:    [:light_green,   :green],
+          info:     [:white,         :light_grey],
+          input:    [:light_yellow,  :yellow],
+          magenta:  [:light_magenta, :magenta],
+          output:   [:light_yellow,  :yellow],
+          red:      [:light_red,     :red],
+          render:   [:light_green,   :green],
+          reset:    [:light_cyan,    :cyan],
+          store:    [:light_cyan,    :cyan],
+          test:     [:white,         :light_grey],
+          timer:    [:light_blue,    :blue],
+          update:   [:light_cyan,    :cyan],
+          white:    [:white,         :light_grey],
+          yellow:   [:light_yellow,  :yellow],
+        }
       end
 
       # Returns true if the given type was included in the :log_only
@@ -195,7 +237,20 @@ module Vedeu
       # @param type [Symbol]
       # @return [Boolean]
       def loggable?(type)
-        log_only.include?(type) || !log_except.include?(type)
+        return false unless log_types.keys.include?(type)
+        return true if log_only.empty? && log_except.empty?
+
+        types = if log_except.any?
+                  log_types.keys - log_except
+                else
+                  log_types.keys
+                end
+
+        if log_only.any?
+          log_only.include?(type)
+        else
+          types.include?(type) ? true : false
+        end
       end
 
       # Returns whether mouse support was enabled or disabled.

data/lib/vedeu/editor/delete.rb

@@ -70,7 +70,7 @@ module Vedeu
       #
       # @return [Boolean]
       def lines?
-        collection.is_a?(Array)
+        array?(collection)
       end
 
       # Returns a boolean indicating whether the index was given or

data/lib/vedeu/interfaces/dsl.rb

@@ -322,7 +322,7 @@ module Vedeu
         model.zindex = value
       end
       alias z_index zindex
-      alias z zindex
+      alias z       zindex
 
     end # DSL
 

data/lib/vedeu/logging/debug.rb

@@ -65,7 +65,7 @@ module Vedeu
           # - Creates a HTML visualization of the Ruby stack
           ::RubyProf::CallStackPrinter.new(result).print(file)
 
-          # Used with QTCacheGrind to analyse performance.
+          # Used with KCachegrind to analyse performance.
           # ::RubyProf::CallTreePrinter.new(result).print(file)
 
           # Creates a flat report in text format

data/lib/vedeu/logging/log.rb

@@ -27,7 +27,8 @@ module Vedeu
         #   to write to the log file regardless of the Configuration
         #   setting.
         # @param type [Symbol] Colour code messages in the log file
-        #   depending on their source. See {message_types}
+        #   depending on their source. See
+        #   {Vedeu::Configuration.log_types}
         #
         # @return [String]
         def log(message:, force: false, type: :info)
@@ -40,7 +41,7 @@ module Vedeu
 
         # {include:file:docs/dsl/by_method/log_stdout.md}
         # @macro vedeu_logging_log_param_message
-        # @param type [Symbol] See {Vedeu::Logging::Log.message_types}
+        # @param type [Symbol] See {Vedeu::Configuration.log_types}
         #   for valid values.
         # @return [String]
         def log_stdout(message:, type: :info)
@@ -51,7 +52,7 @@ module Vedeu
 
         # {include:file:docs/dsl/by_method/log_stderr.md}
         # @macro vedeu_logging_log_param_message
-        # @param type [Symbol] See {Vedeu::Logging::Log.message_types}
+        # @param type [Symbol] See {Vedeu::Logging::Log.types}
         #   for valid values.
         # @return [String]
         def log_stderr(message:, type: :error)
@@ -102,7 +103,7 @@ module Vedeu
         # @macro vedeu_logging_log_param_message
         # @return [String]
         def log_entry(type, message)
-          colours = message_types.fetch(type, [:default, :default])
+          colours = Vedeu.config.log_types.fetch(type, [:default, :default])
 
           [
             Vedeu.esc.colour(colours[0]) { "[#{type}]".ljust(11) },
@@ -110,56 +111,6 @@ module Vedeu
           ].join
         end
 
-        # The defined message types for Vedeu with their respective
-        # colours. When used, produces a log entry of the format:
-        #
-        #     [type] message
-        #
-        # The 'type' will be shown as the first colour defined in the
-        # value array, whilst the 'message' will be shown using the
-        # last colour.
-        #
-        # @return [Hash<Symbol => Array<Symbol>>]
-        def message_types
-          {
-            create:   [:light_cyan, :cyan],
-            store:    [:light_cyan, :cyan],
-            update:   [:light_cyan, :cyan],
-            reset:    [:light_cyan, :cyan],
-
-            event:    [:light_magenta, :magenta],
-
-            timer:    [:light_blue, :blue],
-
-            info:     [:white, :light_grey],
-            test:     [:white, :light_grey],
-            debug:    [:white, :light_grey],
-            compress: [:white, :light_grey],
-
-            input:    [:light_yellow, :yellow],
-            output:   [:light_yellow, :yellow],
-
-            cursor:   [:light_green, :green],
-            buffer:   [:light_green, :green],
-            render:   [:light_green, :green],
-
-            error:    [:light_red, :red],
-
-            config:   [:light_blue, :blue],
-            dsl:      [:light_blue, :blue],
-            editor:   [:light_blue, :blue],
-            drb:      [:light_blue, :blue],
-
-            blue:     [:light_blue,    :blue],
-            cyan:     [:light_cyan,    :cyan],
-            green:    [:light_green,   :green],
-            magenta:  [:light_magenta, :magenta],
-            red:      [:light_red,     :red],
-            white:    [:white,         :light_grey],
-            yellow:   [:light_yellow,  :yellow],
-          }
-        end
-
       end # Eigenclass
 
     end # Log

data/lib/vedeu/presentation/colour.rb

@@ -140,6 +140,15 @@ module Vedeu
         present?(parent) && parent.respond_to?(:colour?)
       end
 
+      # Renders the colour attributes of the receiver and yields (to
+      # then render the styles).
+      #
+      # @param block [Proc]
+      # @return [String]
+      def render_colour(&block)
+        "#{colour}#{yield}"
+      end
+
     end # Colour
 
   end # Presentation

data/lib/vedeu/presentation/position.rb

@@ -50,6 +50,16 @@ module Vedeu
         position.y if position?
       end
 
+      private
+
+      # @param block [Proc]
+      # @return [String]
+      def render_position(&block)
+        return position.to_s { yield } if position?
+
+        yield
+      end
+
     end # Position
 
   end # Presentation

data/lib/vedeu/presentation/presentation.rb

@@ -18,34 +18,6 @@ module Vedeu
     end
     alias to_str to_s
 
-    private
-
-    # Renders the colour attributes of the receiver and yields (to
-    # then render the styles).
-    #
-    # @param block [Proc]
-    # @return [String]
-    def render_colour(&block)
-      "#{colour}#{yield}"
-    end
-
-    # @param block [Proc]
-    # @return [String]
-    def render_position(&block)
-      return position.to_s { yield } if position?
-
-      yield
-    end
-
-    # Renders the style attributes of the receiver and yields (to
-    # then render the next model, or finally, the content).
-    #
-    # @param block [Proc]
-    # @return [String]
-    def render_style(&block)
-      "#{style}#{yield}"
-    end
-
   end # Presentation
 
 end # Vedeu

data/lib/vedeu/presentation/styles.rb

@@ -52,6 +52,17 @@ module Vedeu
         @_style = @style = Vedeu::Presentation::Style.coerce(value)
       end
 
+      private
+
+      # Renders the style attributes of the receiver and yields (to
+      # then render the next model, or finally, the content).
+      #
+      # @param block [Proc]
+      # @return [String]
+      def render_style(&block)
+        "#{style}#{yield}"
+      end
+
     end # Style
 
   end # Presentation

data/lib/vedeu/renderers/all.rb

@@ -132,8 +132,9 @@ module Vedeu
 
 end # Vedeu
 
-require 'vedeu/renderers/options'
-require 'vedeu/renderers/file'
+require 'vedeu/renderers/support/options'
+require 'vedeu/renderers/support/file'
+
 require 'vedeu/renderers/escape'
 require 'vedeu/renderers/html'
 require 'vedeu/renderers/json'

data/lib/vedeu/repositories/collection.rb

@@ -11,6 +11,7 @@ module Vedeu
     #
     class Collection
 
+      include Vedeu::Common
       include Vedeu::Repositories::Assemblage
 
       # @!attribute [r] collection

data/lib/vedeu/repositories/repository.rb

@@ -47,7 +47,7 @@ module Vedeu
       #
       # @return [Array<void>] An array containing each stored model.
       def all
-        return storage.values if storage.is_a?(Hash)
+        return storage.values if hash?(storage)
 
         registered
       end

data/lib/vedeu/repositories/store.rb

@@ -48,7 +48,7 @@ module Vedeu
       # @return [Array]
       def registered
         return []           if empty?
-        return storage.keys if storage.is_a?(Hash)
+        return storage.keys if hash?(storage)
         return storage.to_a if storage.is_a?(Set)
 
         storage

data/lib/vedeu/version.rb

@@ -3,6 +3,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.8.13'
+  VERSION = '0.8.14'
 
 end

data/lib/vedeu/views/chars.rb

@@ -10,47 +10,53 @@ module Vedeu
     #
     class Chars < Vedeu::Repositories::Collection
 
-      # @param collection [void]
-      # @param parent [Vedeu::Views::Stream]
-      # @param name [NilClass|Symbol|String]
-      # @macro raise_invalid_syntax
-      # @return [Vedeu::Views::Chars]
-      def self.coerce(collection = [], parent = nil, name = nil)
-        if collection.is_a?(Vedeu::Views::Chars)
-          collection
-
-        elsif collection.is_a?(Array)
-          return new(collection, parent, name) if collection.empty?
-
-          coerced_collection = []
-          collection.each do |element|
-            coerced_collection << element if element.is_a?(Vedeu::Cells::Char)
-          end
+      class << self
 
-          new(coerced_collection, parent, name)
+        include Vedeu::Common
 
-        elsif collection.is_a?(Vedeu::Views::Stream)
-          Vedeu::Views::Chars.coerce(collection.value,
-                                     collection.parent,
-                                     collection.name)
+        # @param collection [void]
+        # @param parent [Vedeu::Views::Stream]
+        # @param name [NilClass|Symbol|String]
+        # @macro raise_invalid_syntax
+        # @return [Vedeu::Views::Chars]
+        def coerce(collection = [], parent = nil, name = nil)
+          if collection.is_a?(Vedeu::Views::Chars)
+            collection
 
-        elsif collection.is_a?(String)
-          return new([], parent, name) if collection.empty?
+          elsif array?(collection)
+            return new(collection, parent, name) if collection.empty?
 
-          if parent && parent.attributes
-            new_collection = Vedeu::DSL::Text.new(collection,
-                                                  parent.attributes).chars
+            coerced_collection = []
+            collection.each do |element|
+              coerced_collection << element if element.is_a?(Vedeu::Cells::Char)
+            end
 
-            new(new_collection, parent, name)
-          end
+            new(coerced_collection, parent, name)
+
+          elsif collection.is_a?(Vedeu::Views::Stream)
+            Vedeu::Views::Chars.coerce(collection.value,
+                                       collection.parent,
+                                       collection.name)
+
+          elsif string?(collection)
+            return new([], parent, name) if collection.empty?
 
-        else
-          raise Vedeu::Error::InvalidSyntax,
-                'Cannot coerce for Vedeu::View::Chars, as collection is ' \
-                'unrecognised.'
+            if parent && parent.attributes
+              new_collection = Vedeu::DSL::Text.new(collection,
+                                                    parent.attributes).chars
 
+              new(new_collection, parent, name)
+            end
+
+          else
+            raise Vedeu::Error::InvalidSyntax,
+                  'Cannot coerce for Vedeu::View::Chars, as collection is ' \
+                  'unrecognised.'
+
+          end
         end
-      end
+
+      end # Eigenclass
 
       alias chars value
 

data/lib/vedeu/views/lines.rb

@@ -10,38 +10,44 @@ module Vedeu
     #
     class Lines < Vedeu::Repositories::Collection
 
-      # @param (see Vedeu::Repositories::Collection#initialize)
-      # @macro raise_invalid_syntax
-      # @return [Vedeu::Views::Lines]
-      def self.coerce(collection = [], parent = nil, name = nil)
-        if collection.is_a?(Vedeu::Views::Lines)
-          collection
-
-        elsif collection.is_a?(Vedeu::Views::Streams)
-          if collection.empty?
-            # @todo Investigate whether this is being used.
-          end
+      class << self
 
-        elsif collection.is_a?(Array)
-          return new(collection, parent, name) if collection.empty?
+        include Vedeu::Common
 
-          coerced_collection = []
-          collection.each do |element|
-            coerced_collection << element if element.is_a?(Vedeu::Views::Line)
-          end
+        # @param (see Vedeu::Repositories::Collection#initialize)
+        # @macro raise_invalid_syntax
+        # @return [Vedeu::Views::Lines]
+        def coerce(collection = [], parent = nil, name = nil)
+          if collection.is_a?(Vedeu::Views::Lines)
+            collection
+
+          elsif collection.is_a?(Vedeu::Views::Streams)
+            if collection.empty?
+              # @todo Investigate whether this is being used.
+            end
+
+          elsif array?(collection)
+            return new(collection, parent, name) if collection.empty?
 
-          new(coerced_collection, parent, name)
+            coerced_collection = []
+            collection.each do |element|
+              coerced_collection << element if element.is_a?(Vedeu::Views::Line)
+            end
 
-        elsif collection.is_a?(Vedeu::Views::Line)
-          new([collection], parent, name)
+            new(coerced_collection, parent, name)
 
-        else
-          raise Vedeu::Error::InvalidSyntax,
-                'Cannot coerce for Vedeu::View::Lines, as collection ' \
-                'unrecognised.'
+          elsif collection.is_a?(Vedeu::Views::Line)
+            new([collection], parent, name)
 
+          else
+            raise Vedeu::Error::InvalidSyntax,
+                  'Cannot coerce for Vedeu::View::Lines, as collection ' \
+                  'unrecognised.'
+
+          end
         end
-      end
+
+      end # Eigenclass
 
       alias lines value
 

data/lib/vedeu/views/streams.rb

@@ -10,49 +10,55 @@ module Vedeu
     #
     class Streams < Vedeu::Repositories::Collection
 
-      # @param (see Vedeu::Repositories::Collection#initialize)
-      # @macro raise_invalid_syntax
-      # @return [Vedeu::Views::Streams]
-      def self.coerce(collection = [], parent = nil, name = nil)
-        if collection.is_a?(Vedeu::Views::Streams)
-          collection
+      class << self
 
-        elsif collection.is_a?(Array)
-          return new(collection, parent, name) if collection.empty?
+        include Vedeu::Common
 
-          coerced_collection = []
-          collection.each do |element|
-            if element.is_a?(Vedeu::Views::Stream)
-              coerced_collection << element
+        # @param (see Vedeu::Repositories::Collection#initialize)
+        # @macro raise_invalid_syntax
+        # @return [Vedeu::Views::Streams]
+        def coerce(collection = [], parent = nil, name = nil)
+          if collection.is_a?(Vedeu::Views::Streams)
+            collection
 
-            elsif element.is_a?(String)
-              coerced_collection << Vedeu::Views::Stream.new(value: element)
+          elsif array?(collection)
+            return new(collection, parent, name) if collection.empty?
 
+            coerced_collection = []
+            collection.each do |element|
+              if element.is_a?(Vedeu::Views::Stream)
+                coerced_collection << element
+
+              elsif string?(element)
+                coerced_collection << Vedeu::Views::Stream.new(value: element)
+
+              end
             end
-          end
 
-          new(coerced_collection, parent, name)
+            new(coerced_collection, parent, name)
 
-        elsif collection.is_a?(Vedeu::Views::Stream)
-          new([collection], parent, name)
+          elsif collection.is_a?(Vedeu::Views::Stream)
+            new([collection], parent, name)
 
-        elsif collection.is_a?(Vedeu::Views::Chars)
-          return new([], parent, name) if collection.empty?
+          elsif collection.is_a?(Vedeu::Views::Chars)
+            return new([], parent, name) if collection.empty?
 
-          new([Vedeu::Views::Stream.new(value: collection)], parent, name)
+            new([Vedeu::Views::Stream.new(value: collection)], parent, name)
 
-        elsif collection.is_a?(String)
-          return new([], parent, name) if collection.empty?
+          elsif string?(collection)
+            return new([], parent, name) if collection.empty?
 
-          new([Vedeu::Views::Stream.new(value: collection)], parent, name)
+            new([Vedeu::Views::Stream.new(value: collection)], parent, name)
 
-        else
-          raise Vedeu::Error::InvalidSyntax,
-                'Cannot coerce for Vedeu::View::Streams, as collection ' \
-                "unrecognised. (#{collection.class.name})"
+          else
+            raise Vedeu::Error::InvalidSyntax,
+                  'Cannot coerce for Vedeu::View::Streams, as collection ' \
+                  "unrecognised. (#{collection.class.name})"
 
+          end
         end
-      end
+
+      end # Eigenclass
 
       alias streams value
 

data/test/lib/vedeu/cells/empty_test.rb

@@ -21,7 +21,7 @@ module Vedeu
       }
       let(:colour)   { {} }
       let(:_name)    { '' }
-      let(:position) {}
+      let(:position) { Vedeu::Geometries::Position.new(1, 1) }
       let(:style)    { '' }
       let(:_value)   { '' }
 
@@ -47,7 +47,9 @@ module Vedeu
         it { subject.must_equal(true) }
 
         context 'when different to other' do
-          let(:other) { described.new(value: 'b') }
+          let(:other) {
+            described.new(position: Vedeu::Geometries::Position.new(1, 2))
+          }
 
           it { subject.must_equal(false) }
         end
@@ -64,7 +66,6 @@ module Vedeu
       end
 
       describe '#to_h' do
-        let(:position) { Vedeu::Geometries::Position.new(1, 1) }
         let(:colour)   { Vedeu::Colours::Colour.new(background: '#000000') }
         let(:expected) {
           {
@@ -101,7 +102,8 @@ module Vedeu
       end
 
       describe '#to_s' do
-        let(:_value) { 'a' }
+        let(:position) {}
+        let(:_value)   { 'a' }
 
         subject { instance.to_s }
 

data/test/lib/vedeu/common_test.rb

@@ -63,6 +63,22 @@ module Vedeu
       end
     end
 
+    describe '#array?' do
+      let(:_value) {}
+
+      subject { instance.array?(_value) }
+
+      context 'when the value is an Array' do
+        let(:_value) { [:hydrogen] }
+
+        it { subject.must_equal(true) }
+      end
+
+      context 'when the value is not an Array' do
+        it { subject.must_equal(false) }
+      end
+    end
+
     describe '#boolean' do
       subject { instance.boolean(_value) }
 

data/test/lib/vedeu/configuration/api_test.rb

@@ -264,12 +264,8 @@ module Vedeu
       describe '#log_except' do
         it 'sets the options to the desired value' do
           configuration = Vedeu.configure { log_except :debug, :store }
-          configuration.log_except.must_equal([:debug, :store])
-        end
-
-        it 'sets the options to the desired value' do
-          configuration = Vedeu.configure { log_except [:debug, :info] }
-          configuration.log_except.must_equal([:debug, :info])
+          configuration.log_except.must_include(:debug)
+          configuration.log_except.must_include(:store)
         end
       end
 
@@ -278,11 +274,6 @@ module Vedeu
           configuration = Vedeu.configure { log_only :debug, :store }
           configuration.log_only.must_equal([:debug, :store])
         end
-
-        it 'sets the options to the desired value' do
-          configuration = Vedeu.configure { log_only [:debug, :info] }
-          configuration.log_only.must_equal([:debug, :info])
-        end
       end
 
       describe '#renderer' do

data/test/lib/vedeu/configuration/configuration_test.rb

@@ -107,7 +107,8 @@ module Vedeu
           end
         end
 
-        it { described.log_except.must_equal([:timer, :event]) }
+        it { described.log_except.must_include(:timer) }
+        it { described.log_except.must_include(:event) }
       end
     end
 
@@ -123,49 +124,76 @@ module Vedeu
           end
         end
 
-        it { described.log_only.must_equal([:timer, :event]) }
+        it { described.log_only.must_include(:timer) }
+        it { described.log_only.must_include(:event) }
       end
     end
 
-    describe '.loggable?' do
-      let(:type) { :hydrogen }
+    describe '.log_types' do
+      subject { described.log_types }
+
+      it { subject.must_be_instance_of(Hash) }
+    end
 
+    describe '.loggable?' do
       subject { described.loggable?(type) }
 
-      context 'when the type exists in log_only and log_except' do
-        before do
-          described.stubs(:log_only).returns([:hydrogen])
-          described.stubs(:log_except).returns([:hydrogen])
-        end
+      context 'when the type is invalid' do
+        let(:type) { :hydrogen }
 
-        it { subject.must_equal(true) }
+        it { subject.must_equal(false) }
       end
 
-      context 'when the type exists in log_only' do
-        before do
-          described.stubs(:log_only).returns([:hydrogen])
-          described.stubs(:log_except).returns([])
+      context 'when the type is valid' do
+        let(:type) { :debug }
+
+        context 'when log_only and log_except are both empty' do
+          it { subject.must_equal(true) }
         end
 
-        it { subject.must_equal(true) }
-      end
+        context 'when log_only contains entries' do
+          context 'when log_only includes the type' do
+            before do
+              Vedeu.configure do
+                log_only [:info, :debug, :error]
+              end
+            end
 
-      context 'when the type exists in log_except' do
-        before do
-          described.stubs(:log_only).returns([])
-          described.stubs(:log_except).returns([:hydrogen])
-        end
+            it { subject.must_equal(true) }
+          end
 
-        it { subject.must_equal(false) }
-      end
+          context 'when log_only does not include the type' do
+            before do
+              Vedeu.configure do
+                log_only [:info, :error]
+              end
+            end
 
-      context 'when the type does not exist in either' do
-        before do
-          described.stubs(:log_only).returns([])
-          described.stubs(:log_except).returns([])
+            it { subject.must_equal(false) }
+          end
         end
 
-        it { subject.must_equal(true) }
+        context 'when log_except contains entries' do
+          context 'when log_except includes the type' do
+            before do
+              Vedeu.configure do
+                log_except [:info, :debug, :error]
+              end
+            end
+
+            it { subject.must_equal(false) }
+          end
+
+          context 'when log_except does not include the type' do
+            before do
+              Vedeu.configure do
+                log_only [:info, :error]
+              end
+            end
+
+            it { subject.must_equal(false) }
+          end
+        end
       end
     end
 

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

@@ -16,7 +16,7 @@ module Vedeu
       end
 
       def add(model)
-        if storage.is_a?(Hash)
+        if hash?(storage)
           @storage = in_memory.merge!(model)
 
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.8.14
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -783,10 +783,10 @@ files:
 - lib/vedeu/presentation/styles.rb
 - lib/vedeu/renderers/all.rb
 - lib/vedeu/renderers/escape.rb
-- lib/vedeu/renderers/file.rb
 - lib/vedeu/renderers/html.rb
 - lib/vedeu/renderers/json.rb
-- lib/vedeu/renderers/options.rb
+- lib/vedeu/renderers/support/file.rb
+- lib/vedeu/renderers/support/options.rb
 - lib/vedeu/renderers/templates/html_renderer.vedeu
 - lib/vedeu/renderers/terminal.rb
 - lib/vedeu/renderers/text.rb
@@ -1010,10 +1010,10 @@ files:
 - test/lib/vedeu/presentation/styles_test.rb
 - test/lib/vedeu/renderers/all_test.rb
 - test/lib/vedeu/renderers/escape_test.rb
-- test/lib/vedeu/renderers/file_test.rb
 - test/lib/vedeu/renderers/html_test.rb
 - test/lib/vedeu/renderers/json_test.rb
-- test/lib/vedeu/renderers/options_test.rb
+- test/lib/vedeu/renderers/support/file_test.rb
+- test/lib/vedeu/renderers/support/options_test.rb
 - test/lib/vedeu/renderers/terminal_test.rb
 - test/lib/vedeu/renderers/text_test.rb
 - test/lib/vedeu/repositories/assemblage_test.rb
@@ -1275,10 +1275,10 @@ test_files:
 - test/lib/vedeu/presentation/styles_test.rb
 - test/lib/vedeu/renderers/all_test.rb
 - test/lib/vedeu/renderers/escape_test.rb
-- test/lib/vedeu/renderers/file_test.rb
 - test/lib/vedeu/renderers/html_test.rb
 - test/lib/vedeu/renderers/json_test.rb
-- test/lib/vedeu/renderers/options_test.rb
+- test/lib/vedeu/renderers/support/file_test.rb
+- test/lib/vedeu/renderers/support/options_test.rb
 - test/lib/vedeu/renderers/terminal_test.rb
 - test/lib/vedeu/renderers/text_test.rb
 - test/lib/vedeu/repositories/assemblage_test.rb