vedeu 0.4.53 → 0.4.54

data/lib/vedeu/support/toggleable.rb

@@ -0,0 +1,98 @@
+module Vedeu
+
+  # Toggleable instance methods for certain models.
+  #
+  # @api private
+  module Toggleable
+
+    # @!attribute [rw] visible
+    # @return [Boolean] Whether the toggleable is visible.
+    attr_accessor :visible
+    alias_method :visible?, :visible
+
+    # @return [FalseClass]
+    def hide
+      @visible = false
+
+      store
+    end
+
+    # @return [TrueClass]
+    def show
+      @visible = true
+
+      store
+    end
+
+    # @return [FalseClass|TrueClass]
+    def toggle
+      if visible?
+        hide
+
+      else
+        show
+
+      end
+    end
+
+    # Toggleable class methods for models.
+    #
+    # @api private
+    module ClassMethods
+
+      # @param name [String]
+      # @return [void]
+      def hide(name = nil)
+        model_by_name(name, self.repository).hide
+      end
+      alias_method :hide_cursor,    :hide
+      alias_method :hide_group,     :hide
+      alias_method :hide_interface, :hide
+
+      # @param name [String]
+      # @return [void]
+      def show(name = nil)
+        model_by_name(name, self.repository).show
+      end
+      alias_method :show_cursor,    :show
+      alias_method :show_group,     :show
+      alias_method :show_interface, :show
+
+      # @param name [String]
+      # @return [void]
+      def toggle(name = nil)
+        model_by_name(name, self.repository).toggle
+      end
+      alias_method :toggle_cursor,    :toggle
+      alias_method :toggle_group,     :toggle
+      alias_method :toggle_interface, :toggle
+
+      private
+
+      # @param name [String]
+      # @param klass [void] The repository of the model.
+      # @return [void]
+      def model_by_name(name = nil, klass)
+        klass.by_name(model_name(name))
+      end
+
+      # @param name [String]
+      # @return [void]
+      def model_name(name = nil)
+        return name || Vedeu.focus
+      end
+
+    end # ClassMethods
+
+    # When this module is included in a class, provide ClassMethods as class
+    # methods for the class.
+    #
+    # @param klass [Class]
+    # @return [void]
+    def self.included(klass)
+      klass.send :extend, ClassMethods
+    end
+
+  end # Toggleable
+
+end # Vedeu

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.4.53'
+  VERSION = '0.4.54'
 
 end

data/test/lib/vedeu/api_test.rb

@@ -52,7 +52,13 @@ module Vedeu
     it { Vedeu.must_respond_to(:clear_by_group) }
     it { Vedeu.must_respond_to(:hide_cursor) }
     it { Vedeu.must_respond_to(:show_cursor) }
-
+    it { Vedeu.must_respond_to(:toggle_cursor) }
+    it { Vedeu.must_respond_to(:hide_group) }
+    it { Vedeu.must_respond_to(:show_group) }
+    it { Vedeu.must_respond_to(:toggle_group) }
+    it { Vedeu.must_respond_to(:hide_interface) }
+    it { Vedeu.must_respond_to(:show_interface) }
+    it { Vedeu.must_respond_to(:toggle_interface) }
   end # API
 
 end # Vedeu

data/test/lib/vedeu/bindings/system_test.rb

@@ -7,36 +7,25 @@ module Vedeu
     describe System do
 
       context 'the system events needed by Vedeu to run are defined' do
-        it { Vedeu.bound?(:_clear_).must_equal(true) }
-        it { Vedeu.bound?(:_clear_group_).must_equal(true) }
         it { Vedeu.bound?(:_cleanup_).must_equal(true) }
+        it { Vedeu.bound?(:_clear_).must_equal(true) }
         it { Vedeu.bound?(:_command_).must_equal(true) }
         it { Vedeu.bound?(:_exit_).must_equal(true) }
+        it { Vedeu.bound?(:_focus_by_name_).must_equal(true) }
+        it { Vedeu.bound?(:_focus_next_).must_equal(true) }
+        it { Vedeu.bound?(:_focus_prev_).must_equal(true) }
         it { Vedeu.bound?(:_initialize_).must_equal(true) }
         it { Vedeu.bound?(:_keypress_).must_equal(true) }
         it { Vedeu.bound?(:_log_).must_equal(true) }
+        it { Vedeu.bound?(:_maximise_).must_equal(true) }
         it { Vedeu.bound?(:_mode_switch_).must_equal(true) }
         it { Vedeu.bound?(:_refresh_).must_equal(true) }
         it { Vedeu.bound?(:_refresh_cursor_).must_equal(true) }
         it { Vedeu.bound?(:_refresh_group_).must_equal(true) }
         it { Vedeu.bound?(:_resize_).must_equal(true) }
-      end
-
-      context 'the geometry specific events are defined' do
-        it { Vedeu.bound?(:_maximise_).must_equal(true) }
         it { Vedeu.bound?(:_unmaximise_).must_equal(true) }
       end
 
-      context 'the focus specific events are defined' do
-        it { Vedeu.bound?(:_focus_by_name_).must_equal(true) }
-        it { Vedeu.bound?(:_focus_next_).must_equal(true) }
-        it { Vedeu.bound?(:_focus_prev_).must_equal(true) }
-      end
-
-      context 'the refresh event for all registered interfaces is defined' do
-        it { Vedeu.bound?(:_refresh_).must_equal(true) }
-      end
-
     end # System
 
   end # Bindings

data/test/lib/vedeu/bindings/visibility_test.rb

@@ -7,13 +7,17 @@ module Vedeu
     describe Visibility do
 
       context 'the visibility events are defined' do
+        it { Vedeu.bound?(:_clear_group_).must_equal(true) }
+
         it { Vedeu.bound?(:_cursor_hide_).must_equal(true) }
         it { Vedeu.bound?(:_cursor_show_).must_equal(true) }
         it { Vedeu.bound?(:_hide_cursor_).must_equal(true) }
         it { Vedeu.bound?(:_show_cursor_).must_equal(true) }
+        it { Vedeu.bound?(:_toggle_cursor_).must_equal(true) }
 
         it { Vedeu.bound?(:_hide_group_).must_equal(true) }
         it { Vedeu.bound?(:_show_group_).must_equal(true) }
+        it { Vedeu.bound?(:_toggle_group_).must_equal(true) }
 
         it { Vedeu.bound?(:_hide_interface_).must_equal(true) }
         it { Vedeu.bound?(:_show_interface_).must_equal(true) }

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

@@ -95,12 +95,6 @@ module Vedeu
       end
     end
 
-    describe '#clear' do
-      subject { instance.clear }
-
-      it { subject.must_be_instance_of(Array) }
-    end
-
     describe '#front?' do
       subject { instance.front? }
 
@@ -141,99 +135,25 @@ module Vedeu
     end
 
     describe '#hide' do
-      let(:interface) {
-        Vedeu::Interface.new({ name: _name, visible: visible }).store
-      }
-      let(:_name)   { 'Buffer#hide' }
-      let(:visible) {}
-
-      before do
-        Vedeu::Output.stubs(:render)
-        Vedeu::Visibility.stubs(:hide)
-      end
+      before { Vedeu::Output.stubs(:render) }
 
       subject { instance.hide }
 
-      context 'when the interface is visible' do
-        let(:visible) { true }
-
-        it {
-          Vedeu::Visibility.expects(:hide).with(interface)
-          subject
-        }
-      end
-
-      context 'when the interface is not visible' do
-        let(:visible) { false }
-
-        it { subject.must_be_instance_of(NilClass) }
-      end
+      it {
+        Vedeu::Output.expects(:render)
+        subject
+      }
     end
 
     describe '#show' do
-      let(:interface) {
-        Vedeu::Interface.new({ name: _name, visible: visible }).store
-      }
-      let(:_name)   { 'Buffer#show' }
-      let(:visible) {}
-
-      before do
-        Vedeu::Output.stubs(:render)
-        Vedeu::Visibility.stubs(:show)
-      end
+      before { Vedeu::Output.stubs(:render) }
 
       subject { instance.show }
 
-      context 'when the interface is visible' do
-        let(:visible) { true }
-
-        it { subject.must_be_instance_of(NilClass) }
-      end
-
-      context 'when the interface is not visible' do
-        let(:visible) { false }
-
-        it {
-          Vedeu::Visibility.expects(:show).with(interface)
-          subject
-        }
-      end
-    end
-
-    describe '#toggle' do
-      let(:interface) {
-        Vedeu::Interface.new({ name: _name, visible: visible }).store
+      it {
+        Vedeu::Output.expects(:render)
+        subject
       }
-      let(:_name)   { 'Buffer#toggle' }
-      let(:visible) {}
-
-      before do
-        Vedeu::Output.stubs(:render)
-      end
-
-      subject { instance.toggle }
-
-      context 'when the interface is visible' do
-        let(:visible) { true }
-
-        before { Vedeu::Visibility.stubs(:hide) }
-
-        it {
-          Vedeu::Visibility.expects(:hide).with(interface)
-          subject
-        }
-      end
-
-      context 'when the interface is not visible' do
-        let(:visible) { false }
-
-        before { Vedeu::Visibility.stubs(:show) }
-
-        it {
-          Vedeu::Visibility.expects(:show).with(interface)
-          subject
-        }
-      end
     end
 
     describe '#render' do
@@ -241,8 +161,6 @@ module Vedeu
 
       subject { instance.render }
 
-      it { instance.must_respond_to(:content) }
-
       # @todo
       # it { skip }
       # it { subject.must_be_instance_of(Array) }

data/test/lib/vedeu/cursor/cursor_test.rb

@@ -47,16 +47,14 @@ module Vedeu
       it { instance.must_respond_to(:oy) }
       it { instance.must_respond_to(:oy=) }
       it { instance.must_respond_to(:state) }
-      it { instance.must_respond_to(:visible) }
-      it { instance.must_respond_to(:visible?) }
       it { instance.must_respond_to(:x) }
       it { instance.must_respond_to(:x=) }
       it { instance.must_respond_to(:y) }
       it { instance.must_respond_to(:y=) }
     end
 
-    describe '#hide_cursor' do
-      subject { instance.hide_cursor }
+    describe '#hide' do
+      subject { instance.hide }
 
       it { subject.must_be_instance_of(Vedeu::EscapeChar) }
       it { subject.to_s.must_equal("\e[?25l") }
@@ -77,8 +75,8 @@ module Vedeu
       it { subject.must_be_instance_of(Vedeu::Position) }
     end
 
-    describe '#show_cursor' do
-      subject { instance.show_cursor }
+    describe '#show' do
+      subject { instance.show }
 
       it { subject.must_be_instance_of(Vedeu::EscapeChar) }
       it { subject.to_s.must_equal("\e[?25h") }

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

@@ -59,6 +59,18 @@ module Vedeu
         subject { instance.columns(3) }
 
         it { subject.must_equal(18) }
+
+        context 'DSL #columns' do
+          before { Vedeu.stubs(:width).returns(80) }
+
+          subject {
+            Vedeu.geometry 'geometry' do
+              width columns(8)
+            end
+          }
+
+          it { subject.width.must_equal(48) }
+        end
       end
 
       describe '#height' do
@@ -87,6 +99,18 @@ module Vedeu
         subject { instance.rows(3) }
 
         it { subject.must_equal(6) }
+
+        context 'DSL #rows' do
+          before { Vedeu.stubs(:height).returns(38) }
+
+          subject {
+            Vedeu.geometry 'geometry' do
+              height rows(8)
+            end
+          }
+
+          it { subject.height.must_equal(24) }
+        end
       end
 
       describe '#use' do

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

@@ -8,12 +8,15 @@ module Vedeu
     let(:instance)   { described.new(attributes) }
     let(:attributes) {
       {
-        name:    _name,
-        members: members,
+        name:       _name,
+        members:    members,
+        repository: Vedeu.groups,
+        visible:    visible,
       }
     }
     let(:_name)      { 'organics' }
     let(:members)    { ['carbon', 'nitrogen', 'oxygen'] }
+    let(:visible)    { true }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
@@ -25,12 +28,21 @@ module Vedeu
       it {
         instance.instance_variable_get('@repository').must_equal(Vedeu.groups)
       }
+      it { instance.instance_variable_get('@visible').must_equal(visible) }
+    end
+
+    describe 'accessors' do
+      it { instance.must_respond_to(:name) }
+      it { instance.must_respond_to(:name=) }
+      it { instance.must_respond_to(:visible) }
+      it { instance.must_respond_to(:visible=) }
+      it { instance.must_respond_to(:visible?) }
     end
 
     describe '#add' do
       subject { instance.add('hydrogen') }
 
-      it { subject.must_be_instance_of(Group) }
+      it { subject.must_be_instance_of(Vedeu::Group) }
 
       context 'when the member already exists' do
         it 'does not add the member again but returns a new Group' do
@@ -65,16 +77,6 @@ module Vedeu
       end
     end
 
-    describe '#name' do
-      subject { instance.name }
-
-      it { subject.must_equal('organics') }
-    end
-
-    describe '#name=' do
-      it { instance.must_respond_to(:name=) }
-    end
-
     describe '#remove' do
       let(:member) { 'hydrogen' }
 
@@ -104,7 +106,7 @@ module Vedeu
     describe '#reset' do
       subject { instance.reset }
 
-      it { subject.must_be_instance_of(Group) }
+      it { subject.must_be_instance_of(Vedeu::Group) }
       it { subject.members.must_be_empty }
     end