vedeu 0.6.31 → 0.6.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e129ccc6fe63f7b1f7b48ab9030683d79fe8544c
-  data.tar.gz: fab4cf9d158706ff5670b11c59bfaf1f03710683
+  metadata.gz: 2fc9f2ae69352f9b6c21d8d8607082bb988cff48
+  data.tar.gz: 9a0d1207af8e078b58cccadab420b3465e00b816
 SHA512:
-  metadata.gz: f76de0943d7be6e18efc10e248acac5232be21608228f45766a4815dd9e6bda0488dc7d304793fa6dea38aceadbf8bbcbba2694fe9763aff645db8d7b8f37b58
-  data.tar.gz: 8e9ef60497f7132a022a87d8223dddb9b3e486f3887ada7ffc276143dab0dc4c35341a141104eb2c8e5b4621ced3d1de2d00517bfa1aa315b75da4ae9b355f42
+  metadata.gz: 2a17c83991be48b4ccbee939f304a72e3e4f2401c2793782b469403ae9386020bb2e36b0afdec9b5c42471045b9262a1c9e23a6ee50c3d6812506ee638480c3e
+  data.tar.gz: c7149fbd4b90a7d5eb4e2fecabcafca828cb4805b76c86b369441f37db3b91b3e7077988c7cda7bcde08ef5f5f9ec4c9baf0afdb3c4968a8e257b0a490dda6aa

data/examples/hello_worlds.rb

@@ -72,7 +72,7 @@ class HelloWorldsApp
           line
           line { centre "Press 'q' to exit,",     width: 24 }
           line { centre " 'w' to switch worlds.", width: 24 }
-          line { centre "#{Vedeu.trigger(:_cursor_position_, Vedeu.focus)" }
+          line { centre "#{Vedeu.trigger(:_cursor_position_, Vedeu.focus)}" }
         end
       end
     end

data/lib/vedeu/buffers/buffer.rb

@@ -109,9 +109,12 @@ module Vedeu
       #
       # @return [Array<Array<Array<Vedeu::Views::Char>>>]
       def render
-        swap if back?
+        if back?
+          swap
 
-        if front?
+          Vedeu::Output::Viewport.render(front)
+
+        elsif front?
           Vedeu::Output::Viewport.render(front)
 
         elsif previous?

data/lib/vedeu/buffers/repository.rb

@@ -11,7 +11,7 @@ module Vedeu
       null Vedeu::Buffers::Null
       real Vedeu::Buffers::Buffer
 
-    end # Buffers
+    end # Repository
 
     class Buffer
 

data/lib/vedeu/dsl/composition.rb

@@ -127,7 +127,7 @@ module Vedeu
       # @param name [String|Symbol] The name of the interface.
       # @return [Hash]
       def new_attributes(name)
-        attributes.merge!(existing_attributes(name))
+        existing_attributes(name).merge!(attributes)
       end
 
       # Retrieve the attributes of the interface by name.

data/lib/vedeu/menus/dsl.rb

@@ -9,6 +9,51 @@ module Vedeu
 
       include Vedeu::DSL
 
+      class << self
+
+        # Register a menu by name which will display a collection of
+        # items for your users to select; and provide interactivity
+        # within your application.
+        #
+        # @param name [String|Symbol]
+        # @param block [Proc] A set of attributes which define the
+        #   features of the menu. See {Vedeu::Menus::DSL#items} and
+        #   {Vedeu::Menus::DSL#name}.
+        #
+        # @example
+        #   Vedeu.menu :my_interface do
+        #     items [:item_1, :item_2, :item_3]
+        #     # ...
+        #   end
+        #
+        #   Vedeu.menu do
+        #     name :menus_must_have_a_name
+        #     items Track.all_my_favourites
+        #     # ...
+        #   end
+        #
+        # @raise [Vedeu::Error::RequiresBlock]
+        # @return [API::Menu]
+        def menu(name = '', &block)
+          fail Vedeu::Error::RequiresBlock unless block_given?
+
+          attributes = { client: client(&block), name: name }
+
+          Vedeu::Menus::Menu.build(attributes, &block).store
+        end
+
+        private
+
+        # Returns the client object which called the DSL method.
+        #
+        # @param block [Proc]
+        # @return [Object]
+        def client(&block)
+          eval('self', block.binding)
+        end
+
+      end # Eigenclass
+
       # Add an individual item to the menu.
       #
       # @param element [Object] An object you wish to add to the

data/lib/vedeu/menus/menu.rb

@@ -34,35 +34,6 @@ module Vedeu
       # @return [Fixnum]
       attr_accessor :selected
 
-      # Register a menu by name which will display a collection of
-      # items for your users to select; and provide interactivity
-      # within your application.
-      #
-      # @param name [String|Symbol]
-      # @param block [Proc] A set of attributes which define the
-      #   features of the menu. See {Vedeu::Menus::DSL#items} and
-      #   {Vedeu::Menus::DSL#name}.
-      #
-      # @example
-      #   Vedeu.menu :my_interface do
-      #     items [:item_1, :item_2, :item_3]
-      #     # ...
-      #   end
-      #
-      #   Vedeu.menu do
-      #     name :menus_must_have_a_name
-      #     items Track.all_my_favourites
-      #     # ...
-      #   end
-      #
-      # @raise [Vedeu::Error::RequiresBlock]
-      # @return [API::Menu]
-      def self.menu(name = '', &block)
-        fail Vedeu::Error::RequiresBlock unless block_given?
-
-        build(name: name, &block).store
-      end
-
       # Returns a new instance of Vedeu::Menus::Menu.
       #
       # @param attributes [Hash]
@@ -229,7 +200,7 @@ module Vedeu
   end # Menus
 
   # @!method menu
-  #   @see Vedeu::Menus::Menu.menu
-  def_delegators Vedeu::Menus::Menu, :menu
+  #   @see Vedeu::Menus::DSL.menu
+  def_delegators Vedeu::Menus::DSL, :menu
 
 end # Vedeu

data/lib/vedeu/version.rb

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

data/test/lib/vedeu/buffers/buffer_test.rb

@@ -110,6 +110,43 @@ module Vedeu
         }
 
         subject { instance.render }
+
+        context 'when there is new content on the back buffer' do
+          let(:back) {
+            Vedeu::Views::View.new(value: [Vedeu::Views::Line.new])
+          }
+
+          it {
+            Vedeu::Output::Viewport.expects(:render)
+            subject
+          }
+        end
+
+        context 'when there is existing content on the front buffer' do
+          let(:front) {
+            Vedeu::Views::View.new(value: [Vedeu::Views::Line.new])
+          }
+
+          it {
+            Vedeu::Output::Viewport.expects(:render)
+            subject
+          }
+        end
+
+        context 'when there is content on the previous buffer' do
+          let(:previous) {
+            Vedeu::Views::View.new(value: [Vedeu::Views::Line.new])
+          }
+
+          it {
+            Vedeu::Output::Viewport.expects(:render)
+            subject
+          }
+        end
+
+        context 'when there is no content on any buffer' do
+          it { subject.must_equal(nil) }
+        end
       end
 
     end # Buffer

data/test/lib/vedeu/dsl/shared_test.rb

@@ -5,6 +5,26 @@ module Vedeu
   module DSL
 
     describe Shared do
+
+      let(:described) { Vedeu::DSL::Shared }
+      let(:instance)  { Class.include(described).new }
+
+      describe '#border' do
+        context 'when the block is not given' do
+          subject { instance.border }
+
+          it { proc { subject }.must_raise(Vedeu::Error::RequiresBlock) }
+        end
+      end
+
+      describe '#geometry' do
+        context 'when the required block is not given' do
+          subject { instance.geometry }
+
+          it { proc { subject }.must_raise(Vedeu::Error::RequiresBlock) }
+        end
+      end
+
     end # Shared
 
   end # DSL

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

@@ -63,7 +63,7 @@ module Vedeu
 
         it { subject.must_be_instance_of(Vedeu::Views::Lines) }
 
-        context 'when the required block is not provided' do
+        context 'when the required block is not given' do
           subject { instance.lines }
 
           it { proc { subject }.must_raise(Vedeu::Error::RequiresBlock) }

data/test/lib/vedeu/editor/cropper_test.rb

@@ -47,8 +47,6 @@ module Vedeu
         subject { instance.to_a }
 
         context 'when there are no lines' do
-          let(:lines) { Vedeu::Editor::Lines.new }
-
           it { subject.must_equal([]) }
         end
 
@@ -67,51 +65,47 @@ module Vedeu
         end
       end
 
-      # describe '#viewport' do
-      #   subject { instance.viewport }
-
-      #   context 'when there are no lines' do
-      #     let(:lines) { Vedeu::Editor::Lines.new }
-
-      #     it { subject.must_equal([]) }
-      #   end
-
-      #   context 'when there are lines' do
-      #     let(:lines) {
-      #       Vedeu::Editor::Lines.new([
-      #         Vedeu::Editor::Line.new('Hydrogen'),
-      #         Vedeu::Editor::Line.new('Helium'),
-      #         Vedeu::Editor::Line.new('Lithium'),
-      #         Vedeu::Editor::Line.new('Beryllium'),
-      #         Vedeu::Editor::Line.new('Boron'),
-      #       ])
-      #     }
-
-      #     it { subject.must_equal(['elium', 'ithiu', 'eryll']) }
-
-      #     context 'when oy is near the bottom' do
-      #       let(:oy) { 6 }
+      describe '#viewport' do
+        subject { instance.viewport }
 
-      #       it { subject.must_equal([]) }
-      #     end
-
-      #     context 'when ox is nearly past the content width' do
-      #       let(:oy) { 5 }
-      #       let(:ox) { 10 }
-
-      #       it 'returns only that which is visible, discarding empty lines' do
-      #         subject.must_equal([])
-      #       end
-      #     end
+        context 'when there are no lines' do
+          it { subject.must_equal([]) }
+        end
 
-      #     context 'when both oy and ox are effectively out of range' do
-      #       let(:oy) { 10 }
-      #       let(:ox) { 20 }
+        context 'when there are lines' do
+          let(:lines) {
+            Vedeu::Editor::Lines.new([
+              Vedeu::Editor::Line.new('Hydrogen'),
+              Vedeu::Editor::Line.new('Helium'),
+              Vedeu::Editor::Line.new('Lithium'),
+              Vedeu::Editor::Line.new('Beryllium'),
+              Vedeu::Editor::Line.new('Boron'),
+            ])
+          }
+          let(:expected) {
+            [
+              "\e[1;1H\e[39m\e[49m\e[24m\e[22m\e[27me",
+              "\e[1;2H\e[39m\e[49m\e[24m\e[22m\e[27ml",
+              "\e[1;3H\e[39m\e[49m\e[24m\e[22m\e[27mi",
+              "\e[1;4H\e[39m\e[49m\e[24m\e[22m\e[27mu",
+              "\e[1;5H\e[39m\e[49m\e[24m\e[22m\e[27mm",
+              "\e[2;1H\e[39m\e[49m\e[24m\e[22m\e[27mi",
+              "\e[2;2H\e[39m\e[49m\e[24m\e[22m\e[27mt",
+              "\e[2;3H\e[39m\e[49m\e[24m\e[22m\e[27mh",
+              "\e[2;4H\e[39m\e[49m\e[24m\e[22m\e[27mi",
+              "\e[2;5H\e[39m\e[49m\e[24m\e[22m\e[27mu",
+              "\e[3;1H\e[39m\e[49m\e[24m\e[22m\e[27me",
+              "\e[3;2H\e[39m\e[49m\e[24m\e[22m\e[27mr",
+              "\e[3;3H\e[39m\e[49m\e[24m\e[22m\e[27my",
+              "\e[3;4H\e[39m\e[49m\e[24m\e[22m\e[27ml",
+              "\e[3;5H\e[39m\e[49m\e[24m\e[22m\e[27ml"
+            ]
+          }
 
-      #       it { subject.must_equal([]) }
-      #     end
-      #   end
-      # end
+          it { subject.size.must_equal(15) }
+          it { subject.map(&:to_s).must_equal(expected) }
+        end
+      end
 
     end # Cropper
 

data/test/lib/vedeu/error_test.rb

@@ -4,6 +4,33 @@ module Vedeu
 
   module Error
 
+    describe ActionNotFound do
+    end
+
+    describe ControllerNotFound do
+    end
+
+    describe Fatal do
+    end
+
+    describe Interrupt do
+    end
+
+    describe InvalidSyntax do
+    end
+
+    describe MissingRequired do
+    end
+
+    describe ModelNotFound do
+    end
+
+    describe ModeSwitch do
+    end
+
+    describe NotImplemented do
+    end
+
     describe OutOfRange do
 
       let(:described) { Vedeu::Error::OutOfRange }

data/test/lib/vedeu/groups/refresh_test.rb

@@ -29,10 +29,10 @@ module Vedeu
         end
 
         context 'when the name is present' do
-          it {
-            Vedeu::Groups::Refresh.expects(:by_name).with(_name)
-            subject
-          }
+          # it {
+          #   Vedeu.expects(:trigger).with(:_refresh_view_)
+          #   subject
+          # }
         end
       end
 

data/test/lib/vedeu/interfaces/dsl_test.rb

@@ -42,44 +42,6 @@ module Vedeu
         end
       end
 
-      describe '#border' do
-        after { Vedeu.borders.reset }
-
-        context 'when the block is not given' do
-          subject { instance.border }
-
-          it { proc { subject }.must_raise(Vedeu::Error::RequiresBlock) }
-        end
-
-        context 'when the block is given' do
-          subject { instance.border { } }
-
-          it { subject.must_be_instance_of(Vedeu::Borders::Border) }
-
-          context 'when the name is not given' do
-            it 'uses the interface name for storing the border' do
-              subject.name.must_equal('actinium')
-            end
-          end
-
-          context 'when the name is given' do
-            subject { instance.border('magnesium') { } }
-
-            it 'uses the name for storing the border' do
-              subject.name.must_equal('magnesium')
-            end
-          end
-        end
-      end
-
-      describe '#border!' do
-        after { Vedeu.borders.reset }
-
-        subject { instance.border! }
-
-        it { subject.must_be_instance_of(Vedeu::Borders::Border) }
-      end
-
       describe '#cursor' do
         let(:_value) {}
 
@@ -172,34 +134,6 @@ module Vedeu
         end
       end
 
-      describe '#geometry' do
-        context 'when the required block is not provided' do
-          subject { instance.geometry }
-
-          it { proc { subject }.must_raise(Vedeu::Error::RequiresBlock) }
-        end
-
-        context 'when the block is given' do
-          subject { instance.geometry { } }
-
-          it { subject.must_be_instance_of(Vedeu::Geometry::Geometry) }
-
-          context 'when the name is not given' do
-            it 'uses the interface name for storing the geometry' do
-              subject.name.must_equal('actinium')
-            end
-          end
-
-          context 'when the name is given' do
-            subject { instance.geometry('magnesium') { } }
-
-            it 'uses the name for storing the geometry' do
-              subject.name.must_equal('magnesium')
-            end
-          end
-        end
-      end
-
       describe '#group' do
         let(:_value) { 'elements' }
 

data/test/lib/vedeu/menus/dsl_test.rb

@@ -18,6 +18,22 @@ module Vedeu
       let(:collection) { [:sodium, :magnesium, :aluminium, :silicon] }
       let(:menu_name)  { 'elements' }
 
+      describe '.menu' do
+        subject {
+          described.menu('elements') do
+            # ...
+          end
+        }
+
+        it { subject.must_be_instance_of(Vedeu::Menus::Menu) }
+
+        context 'when the block is not given' do
+          subject { described.menu }
+
+          it { proc { subject }.must_raise(Vedeu::Error::RequiresBlock) }
+        end
+      end
+
       describe '#item' do
         let(:_value) { :platinum }
 

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

@@ -21,22 +21,6 @@ module Vedeu
       let(:current)    { 0 }
       let(:selected)   {}
 
-      describe '.menu' do
-        subject {
-          described.menu('elements') do
-            # ...
-          end
-        }
-
-        it { subject.must_be_instance_of(described) }
-
-        context 'when the block is not given' do
-          subject { described.menu }
-
-          it { proc { subject }.must_raise(Vedeu::Error::RequiresBlock) }
-        end
-      end
-
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.31
+  version: 0.6.32
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard