uh-layout 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a1637a620687e36d7ff7fbe4af3b4ffff5a8039
-  data.tar.gz: ff7e8946af03a49c31a403c8130bce7cf36adc06
+  metadata.gz: 27063bf0c7da809ea430cc4de1595149868766db
+  data.tar.gz: 3770a238eb847d0f214d4560cc28b11177443ea1
 SHA512:
-  metadata.gz: 0d5b7d74cfb9127b7fd9cec06256d2848a5fdc5fd8bdffc45fb57301421175421c1b855ff35e7b96a8cca3b6491daacbbb06962a1c29074df53c1568998cbe61
-  data.tar.gz: 047789ccf9b1c14401e707869867bfd11b4ed4d88dc178ca1b74f0b04eb1eecdcfa26ed652fc85dd745bcfddd448ca1fce94d7698c352ac1a8f174db55436a05
+  metadata.gz: c58a7649238a4fad66661ece07040c51359d0afdbb485fea97a2352c2def84634c4a2b2b1bd7b5d6d3eceefa000be944d5eee87f83c84ca01785e3df2bca1f88
+  data.tar.gz: 1fe67fcbd4de7cc6525d7822e83da41c13b6d80b8a002cdf4e7d7904c937a50a827372c09f40c8977cadd3e320d665dcc79a709772035f76fdfcb0fbbc350789

data/lib/uh/layout/bar.rb

@@ -6,7 +6,7 @@ module Uh
       BORDER_HEIGHT     = 2
       BORDER_PADDING_Y  = 0
       COLUMN_PADDING_X  = 1
-      TAG_PADDING_X     = 5
+      VIEW_PADDING_X    = 5
 
       include GeoAccessors
 
@@ -38,9 +38,9 @@ module Uh
       def redraw
         draw_background
         draw_columns BORDER_HEIGHT + BORDER_PADDING_Y,
-          @screen.current_tag.columns, @screen.current_tag.current_column
-        draw_tags BORDER_HEIGHT + BORDER_PADDING_Y + text_line_height,
-          @screen.tags, @screen.current_tag
+          @screen.current_view.columns, @screen.current_view.current_column
+        draw_views BORDER_HEIGHT + BORDER_PADDING_Y + text_line_height,
+          @screen.views, @screen.current_view
         if @status
           draw_status BORDER_HEIGHT + BORDER_PADDING_Y + text_line_height,
             @status
@@ -126,19 +126,19 @@ module Uh
           bg: current ? @colors[:hi] : @colors[:bg]
       end
 
-      def draw_tags(y_offset, tags, current_tag)
-        tags.sort_by(&:id).inject(0) do |x_offset, tag|
-          color = if tag == current_tag
+      def draw_views(y_offset, views, current_view)
+        views.sort_by(&:id).inject(0) do |x_offset, view|
+          color = if view == current_view
             active_color
-          elsif tag.clients.any?
+          elsif view.clients.any?
             @colors[:hi]
           else
             @colors[:bg]
           end
 
-          x_offset + draw_text(tag.id, x_offset, y_offset,
+          x_offset + draw_text(view.id, x_offset, y_offset,
             bg:         color,
-            padding_x:  TAG_PADDING_X
+            padding_x:  VIEW_PADDING_X
           )
         end
       end

data/lib/uh/layout/dumper.rb

@@ -8,10 +8,10 @@ module Uh
       def to_s
         @layout.screens.inject('') do |m, screen|
           m << "%s%s\n" % [@layout.current_screen?(screen) ? '*' : ' ', screen]
-          screen.tags.each do |tag|
-            m << "  %s%s\n" % [screen.current_tag?(tag) ? '*' : ' ', tag]
-            tag.columns.each do |column|
-              m << "    %s%s\n" % [tag.current_column?(column) ? '*' : ' ', column]
+          screen.views.each do |view|
+            m << "  %s%s\n" % [screen.current_view?(view) ? '*' : ' ', view]
+            view.columns.each do |column|
+              m << "    %s%s\n" % [view.current_column?(column) ? '*' : ' ', column]
               column.clients.each do |client|
                 m << "      %s%s\n" % [
                   column.current_client?(client) ? '*' : ' ',

data/lib/uh/layout/history.rb

@@ -1,24 +1,24 @@
 module Uh
   class Layout
     class History
-      TAGS_SIZE_MAX = 8
+      VIEWS_SIZE_MAX = 8
 
-      attr_reader :tags, :tags_size_max
+      attr_reader :views, :views_size_max
 
-      def initialize(tags = [], tags_size_max: TAGS_SIZE_MAX)
-        @tags           = tags
-        @tags_size_max  = tags_size_max
+      def initialize(views = [], views_size_max: VIEWS_SIZE_MAX)
+        @views           = views
+        @views_size_max  = views_size_max
       end
 
-      def record_tag(tag)
-        @tags << tag
-        if @tags.size > @tags_size_max
-          @tags = @tags.drop @tags.size - @tags_size_max
+      def record_view(view)
+        @views << view
+        if @views.size > @views_size_max
+          @views = @views.drop @views.size - @views_size_max
         end
       end
 
-      def last_tag
-        @tags.last
+      def last_view
+        @views.last
       end
     end
   end

data/lib/uh/layout/screen.rb

@@ -4,15 +4,15 @@ module Uh
       include GeoAccessors
 
       extend Forwardable
-      def_delegator :@tags, :current, :current_tag
-      def_delegator :current_tag, :==, :current_tag?
+      def_delegator :@views, :current, :current_view
+      def_delegator :current_view, :==, :current_view?
 
-      attr_reader :id, :tags, :geo
+      attr_reader :id, :views, :geo
 
       def initialize(id, geo)
         @id   = id
         @geo  = geo.dup
-        @tags = Container.new([Tag.new('1', @geo)])
+        @views = Container.new([View.new('1', @geo)])
       end
 
       def to_s
@@ -21,11 +21,11 @@ module Uh
 
       def height=(value)
         @geo.height = value
-        @tags.each { |tag| tag.height = value }
+        @views.each { |view| view.height = value }
       end
 
       def include?(client)
-        @tags.any? { |tag| tag.include? client }
+        @views.any? { |view| view.include? client }
       end
     end
   end

data/lib/uh/layout/version.rb

@@ -1,5 +1,5 @@
 module Uh
   class Layout
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/lib/uh/layout/{tag.rb → view.rb}

@@ -1,6 +1,6 @@
 module Uh
   class Layout
-    class Tag
+    class View
       include GeoAccessors
 
       extend Forwardable
@@ -23,7 +23,7 @@ module Uh
       end
 
       def to_s
-        "TAG ##{@id}, geo: #{@geo}"
+        "VIEW ##{@id}, geo: #{@geo}"
       end
 
       def clients

data/lib/uh/layout.rb

@@ -11,7 +11,7 @@ require 'uh/layout/dumper'
 require 'uh/layout/history'
 require 'uh/layout/registrant'
 require 'uh/layout/screen'
-require 'uh/layout/tag'
+require 'uh/layout/view'
 
 module Uh
   class Layout
@@ -29,8 +29,8 @@ module Uh
     extend Forwardable
     def_delegator :@screens, :current, :current_screen
     def_delegator :current_screen, :==, :current_screen?
-    def_delegator :current_screen, :current_tag
-    def_delegator :current_tag, :current_column
+    def_delegator :current_screen, :current_view
+    def_delegator :current_view, :current_column
 
     attr_reader :screens, :widgets, :colors, :history
 
@@ -65,11 +65,11 @@ module Uh
     end
 
     def suggest_geo
-      (current_column or current_tag).geo.dup
+      (current_column or current_view).geo.dup
     end
 
     def <<(client)
-      current_tag.current_column_or_create << client
+      current_view.current_column_or_create << client
       current_column.current_client = client
       current_column.arrange_clients
       current_column.show_hide_clients
@@ -80,9 +80,9 @@ module Uh
     alias push <<
 
     def remove(client)
-      screen, tag, column = find_client client
+      screen, view, column = find_client client
       column.remove client
-      tag.arrange_columns
+      view.arrange_columns
       column.show_hide_clients
       current_client.focus if current_client
       update_widgets
@@ -109,29 +109,29 @@ module Uh
       push client
     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
+    def handle_view_sel(view_id)
+      view_id = view_id.to_s
+      return unless current_view.id != view_id
+      @history.record_view current_view
+      current_view.hide
+      current_screen.views.current = find_view_or_create view_id
+      current_view.each_column &:show_hide_clients
       current_client.focus if current_client
       update_widgets
     end
 
-    def handle_tag_set(tag_id)
-      return unless current_client && current_tag.id != tag_id
-      previous_tag_id = current_tag.id
+    def handle_view_set(view_id)
+      return unless current_client && current_view.id != view_id
+      previous_view_id = current_view.id
       remove client = current_client
-      handle_tag_sel tag_id
+      handle_view_sel view_id
       push client
-      handle_tag_sel previous_tag_id
+      handle_view_sel previous_view_id
     end
 
     def handle_column_sel(direction)
-      return unless current_tag.columns.any?
-      current_tag.columns.sel direction
+      return unless current_view.columns.any?
+      current_view.columns.sel direction
       current_client.focus
       update_widgets
     end
@@ -157,16 +157,16 @@ module Uh
       update_widgets
     end
 
-    def handle_client_column_set(direction, mover: client_mover_for_current_tag)
+    def handle_client_column_set(direction, mover: client_mover_for_current_view)
       return unless current_client
       mover.move_current direction
-      current_tag.arrange_columns
-      current_tag.each_column &:show_hide_clients
+      current_view.arrange_columns
+      current_view.each_column &:show_hide_clients
       update_widgets
     end
 
-    def handle_history_tag_pred
-      handle_tag_sel @history.last_tag.id
+    def handle_history_view_pred
+      handle_view_sel @history.last_view.id
     end
 
     def handle_kill_current
@@ -178,24 +178,24 @@ module Uh
 
     def find_client(client)
       screens.each do |screen|
-        screen.tags.each do |tag|
-          tag.each_column do |column|
+        screen.views.each do |view|
+          view.each_column do |column|
             if column.include? client
-              return screen, tag, column
+              return screen, view, column
             end
           end
         end
       end
     end
 
-    def find_tag_or_create(tag_id)
-      current_screen.tags.find { |e| e.id == tag_id } or Tag.new(tag_id, current_screen.geo).tap do |tag|
-        current_screen.tags << tag
+    def find_view_or_create(view_id)
+      current_screen.views.find { |e| e.id == view_id } or View.new(view_id, current_screen.geo).tap do |view|
+        current_screen.views << view
       end
     end
 
-    def client_mover_for_current_tag
-      ClientColumnMover.new(current_tag.columns, current_tag.columns_max_count?)
+    def client_mover_for_current_view
+      ClientColumnMover.new(current_view.columns, current_view.columns_max_count?)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh-layout
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uh
@@ -72,8 +72,8 @@ files:
 - 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
+- lib/uh/layout/view.rb
 homepage: https://rubygems.org/gems/uh-layout
 licenses:
 - BSD-3-Clause