vedeu 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aeb09ef744842c704e9bdf1e1fb5b4aedc8f130
-  data.tar.gz: 84c802a8a7d76a20896f2062dc150f2a02294acb
+  metadata.gz: da7db44d3fbb1a694c60eb4a8112015a79fa0f4e
+  data.tar.gz: a132a4ac6eff1b1a4d12684837ce72edf667ec77
 SHA512:
-  metadata.gz: ad4a0e07634064d86fc758f62a6bdba2d17366e5295e890bac15024991149a0910c1a90ce125ea227cf740ca871def5b3bd88547a12ac2f9f9c84ce713e06613
-  data.tar.gz: 269d83fef585811e1b3ea07b261809b405f7753827a2a24f8f0a2e964be7c44e5438bce495954d1551da4ca261dc2fb79de1680cf970577cdf70688d3cfdbfb5
+  metadata.gz: 4cfc8f7d4de135c80242b489e3bfb04ed627896c2fc945380dbc7c1c54c85a17792430fbd0a68ecf9734589819ab3f27c83121feeee0cfe895a0228896c894ad
+  data.tar.gz: 58e58be65d0e522abb67d542f1a7f390c8663fb80748664a9d5b7fe248307ea8b378bc77d79d727af585f2a4d03cb9bc2f0c51e8bbe70b30b0cb41bffbeb020f

data/lib/vedeu.rb

@@ -13,12 +13,10 @@ 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/helpers'
 require 'vedeu/api/interface'
 require 'vedeu/api/line'
 require 'vedeu/api/log'
@@ -30,18 +28,12 @@ require 'vedeu/application'
 require 'vedeu/configuration'
 require 'vedeu/launcher'
 
-require 'vedeu/models/attributes/background'
-require 'vedeu/models/attributes/collection'
+require 'vedeu/models/attributes/attributes'
 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'

data/lib/vedeu/api/api.rb

@@ -1,7 +1,27 @@
 module Vedeu
   module API
+    def event(name, delay = 0, &block)
+      Vedeu.events.event(name, delay, &block)
+    end
+
+    def events
+      @events ||= API::Events.new do
+        event(:_exit_)        { fail StopIteration                   }
+        event(:_log_)         { |message| Vedeu.log(message)         }
+        event(:_mode_switch_) { fail ModeSwitch                      }
+        event(:_clear_)       { Terminal.output(Esc.string('clear')) }
+        event(:_refresh_)     { Buffers.refresh_all                  }
+
+        event(:_keypress_) do |key|
+          trigger(:key, key)
+          trigger(:_log_, (' ' * 42) + "key: #{key}")
+          trigger(:_mode_switch_) if key == :escape
+        end
+      end
+    end
+
     def interface(name, &block)
-      API::Interface.save(name, &block)
+      API::Interface.create(name, &block)
     end
 
     def log(message)
@@ -12,6 +32,14 @@ module Vedeu
     #   Vedeu::View.render(object)
     # end
 
+    def trigger(name, *args)
+      Vedeu.events.trigger(name, *args)
+    end
+
+    def use(name)
+      Vedeu::Interface.new(Store.query(name))
+    end
+
     def view(name, &block)
       API::View.build(name, &block)
     end

data/lib/vedeu/api/events.rb

@@ -1,30 +1,5 @@
 module Vedeu
   module API
-    def on(name, delay = 0, &block)
-      Vedeu.events.on(name, delay, &block)
-    end
-    alias_method :event, :on
-
-    def trigger(name, *args)
-      Vedeu.events.trigger(name, *args)
-    end
-
-    def events
-      @events ||= API::Events.new do
-        on(:_exit_)        { fail StopIteration }
-        on(:_log_)         { |message| Vedeu.log(message) }
-        on(:_mode_switch_) { fail ModeSwitch    }
-        on(:_clear_)       { Terminal.output(Esc.string('clear')) }
-        on(:_refresh_)     { Buffers.refresh_all }
-
-        on(:_keypress_) do |key|
-          trigger(:key, key)
-          trigger(:_log_, (' ' * 42) + "key: #{key}")
-          trigger(:_mode_switch_) if key == :escape
-        end
-      end
-    end
-
     class Events
       def initialize(&block)
         @handlers = Hash.new do |hash, key|
@@ -43,7 +18,7 @@ module Vedeu
         instance_eval(&block)
       end
 
-      def on(event, delay = 0, &block)
+      def event(event, delay = 0, &block)
         handlers[event][:events] << block
         handlers[event][:delay]  = delay
         handlers[event]

data/lib/vedeu/api/{base.rb → helpers.rb}

@@ -1,17 +1,6 @@
 module Vedeu
   module API
-    class Base
-      def self.build(attributes = {}, &block)
-        new(attributes, &block).build
-      end
-
-      def initialize(attributes = {}, &block)
-        @attributes                = attributes
-        @self_before_instance_eval = eval('self', block.binding)
-
-        instance_eval(&block)
-      end
-
+    module Helpers
       def colour(values = {})
         fail InvalidArgument, '#colour expects a Hash containing :foreground,' \
                               ' :background or both.' unless values.is_a?(Hash)
@@ -28,12 +17,6 @@ module Vedeu
 
         end
       end
-
-      private
-
-      def method_missing(method, *args, &block)
-        @self_before_instance_eval.send method, *args, &block
-      end
     end
   end
 end

data/lib/vedeu/api/interface.rb

@@ -6,18 +6,19 @@ module Vedeu
 
   module API
     class Interface
-      def self.save(name, &block)
-        new(name).save(&block)
+      def self.create(name, &block)
+        new(name).create(&block)
       end
 
       def initialize(name)
         @name = name.to_s
       end
 
-      def save(&block)
+      def create(&block)
         instance_eval(&block) if block_given?
 
         stored_attributes = Store.create(attributes)
+
         interface = Vedeu::Interface.new(stored_attributes)
 
         Vedeu::Buffers.create(interface)
@@ -33,6 +34,18 @@ module Vedeu
         Vedeu.use(value)
       end
 
+      def cursor(value)
+        attributes[:cursor] = value
+      end
+
+      def delay(value)
+        attributes[:delay] = value
+      end
+
+      def group(value)
+        attributes[:group] = value
+      end
+
       def x(value)
         fail XOutOfBounds if x_out_of_bounds?(value)
 

data/lib/vedeu/api/line.rb

@@ -1,6 +1,19 @@
 module Vedeu
   module API
-    class Line < Base
+    class Line
+      include Helpers
+
+      def self.build(attributes = {}, &block)
+        new(attributes, &block).build
+      end
+
+      def initialize(attributes = {}, &block)
+        @attributes                = attributes
+        @self_before_instance_eval = eval('self', block.binding)
+
+        instance_eval(&block)
+      end
+
       def build
         attributes
       end
@@ -26,9 +39,21 @@ module Vedeu
       end
 
       def attributes
-        @_attributes ||= { colour:  {},
-                           style:   [],
-                           streams: [] }.merge!(@attributes)
+        @_attributes ||= defaults.merge!(@attributes)
+      end
+
+      def defaults
+        {
+          colour:  {},
+          style:   [],
+          streams: []
+        }
+      end
+
+      private
+
+      def method_missing(method, *args, &block)
+        @self_before_instance_eval.send method, *args, &block
       end
     end
   end

data/lib/vedeu/api/log.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Vedeu
   module API
     class Log
@@ -19,7 +21,17 @@ module Vedeu
       private
 
       def self.filename
-        Dir.home + '/.vedeu/vedeu.log'
+        @_filename ||= directory + '/vedeu.log'
+      end
+
+      def self.directory
+        FileUtils.mkdir_p(path) unless File.directory?(path)
+
+        path
+      end
+
+      def self.path
+        Dir.home + '/.vedeu'
       end
     end
 

data/lib/vedeu/api/store.rb

@@ -2,10 +2,6 @@ module Vedeu
   EntityNotFound = Class.new(StandardError)
 
   module API
-    def use(name)
-      Vedeu::Interface.new(Store.query(name))
-    end
-
     module Store
       extend self
 

data/lib/vedeu/api/stream.rb

@@ -1,6 +1,19 @@
 module Vedeu
   module API
-    class Stream < Base
+    class Stream
+      include Helpers
+
+      def self.build(attributes = {}, &block)
+        new(attributes, &block).build
+      end
+
+      def initialize(attributes = {}, &block)
+        @attributes                = attributes
+        @self_before_instance_eval = eval('self', block.binding)
+
+        instance_eval(&block)
+      end
+
       def build
         attributes
       end
@@ -18,7 +31,21 @@ module Vedeu
       end
 
       def attributes
-        @_attributes ||= { colour: {}, style: [], text: '' }.merge!(@attributes)
+        @_attributes ||= defaults.merge!(@attributes)
+      end
+
+      def defaults
+        {
+          colour: {},
+          style:  [],
+          text:   ''
+        }
+      end
+
+      private
+
+      def method_missing(method, *args, &block)
+        @self_before_instance_eval.send method, *args, &block
       end
     end
   end

data/lib/vedeu/api/view.rb

@@ -14,9 +14,11 @@ module Vedeu
       end
 
       def build(&block)
-        @self_before_instance_eval = eval('self', block.binding)
+        if block_given?
+          @self_before_instance_eval = eval('self', block.binding)
 
-        instance_eval(&block) if block_given?
+          instance_eval(&block)
+        end
 
         attributes
       end

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

@@ -0,0 +1,25 @@
+module Vedeu
+  module Attributes
+    extend self
+
+    def coercer(value, model, key)
+      return [] if value.nil? || value.empty?
+
+      [value].flatten.map do |v|
+        if v.is_a?(model)
+          v
+
+        else
+          model.new(v)
+
+        end
+      end
+    end
+
+    def coerce_styles(values)
+      return '' if values.nil? || values.empty?
+
+      Array(values).flatten.map { |s| Esc.string(s) }.join
+    end
+  end
+end

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

@@ -1,9 +1,5 @@
 module Vedeu
   class ColourTranslator
-    def self.translate(html_colour = '')
-      new(html_colour).value
-    end
-
     def initialize(html_colour = '')
       @html_colour = html_colour
     end
@@ -20,12 +16,6 @@ module Vedeu
       ["\e[38;5;", translate, 'm'].join
     end
 
-    def value
-      return '' unless valid?
-
-      translate
-    end
-
     private
 
     attr_reader :html_colour

data/lib/vedeu/models/colour.rb

@@ -1,12 +1,32 @@
 module Vedeu
   class Colour
-    include Virtus.model
+    def initialize(attributes = {})
+      @attributes = attributes
+    end
 
-    attribute :foreground, Foreground, default: ''
-    attribute :background, Background, default: ''
+    def attributes
+      defaults.merge!(@attributes)
+    end
+
+    def foreground
+      @foreground ||= ColourTranslator.new(attributes[:foreground]).foreground
+    end
+
+    def background
+      @background ||= ColourTranslator.new(attributes[:background]).background
+    end
 
     def to_s
       foreground + background
     end
+
+    private
+
+    def defaults
+      {
+        foreground: '',
+        background: ''
+      }
+    end
   end
 end

data/lib/vedeu/models/composition.rb

@@ -1,11 +1,41 @@
 module Vedeu
   class Composition
-    include Virtus.model
+    def initialize(attributes = {})
+      @attributes = attributes
+    end
+
+    def attributes
+      defaults.merge!(@attributes)
+    end
+
+    def interfaces
+      @interfaces ||= if _interfaces.nil? || _interfaces.empty?
+        []
+
+      else
+        [_interfaces].flatten.map do |new_attributes|
+          stored_attributes = API::Store.query(new_attributes[:name])
+
+          Interface.new(stored_attributes.merge!(new_attributes))
+        end
 
-    attribute :interfaces, InterfaceCollection
+      end
+    end
 
     def to_s
       interfaces.map(&:to_s).join
     end
+
+    private
+
+    def _interfaces
+      attributes[:interfaces]
+    end
+
+    def defaults
+      {
+        interfaces: []
+      }
+    end
   end
 end