whirled_peas 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6608e1e6c9505eefea5409bcdc0f8af117b5bcf390564d163315f05b9fe73323
-  data.tar.gz: 713b7ff1c83c462b137e1a9203282ad74f8dc71e660237da35b40d472ae1d486
+  metadata.gz: caed061285ef515e70f20c18153a16eedb3876a98842f2029db069c4a14dcd7f
+  data.tar.gz: c07b7daeaa8c048d0068c1150ad248099c335a2a9e8fd70bd47ad8f9bfc99174
 SHA512:
-  metadata.gz: 81d5ae8c86907fa5a32025be54fd4649d1c75c93726d0f581f0f63cd7182f8381285451cef1c2350b223c378ba98c00682b2a96ac65b31cabc05b5871cbaf1fc
-  data.tar.gz: 52cdda8685d24cd1ad89c5a2acc70b7fb77c22cf6c21cb3d3eb20dce5df2660bc2e9d285e04fbb13018189f9b2f9700203e3915c13f678ecb4d92f2ce173bfab
+  metadata.gz: f4c3c1003793b47a99413aed446f0935da5a866819336c6b58e02f5b90ae1d69eeefae6b8ea92a8460fda3fcd89843faeeadf9824a4ba5502dd7ca5539a390d5
+  data.tar.gz: dccb23acdc4a580e3b319e17f8d0deeac981be86482c9426b5306c40dbed0691b0308bb5300a764830bb3832700b34db0f99beb98796992521294f295623bcda

data/README.md

@@ -130,7 +130,7 @@ WhirledPeas.template do |template, template_settings|
   template.add_grid do |grid, grid_settings|
     grid_settings.num_cols = 10
     100.times do |i|
-      grid.add_text { i.to_s }
+      grid.add_text { i }
     end
   end
 end
@@ -142,7 +142,7 @@ The above template can also be broken down into more manageable methods, e.g.
 def number_grid(grid, settings)
   settings.num_cols = 10
   100.times do |i|
-    grid.add_text { i.to_s }
+    grid.add_text { i }
   end
 end
 
@@ -157,12 +157,12 @@ Additionally, if no child element is explicitly added to a `GridElement`, but th
 ```ruby
 template.add_grid do |g|
   100.times do |i|
-    g.add_text { i.to_s }
+    g.add_text { i }
   end
 end
 
 template.add_grid do |g|
-  100.times.map(&:to_s)
+  100.times.map(&:itself)
 end
 ```
 
@@ -338,7 +338,7 @@ class TemplateFactory
     @numbers.each.with_index do |num, index|
       g.add_text do |_, settings|
         settings.bg_color = (@low == index || @high == index) ? :cyan : :white
-        num.to_s
+        num
       end
     end
   end

data/lib/whirled_peas.rb

@@ -17,6 +17,9 @@ module WhirledPeas
     logger = Logger.new(File.open('whirled_peas.log', 'a'))
     logger.level = log_level
     logger.formatter = proc do |severity, datetime, progname, msg|
+      if msg.is_a?(Exception)
+        msg = %Q(#{msg.class}: #{msg.to_s}\n    #{msg.backtrace.join("\n    ")})
+      end
       "[#{severity}] #{datetime.strftime('%Y-%m-%dT%H:%M:%S.%L')} (#{progname}) - #{msg}\n"
     end
 
@@ -30,10 +33,11 @@ module WhirledPeas
       begin
         driver.start(producer)
         producer.stop
+      rescue Errno::EPIPE
+        logger.error(LOGGER_ID) { 'Producer cannot connect to consumer, exiting...' }
       rescue => e
         logger.warn(LOGGER_ID) { 'Driver exited with error, terminating producer...' }
         logger.error(LOGGER_ID) { e }
-        logger.error(LOGGER_ID) { e.backtrace.join("\n") }
         producer.terminate
         raise
       end

data/lib/whirled_peas/frame/consumer.rb

@@ -46,8 +46,7 @@ module WhirledPeas
       rescue => e
         event_loop.stop if event_loop.running?
         logger.warn(LOGGER_ID) { 'Exited with error' }
-        logger.error(LOGGER_ID) { e.message }
-        logger.error(LOGGER_ID) { e.backtrace.join("\n") }
+        logger.error(LOGGER_ID) { e }
         raise
       ensure
         logger.info(LOGGER_ID) { 'Closing socket' }

data/lib/whirled_peas/frame/event_loop.rb

@@ -35,7 +35,7 @@ module WhirledPeas
             template = template_factory.build(name, args)
             screen.paint(template)
           end
-          sleep(next_frame_at - Time.now)
+          sleep([0, next_frame_at - Time.now].max)
         end
         logger.info('EVENT LOOP') { 'Exiting normally' }
       rescue

data/lib/whirled_peas/frame/producer.rb

@@ -16,8 +16,7 @@ module WhirledPeas
       rescue => e
         producer.terminate
         logger.warn(LOGGER_ID) { 'Exited with error' }
-        logger.error(LOGGER_ID) { e.message }
-        logger.error(LOGGER_ID) { e.backtrace.join("\n") }
+        logger.error(LOGGER_ID) { e }
         raise
       ensure
         if client

data/lib/whirled_peas/ui/element.rb

@@ -2,11 +2,14 @@ require_relative 'settings'
 
 module WhirledPeas
   module UI
+    STRINGALBE_CLASSES = [FalseClass, Float, Integer, NilClass, String, Symbol, TrueClass]
+
     class Element
       attr_accessor :preferred_width, :preferred_height
-      attr_reader :settings
+      attr_reader :name, :settings
 
-      def initialize(settings)
+      def initialize(name, settings)
+        @name = name
         @settings = settings
       end
     end
@@ -15,31 +18,42 @@ module WhirledPeas
     class TextElement < Element
       attr_reader :value
 
-      def initialize(settings)
-        super(TextSettings.merge(settings))
+      def initialize(name, settings)
+        super(name, TextSettings.merge(settings))
       end
 
       def value=(val)
-        @value = val
+        unless STRINGALBE_CLASSES.include?(val.class)
+          raise ArgmentError, "Unsupported type for TextElement: #{val.class}"
+        end
+        @value = val.to_s
         @preferred_width = settings.width || value.length
         @preferred_height = 1
       end
 
       def inspect(indent='')
         dims = unless preferred_width.nil?
-          "#{indent + '  '}Dimensions: #{preferred_width}x#{preferred_height}"
+          "#{indent + '  '}- Dimensions: #{preferred_width}x#{preferred_height}"
         end
         [
-          "#{indent}#{self.class.name}",
+          "#{indent}+ #{name} [#{self.class.name}]",
           dims,
-          "#{indent + '  '}Settings",
+          "#{indent + '  '}- Settings",
           settings.inspect(indent + '    ')
         ].compact.join("\n")
       end
     end
 
     class ComposableElement < Element
-      def initialize(settings)
+      class << self
+        def next_name
+          @counter ||= 0
+          @counter += 1
+          "Element-#{@counter}"
+        end
+      end
+
+      def initialize(name, settings)
         super
       end
 
@@ -47,61 +61,95 @@ module WhirledPeas
         @children ||= []
       end
 
-      def add_text(&block)
-        element = TextElement.new(settings)
+      def add_text(name=self.class.next_name, &block)
+        element = TextElement.new(name, settings)
         element.value = yield nil, element.settings
         children << element
       end
 
-      def add_box(&block)
-        element = BoxElement.new(settings)
+      def add_box(name=self.class.next_name, &block)
+        element = BoxElement.new(name, settings)
         value = yield element, element.settings
         children << element
-        if element.children.empty? && value.is_a?(String)
-          element.add_text { value }
+        if element.children.empty? && STRINGALBE_CLASSES.include?(value.class)
+          element.add_text { value.to_s }
         end
       end
 
-      def add_grid(&block)
-        element = GridElement.new(settings)
+      def add_grid(name=self.class.next_name, &block)
+        element = GridElement.new(name, settings)
         values = yield element, element.settings
         children << element
         if element.children.empty? && values.is_a?(Array)
-          values.each { |v| element.add_text { v } }
+          values.each { |v| element.add_text { v.to_s } }
         end
       end
 
       def inspect(indent='')
         kids = children.map { |c| c.inspect(indent + '    ') }.join("\n")
         dims = unless preferred_width.nil?
-          "#{indent + '  '}Dimensions: #{preferred_width}x#{preferred_height}"
+          "#{indent + '  '}- Dimensions: #{preferred_width}x#{preferred_height}"
         end
         [
-          "#{indent}#{self.class.name}",
+          "#{indent}+ #{name} [#{self.class.name}]",
           dims,
-          "#{indent + '  '}Settings",
+          "#{indent + '  '}- Settings",
           settings.inspect(indent + '    '),
-          "#{indent + '  '}Children",
+          "#{indent + '  '}- Children",
           kids
         ].compact.join("\n")
       end
+
+      private
+
+      def margin_width
+        settings.margin.left + settings.margin.right
+      end
+
+      def margin_height
+        settings.margin.top + settings.margin.bottom
+      end
+
+      def outer_border_width
+        (settings.border.left? ? 1 : 0) + (settings.border.right? ? 1 : 0)
+      end
+
+      def outer_border_height
+        (settings.border.top? ? 1 : 0) + (settings.border.bottom? ? 1 : 0)
+      end
+
+      def inner_border_width
+        settings.border.inner_vert? ? 1 : 0
+      end
+
+      def inner_border_height
+        settings.border.inner_horiz? ? 1 : 0
+      end
+
+      def padding_width
+        settings.padding.left + settings.padding.right
+      end
+
+      def padding_height
+        settings.padding.top + settings.padding.bottom
+      end
     end
 
     class Template < ComposableElement
       def initialize(settings=TemplateSettings.new)
-        super(settings)
+        super('TEMPLATE', settings)
       end
     end
 
     class BoxElement < ComposableElement
       attr_writer :content_width, :content_height
 
-      def initialize(settings)
-        super(BoxSettings.merge(settings))
+      def initialize(name, settings)
+        super(name, BoxSettings.merge(settings))
       end
 
       def self.from_template(template, width, height)
-        box = new(template.settings)
+        box = new(template.name, template.settings)
         template.children.each { |c| box.children << c }
         box.content_width = box.preferred_width = width
         box.content_height = box.preferred_height = height
@@ -117,13 +165,8 @@ module WhirledPeas
       end
 
       def preferred_width
-        @preferred_width ||= settings.margin.left +
-          (settings.border.left? ? 1 : 0) +
-          settings.padding.left +
-          content_width +
-          settings.padding.right +
-          (settings.border.right? ? 1 : 0) +
-          settings.margin.right
+        @preferred_width ||=
+          margin_width + outer_border_width + padding_width + content_width
       end
 
       def content_height
@@ -134,19 +177,14 @@ module WhirledPeas
       end
 
       def preferred_height
-        @preferred_height ||= settings.margin.top +
-          (settings.border.top? ? 1 : 0) +
-          settings.padding.top +
-          content_height +
-          settings.padding.bottom +
-          (settings.border.bottom? ? 1 : 0) +
-          settings.margin.bottom
+        @preferred_height ||=
+          margin_height + outer_border_height + padding_height + content_height
       end
     end
 
     class GridElement < ComposableElement
-      def initialize(settings)
-        super(GridSettings.merge(settings))
+      def initialize(name, settings)
+        super(name, GridSettings.merge(settings))
       end
 
       def col_width
@@ -169,30 +207,18 @@ module WhirledPeas
 
 
       def preferred_width
-        settings.margin.left +
-          (settings.border.left? ? 1 : 0) +
-          settings.num_cols * (
-            settings.padding.left +
-            col_width +
-            settings.padding.right
-          ) +
-          (settings.num_cols - 1) * (settings.border.inner_vert? ? 1 : 0) +
-          (settings.border.right? ? 1 : 0) +
-          settings.margin.right
+        margin_width +
+          outer_border_width +
+          settings.num_cols * (padding_width + col_width) +
+          (settings.num_cols - 1) * inner_border_width
       end
 
       def preferred_height
         num_rows = (children.length / settings.num_cols).ceil
-        settings.margin.top +
-          (settings.border.top? ? 1 : 0) +
-          num_rows * (
-            settings.padding.top +
-            row_height +
-            settings.padding.bottom
-          ) +
-          (num_rows - 1) * (settings.border.inner_horiz? ? 1 : 0) +
-          (settings.border.bottom? ? 1 : 0) +
-          settings.margin.bottom
+        margin_height +
+          outer_border_height +
+          num_rows * (padding_height + row_height) +
+          (num_rows - 1) * inner_border_height
       end
     end
   end

data/lib/whirled_peas/ui/settings.rb

@@ -342,6 +342,11 @@ module WhirledPeas
         @_margin.bottom = bottom if bottom
       end
 
+      def clear_margin
+        set_margin(left: 0, top: 0, right: 0, bottom: 0)
+        @_auto_margin = nil
+      end
+
       def margin
         @_margin || Margin.new
       end
@@ -387,7 +392,7 @@ module WhirledPeas
         @_border.color = color unless color.nil?
       end
 
-      def no_border
+      def clear_border
         set_border(
           left: false, top: false, right: false, bottom: false, inner_horiz: false, inner_vert: false
         )
@@ -424,6 +429,10 @@ module WhirledPeas
         @_padding.bottom = bottom if bottom
       end
 
+      def clear_padding
+        set_padding(left: 0, top: 0, right: 0, bottom: 0)
+      end
+
       def padding
         @_padding || Padding.new
       end

data/lib/whirled_peas/version.rb

@@ -1,3 +1,3 @@
 module WhirledPeas
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whirled_peas
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tom Collier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline