vedeu 0.6.67 → 0.6.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0621e21742d8ad220683b0170dde12c52244fe6
-  data.tar.gz: f66881ddd805fd68c13877553422736c74ac482c
+  metadata.gz: 850ce1133d6018ed381e4ddbb4ee9bdff12e4bbb
+  data.tar.gz: bb06f89c8568103c095e448fab6a2fc3eef3dfb8
 SHA512:
-  metadata.gz: 2414b55833736a3e19e7f779bbe833721666bce2888d4280d9ef2c4a6161214dfae722525186e59ac0e0e0022907893b7014fc1945cc3819906323102e594a26
-  data.tar.gz: 174b57ce52b732d279e9c5f9fdbf20a031c2574b2ea01f5a9852e5cc9f872c9a829f9b4b0cb6f06ec8f97e0f5618c8714dac868f3eeee23ccb473bbf065c1b3e
+  metadata.gz: 2cdb5a8f19a21d62dd57faead71646070464ac3072e3945d08b534a642be3ad52004e53bf8af4614c870cf18f332888595805e280f6863b8a18c36d8f07bc347
+  data.tar.gz: e045c49ba37aaf20676442a648f8e5c84bc99181835c3fd09f00b349aa21dd15926a5a76216cf6618bdf1af4e51dc60ffc3c422ab32cc869cec4281986a30e59

data/docs/api.md

@@ -409,6 +409,10 @@ Returns the last keypress entered into Vedeu.
 
 @todo Add more documentation.
 
+### Vedeu.log_timestamp
+
+@todo Add more documentation.
+
 ### Vedeu.menu
 
 @todo Add more documentation.

data/examples/dsl_editor.rb

@@ -26,7 +26,7 @@ class EditorApp
 
   Vedeu.interface :help_view do
     geometry do
-      height use(:editor_view).height
+      height 4
       width  use(:editor_view).width
       x      use(:editor_view).left
       y      use(:editor_view).south

data/lib/vedeu/editor/editor.rb

@@ -91,9 +91,11 @@ module Vedeu
 
   # See {file:docs/events/system.md#\_editor_}
   Vedeu.bind(:_editor_) do |key|
-    Vedeu.trigger(:key, key)
+    Vedeu.timer('Executing editor keypress') do
+      Vedeu.trigger(:key, key)
 
-    Vedeu::Editor::Editor.keypress(name: Vedeu.focus, input: key)
+      Vedeu::Editor::Editor.keypress(name: Vedeu.focus, input: key)
+    end
   end
 
   # :nocov:

data/lib/vedeu/events/aliases.rb

@@ -88,7 +88,9 @@ module Vedeu
         return [] unless registered?(alias_name)
 
         find(alias_name).map do |event_name|
-          Vedeu.log(type: :debug, message: "#{event_name}".freeze)
+          Vedeu.log(type:    :event,
+                    message: "Triggering: '#{event_name}' from alias " \
+                             "'#{alias_name}'".freeze)
           Vedeu::Events::Trigger.trigger(event_name, *args)
         end
       end

data/lib/vedeu/input/mapper.rb

@@ -157,11 +157,13 @@ module Vedeu
 
   # See {file:docs/events/system.md#\_keypress_}
   Vedeu.bind(:_keypress_) do |key, name|
-    Vedeu.trigger(:key, key)
+    Vedeu.timer('Executing keypress') do
+      Vedeu.trigger(:key, key)
 
-    Vedeu.add_keypress(key)
+      Vedeu.add_keypress(key)
 
-    Vedeu.keypress(key, name)
+      Vedeu.keypress(key, name)
+    end
   end
 
   # See {file:docs/events/drb.md#\_drb_input_}
@@ -177,9 +179,11 @@ module Vedeu
 
   # See {file:docs/events/system.md#\_command_}
   Vedeu.bind(:_command_) do |command|
-    Vedeu.add_command(command)
+    Vedeu.timer('Executing command') do
+      Vedeu.add_command(command)
 
-    Vedeu.trigger(:command, command)
+      Vedeu.trigger(:command, command)
+    end
   end
 
   # :nocov:

data/lib/vedeu/logging/log.rb

@@ -196,6 +196,8 @@ module Vedeu
   #   @see Vedeu::Logging::Log.log_stdout
   # @!method log_stderr
   #   @see Vedeu::Logging::Log.log_stderr
+  # @!method log_timestamp
+  #   @see Vedeu::Logging::Log.log_timestamp
   def_delegators Vedeu::Logging::Log,
                  :log,
                  :log_stdout,

data/lib/vedeu/models/row.rb

@@ -48,7 +48,7 @@ module Vedeu
 
       # @return [Array<void>]
       def content
-        cells.flatten << reset_character
+        (cells.flatten << reset_character).reject(&:cell?)
       end
 
       # Provides iteration over the collection.

data/lib/vedeu/models/views/char.rb

@@ -96,7 +96,7 @@ module Vedeu
 
       # @return [Vedeu::Geometries::Position]
       def position
-        @position = Vedeu::Geometries::Position.coerce(@attributes[:position])
+        @position ||= Vedeu::Geometries::Position.coerce(@attributes[:position])
       end
 
       # Sets the position of the Vedeu::Views::Char.

data/lib/vedeu/output/all.rb

@@ -6,6 +6,7 @@ module Vedeu
 
 end # Vedeu
 
+require 'vedeu/output/compressor_cache'
 require 'vedeu/output/compressor'
 require 'vedeu/output/text'
 require 'vedeu/output/output'

data/lib/vedeu/output/compressor.rb

@@ -33,10 +33,11 @@ module Vedeu
       end
 
       # @note
-      #   Takes approximately ~25ms for 2100 chars. (2015-07-25)
+      #   - Takes approximately ~6ms for 2100 chars. (2015-11-25)
+      #   - Takes approximately ~25ms for 2100 chars. (2015-07-25)
       # @return [String]
       def render
-        return compress if Vedeu::Configuration.compression?
+        return cached if Vedeu::Configuration.compression?
 
         uncompress
       end
@@ -60,9 +61,26 @@ module Vedeu
                      end
       end
 
+      def cached
+        cached_original   = Vedeu::Output::CompressorCache.read(:original)
+        cached_compressed = Vedeu::Output::CompressorCache.read(:compressed)
+
+        if content.size == cached_original.size && content == cached_original
+          cached_compressed
+
+        else
+          Vedeu::Output::CompressorCache.write(:original, content)
+          Vedeu::Output::CompressorCache.write(:compressed, compress)
+          compress
+
+        end
+      end
+
       # @return [String]
       def compress
-        Vedeu.timer("Compression for #{content.size} objects".freeze) do
+        message = "Compression for #{content.size} objects".freeze
+
+        @compress ||= Vedeu.timer(message) do
           out = content.map do |cell|
             [
               # position_for(cell),
@@ -73,9 +91,9 @@ module Vedeu
             ].join
           end.join
 
+
           Vedeu.log(type:    :compress,
-                    message: "Compression: #{content.size} objects -> " \
-                             "#{out.size} characters".freeze)
+                    message: "#{message} -> #{out.size} characters".freeze)
 
           out
         end

data/lib/vedeu/output/compressor_cache.rb

@@ -0,0 +1,61 @@
+module Vedeu
+
+  module Output
+
+    module CompressorCache
+
+      extend self
+
+      # @param key [NilClass|Symbol]
+      # @return [Array<void>]
+      def read(key)
+        storage.fetch(key, [])
+      end
+
+      # @return [Hash<Symbol => Array<void>>]
+      def reset!
+        @storage = in_memory
+      end
+      alias_method :reset, :reset!
+
+      # @return [Hash<Symbol => Array<void>>]
+      def storage
+        @storage ||= in_memory
+      end
+
+      # @param key [NilClass|Symbol]
+      # @param value [Array|NilClass]
+      # @return [Hash<Symbol => Array<void>>]
+      def write(key, value)
+        return storage if invalid_key?(key) || invalid_value?(value)
+
+        storage.merge!(key => value)
+      end
+
+      private
+
+      # @return [Hash<Symbol => Array<void>>]
+      def in_memory
+        {
+          compressed: '',
+          original:   [],
+        }
+      end
+
+      # @param key [NilClass|Symbol]
+      # @return [Boolean]
+      def invalid_key?(key)
+        key.nil? || !in_memory.keys.include?(key)
+      end
+
+      # @param value [Array|NilClass]
+      # @return [Boolean]
+      def invalid_value?(value)
+        value.nil? || value.empty?
+      end
+
+    end # CompressorCache
+
+  end # Output
+
+end # Vedeu

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.67'.freeze
+  VERSION = '0.6.68'.freeze
 
 end

data/test/lib/vedeu/models/row_test.rb

@@ -8,7 +8,13 @@ module Vedeu
 
       let(:described) { Vedeu::Models::Row }
       let(:instance)  { described.new(cells) }
-      let(:cells)     { [:hydrogen, :helium, :lithium] }
+      let(:cells)     {
+        [
+          Vedeu::Views::Char.new(value: 'A'),
+          Vedeu::Models::Cell.new(value: 'B'),
+          Vedeu::Views::Char.new(value: 'C'),
+        ]
+      }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -69,9 +75,11 @@ module Vedeu
 
         context 'when the index is not nil' do
           context 'and the index is in range' do
-            let(:index) { 1 }
+            let(:expected) { Vedeu::Views::Char.new(value: 'C') }
 
-            it { subject.must_equal(:helium) }
+            let(:index) { 2 }
+
+            it { subject.must_equal(expected) }
           end
 
           context 'and the index is out of range' do
@@ -88,11 +96,19 @@ module Vedeu
         end
       end
 
-      # describe '#content' do
-      #   subject { instance.content }
+      describe '#content' do
+        let(:expected) {
+          [
+            Vedeu::Views::Char.new(value: 'A'),
+            Vedeu::Views::Char.new(value: 'C'),
+            Vedeu::Views::Char.new(value: "\e[0m"),
+          ]
+        }
+
+        subject { instance.content }
 
-      #   it { subject.must_equal() }
-      # end
+        it { subject.must_equal(expected) }
+      end
 
       describe '#each' do
         subject { instance.each }

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

@@ -0,0 +1,148 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Output
+
+    # class CompressorCacheTestClass
+    # end
+
+    describe CompressorCache do
+
+      let(:described) { Vedeu::Output::CompressorCache }
+      let(:empty)     {
+        {
+          compressed: '',
+          original:   [],
+        }
+      }
+
+      before { described.reset! }
+
+      describe '#read' do
+        let(:key) {}
+
+        subject { described.read(key) }
+
+        context 'when the key is nil' do
+          it { subject.must_equal([]) }
+        end
+
+        context 'when the key is not :compressed or :original' do
+          let(:key) { :invalid }
+
+          it { subject.must_equal([]) }
+        end
+
+        context 'when the key is :compressed' do
+          let(:key) { :compressed }
+
+          context 'when there is no compressed data stored' do
+            it { subject.must_equal('') }
+          end
+
+          context 'when there is compressed data stored' do
+            before { described.write(:compressed, 'compressed_data') }
+
+            it { subject.must_equal('compressed_data') }
+          end
+        end
+
+        context 'when the key is :original' do
+          let(:key) { :original }
+
+          context 'when there is no original data stored' do
+            it { subject.must_equal([]) }
+          end
+
+          context 'when there is original data stored' do
+            before { described.write(:original, [:original_data]) }
+
+            it { subject.must_equal([:original_data]) }
+          end
+        end
+      end
+
+      describe '#reset!' do
+        before { described.write(:original, [:original_data]) }
+
+        subject { described.reset! }
+
+        it { described.must_respond_to(:reset) }
+        it { subject.must_equal(empty) }
+      end
+
+      describe '#storage' do
+        subject { described.storage }
+
+        context 'when the storage is empty' do
+          it { subject.must_equal(empty) }
+        end
+
+        context 'when the storage is not empty' do
+          let(:expected) {
+            {
+              compressed: 'compressed_data',
+              original:   [:original_data],
+            }
+          }
+
+          before {
+            described.write(:original, [:original_data])
+            described.write(:compressed, 'compressed_data')
+          }
+
+          it { subject.must_equal(expected) }
+        end
+      end
+
+      describe '#write' do
+        let(:key)    {}
+        let(:_value) {}
+
+        subject { described.write(key, _value) }
+
+        context 'when the key is invalid' do
+          context 'when the key is nil' do
+            it { subject.must_equal(empty) }
+          end
+
+          context 'when the key is invalid' do
+            let(:key) { :invalid }
+
+            it { subject.must_equal(empty) }
+          end
+        end
+
+        context 'when the key is valid' do
+          let(:key) { :compressed }
+
+          context 'when the value is nil' do
+            it { subject.must_equal(empty) }
+          end
+
+          context 'when the value is empty' do
+            let(:_value) { [] }
+
+            it { subject.must_equal(empty) }
+          end
+
+          context 'when the value is not nil or empty' do
+            let(:_value)   { 'compressed_data' }
+            let(:expected) {
+              {
+                compressed: 'compressed_data',
+                original:   [],
+              }
+            }
+
+            it { subject.must_equal(expected) }
+          end
+        end
+      end
+
+    end # CompressorCache
+
+  end # Output
+
+end # Vedeu

data/vedeu.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-minitest',     '2.4.4'
   spec.add_development_dependency 'guard-rubocop',      '1.2.0'
   spec.add_development_dependency 'minitest',           '5.8.3'
-  spec.add_development_dependency 'minitest-reporters', '1.1.5'
+  spec.add_development_dependency 'minitest-reporters', '1.1.6'
   spec.add_development_dependency 'mocha',              '1.1.0'
   spec.add_development_dependency 'pry',                '0.10.3'
   spec.add_development_dependency 'rubocop',            '0.35.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.67
+  version: 0.6.68
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -482,6 +482,7 @@ files:
 - lib/vedeu/null/view.rb
 - lib/vedeu/output/all.rb
 - lib/vedeu/output/compressor.rb
+- lib/vedeu/output/compressor_cache.rb
 - lib/vedeu/output/output.rb
 - lib/vedeu/output/presentation/all.rb
 - lib/vedeu/output/presentation/colour.rb
@@ -660,6 +661,7 @@ files:
 - test/lib/vedeu/models/views/view_test.rb
 - test/lib/vedeu/null/generic_test.rb
 - test/lib/vedeu/null/view_test.rb
+- test/lib/vedeu/output/compressor_cache_test.rb
 - test/lib/vedeu/output/compressor_test.rb
 - test/lib/vedeu/output/output_test.rb
 - test/lib/vedeu/output/presentation/colour_test.rb
@@ -875,6 +877,7 @@ test_files:
 - test/lib/vedeu/models/views/view_test.rb
 - test/lib/vedeu/null/generic_test.rb
 - test/lib/vedeu/null/view_test.rb
+- test/lib/vedeu/output/compressor_cache_test.rb
 - test/lib/vedeu/output/compressor_test.rb
 - test/lib/vedeu/output/output_test.rb
 - test/lib/vedeu/output/presentation/colour_test.rb