vedeu 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da7db44d3fbb1a694c60eb4a8112015a79fa0f4e
-  data.tar.gz: a132a4ac6eff1b1a4d12684837ce72edf667ec77
+  metadata.gz: 5bc23985fc8270da6cebe20612c4aaa02967a07f
+  data.tar.gz: bf6587149152e3111183fe10abe958376a024872
 SHA512:
-  metadata.gz: 4cfc8f7d4de135c80242b489e3bfb04ed627896c2fc945380dbc7c1c54c85a17792430fbd0a68ecf9734589819ab3f27c83121feeee0cfe895a0228896c894ad
-  data.tar.gz: 58e58be65d0e522abb67d542f1a7f390c8663fb80748664a9d5b7fe248307ea8b378bc77d79d727af585f2a4d03cb9bc2f0c51e8bbe70b30b0cb41bffbeb020f
+  metadata.gz: dd0458ce9a0b1e2b93788a4adef0439e7946db8a5e4e508ce68a662d885dd726b900692af0b8dfd385f24ddb78be19a0ddf5ce628c165243de0672a499a82cc8
+  data.tar.gz: 6a56e31aba151c295f6989e43947a1e0e6b7571cd5c65d8b17077abf3c15eee7d3fa558559f9e72db63421e1afedb5aeba46eb7b5052b937a49efe5191cb78c0

data/README.md

@@ -6,6 +6,13 @@
 Vedeu is my attempt at creating a terminal based application framework without the need for Ncurses. I've tried to make Vedeu as simple and flexible as possible.
 
 
+## Requirements
+
+Vedeu has been built on MacOSX 10.9 (Mavericks) with Ruby v2.1.2.
+
+Note: You may have trouble running Vedeu with Windows installations.
+
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/vedeu.rb

@@ -13,6 +13,17 @@ require 'io/console'
 require 'logger'
 require 'optparse'
 
+require 'vedeu/models/attributes/attributes'
+require 'vedeu/models/attributes/colour_translator'
+require 'vedeu/models/composition'
+require 'vedeu/support/terminal'
+require 'vedeu/models/geometry'
+require 'vedeu/models/colour'
+require 'vedeu/models/interface'
+require 'vedeu/models/line'
+require 'vedeu/models/store'
+require 'vedeu/models/stream'
+
 require 'vedeu/api/api'
 require 'vedeu/api/events'
 require 'vedeu/api/grid'
@@ -20,29 +31,18 @@ require 'vedeu/api/helpers'
 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/application'
 require 'vedeu/configuration'
 require 'vedeu/launcher'
 
-require 'vedeu/models/attributes/attributes'
-require 'vedeu/models/attributes/colour_translator'
-require 'vedeu/models/composition'
-require 'vedeu/support/terminal'
-require 'vedeu/models/geometry'
-require 'vedeu/models/colour'
-require 'vedeu/models/interface'
-require 'vedeu/models/line'
-require 'vedeu/models/stream'
-
 require 'vedeu/output/buffers'
 require 'vedeu/output/clear'
 require 'vedeu/output/render'
 require 'vedeu/output/view'
 
+require 'vedeu/support/position'
 require 'vedeu/support/esc'
 require 'vedeu/support/input'
 require 'vedeu/support/menu'

data/lib/vedeu/api/api.rb

@@ -6,42 +6,47 @@ module Vedeu
 
     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
+        event(:_log_)         { |msg| Vedeu.log(msg)      }
+        event(:_exit_)        { fail StopIteration        }
+        event(:_mode_switch_) { fail ModeSwitch           }
+        event(:_clear_)       { Terminal.clear_screen     }
+        event(:_refresh_)     { Buffers.refresh_all       }
+        event(:_keypress_)    { |key| Vedeu.keypress(key) }
       end
     end
 
+    def height
+      Terminal.height
+    end
+
     def interface(name, &block)
-      API::Interface.create(name, &block)
+      API::Interface.define({ name: name }, &block)
+    end
+
+    def keypress(key)
+      trigger(:key, key)
+      trigger(:_log_, (' ' * 42) + "key: #{key}")
+      trigger(:_mode_switch_) if key == :escape
     end
 
     def log(message)
       API::Log.logger.debug(message)
     end
 
-    # def render(object = nil)
-    #   Vedeu::View.render(object)
-    # end
-
     def trigger(name, *args)
       Vedeu.events.trigger(name, *args)
     end
 
     def use(name)
-      Vedeu::Interface.new(Store.query(name))
+      Vedeu::Interface.new(Vedeu::Store.query(name))
     end
 
     def view(name, &block)
-      API::View.build(name, &block)
+      API::Interface.build({ name: name }, &block)
+    end
+
+    def width
+      Terminal.width
     end
   end
 

data/lib/vedeu/api/events.rb

@@ -39,7 +39,7 @@ module Vedeu
       attr_reader :handlers
 
       def method_missing(method, *args, &block)
-        @self_before_instance_eval.send method, *args, &block
+        @self_before_instance_eval.send(method, *args, &block)
       end
     end
   end

data/lib/vedeu/api/interface.rb

@@ -5,35 +5,45 @@ module Vedeu
   YOutOfBounds  = Class.new(StandardError)
 
   module API
-    class Interface
-      def self.create(name, &block)
-        new(name).create(&block)
+    class Interface < Vedeu::Interface
+      def self.build(attributes = {}, &block)
+        new(attributes, &block).attributes
       end
 
-      def initialize(name)
-        @name = name.to_s
+      def self.define(attributes = {}, &block)
+        new(attributes).define(&block)
       end
 
-      def create(&block)
-        instance_eval(&block) if block_given?
+      def initialize(attributes = {}, &block)
+        @attributes = attributes
 
-        stored_attributes = Store.create(attributes)
+        if block_given?
+          @self_before_instance_eval = eval('self', block.binding)
 
-        interface = Vedeu::Interface.new(stored_attributes)
+          instance_eval(&block)
+        end
+      end
 
+      def define(&block)
+        instance_eval(&block) if block_given?
+        stored_attributes = Vedeu::Store.create(attributes)
+        interface = Vedeu::Interface.new(stored_attributes)
         Vedeu::Buffers.create(interface)
-
         interface
       end
 
-      private
-
-      attr_reader :name
+      def line(&block)
+        attributes[:lines] << Line.build(&block)
+      end
 
       def use(value)
         Vedeu.use(value)
       end
 
+      def colour(value)
+        attributes[:colour] = value
+      end
+
       def cursor(value)
         attributes[:cursor] = value
       end
@@ -74,6 +84,10 @@ module Vedeu
         attributes[:geometry][:centred] = value
       end
 
+      def style(value)
+        attributes[:style] = value
+      end
+
       def y_out_of_bounds?(value)
         value < 1 || value > Terminal.height
       end
@@ -82,12 +96,8 @@ module Vedeu
         value < 1 || value > Terminal.width
       end
 
-      def method_missing(method_name, arg, &block)
-        attributes[method_name] = arg
-      end
-
-      def attributes
-        @attributes ||= { name: name, geometry: {} }
+      def method_missing(method, *args, &block)
+        @self_before_instance_eval.send(method, *args, &block)
       end
     end
   end

data/lib/vedeu/api/line.rb

@@ -1,23 +1,8 @@
 module Vedeu
   module API
-    class Line
+    class Line < Vedeu::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
-
       def stream(&block)
         attributes[:streams] << API::Stream.build(&block)
       end
@@ -37,24 +22,6 @@ module Vedeu
                                   colour: { background: value }
                                 }, &block)
       end
-
-      def 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
 end

data/lib/vedeu/api/stream.rb

@@ -1,23 +1,8 @@
 module Vedeu
   module API
-    class Stream
+    class Stream < Vedeu::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
-
       def align(value)
         attributes[:align] = value
       end
@@ -29,24 +14,6 @@ module Vedeu
       def width(value)
         attributes[:width] = value
       end
-
-      def 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
 end

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

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

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

@@ -1,19 +1,34 @@
 module Vedeu
   class ColourTranslator
-    def initialize(html_colour = '')
+    def initialize(html_colour = '', options = {})
       @html_colour = html_colour
+      @options     = options
     end
 
     def background
       return '' unless valid?
 
-      ["\e[48;5;", translate, 'm'].join
+      if truecolor?
+        r, g, b = translate
+        ["\e[48;2;", r, ';', g, ';', b, 'm'].join
+
+      else
+        ["\e[48;5;", translate, 'm'].join
+
+      end
     end
 
     def foreground
       return '' unless valid?
 
-      ["\e[38;5;", translate, 'm'].join
+      if truecolor?
+        r, g, b = translate
+        ["\e[38;2;", r, ';', g, ';', b, 'm'].join
+
+      else
+        ["\e[38;5;", translate, 'm'].join
+
+      end
     end
 
     private
@@ -21,19 +36,28 @@ module Vedeu
     attr_reader :html_colour
 
     def translate
-      [16, red, green, blue].inject(:+)
+      if truecolor?
+        [red, green, blue]
+      else
+        [
+          16,
+          ((red / 51) * 36),
+          ((green / 51) * 6),
+          ((blue / 51) * 1)
+        ].inject(:+)
+      end
     end
 
     def red
-      (html_colour[1..2].to_i(16) / 51) * 36
+      html_colour[1..2].to_i(16)
     end
 
     def green
-      (html_colour[3..4].to_i(16) / 51) * 6
+      html_colour[3..4].to_i(16)
     end
 
     def blue
-      (html_colour[5..6].to_i(16) / 51) * 1
+      html_colour[5..6].to_i(16)
     end
 
     def valid?
@@ -53,5 +77,19 @@ module Vedeu
     def valid_format?
       html_colour =~ /^#([A-Fa-f0-9]{6})$/
     end
+
+    def truecolor?
+      options.fetch(:truecolor)
+    end
+
+    def options
+      defaults.merge!(@options)
+    end
+
+    def defaults
+      {
+        truecolor: false
+      }
+    end
   end
 end