vedeu 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f1c1d57417fc05b09722865230c56b1ae0c255f
-  data.tar.gz: bc49bf53438c817107da4b3487f3f3c7d8d65e88
+  metadata.gz: e590fa41d87fd5be6367a2895240ddc3ea8b624d
+  data.tar.gz: 872c9d6dd4aa0c150609d528405c9db36a863bf1
 SHA512:
-  metadata.gz: 64922d74b257a74850aa87cf2455ba58a368060b0d3316f2a14fd3d63b774aaf2017c3ffb11dcdd2934e5f0007661d2c7b252a933a5e1a32ddad7cf761a2a8eb
-  data.tar.gz: 5e3b0890b6121e88a5001e29b6cdf1541e2db0499bfe02f08fecc486bf9347956813394d5e5c7909e4453a0bb9e206a231272933d884afca2690e6a5bc9c1c88
+  metadata.gz: 9b30dbfb6dadb583d08726d1f6d4eca4fb82023216a52c69e10bc05d4af66572ce62291fc618863210ce4888e408032afa8b4ebd0f1a7a41f6a29364cd73c7a9
+  data.tar.gz: d8354d2b6a0dd7bfc6a5965a159fe7642b51bb0520affa5ca1f328cea82b258b12ae5e25f0d051478c0337147f3931e6ddb3306fca38e137b21686fed3eb6c6a

data/Rakefile

@@ -5,7 +5,7 @@ Rake::TestTask.new(:minitest) do |t|
   t.libs << 'lib/vedeu'
   t.test_files = FileList["test/lib/vedeu/*_test.rb",
                           "test/lib/vedeu/**/*_test.rb"]
-  t.verbose = false
+  # t.options = '-v' # verbose mode
 end
 
 task default: :minitest

data/lib/vedeu/models/composition.rb

@@ -16,6 +16,7 @@ module Vedeu
     def enqueue
       interfaces.map do |interface|
         interface.enqueue(interface.to_s)
+        interface
       end
     end
 

data/lib/vedeu/models/interface.rb

@@ -26,13 +26,13 @@ module Vedeu
 
     def refresh
       if enqueued?
-        current = dequeue
+        self.current = dequeue
 
       elsif no_content?
-        current = clear_interface
+        self.current = clear_interface
 
       else
-        current
+        self.current
 
       end
     end
@@ -48,7 +48,7 @@ module Vedeu
     private
 
     def no_content?
-      current.nil? || current.empty?
+      self.current.nil? || self.current.empty?
     end
 
     def render_content

data/lib/vedeu/process/process.rb

@@ -13,9 +13,9 @@ module Vedeu
     def evaluate
       fail StopIteration if no_result?
 
-      json = Parser.parse(result)
+      parsed_data = Parser.parse(result)
 
-      Composition.enqueue(json)
+      Composition.enqueue(parsed_data)
     end
 
     private

data/lib/vedeu/support/geometry.rb

@@ -24,8 +24,8 @@ module Vedeu
     end
 
     def max_y
-      if ((y + height) > Terminal.height)
-        Terminal.height
+      if ((y + height) > screen_height)
+        screen_height
 
       else
         (y + height)
@@ -34,8 +34,8 @@ module Vedeu
     end
 
     def max_x
-      if ((x + width) > Terminal.width)
-        Terminal.width
+      if ((x + width) > screen_width)
+        screen_width
 
       else
         (x + width)
@@ -62,5 +62,13 @@ module Vedeu
     def y
       interface.y
     end
+
+    def screen_height
+      @height ||= Terminal.height
+    end
+
+    def screen_width
+      @width ||= Terminal.width
+    end
   end
 end

data/lib/vedeu/support/queue.rb

@@ -8,7 +8,6 @@ module Vedeu
 
     def enqueue(result)
       store.unshift(result)
-      store
     end
 
     def enqueued?

data/lib/vedeu/version.rb

@@ -1,3 +1,3 @@
 module Vedeu
-  VERSION = '0.0.26'
+  VERSION = '0.0.27'
 end

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

@@ -7,7 +7,13 @@ module Vedeu
     let(:described_class)    { Composition }
     let(:described_instance) { described_class.new(attributes) }
     let(:attributes)         { { interfaces: interfaces } }
-    let(:interfaces)         { { name: 'dummy', width: 40, height: 25 } }
+    let(:interfaces)         {
+      {
+        name:   'dummy',
+        width:  40,
+        height: 25
+      }
+    }
 
     describe '#initialize' do
       let(:subject) { described_instance }
@@ -15,17 +21,59 @@ module Vedeu
       it 'returns a Composition instance' do
         subject.must_be_instance_of(Composition)
       end
+
+      it 'sets an instance variable' do
+        subject.instance_variable_get('@interfaces')
+          .must_be_instance_of(Array)
+      end
+    end
+
+    describe '#interfaces' do
+      let(:subject) { described_instance.interfaces }
+
+      it 'returns an Array' do
+        subject.must_be_instance_of(Array)
+      end
+
+      it 'returns a collection of interfaces' do
+        subject.first.must_be_instance_of(Interface)
+      end
+
+      context 'when no interfaces are associated' do
+        let(:attributes) { {} }
+
+        it 'returns an empty collection' do
+          subject.must_be_empty
+        end
+      end
     end
 
-    describe '#enqueue' do
-      let(:subject) { described_instance.enqueue }
+    describe '.enqueue' do
+      let(:subject)     { described_class.enqueue(composition) }
+      let(:composition) {
+        {
+          interfaces: [
+            { name: "enq1", lines: { streams: { text: "Some text..." } } },
+            { name: "enq2", lines: { streams: { text: "Some text..." } } }
+          ]
+        }
+      }
 
       before do
-        InterfaceRepository.create({ name: 'dummy', width: 10, height: 2 })
+        InterfaceRepository.create(name: 'enq1', width: 15, height: 2)
+        InterfaceRepository.create(name: 'enq2', width: 15, height: 2)
+      end
+
+      it 'returns an Array' do
+        subject.must_be_instance_of(Array)
+      end
+
+      it 'returns a collection of interfaces' do
+        subject.first.must_be_instance_of(Interface)
       end
 
-      it 'creates a composition and enqueues the interface for rendering' do
-        skip
+      it 'enqueues the interfaces for rendering' do
+        subject.first.enqueued?.must_equal(true)
       end
     end
 

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

@@ -188,8 +188,28 @@ module Vedeu
         subject.must_be_instance_of(String)
       end
 
-      it 'returns a String' do
-        subject.must_equal("\e[38;5;196m\e[48;5;16m\e[1;1H       \e[1;1H\e[2;1H       \e[2;1H\e[3;1H       \e[3;1H")
+      context 'when content is queued up to be displayed' do
+        before { described_instance.enqueue("\e[38;5;196m\e[48;5;16m\e[1;1HContent\e[1;1H\e[2;1HContent\e[2;1H\e[3;1HContent\e[3;1H") }
+
+        it 'returns the fresh content' do
+          subject.must_equal("\e[38;5;196m\e[48;5;16m\e[1;1HContent\e[1;1H\e[2;1HContent\e[2;1H\e[3;1HContent\e[3;1H")
+        end
+      end
+
+      context 'when there is no content to display (initial state)' do
+        it 'returns a blank interface' do
+          subject.must_equal("\e[38;5;196m\e[48;5;16m\e[1;1H       \e[1;1H\e[2;1H       \e[2;1H\e[3;1H       \e[3;1H")
+        end
+      end
+
+      context 'when there is stale content from last run' do
+        before do
+          described_instance.current = "\e[38;5;196m\e[48;5;16m\e[1;1HOld\e[1;1H\e[2;1HContent\e[2;1H\e[3;1Here\e[3;1H"
+        end
+
+        it 'returns the previously shown content' do
+          subject.must_equal("\e[38;5;196m\e[48;5;16m\e[1;1HOld\e[1;1H\e[2;1HContent\e[2;1H\e[3;1Here\e[3;1H")
+        end
       end
     end
 

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

@@ -6,7 +6,52 @@ module Vedeu
   describe InterfaceRenderer do
     let(:described_class)    { InterfaceRenderer }
     let(:described_instance) { described_class.new(interface) }
-    let(:interface)          { }
+    let(:interface)          { Interface.new(attributes) }
+    let(:attributes)         { { name: 'dummy', width: 20, height: 2 } }
 
+    describe '#initialize' do
+      let(:subject) { described_instance }
+
+      it 'returns an InterfaceRenderer instance' do
+        subject.must_be_instance_of(InterfaceRenderer)
+      end
+
+      it 'sets an instance variable' do
+        subject.instance_variable_get("@interface").must_equal(interface)
+      end
+    end
+
+    describe '.clear' do
+      let(:subject) { described_class.clear(interface) }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns the escape sequence to clear the whole interface' do
+        subject.must_equal("\e[1;1H                    \e[1;1H\e[2;1H                    \e[2;1H")
+      end
+
+      context 'when the interface has colour attributes' do
+        let(:attributes) { { name: 'dummy', width: 20, height: 2, colour: { foreground: '#00ff00', background: '#ffff00' } } }
+
+        it 'returns the escape sequence to clear the whole interface' do
+          subject.must_equal("\e[38;5;46m\e[48;5;226m\e[1;1H                    \e[1;1H\e[2;1H                    \e[2;1H")
+        end
+      end
+    end
+
+    describe '.render' do
+      let(:subject)    { described_class.render(interface) }
+      let(:attributes) { { name: 'dummy', width: 20, height: 2, lines: "Some text..." } }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns the content for the interface' do
+        subject.must_equal("\e[1;1HSome text...")
+      end
+    end
   end
 end

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

@@ -20,10 +20,10 @@ module Vedeu
     end
 
     describe '#on' do
-      let(:subject) { described_instance.on(event) { :do_something } }
+      let(:subject) { described_instance.on(event) { proc { |x, y| x + y } } }
       let(:event)   { :some_event }
 
-      it 'returns the handlers value' do
+      it 'returns an Array' do
         subject.must_be_instance_of(Array)
       end
     end
@@ -31,7 +31,15 @@ module Vedeu
     describe '#trigger' do
       let(:subject) { described_instance.trigger(event, args) }
       let(:event)   { :some_event }
-      let(:args)    {}
+      let(:args)    { :arg }
+
+      before do
+        described_instance.on(:some_event) { proc { |x| x } }
+      end
+
+      it 'returns an Array' do
+        subject.must_be_instance_of(Array)
+      end
     end
   end
 end

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

@@ -27,30 +27,12 @@ module Vedeu
       end
     end
 
-    # describe '#parse' do
-    #   let(:subject) { described_class.parse(output) }
-
-    #   it 'returns a Composition' do
-    #     subject.must_be_instance_of(Composition)
-    #   end
-
-    #   context 'when the output is an interface name and a stream' do
-    #     it 'returns a composition' do
-    #       subject.must_equal('')
-    #     end
-    #   end
-
-    #   context 'when the output contains a single interface' do
-    #     it 'returns a Composition instance' do
-    #       subject.must_be_instance_of(Composition)
-    #     end
-    #   end
-
-    #   context 'when the output contains multiple interfaces' do
-    #     it 'returns a Composition instance' do
-    #       subject.must_be_instance_of(Composition)
-    #     end
-    #   end
-    # end
+    describe '#parse' do
+      let(:subject) { described_class.parse(output) }
+
+      it 'returns a Composition' do
+        subject.must_be_instance_of(Composition)
+      end
+    end
   end
 end

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

@@ -59,6 +59,15 @@ module Vedeu
           subject.must_equal(formatted_value)
         end
       end
+
+      context 'when the content is less than the prune size' do
+        let(:options) { { width: 70, prune: true } }
+        let(:value)   { 'Some text...' }
+
+        it 'returns formatted text' do
+          subject.must_equal(value)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler