vedeu 0.6.33 → 0.6.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2d162793e93e4fa86ae8aa3de42eebb420dfe04
-  data.tar.gz: f85ce22f4ae5e77674fb833f8424236a89980ccc
+  metadata.gz: 12cdb96715e44a6ed789be72c594f11a2fca50c4
+  data.tar.gz: 5fb1b73c0e64a16bfaa3c227169fec1ad8d69475
 SHA512:
-  metadata.gz: 9d43739fa7157c31b80664ef5745d9ba27321b876aa35eae85ddd1dd45f77a89d0d27386bfc50e699979cb4c21783432afab585fe7312b01f08da0916af9f12e
-  data.tar.gz: b05c10e2f4903031809a462cd4257952fd925f5b8bc0a4dc84880f704b5e82b255510624cddde9828edf4d4c4eb729397d3cada44143ab03a0cb3a965d6ec752
+  metadata.gz: dcce80eac99efd8c58394bf7bc595ce26ec4534288357894afbbbb7ac7abe76dd4b4f1f80f5500b6208dbfe0be58882ad7c455a4e6f669d937a0b866ab2958df
+  data.tar.gz: e55fbfa42ce9f608f0f28dffa9584f763a5f6ae8126e03de8c841fde5377612d67d7437a33b5962c63119a14eccce43b1cf4e0933982b65e1751ba7372080638

data/.rubocop.yml

@@ -93,6 +93,9 @@ Style/Next:
     - skip_modifier_ifs
     - always
 
+Style/SpaceAroundOperators:
+  Enabled: false
+
 Style/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
 

data/lib/vedeu.rb

@@ -23,13 +23,6 @@ module Vedeu
   extend Forwardable
   extend self
 
-  # Return the name of currently focussed interface.
-  #
-  # @return [Vedeu::Models::Focus]
-  def self.focusable
-    @focusable ||= Vedeu::Models::Focus
-  end
-
 end # Vedeu
 
 require 'vedeu/all'

data/lib/vedeu/geometry/area.rb

@@ -7,24 +7,26 @@ module Vedeu
     class Area
 
       # @!attribute [r] y
-      # @return [Fixnum] Returns the top coordinate of the interface.
+      # @return [Fixnum] Returns the top coordinate (row/line start
+      #   position) of the interface.
       attr_reader :y
       alias_method :top, :y
 
       # @!attribute [r] yn
-      # @return [Fixnum] Returns the bottom coordinate of the
-      #   interface.
+      # @return [Fixnum] Returns the bottom coordinate (row/line end
+      #   position) of the interface.
       attr_reader :yn
       alias_method :bottom, :yn
 
       # @!attribute [r] x
-      # @return [Fixnum] Returns the left coordinate of the interface.
+      # @return [Fixnum] Returns the left coordinate (column/character
+      #   start position) of the interface.
       attr_reader :x
       alias_method :left, :x
 
       # @!attribute [r] xn
-      # @return [Fixnum] Returns the right coordinate of the
-      #   interface.
+      # @return [Fixnum] Returns the right coordinate (column/
+      #   character end position) of the interface.
       attr_reader :xn
       alias_method :right, :xn
 
@@ -44,7 +46,7 @@ module Vedeu
           d:         attributes[:y],
           dn:        attributes[:yn],
           d_dn:      attributes[:y_yn],
-          default:   attributes[:y_default],
+          default:   Vedeu.height,
           maximised: attributes[:maximised],
           centred:   attributes[:centred],
         }
@@ -52,7 +54,7 @@ module Vedeu
           d:         attributes[:x],
           dn:        attributes[:xn],
           d_dn:      attributes[:x_xn],
-          default:   attributes[:x_default],
+          default:   Vedeu.width,
           maximised: attributes[:maximised],
           centred:   attributes[:centred],
         }
@@ -86,26 +88,39 @@ module Vedeu
       end
       alias_method :==, :eql?
 
+      # Returns an array containing the centred y and x coordinates of
+      # the interface.
+      #
       # @return [Array<Fixnum>]
       def centre
         [centre_y, centre_x]
       end
 
+      # Returns the centred y coordinate (the vertical centre row) of
+      # the interface.
+      #
       # @return [Fixnum]
       def centre_y
         (height / 2) + y
       end
 
+      # Returns the centred x coordinate (the horizontal centre
+      # character) of the interface.
+      #
       # @return [Fixnum]
       def centre_x
         (width / 2) + x
       end
 
+      # Returns the height of the interface.
+      #
       # @return [Fixnum]
       def height
         (y..yn).size
       end
 
+      # Returns the width of the interface.
+      #
       # @return [Fixnum]
       def width
         (x..xn).size
@@ -117,7 +132,7 @@ module Vedeu
       #   `top` or `y` is 4.
       #
       #   north     # => 3
-      #   north(2)  # => 2 (positive goes north)
+      #   north(2)  # => 2 (positive goes 'more' north)
       #   north(-4) # => 8 (negative goes south)
       #
       # @param offset [Fixnum]
@@ -132,7 +147,7 @@ module Vedeu
       #   `right` or `xn` is 19.
       #
       #   east     # => 20
-      #   east(2)  # => 21 (positive goes east)
+      #   east(2)  # => 21 (positive goes 'more' east)
       #   east(-4) # => 15 (negative goes west)
       #
       # @param offset [Fixnum]
@@ -147,7 +162,7 @@ module Vedeu
       #   `bottom` or `yn` is 12.
       #
       #   south     # => 13
-      #   south(2)  # => 14 (positive goes south)
+      #   south(2)  # => 14 (positive goes 'more' south)
       #   south(-4) # => 8  (negative goes north)
       #
       # @param offset [Fixnum]
@@ -162,7 +177,7 @@ module Vedeu
       #   `left` or `x` is 8.
       #
       #   west      # => 7
-      #   west(2)   # => 6  (positive goes west)
+      #   west(2)   # => 6  (positive goes 'more' west)
       #   west(-4)  # => 12 (negative goes east)
       #
       # @param offset [Fixnum]

data/lib/vedeu/geometry/geometry.rb

@@ -103,15 +103,15 @@ module Vedeu
         {
           client:     @client,
           centred:    @centred,
-          height:     _height,
+          height:     height,
           maximised:  @maximised,
           name:       @name,
           repository: @repository,
-          width:      _width,
-          x:          _x,
-          xn:         _xn,
-          y:          _y,
-          yn:         _yn,
+          width:      width,
+          x:          x,
+          xn:         xn,
+          y:          y,
+          yn:         yn,
         }
       end
 
@@ -144,51 +144,50 @@ module Vedeu
 
       # Moves the geometry down by one row.
       #
-      # TODO: Move cursor also.
+      # @todo Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_down
         return self if yn + 1 > Vedeu.height
 
-        Vedeu::Geometry::Geometry.store(move_attributes(y: y + 1, yn: yn + 1))
+        move(y: y + 1, yn: yn + 1)
       end
 
       # Moves the geometry left by one column.
       #
-      # TODO: Move cursor also.
+      # @todo Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_left
         return self if x - 1 < 1
 
-        Vedeu::Geometry::Geometry.store(move_attributes(x: x - 1, xn: xn - 1))
+        move(x: x - 1, xn: xn - 1)
       end
 
       # Moves the geometry to the top left of the terminal.
       #
-      # TODO: Move cursor also.
+      # @todo Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_origin
-        Vedeu::Geometry::Geometry.store(
-          move_attributes(x: 1, xn: (xn - x + 1), y: 1, yn: (yn - y + 1)))
+        move(x: 1, xn: (xn - x + 1), y: 1, yn: (yn - y + 1))
       end
 
       # Moves the geometry right by one column.
       #
-      # TODO: Move cursor also.
+      # @todo Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_right
         return self if xn + 1 > Vedeu.width
 
-        Vedeu::Geometry::Geometry.store(move_attributes(x: x + 1, xn: xn + 1))
+        move(x: x + 1, xn: xn + 1)
       end
 
       # Moves the geometry up by one column.
       #
-      # TODO: Move cursor also.
+      # @todo Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_up
         return self if y - 1 < 1
 
-        Vedeu::Geometry::Geometry.store(move_attributes(y: y - 1, yn: yn - 1))
+        move(y: y - 1, yn: yn - 1)
       end
 
       # Will unmaximise the named interface geometry. Previously, when
@@ -223,75 +222,38 @@ module Vedeu
       # @return [Hash<Symbol => Boolean, Fixnum>]
       def area_attributes
         {
-          y:         _y,
-          yn:        _yn,
-          y_yn:      _height,
-          y_default: Vedeu.height,
-          x:         _x,
-          xn:        _xn,
-          x_xn:      _width,
-          x_default: Vedeu.width,
-          centred:   centred,
-          maximised: maximised,
+          centred:   @centred,
+          maximised: @maximised,
+          x:         @x.is_a?(Proc)      ? @x.call      : @x,
+          xn:        @xn.is_a?(Proc)     ? @xn.call     : @xn,
+          x_xn:      @width.is_a?(Proc)  ? @width.call  : @width,
+          y:         @y.is_a?(Proc)      ? @y.call      : @y,
+          yn:        @yn.is_a?(Proc)     ? @yn.call     : @yn,
+          y_yn:      @height.is_a?(Proc) ? @height.call : @height,
         }
       end
 
-      # @param attrs [Hash<Symbol => Fixnum>]
-      # @option attrs x [Fixnum]
-      # @option attrs xn [Fixnum]
-      # @option attrs y [Fixnum]
-      # @option attrs yn [Fixnum]
-      # @return [Hash<Symbol => Boolean, Fixnum>]
-      def move_attributes(attrs = {})
-        attributes.merge!(
-          centred:   false,
-          maximised: false,
-          x:         x,
-          xn:        xn,
-          y:         y,
-          yn:        yn).merge!(attrs)
-      end
-
-      # Returns the row/line start position for the interface.
-      #
-      # @return [Fixnum]
-      def _y
-        @y.is_a?(Proc) ? @y.call : @y
-      end
-
-      # Returns the row/line end position for the interface.
-      #
-      # @return [Fixnum]
-      def _yn
-        @yn.is_a?(Proc) ? @yn.call : @yn
-      end
-
-      # Returns the column/character start position for the interface.
-      #
-      # @return [Fixnum]
-      def _x
-        @x.is_a?(Proc) ? @x.call : @x
-      end
-
-      # Returns the column/character end position for the interface.
-      #
-      # @return [Fixnum]
-      def _xn
-        @xn.is_a?(Proc) ? @xn.call : @xn
-      end
-
-      # Returns the width of the interface.
+      # When moving an interface;
+      # 1) Reset the centred and maximised states to false; it wont be
+      #    centred if moved, and cannot be moved if maximised.
+      # 2) Get the current coordinates of the interface, then:
+      # 3) Override the attributes with the new coordinates for
+      #    desired movement; these are usually +/- 1 of the current
+      #    state, depending on direction.
       #
-      # @return [Fixnum]
-      def _width
-        @width.is_a?(Proc) ? @width.call : @width
-      end
+      # @param coordinates [Hash<Symbol => Fixnum>]
+      # @option coordinates x [Fixnum] The starting column/character
+      #   position.
+      # @option coordinates xn [Fixnum] The ending column/character
+      #   position.
+      # @option coordinates y [Fixnum] The starting row/line position.
+      # @option coordinates yn [Fixnum] The ending row/line position.
+      # @return [Hash<Symbol => Boolean, Fixnum>]
+      def move(coordinates = {})
+        attrs = attributes.merge!(centred: false, maximised: false)
+                .merge!(coordinates)
 
-      # Returns the height of the interface.
-      #
-      # @return [Fixnum]
-      def _height
-        @height.is_a?(Proc) ? @height.call : @height
+        Vedeu::Geometry::Geometry.store(attrs)
       end
 
       # Returns the default options/attributes for this class.
@@ -300,7 +262,7 @@ module Vedeu
       def defaults
         {
           client:     nil,
-          centred:    nil,
+          centred:    false,
           height:     nil,
           maximised:  false,
           name:       nil,

data/lib/vedeu/geometry/repository.rb

@@ -32,6 +32,13 @@ module Vedeu
     Vedeu.geometries.by_name(name).maximise
   end
 
+  Vedeu.bind(:_movement_refresh_) do |name|
+    Vedeu.trigger(:_clear_)
+    Vedeu.trigger(:_refresh_)
+    Vedeu.trigger(:_clear_view_, name)
+    Vedeu.trigger(:_refresh_view_, name)
+  end
+
   # See {file:docs/events/view.md#\_unmaximise_}
   Vedeu.bind(:_unmaximise_) do |name|
     Vedeu.geometries.by_name(name).unmaximise
@@ -41,10 +48,7 @@ module Vedeu
     Vedeu.bind(:"_view_#{direction}_") do |name|
       Vedeu.geometries.by_name(name).send("move_#{direction}")
 
-      Vedeu.trigger(:_clear_)
-      Vedeu.trigger(:_refresh_)
-      Vedeu.trigger(:_clear_view_, name)
-      Vedeu.trigger(:_refresh_view_, name)
+      Vedeu.trigger(:_movement_refresh_, name)
     end
   end
 

data/lib/vedeu/interfaces/dsl.rb

@@ -76,7 +76,7 @@ module Vedeu
         # @param name [String|Symbol]
         # @return [void]
         def add_focusable!(name)
-          Vedeu.focusable.add(name) unless Vedeu.focusable.registered?(name)
+          Vedeu::Models::Focus.add(name)
         end
 
         # Returns the client object which called the DSL method.

data/lib/vedeu/version.rb

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

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

@@ -12,48 +12,69 @@ module Vedeu
     describe Refresh do
 
       let(:described) { Vedeu::Buffers::Refresh }
-      let(:instance)  { described.new(_name) }
+      let(:instance)  { described.new(_name, options) }
       let(:_name)     { 'Vedeu::Buffers::Refresh' }
-      let(:ready)     { true }
+      let(:options)   {
+        {
+          content_only: content_only,
+        }
+      }
+      let(:content_only) { false }
+      let(:ready)        { true }
+      let(:buffer)       { mock('Vedeu::Buffers::Buffer', render: nil) }
 
       before do
-        Vedeu.stubs(:ready?).returns(ready)
+        Vedeu.stubs(:trigger).with(:_clear_view_content_, _name)
+        Vedeu.stubs(:trigger).with(:_refresh_border_, _name)
       end
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@name').must_equal(_name) }
+        it { instance.instance_variable_get('@options').must_equal(options) }
       end
 
       describe '.by_name' do
+        before do
+          Vedeu.buffers.stubs(:by_name).with(_name).returns(buffer)
+        end
+
         subject { described.by_name(_name) }
 
-        context 'when Vedeu is not yet ready' do
-          let(:buffer) { mock(render: '') }
+        it {
+          Vedeu.expects(:trigger).with(:_clear_view_content_, _name)
+          subject
+        }
 
-          before do
-            Vedeu.stubs(:trigger).with(:_clear_view_content_, _name)
-            Vedeu.buffers.expects(:by_name).with(_name).returns(buffer)
-            Vedeu.stubs(:trigger).with(:_refresh_border_, _name)
-          end
+        it {
+          Vedeu.buffers.expects(:by_name).with(_name).returns(buffer)
+          subject
+        }
 
-          let(:ready) { false }
+        it {
+          Vedeu.expects(:trigger).with(:_refresh_border_, _name)
+          subject
+        }
+      end
 
-          it {
-            Vedeu.expects(:trigger).with(:_clear_view_content_, _name)
-            subject
-          }
+      describe '.refresh_content_by_name' do
+        let(:content_only) { true }
 
-          it {
-            Vedeu.expects(:trigger).with(:_refresh_border_, _name)
-            subject
-          }
+        before do
+          Vedeu.buffers.stubs(:by_name).with(_name).returns(buffer)
         end
 
-        context 'when Vedeu is ready' do
-          # @todo Add more tests.
-          # it { skip }
-        end
+        subject { described.refresh_content_by_name(_name) }
+
+        it {
+          Vedeu.expects(:trigger).with(:_clear_view_content_, _name)
+          subject
+        }
+
+        it {
+          Vedeu.buffers.expects(:by_name).with(_name).returns(buffer)
+          subject
+        }
       end
 
       describe '#by_name' do

data/vedeu.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest',           '5.8.1'
   spec.add_development_dependency 'minitest-reporters', '1.1.3'
   spec.add_development_dependency 'mocha',              '1.1.0'
-  spec.add_development_dependency 'pry',                '0.10.2'
+  spec.add_development_dependency 'pry',                '0.10.3'
   spec.add_development_dependency 'rubocop',            '0.34.2'
   spec.add_development_dependency 'simplecov',          '0.10.0'
   spec.add_development_dependency 'simplecov-console',  '0.2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.33
+  version: 0.6.34
 platform: ruby
 authors:
 - Gavin Laking
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement