uh-layout 0.2.0.pre → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc164691d2b3d8dc056de7e226bbd5b5bc3ace1d
-  data.tar.gz: 7165a0026736e62d2dbe3eff8685104db77f7949
+  metadata.gz: 3c533d7d89d0e414fbb0e0d38aab099bf212fb12
+  data.tar.gz: 8f2519ea364df77eb5dbc4a3fc72fc3d9b3a38a4
 SHA512:
-  metadata.gz: 162c88a8afceaa50dc189b20e4c711cd10754d10ede67d5877b7c57e31dd854a3dd28757ed2fa97bacbe04214590742799589603dc36fb0d87c398950bfa4fdc
-  data.tar.gz: 6b8426fb7d7c09244555b582f1ceed8edeeba0f503a07e8987788d0a2a65a9f4fcf46ad749ae58285b0cbe06d9fc1512e66dff34385cb5fe7f2f3dc5ea92e153
+  metadata.gz: f8b643fa3d028bcfdf30d8c9d9bca5093e9851c1755c35a33d79bb4892a1c251b628d16a6263559f0a7adc0c3ecb6eef2a5083dfdf0a6693f0ffde4cb2743e64
+  data.tar.gz: 1440d45b69db7599aff55259a0ebe146519a890311df09f97af4d74eae6c8e928f5bb3fe76b788bdfea41152cf4b50f22884835b8794b7e953334963fd1ca1b2

data/lib/uh/layout/bar.rb

@@ -10,6 +10,7 @@ module Uh
 
       include GeoAccessors
 
+      attr_reader :screen
       attr_writer :active, :status
 
       def initialize(display, screen, colors)

data/lib/uh/layout/registrant.rb

@@ -0,0 +1,19 @@
+module Uh
+  class Layout
+    module Registrant
+      class << self
+        def register(layout, display)
+          display.screens.each do |screen|
+            layout.screens << scr = Screen.new(screen.id, screen.geo)
+            layout.widgets << bar = Bar.new(display, scr, layout.colors).show.focus
+            bar.on_update do
+              bar.active = layout.current_screen? scr
+            end
+            scr.height = scr.height - bar.height
+          end
+          layout.update_widgets
+        end
+      end
+    end
+  end
+end

data/lib/uh/layout/version.rb

@@ -1,5 +1,5 @@
 module Uh
   class Layout
-    VERSION = '0.2.0.pre'
+    VERSION = '0.2.0'
   end
 end

data/lib/uh/layout.rb

@@ -9,6 +9,7 @@ require 'uh/layout/container'
 require 'uh/layout/column'
 require 'uh/layout/dumper'
 require 'uh/layout/history'
+require 'uh/layout/registrant'
 require 'uh/layout/screen'
 require 'uh/layout/tag'
 
@@ -31,7 +32,7 @@ module Uh
     def_delegator :current_screen, :current_tag
     def_delegator :current_tag, :current_column
 
-    attr_reader :screens, :widgets, :history
+    attr_reader :screens, :widgets, :colors, :history
 
     def initialize
       @screens  = Container.new
@@ -41,15 +42,7 @@ module Uh
     end
 
     def register(display)
-      display.screens.each do |screen|
-        @screens << scr = Screen.new(screen.id, screen.geo)
-        @widgets << bar = Bar.new(display, scr, @colors).show.focus
-        bar.on_update do
-          bar.active = current_screen? scr
-        end
-        scr.height = scr.height - bar.height
-      end
-      update_widgets
+      Registrant.register self, display
     end
 
     def to_s

data/spec/uh/layout/registrant_spec.rb

@@ -0,0 +1,46 @@
+module Uh
+  class Layout
+    describe Registrant do
+      let(:layout)  { Layout.new }
+      let(:geo)     { build_geo }
+      let(:screen)  { double 'screen', id: 0, geo: geo, height: geo.height }
+      let(:display) { double 'display', screens: [screen] }
+      let(:bar)     { instance_spy Bar, height: 16 }
+
+      before do
+        allow(Bar).to receive(:new) { bar }
+      end
+
+      describe '#register' do
+        it 'registers display screens as layout screens' do
+          described_class.register layout, display
+          expect(layout.screens[0])
+            .to be_a(Screen)
+            .and have_attributes(id: 0)
+        end
+
+        it 'builds a new bar widget' do
+          expect(Bar)
+            .to receive(:new)
+            .with display, an_instance_of(Screen), layout.colors
+          described_class.register layout, display
+        end
+
+        it 'registers the bar widget' do
+          described_class.register layout, display
+          expect(layout.widgets[0]).to be bar
+        end
+
+        it 'decreases the layout screens height with the bar height' do
+          described_class.register layout, display
+          expect(layout.screens[0].height).to eq screen.height - bar.height
+        end
+
+        it 'updates layout widgets' do
+          expect(layout).to receive :update_widgets
+          described_class.register layout, display
+        end
+      end
+    end
+  end
+end

data/spec/uh/layout_spec.rb

@@ -12,6 +12,14 @@ module Uh
       layout.widgets << widget
     end
 
+    describe '#register' do
+      it 'uses a registrant to register the layout with given display' do
+        display = double 'display'
+        expect(Layout::Registrant).to receive(:register).with layout, display
+        layout.register display
+      end
+    end
+
     describe '#include?' do
       it 'returns false when layout does not include given client' do
         expect(layout.include? client).to be false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh-layout
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre
+  version: 0.2.0
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uh
@@ -75,6 +75,7 @@ files:
 - lib/uh/layout/container.rb
 - lib/uh/layout/dumper.rb
 - lib/uh/layout/history.rb
+- lib/uh/layout/registrant.rb
 - lib/uh/layout/screen.rb
 - lib/uh/layout/tag.rb
 - lib/uh/layout/version.rb
@@ -87,6 +88,7 @@ files:
 - spec/uh/layout/column_spec.rb
 - spec/uh/layout/container_spec.rb
 - spec/uh/layout/history_spec.rb
+- spec/uh/layout/registrant_spec.rb
 - spec/uh/layout/screen_spec.rb
 - spec/uh/layout/tag_spec.rb
 - spec/uh/layout_spec.rb
@@ -105,9 +107,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -124,6 +126,7 @@ test_files:
 - spec/uh/layout/column_spec.rb
 - spec/uh/layout/container_spec.rb
 - spec/uh/layout/history_spec.rb
+- spec/uh/layout/registrant_spec.rb
 - spec/uh/layout/screen_spec.rb
 - spec/uh/layout/tag_spec.rb
 - spec/uh/layout_spec.rb