vedeu 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fee0507672be816ff50768dda87bcae402feddf
-  data.tar.gz: 4a8c9d298fda7eaafba079138bf87e408dbd7739
+  metadata.gz: d4ccb72c3982e068887e6d1ac1e7dab94bfd25a9
+  data.tar.gz: a92614c47e5b02740ed486f0ea76bf3c3bbb8b67
 SHA512:
-  metadata.gz: 6960df810fcdc92db6d6c0e753d9e8a7e372d33e3deed7bbe374b6dcb91b1243d4027d3445ffdd8a7b1fc9ea5a749f6935935a5eea62f06dbfecd3a892fe5af9
-  data.tar.gz: f40602cd24e26a9395dd95bc7a791b5542da1350f0ede53dc7a8b1af1ffa6835f3cb9810f9b7345b85321b133ff89269d174ceb69f64312bbd81e81330fa94e7
+  metadata.gz: 056459bd4d73d522448bb43214420a255edf99dd58e3c5fc11d9b85da885a63badc6cc66e9cc5965e8815979f8d8e2cac846cef39154399dc4917e77bf93b375
+  data.tar.gz: e503cbc2ef1e1714c1993b37490c0d8d2ebc1fef012ed707018051ec7dc1927f9f8d71bea4882d89484d67a0bbb85a3889cb0d5f0328952bb5dffcd91a26adbc

data/lib/vedeu.rb

@@ -1,33 +1,39 @@
 require 'vedeu/instrumentation'
 require 'vedeu/support/builder'
 require 'vedeu/support/events'
+require 'vedeu/support/persistence'
+
 require 'vedeu/support/geometry'
 require 'vedeu/support/menu'
-require 'vedeu/parsing/view'
+require 'vedeu/output/view'
 require 'vedeu/launcher'
 
 module Vedeu
+  # :nocov:
   def self.debug?
     false
   end
 
   Vedeu::Instrumentation::Trace.call if debug?
 
-  # :nocov:
-  module ClassMethods
+  module API
     def interface(name, &block)
       Builder.build(name, &block)
     end
 
-    def event(name, &block)
-      Vedeu.events.on(name, &block)
+    def on(name, delay = 0, &block)
+      Vedeu.events.on(name, delay, &block)
     end
-    alias_method :on, :event
+    alias_method :event, :on
 
-    def run(name, *args)
+    def trigger(name, *args)
       Vedeu.events.trigger(name, *args)
     end
-    alias_method :trigger, :run
+    alias_method :run, :trigger
+
+    def view(name)
+      Persistence.query(name)
+    end
   end
 
   def self.events
@@ -53,11 +59,11 @@ module Vedeu
   end
 
   def self.included(receiver)
-    receiver.send(:include, ClassMethods)
-    receiver.extend(ClassMethods)
+    receiver.send(:include, API)
+    receiver.extend(API)
   end
 
-  extend ClassMethods
+  extend API
 
   private
 

data/lib/vedeu/configuration.rb

@@ -16,15 +16,15 @@ module Vedeu
         opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
 
         opts.on('-1', '--run-once', 'Run application once.') do
-          @options[:interactive] = false
+          options[:interactive] = false
         end
 
         opts.on('-c', '--cooked', 'Run application in cooked mode.') do
-          @options[:mode] = :cooked
+          options[:mode] = :cooked
         end
 
         opts.on('-r', '--raw', 'Run application in raw mode (default).') do
-          @options[:mode] = :raw
+          options[:mode] = :raw
         end
       end
       parser.parse!(args)

data/lib/vedeu/instrumentation.rb

@@ -83,7 +83,6 @@ module Vedeu
 
       def pretty!(&block)
         ["\e[38;5;#{rand(22..231)}m", yield, "\e[38;2;39m"].join
-
       end
 
       def watched
@@ -101,7 +100,7 @@ module Vedeu
       def defaults
         {
           event: 'call',
-          klass: /^Vedeu::(?!.*Instrumentation|Line|Stream|Style|Colour|Geometry|Terminal|Esc|Translator).*/
+          klass: /^Vedeu::(?!.*Instrumentation|Interface|Line|Stream|Style|Colour|Geometry|Terminal|Esc|Translator).*/
         }
       end
 

data/lib/vedeu/launcher.rb

@@ -22,11 +22,14 @@ module Vedeu
       Application.start(configuration)
 
       @exit_code = 0
+
     rescue StandardError => uncaught_exception
       Vedeu.error(uncaught_exception)
+
     ensure
       $stdin, $stdout, $stderr = STDIN, STDOUT, STDERR
       @kernel.exit(@exit_code)
+
     end
 
     private

data/lib/vedeu/models/interface.rb

@@ -27,9 +27,10 @@ module Vedeu
     attribute :current, String,  default: ''
     attribute :cursor,  Boolean, default: true
     attribute :centred, Boolean, default: false
+    attribute :delay,   Float,   default: 0.0
 
     def initialize(attributes = {})
-      Vedeu.events.on(:refresh) { refresh }
+      Vedeu.events.on(:refresh, attributes[:delay]) { refresh }
 
       super
     end

data/lib/vedeu/{parsing → output}/erb_parser.rb

@@ -1,6 +1,6 @@
 require 'erb'
 require 'vedeu/support/helpers'
-require 'vedeu/parsing/text_adaptor'
+require 'vedeu/output/text_adaptor'
 
 module Vedeu
   class ERBParser

data/lib/vedeu/output/json_parser.rb

@@ -0,0 +1,23 @@
+require 'json'
+
+module Vedeu
+  class JSONParser
+    def self.parse(json)
+      new(json).parse
+    end
+
+    def initialize(json)
+      @json = json
+    end
+
+    def parse
+      JSON.load(json, nil, symbolize_names: true)
+    rescue JSON::ParserError
+      {}
+    end
+
+    private
+
+    attr_reader :json
+  end
+end

data/lib/vedeu/{parsing → output}/raw_parser.rb

@@ -1,4 +1,4 @@
-require 'vedeu/parsing/text_adaptor'
+require 'vedeu/output/text_adaptor'
 
 module Vedeu
   class RawParser

data/lib/vedeu/output/render_interface.rb

@@ -24,7 +24,7 @@ module Vedeu
     attr_reader :interface
 
     def processed_lines
-      lines.each_with_index do |line|
+      processed_lines = lines.map do |line|
         if line.streams.any?
           processed_streams = []
           line_length       = 0
@@ -33,13 +33,19 @@ module Vedeu
 
             if (line_length += stream.text.size) >= width
               remainder = width - line_length
-              stream.text = truncate(stream.text, remainder)
-            end
 
-            processed_streams << stream
+              new_stream = Stream.new(text:   truncate(stream.text, remainder),
+                                      style:  stream.style,
+                                      colour: stream.colour)
+              processed_streams << new_stream
+            else
+              processed_streams << stream
+            end
           end
 
-          line.streams = processed_streams
+          new_line = Line.new(streams: processed_streams,
+                              style:   line.style,
+                              colour:  line.colour)
         end
       end
     end

data/lib/vedeu/{parsing → output}/view.rb

@@ -1,9 +1,9 @@
 require 'vedeu/models/composition'
-require 'vedeu/parsing/erb_parser'
-require 'vedeu/parsing/raw_parser'
-require 'vedeu/parsing/json_parser'
-require 'vedeu/parsing/menu_parser'
-require 'vedeu/parsing/raw_parser'
+require 'vedeu/output/erb_parser'
+require 'vedeu/output/raw_parser'
+require 'vedeu/output/json_parser'
+require 'vedeu/output/menu_parser'
+require 'vedeu/output/raw_parser'
 
 module Vedeu
   class View
@@ -33,7 +33,7 @@ module Vedeu
         json:    JSONParser,
         hash:    RawParser,
         menu:    MenuParser,
-        raw:     RawRarser,
+        raw:     RawParser,
       }.fetch(type)
     end
   end

data/lib/vedeu/support/events.rb

@@ -1,7 +1,13 @@
 module Vedeu
   class Events
     def initialize(&block)
-      @handlers = Hash.new { |h, k| h[k] = [] }
+      @handlers = Hash.new do |hash, key|
+        hash[key] = {
+          delay:     0,
+          events:    [],
+          last_exec: 0,
+        }
+      end
       self.instance_eval(&block) if block_given?
       self
     end
@@ -12,13 +18,21 @@ module Vedeu
       self.instance_eval(&block)
     end
 
-    def on(event, &block)
-      handlers[event] << block
+    def on(event, delay = 0, &block)
+      handlers[event][:events] << block
+      handlers[event][:delay]  = delay
+      handlers[event]
     end
 
     def trigger(event, *args)
-      handlers[event].each do |handler|
-        handler.call(*args)
+      elapsed = Time.now.to_f - handlers[event][:last_exec]
+
+      if elapsed > handlers[event][:delay]
+        handlers[event][:last_exec] = Time.now.to_f
+
+        handlers[event][:events].each do |handler|
+          handler.call(*args)
+        end
       end
     end
 
@@ -30,6 +44,6 @@ module Vedeu
 
     private
 
-    attr_reader :handlers
+    attr_reader :handlers, :throttles
   end
 end

data/lib/vedeu/support/persistence.rb

@@ -19,11 +19,9 @@ module Vedeu
     end
 
     def query(value)
-      return false if value.nil? || value.empty?
-
       storage.select do |name, result|
         return result if name == value
-      end
+      end unless value.nil? || value.empty?
 
       fail EntityNotFound, "Interface could not be found."
     end

data/test/lib/vedeu/{parsing → output}/erb_parser_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'vedeu/parsing/erb_parser'
+require 'vedeu/output/erb_parser'
 require 'vedeu/support/helpers'
 
 class UserView

data/test/lib/vedeu/{parsing → output}/json_parser_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'vedeu/parsing/json_parser'
+require 'vedeu/output/json_parser'
 
 module Vedeu
   describe JSONParser do

data/test/lib/vedeu/{parsing → output}/menu_parser_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'vedeu/parsing/menu_parser'
+require 'vedeu/output/menu_parser'
 
 module Vedeu
   describe MenuParser do

data/test/lib/vedeu/{parsing → output}/raw_parser_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'vedeu/parsing/raw_parser'
+require 'vedeu/output/raw_parser'
 
 module Vedeu
   describe RawParser do

data/test/lib/vedeu/{parsing → output}/text_adaptor_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'vedeu/parsing/text_adaptor'
+require 'vedeu/output/text_adaptor'
 
 module Vedeu
   describe TextAdaptor do

data/test/lib/vedeu/output/view_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+require 'vedeu/output/view'
+
+module Vedeu
+  describe View do
+    describe '.render' do
+      it 'returns when the type is :erb' do
+        skip
+        View.render(:erb, '').must_equal('')
+      end
+
+      it 'returns when the type is :json' do
+        skip
+        View.render(:json, '').must_equal('')
+      end
+
+      it 'returns when the type is :raw' do
+        skip
+        View.render(:raw, '').must_equal('')
+      end
+
+      it 'returns when the type is :menu' do
+        skip
+        View.render(:menu, '').must_equal('')
+      end
+
+      it 'returns when the type is not set' do
+        proc { View.render(nil, '') }.must_raise(KeyError)
+      end
+
+      it 'returns when the type is not recognised' do
+        proc { View.render(:unknown, '') }.must_raise(KeyError)
+      end
+    end
+  end
+end

data/test/lib/vedeu/support/events_test.rb

@@ -4,15 +4,22 @@ require 'vedeu/support/events'
 module Vedeu
   describe Events do
     describe '#on' do
-      it 'returns an Array' do
+      it 'adds the event block to the handlers' do
+        skip
         events = Events.new
         events.on(:some_event) { proc { |x| x } }
-          .must_be_instance_of(Array)
+      end
+
+      it 'adds the specified throttle to the throttles' do
+        skip
+        events = Events.new
+        events.on(:some_event, 250) { proc { |x| x } }
       end
     end
 
     describe '#trigger' do
-      it 'returns a collection containing the event when the event is pre-registered' do
+      it 'returns a collection containing the event when the event is ' \
+         'pre-registered' do
         events = Events.new do
           on(:_exit_) { fail StopIteration }
         end

data/test/lib/vedeu/support/menu_test.rb

@@ -8,7 +8,7 @@ module Vedeu
 
     describe '#events' do
       it 'returns the events defined for menus' do
-        menu.events.must_be_instance_of(Array)
+        menu.events.must_be_instance_of(Hash)
       end
     end
 

data/test/lib/vedeu/support/persistence_test.rb

@@ -30,10 +30,6 @@ module Vedeu
     end
 
     describe '#query' do
-      it 'returns false when the value is not provided' do
-        Persistence.query(nil).must_equal(false)
-      end
-
       it 'returns the record when found' do
         Persistence.create({ name: 'hydrogen' })
 

data/test/lib/vedeu_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'vedeu'
 
 module Vedeu
-  describe ClassMethods do
+  describe API do
     describe '.interface' do
     end
 
@@ -14,31 +14,23 @@ module Vedeu
 
     describe '.view' do
       it 'returns the interface referenced by name' do
-        skip
-        [].must_be_instance_of(Interface)
-        [].name.must_equal([])
-      end
+        Vedeu.interface 'Vedeu.view' do
+          width   5
+          height  5
+        end
 
-      it 'returns false with no name' do
-        skip
-        [].must_equal(false)
+        Vedeu.view('Vedeu.view').must_be_instance_of(Interface)
+        Vedeu.view('Vedeu.view').name.must_equal('Vedeu.view')
       end
 
       it 'raises an exception if the interface does not exist' do
-        skip
-        proc { }.must_raise(EntityNotFound)
+        proc { Vedeu.view('unknown') }.must_raise(EntityNotFound)
       end
     end
   end
 end
 
 describe Vedeu do
-  describe '.debug?' do
-    it 'allows me to quickly enable/disable debugging' do
-      skip
-    end
-  end
-
   describe '.events' do
     it 'creates some system events for the client application' do
       skip

data/test/test_helper.rb

@@ -9,6 +9,8 @@ SimpleCov.start do
   add_filter   '/test/'
 end unless ENV['no_simplecov']
 
+require 'mocha/setup'
+
 GC.disable
 
 # commented out by default (makes tests slower)

data/vedeu.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'vedeu'
-  spec.version       = '0.1.1'
+  spec.version       = '0.1.2'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-minitest',     '2.3.1'
   spec.add_development_dependency 'minitest',           '5.4.0'
   spec.add_development_dependency 'minitest-reporters', '1.0.5'
+  spec.add_development_dependency 'mocha',              '1.1.0'
   spec.add_development_dependency 'pry',                '0.10.0'
   spec.add_development_dependency 'rake',               '10.3.2'
   spec.add_development_dependency 'ruby-prof',          '0.15.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -187,13 +201,13 @@ files:
 - lib/vedeu/models/stream.rb
 - lib/vedeu/models/style.rb
 - lib/vedeu/output/clear_interface.rb
+- lib/vedeu/output/erb_parser.rb
+- lib/vedeu/output/json_parser.rb
+- lib/vedeu/output/menu_parser.rb
+- lib/vedeu/output/raw_parser.rb
 - lib/vedeu/output/render_interface.rb
-- lib/vedeu/parsing/erb_parser.rb
-- lib/vedeu/parsing/json_parser.rb
-- lib/vedeu/parsing/menu_parser.rb
-- lib/vedeu/parsing/raw_parser.rb
-- lib/vedeu/parsing/text_adaptor.rb
-- lib/vedeu/parsing/view.rb
+- lib/vedeu/output/text_adaptor.rb
+- lib/vedeu/output/view.rb
 - lib/vedeu/support/builder.rb
 - lib/vedeu/support/esc.rb
 - lib/vedeu/support/events.rb
@@ -222,13 +236,13 @@ files:
 - test/lib/vedeu/models/stream_test.rb
 - test/lib/vedeu/models/style_test.rb
 - test/lib/vedeu/output/clear_interface_test.rb
+- test/lib/vedeu/output/erb_parser_test.rb
+- test/lib/vedeu/output/json_parser_test.rb
+- test/lib/vedeu/output/menu_parser_test.rb
+- test/lib/vedeu/output/raw_parser_test.rb
 - test/lib/vedeu/output/render_interface_test.rb
-- test/lib/vedeu/parsing/erb_parser_test.rb
-- test/lib/vedeu/parsing/json_parser_test.rb
-- test/lib/vedeu/parsing/menu_parser_test.rb
-- test/lib/vedeu/parsing/raw_parser_test.rb
-- test/lib/vedeu/parsing/text_adaptor_test.rb
-- test/lib/vedeu/parsing/view_test.rb
+- test/lib/vedeu/output/text_adaptor_test.rb
+- test/lib/vedeu/output/view_test.rb
 - test/lib/vedeu/support/builder_test.rb
 - test/lib/vedeu/support/esc_test.rb
 - test/lib/vedeu/support/events_test.rb
@@ -302,13 +316,13 @@ test_files:
 - test/lib/vedeu/models/stream_test.rb
 - test/lib/vedeu/models/style_test.rb
 - test/lib/vedeu/output/clear_interface_test.rb
+- test/lib/vedeu/output/erb_parser_test.rb
+- test/lib/vedeu/output/json_parser_test.rb
+- test/lib/vedeu/output/menu_parser_test.rb
+- test/lib/vedeu/output/raw_parser_test.rb
 - test/lib/vedeu/output/render_interface_test.rb
-- test/lib/vedeu/parsing/erb_parser_test.rb
-- test/lib/vedeu/parsing/json_parser_test.rb
-- test/lib/vedeu/parsing/menu_parser_test.rb
-- test/lib/vedeu/parsing/raw_parser_test.rb
-- test/lib/vedeu/parsing/text_adaptor_test.rb
-- test/lib/vedeu/parsing/view_test.rb
+- test/lib/vedeu/output/text_adaptor_test.rb
+- test/lib/vedeu/output/view_test.rb
 - test/lib/vedeu/support/builder_test.rb
 - test/lib/vedeu/support/esc_test.rb
 - test/lib/vedeu/support/events_test.rb

data/lib/vedeu/parsing/json_parser.rb

@@ -1,23 +0,0 @@
-require 'json'
-
-module Vedeu
-  class JSONParser
-    def self.parse(output)
-      new(output).parse
-    end
-
-    def initialize(output)
-      @output = output
-    end
-
-    def parse
-      JSON.load(output, nil, symbolize_names: true)
-    rescue JSON::ParserError
-      {}
-    end
-
-    private
-
-    attr_reader :output
-  end
-end

data/test/lib/vedeu/parsing/view_test.rb

@@ -1,38 +0,0 @@
-require 'test_helper'
-require 'vedeu/parsing/view'
-
-module Vedeu
-  describe View do
-    describe '.render' do
-      # it 'returns when the type is :erb' do
-      #   output = ''
-      #   View.render(:erb, output).must_equal('')
-      # end
-
-      # it 'returns when the type is :json' do
-      #   output = ''
-      #   View.render(:json, output).must_equal('')
-      # end
-
-      # it 'returns when the type is :hash' do
-      #   output = ''
-      #   View.render(:hash, output).must_equal('')
-      # end
-
-      # it 'returns when the type is :menu' do
-      #   output = ''
-      #   View.render(:menu, output).must_equal('')
-      # end
-
-      # it 'returns when the type is not set' do
-      #   output = ''
-      #   View.render(nil, output).must_equal('')
-      # end
-
-      # it 'returns when the type is not recognised' do
-      #   output = ''
-      #   View.render(:unknown, output).must_equal('')
-      # end
-    end
-  end
-end