vedeu 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e5e01aa9e53954f48c2dec1ab53d3cbf2bdbe9f
-  data.tar.gz: 3ee412af2d4751e6e7cf7def63f59b049283fc89
+  metadata.gz: 8aeb09ef744842c704e9bdf1e1fb5b4aedc8f130
+  data.tar.gz: 84c802a8a7d76a20896f2062dc150f2a02294acb
 SHA512:
-  metadata.gz: ce32b74810f69dcbf687a527f2399d05f908095113a9fda6d213c49ddc9d0ef372f3dc70d78e1cf4aa8658330c3d6a8ad73042c94308ecc4c338200f23c9070a
-  data.tar.gz: 853a70f364f8876adec5284120a18f4ddc85027db12decf0b3a8d2a17a4dd621076f73c68e73958a89551357ac6c10a2528f2f6b119a1d6de884575599f53e65
+  metadata.gz: ad4a0e07634064d86fc758f62a6bdba2d17366e5295e890bac15024991149a0910c1a90ce125ea227cf740ca871def5b3bd88547a12ac2f9f9c84ce713e06613
+  data.tar.gz: 269d83fef585811e1b3ea07b261809b405f7753827a2a24f8f0a2e964be7c44e5438bce495954d1551da4ca261dc2fb79de1680cf970577cdf70688d3cfdbfb5

data/lib/vedeu.rb

@@ -1,30 +1,56 @@
-require 'vedeu/instrumentation'
+module Vedeu
+
+  def self.included(receiver)
+    receiver.send(:include, API)
+    receiver.extend(API)
+  end
 
+end
+
+require 'date'
+require 'forwardable'
+require 'io/console'
+require 'logger'
+require 'optparse'
+
+require 'virtus'
+
+require 'vedeu/api/api'
+require 'vedeu/api/base'
 require 'vedeu/api/events'
 require 'vedeu/api/grid'
 require 'vedeu/api/interface'
 require 'vedeu/api/line'
+require 'vedeu/api/log'
 require 'vedeu/api/store'
 require 'vedeu/api/stream'
 require 'vedeu/api/view'
-require 'vedeu/output/view'
 
-require 'vedeu/support/menu'
+require 'vedeu/application'
+require 'vedeu/configuration'
 require 'vedeu/launcher'
 
-module Vedeu
-  extend API
-
-  def self.log(message)
-    Vedeu::Instrumentation::Log.logger.debug(message)
-  end
+require 'vedeu/models/attributes/background'
+require 'vedeu/models/attributes/collection'
+require 'vedeu/models/attributes/colour_translator'
+require 'vedeu/models/attributes/foreground'
+require 'vedeu/models/attributes/interface_collection'
+require 'vedeu/models/attributes/line_collection'
+require 'vedeu/models/attributes/stream_collection'
+require 'vedeu/models/composition'
+require 'vedeu/support/terminal'
+require 'vedeu/models/geometry'
+require 'vedeu/models/colour'
+require 'vedeu/models/style'
+require 'vedeu/models/interface'
+require 'vedeu/models/line'
+require 'vedeu/models/stream'
 
-  def self.error(exception)
-    Vedeu::Instrumentation::Log.error(exception)
-  end
+require 'vedeu/output/buffers'
+require 'vedeu/output/clear'
+require 'vedeu/output/render'
+require 'vedeu/output/view'
 
-  def self.included(receiver)
-    receiver.send(:include, API)
-    receiver.extend(API)
-  end
-end
+require 'vedeu/support/esc'
+require 'vedeu/support/input'
+require 'vedeu/support/menu'

data/lib/vedeu/api/api.rb

@@ -0,0 +1,21 @@
+module Vedeu
+  module API
+    def interface(name, &block)
+      API::Interface.save(name, &block)
+    end
+
+    def log(message)
+      API::Log.logger.debug(message)
+    end
+
+    # def render(object = nil)
+    #   Vedeu::View.render(object)
+    # end
+
+    def view(name, &block)
+      API::View.build(name, &block)
+    end
+  end
+
+  extend API
+end

data/lib/vedeu/api/base.rb

@@ -6,25 +6,17 @@ module Vedeu
       end
 
       def initialize(attributes = {}, &block)
-        @attributes = attributes
+        @attributes                = attributes
+        @self_before_instance_eval = eval('self', block.binding)
 
-        @self_before_instance_eval = eval 'self', block.binding
-
-        self.instance_eval(&block)
+        instance_eval(&block)
       end
 
-      def colour(*args)
-        if args.is_a?(Array) && args.size == 2
-          attributes[:colour] = { background: args.first,
-                                  foreground: args.last }
-
-        elsif args.is_a?(Array) && args.size == 1 && args.first.is_a?(Hash)
-          attributes[:colour] = args.first
+      def colour(values = {})
+        fail InvalidArgument, '#colour expects a Hash containing :foreground,' \
+                              ' :background or both.' unless values.is_a?(Hash)
 
-        else
-          attributes[:colour] = {}
-
-        end
+        attributes[:colour] = values
       end
 
       def style(values = [], &block)

data/lib/vedeu/api/events.rb

@@ -1,5 +1,3 @@
-# Todo: mutation (events)
-
 module Vedeu
   module API
     def on(name, delay = 0, &block)
@@ -36,14 +34,13 @@ module Vedeu
             last_exec: 0,
           }
         end
-        self.instance_eval(&block) if block_given?
-        self
+        instance_eval(&block) if block_given?
       end
 
       def add(object, &block)
-        @self_before_instance_eval = eval 'self', block.binding
+        @self_before_instance_eval = eval('self', block.binding)
 
-        self.instance_eval(&block)
+        instance_eval(&block)
       end
 
       def on(event, delay = 0, &block)
@@ -58,15 +55,13 @@ module Vedeu
         if elapsed > handlers[event][:delay]
           handlers[event][:last_exec] = Time.now.to_f
 
-          handlers[event][:events].each do |handler|
-            handler.call(*args)
-          end
+          handlers[event][:events].each { |handler| handler.call(*args) }
         end
       end
 
       private
 
-      attr_reader :handlers, :throttles
+      attr_reader :handlers
 
       def method_missing(method, *args, &block)
         @self_before_instance_eval.send method, *args, &block

data/lib/vedeu/api/grid.rb

@@ -1,5 +1,3 @@
-require 'vedeu/support/terminal'
-
 class Fixnum
   # Augment Fixnum to calculate column width in a grid-based layout.
   #

data/lib/vedeu/api/interface.rb

@@ -1,20 +1,10 @@
-require 'vedeu/models/geometry'
-require 'vedeu/models/composition'
-require 'vedeu/api/grid'
-require 'vedeu/api/store'
-require 'vedeu/support/terminal'
-
 module Vedeu
-  module API
-    InvalidHeight = Class.new(StandardError)
-    InvalidWidth  = Class.new(StandardError)
-    XOutOfBounds  = Class.new(StandardError)
-    YOutOfBounds  = Class.new(StandardError)
-
-    def interface(name, &block)
-      Interface.save(name, &block)
-    end
+  InvalidHeight = Class.new(StandardError)
+  InvalidWidth  = Class.new(StandardError)
+  XOutOfBounds  = Class.new(StandardError)
+  YOutOfBounds  = Class.new(StandardError)
 
+  module API
     class Interface
       def self.save(name, &block)
         new(name).save(&block)
@@ -25,24 +15,12 @@ module Vedeu
       end
 
       def save(&block)
-        self.instance_eval(&block) if block_given?
+        instance_eval(&block) if block_given?
 
         stored_attributes = Store.create(attributes)
         interface = Vedeu::Interface.new(stored_attributes)
 
-        Vedeu::Buffers.create(interface.name, interface.clear)
-
-        Vedeu.events.on("_refresh_#{interface.name}_".to_sym, interface.delay) do
-          Vedeu::Buffers.refresh(interface.name)
-        end
-
-        # TODO:
-        # cannot do group at this time
-        # unless interface.group.nil? || interface.group.empty?
-        #   Vedeu.events.on("_refresh_group_#{interface.group}_".to_sym, interface.delay) do
-        #     buffer.refresh_group(interface.group)
-        #   end
-        # end
+        Vedeu::Buffers.create(interface)
 
         interface
       end
@@ -83,14 +61,6 @@ module Vedeu
         attributes[:geometry][:centred] = value
       end
 
-      def attributes
-        @attributes ||= { name: name, geometry: {} }
-      end
-
-      def method_missing(method_name, arg, &block)
-        attributes[method_name] = arg
-      end
-
       def y_out_of_bounds?(value)
         value < 1 || value > Terminal.height
       end
@@ -98,6 +68,14 @@ module Vedeu
       def x_out_of_bounds?(value)
         value < 1 || value > Terminal.width
       end
+
+      def method_missing(method_name, arg, &block)
+        attributes[method_name] = arg
+      end
+
+      def attributes
+        @attributes ||= { name: name, geometry: {} }
+      end
     end
   end
 end

data/lib/vedeu/api/line.rb

@@ -1,6 +1,3 @@
-require 'vedeu/api/base'
-require 'vedeu/api/stream'
-
 module Vedeu
   module API
     class Line < Base

data/lib/vedeu/{instrumentation.rb → api/log.rb}

@@ -1,8 +1,5 @@
-require 'date'
-require 'logger'
-
 module Vedeu
-  module Instrumentation
+  module API
     class Log
       def self.logger
         @logger ||= Logger.new(filename).tap do |log|
@@ -63,7 +60,7 @@ module Vedeu
       def defaults
         {
           event: 'call',
-          klass: /^Vedeu::(?!.*Instrumentation|Interface|Line|Stream|Style|Colour|Geometry|Terminal|Esc|ColourTranslator).*/
+          klass: /^Vedeu::(?!.*Log|Interface|Line|Stream|Style|Colour|Geometry|Terminal|Esc|ColourTranslator).*/
         }
       end
 

data/lib/vedeu/api/store.rb

@@ -1,11 +1,7 @@
-require 'vedeu/models/interface'
-
-# Todo: mutation (persistence)
-
 module Vedeu
-  module API
-    EntityNotFound = Class.new(StandardError)
+  EntityNotFound = Class.new(StandardError)
 
+  module API
     def use(name)
       Vedeu::Interface.new(Store.query(name))
     end
@@ -18,9 +14,7 @@ module Vedeu
       end
 
       def query(name)
-        attributes = storage.fetch(name) do
-          fail EntityNotFound, 'Interface was not found.'
-        end
+        storage.fetch(name) { fail EntityNotFound, 'Interface was not found.' }
       end
 
       def reset

data/lib/vedeu/api/stream.rb

@@ -1,5 +1,3 @@
-require 'vedeu/api/base'
-
 module Vedeu
   module API
     class Stream < Base

data/lib/vedeu/api/view.rb

@@ -1,33 +1,22 @@
-require 'vedeu/api/line'
-require 'vedeu/api/store'
-
 module Vedeu
   module API
     InterfaceNotSpecified = Class.new(StandardError)
 
-    def render(object = nil)
-      Vedeu::View.render(object)
-    end
-
-    def view(name = '', &block)
-      Vedeu::API::View.build(name, &block)
-    end
-
     class View
-      def self.build(name = '', &block)
+      def self.build(name, &block)
         new(name).build(&block)
       end
 
-      def initialize(name = '')
+      def initialize(name)
         fail InterfaceNotSpecified if name.nil? || name.empty?
 
         @name = name.to_s
       end
 
       def build(&block)
-        @self_before_instance_eval = eval 'self', block.binding
+        @self_before_instance_eval = eval('self', block.binding)
 
-        self.instance_eval(&block) if block_given?
+        instance_eval(&block) if block_given?
 
         attributes
       end

data/lib/vedeu/application.rb

@@ -1,7 +1,3 @@
-require 'vedeu/instrumentation'
-require 'vedeu/support/input'
-require 'vedeu/support/terminal'
-
 module Vedeu
   ModeSwitch = Class.new(StandardError)
 
@@ -68,7 +64,7 @@ module Vedeu
     end
 
     def debug
-      Vedeu::Instrumentation::Trace.call if options.fetch(:debug)
+      Vedeu::API::Trace.call if options.fetch(:debug)
     end
 
     def options

data/lib/vedeu/configuration.rb

@@ -1,5 +1,3 @@
-require 'optparse'
-
 module Vedeu
   class Configuration
     def self.configure(args = [])

data/lib/vedeu/launcher.rb

@@ -1,6 +1,3 @@
-require 'vedeu/application'
-require 'vedeu/configuration'
-
 module Vedeu
   class Launcher
     def initialize(argv, stdin  = STDIN,

data/lib/vedeu/models/attributes/background.rb

@@ -1,7 +1,3 @@
-require 'virtus'
-
-require 'vedeu/models/attributes/colour_translator'
-
 module Vedeu
   class Background < Virtus::Attribute
     def coerce(value)

data/lib/vedeu/models/attributes/foreground.rb

@@ -1,7 +1,3 @@
-require 'virtus'
-
-require 'vedeu/models/attributes/colour_translator'
-
 module Vedeu
   class Foreground < Virtus::Attribute
     def coerce(value)

data/lib/vedeu/models/attributes/interface_collection.rb

@@ -1,17 +1,12 @@
-require 'virtus'
-
-require 'vedeu/models/interface'
-require 'vedeu/api/store'
-
 module Vedeu
   class InterfaceCollection < Virtus::Attribute
     def coerce(values)
       return [] if values.nil? || values.empty?
 
-      [values].flatten.map do |buffer_attributes|
-        interface_attributes = API::Store.query(buffer_attributes[:name])
+      [values].flatten.map do |view_attributes|
+        stored_attributes = API::Store.query(view_attributes[:name])
 
-        Interface.new(buffer_attributes.merge!(interface_attributes))
+        Interface.new(stored_attributes.merge!(view_attributes))
       end
     end
   end