uh-layout 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edf8a87089f0c32d03e6e00cbc1bc40a93c84011
-  data.tar.gz: a1d22d1bdb126e9a699e0ca2fe8c343e569ccc32
+  metadata.gz: d5eb173000501f534469ab6801bd388d44d309f3
+  data.tar.gz: 014263683a19cedca1cb588cbc65d5cfaafb0254
 SHA512:
-  metadata.gz: b0cd253e73d437556eea6d053607a4f10d04b7f82d2c9cf13a6d985f44b2f346464de146bdc8f261d26196367ff5411abd725761eca691444bee1482e6c18180
-  data.tar.gz: f39cab274b9a47ac3a26a71dd736432bab091b3f425b9781f5aaaeceacbb08b490b49ea99c049bc4c3e234a2094ea8ef9d0b98c0a6ebc68220d7159c18537aee
+  metadata.gz: 7a188d97b67af33cacf8466fb7216364ec782b74dc1688d1e27a0a08df31989c656e647a395dc03839b012d6412de4208a37f84a8f1095f20567d82e38a7a646
+  data.tar.gz: 8003a17f7f10d7a35df2510a9913b104f1ef4295873689d36cc8874926087d5590266588d01fde91fd38d28d5f16418e19f7ad9667192dfc1c9e159336e0a2ca

data/lib/uh/layout/column.rb

@@ -16,10 +16,10 @@ module Uh
 
       attr_reader :geo, :clients, :mode
 
-      def initialize(geo)
+      def initialize(geo, mode: :stack)
         @geo      = geo.dup
         @clients  = Container.new
-        @mode     = :stack
+        @mode     = mode
       end
 
       def to_s
@@ -44,6 +44,14 @@ module Uh
         MODES[@mode].new @clients, @geo
       end
 
+      def client_swap(direction)
+        @clients.set direction
+        if @mode == :tile
+          arrange_clients
+          show_hide_clients
+        end
+      end
+
       def arrange_clients
         arranger.arrange
         clients.each &:moveresize

data/lib/uh/layout/container.rb

@@ -53,6 +53,7 @@ module Uh
       end
 
       def set(direction)
+        raise RuntimeError unless @entries.size >= 2
         new_index = @current_index.send direction
         if new_index.between? 0, @entries.size - 1
           swap @current_index, new_index

data/lib/uh/layout/version.rb

@@ -1,5 +1,5 @@
 module Uh
   class Layout
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

data/lib/uh/layout.rb

@@ -130,7 +130,7 @@ module Uh
 
     def handle_client_swap(direction)
       return unless current_client
-      current_column.clients.set direction
+      current_column.client_swap direction
       update_widgets
     end
 

data/spec/uh/layout/column_spec.rb

@@ -3,9 +3,10 @@ module Uh
     describe Column do
       let(:geo)           { build_geo }
       let(:other_geo)     { build_geo 640, 0, 320, 240 }
+      let(:mode)          { :stack }
       let(:client)        { build_client }
       let(:other_client)  { build_client }
-      subject(:column)    { described_class.new geo }
+      subject(:column)    { described_class.new geo, mode: mode }
 
       it 'has a copy to given geo' do
         expect(column.geo).to eq(geo).and not_be geo
@@ -71,6 +72,29 @@ module Uh
         end
       end
 
+      describe '#client_swap' do
+        before { column << client << other_client }
+
+        it 'sends #set message to clients with given direction' do
+          expect(column.clients).to receive(:set).with :pred
+          column.client_swap :pred
+        end
+
+        context 'when column mode is tile' do
+          let(:mode) { :tile }
+
+          it 'arranges current column clients' do
+            expect(column).to receive :arrange_clients
+            column.client_swap :pred
+          end
+
+          it 'shows and hides clients in current column' do
+            expect(column).to receive :show_hide_clients
+            column.client_swap :pred
+          end
+        end
+      end
+
       describe '#arrange_clients' do
         before { column << client << other_client }
 

data/spec/uh/layout/container_spec.rb

@@ -173,6 +173,14 @@ module Uh
             expect { container.set :pred }.not_to change { container.current }
           end
         end
+
+        context 'when entries count is less than 2' do
+          let(:entries) { %i[foo] }
+
+          it 'raises a RuntimeError' do
+            expect { container.set :pred }.to raise_error Layout::RuntimeError
+          end
+        end
       end
 
       describe '#swap' do

data/spec/uh/layout_spec.rb

@@ -353,15 +353,9 @@ module Uh
       context 'with one column and two clients' do
         before { layout << other_client << client }
 
-        it 'swaps current client with the other client' do
+        it 'sends #client_swap to current column with given direction' do
+          expect(layout.current_column).to receive(:client_swap).with :pred
           layout.handle_client_swap :pred
-          expect(layout.current_column.clients.to_a)
-            .to eq [client, other_client]
-        end
-
-        it 'does not change current client' do
-          expect { layout.handle_client_swap :pred }
-            .not_to change { layout.current_client }
         end
 
         it 'updates widgets' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uh-layout
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Thibault Jouan