uh-layout 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47a100f2229b06ab1aa01eeb35e1b8baba73f804
-  data.tar.gz: 3cc639552ca1d7cfa766a0d6afb03dab85532b86
+  metadata.gz: 8356446f440275b330daab65258ae6401736b0e0
+  data.tar.gz: 4d677edea7b0df77f165c172ed6b920d7ad5083d
 SHA512:
-  metadata.gz: 2c0c3f914c932e129fb9eaf10c18a6fe7cc90335adec8f4822aecda6a6856204ceff06e832016d59716de7b08506450f49b0c56c36b53198d6e29bce3a31f621
-  data.tar.gz: 8a7ce44e77e6edad1746dc478253a0a742c404538e0b9d771e605ad67a6ecc6c19843a1f984cdec1ed4841d697a467574134aa6568d7105edcbe726f7943328c
+  metadata.gz: 7916c175a188b94e57bf96b530ab7ed9172ffb9b5c38d2f637dbf1d0457579fb3a7572ba16ba447d7c614041b2f63dcb2da69089d602a5dd367391bffaff96c1
+  data.tar.gz: 4d15bed975b4d4433d381fdceef276cd6afad3aaf54358871bfa4a2ce397dbc1decab23079458ba34957d49e5ac0bfaf926cd561796cc7e84128a37ee3fe35f4

data/lib/uh/layout/history.rb

@@ -0,0 +1,25 @@
+module Uh
+  class Layout
+    class History
+      TAGS_SIZE_MAX = 8
+
+      attr_reader :tags, :tags_size_max
+
+      def initialize(tags = [], tags_size_max: TAGS_SIZE_MAX)
+        @tags           = tags
+        @tags_size_max  = tags_size_max
+      end
+
+      def record_tag(tag)
+        @tags << tag
+        if @tags.size > @tags_size_max
+          @tags = @tags.drop @tags.size - @tags_size_max
+        end
+      end
+
+      def last_tag
+        @tags.last
+      end
+    end
+  end
+end

data/lib/uh/layout/version.rb

@@ -1,5 +1,5 @@
 module Uh
   class Layout
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/lib/uh/layout.rb

@@ -8,6 +8,7 @@ require 'uh/layout/client_column_mover'
 require 'uh/layout/container'
 require 'uh/layout/column'
 require 'uh/layout/dumper'
+require 'uh/layout/history'
 require 'uh/layout/screen'
 require 'uh/layout/tag'
 
@@ -22,11 +23,12 @@ module Uh
     def_delegator :current_screen, :current_tag
     def_delegator :current_tag, :current_column
 
-    attr_reader :screens, :widgets
+    attr_reader :screens, :widgets, :history
 
     def initialize
       @screens  = Container.new
       @widgets  = []
+      @history  = History.new
     end
 
     def to_s
@@ -84,7 +86,9 @@ module Uh
     end
 
     def handle_tag_sel(tag_id)
+      tag_id = tag_id.to_s
       return unless current_tag.id != tag_id
+      @history.record_tag current_tag
       current_tag.hide
       current_screen.tags.current = find_tag_or_create tag_id
       current_tag.each_column &:show_hide_clients
@@ -137,6 +141,10 @@ module Uh
       update_widgets
     end
 
+    def handle_history_tag_pred
+      handle_tag_sel @history.last_tag.id
+    end
+
     def handle_kill_current
       current_client and current_client.kill
     end

data/spec/uh/layout/history_spec.rb

@@ -0,0 +1,32 @@
+module Uh
+  class Layout
+    describe History do
+      subject(:history) { described_class.new }
+
+      it 'has an empty tag history' do
+        expect(history.tags).to be_empty
+      end
+
+      describe '#record_tag' do
+        it 'adds current tag' do
+          history.record_tag :some_tag
+          expect(history.tags).to include :some_tag
+        end
+
+        it 'limits stored tags count to configured tags size' do
+          history.tags_size_max.times { |n| history.record_tag "tag_#{n}" }
+          expect { history.record_tag :one_more }
+            .not_to change { history.tags.size }
+        end
+      end
+
+      describe '#last_tag' do
+        it 'returns last recorded tag' do
+          history.record_tag :tag_1
+          history.record_tag :tag_2
+          expect(history.last_tag).to be :tag_2
+        end
+      end
+    end
+  end
+end

data/spec/uh/layout_spec.rb

@@ -195,6 +195,17 @@ module Uh
         expect(widget).to receive :update
         layout.handle_tag_sel '2'
       end
+
+      it 'accepts non-string arguments' do
+        layout.handle_tag_sel 2
+        expect(layout.current_tag.id).to eq '2'
+      end
+
+      it 'records previous tag in history' do
+        previous_tag = layout.current_tag
+        layout.handle_tag_sel 2
+        expect(layout.history.tags).to include previous_tag
+      end
     end
 
     describe 'handle_tag_set' do
@@ -399,6 +410,15 @@ module Uh
       end
     end
 
+    describe '#handle_history_tag_pred' do
+      it 'selects last tag recorded in history' do
+        layout.handle_tag_sel 2
+        expect { layout.handle_history_tag_pred }
+          .to change { layout.current_tag.id }
+          .from(?2).to ?1
+      end
+    end
+
     describe '#handle_kill_current' do
       context 'without client' do
         it 'does not raise any error' do

data/uh-layout.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(/\Abin\//) { |f| File.basename(f) }
 
 
-  s.add_development_dependency 'uh'
+  s.add_development_dependency 'uh',    '~> 1.0'
   s.add_development_dependency 'rake',  '~> 10.4'
   s.add_development_dependency 'rspec', '~> 3.2'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: uh-layout
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +73,7 @@ files:
 - lib/uh/layout/column.rb
 - lib/uh/layout/container.rb
 - lib/uh/layout/dumper.rb
+- lib/uh/layout/history.rb
 - lib/uh/layout/screen.rb
 - lib/uh/layout/tag.rb
 - lib/uh/layout/version.rb
@@ -84,6 +85,7 @@ files:
 - spec/uh/layout/client_column_mover_spec.rb
 - spec/uh/layout/column_spec.rb
 - spec/uh/layout/container_spec.rb
+- spec/uh/layout/history_spec.rb
 - spec/uh/layout/screen_spec.rb
 - spec/uh/layout/tag_spec.rb
 - spec/uh/layout_spec.rb
@@ -120,6 +122,7 @@ test_files:
 - spec/uh/layout/client_column_mover_spec.rb
 - spec/uh/layout/column_spec.rb
 - spec/uh/layout/container_spec.rb
+- spec/uh/layout/history_spec.rb
 - spec/uh/layout/screen_spec.rb
 - spec/uh/layout/tag_spec.rb
 - spec/uh/layout_spec.rb