shoes-core 4.0.0.pre8 → 4.0.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1b7205ad873a89bbd6ed14d91f485200cf83f15
-  data.tar.gz: eec9c9656150201d5c0fcce0b9425c6f2c842fef
+  metadata.gz: 4ba64133e02f0c5a97f98f1f9eff7a68b32fba38
+  data.tar.gz: c3ee4b52936eb0125cf87f8c21b318ada8ca949f
 SHA512:
-  metadata.gz: f10912fc2b305ce9296d58358b0b1de4553f291ab1e9471a5cecff13a9838b595ef650ebd36bdb266f0a5f699cf2e361f30e8c3196ccdbb68ee73e4b8b747e3b
-  data.tar.gz: e7de5b6d95f8b7ff98ade674141b42ccdf02e311b6afaa724459e9e0c69e7ca741f169757bee91f6e2155fb0e4fa312760b76e75364d9afd81b2234b3798246e
+  metadata.gz: 399a8a7dc9fe4057095a926b7fb9a41c442a5bfb96295a6b21122dab8f829968f34841a94e4b836be4927bd197582ef544e0c768383dc57152f46ff38f214e76
+  data.tar.gz: 161b478d23e6949f3c5ce41fd7178c7f75ed3ef6da3a52b1e9f57f6daddfa61d86a3dcdeb2aa9a927b5eae167ea098a7eb880a1d841d41f0019c196bb7eaa5d9

data/bin/shoes-picker

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 lib_directory = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH << lib_directory
 

data/lib/shoes.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require 'shoes/core'

data/lib/shoes/animation.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   class Animation
     include Common::Inspect

data/lib/shoes/app.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   ICON = File.join(DIR, 'static/shoes-icon.png').freeze
 
@@ -61,6 +62,11 @@ class Shoes
       self.class.new(options, &block)
     end
 
+    # Remember startup block for execution later
+    def start(&blk)
+      @__app__.start_block = blk
+    end
+
     def quit
       Shoes.unregister self
       @__app__.quit
@@ -75,7 +81,7 @@ class Shoes
     delegated_to_internal_app = %w(
       width height owner started? location left top absolute_left
       absolute_top click release clear fullscreen fullscreen=
-      contents wait_until_closed gui
+      contents wait_until_closed focus open? gui
     )
 
     def_delegators :@__app__, *delegated_to_internal_app

data/lib/shoes/arc.rb

@@ -1,7 +1,6 @@
+# frozen_string_literal: true
 class Shoes
-  class Arc
-    include Common::ArtElement
-
+  class Arc < Common::ArtElement
     style_with :angle1, :angle2, :art_styles, :center, :common_styles, :dimensions, :radius, :wedge
     STYLES = { wedge: false, fill: Shoes::COLORS[:black] }.freeze
 

data/lib/shoes/arrow.rb

@@ -1,7 +1,6 @@
+# frozen_string_literal: true
 class Shoes
-  class Arrow
-    include Common::ArtElement
-
+  class Arrow < Common::ArtElement
     style_with :angle, :art_styles, :curve, :common_styles, :dimensions
     STYLES = { angle: 0, fill: Shoes::COLORS[:black] }.freeze
 

data/lib/shoes/background.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 class Shoes
-  class Background
-    include Common::BackgroundElement
+  class Background < Common::BackgroundElement
     include Common::Fill
 
     style_with :angle, :common_styles, :curve, :dimensions, :fill

data/lib/shoes/border.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 class Shoes
-  class Border
-    include Common::BackgroundElement
+  class Border < Common::BackgroundElement
     include Common::Stroke
 
     style_with :angle, :common_styles, :curve, :dimensions, :stroke, :strokewidth

data/lib/shoes/builtin_methods.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 # The methods defined in this module/file are also available outside of the
 # Shoes.app block. So they are monkey patched onto the main object.
 # However they can also be used from the normal Shoes.app block.
 class Shoes
   def self.p(message)
-    Shoes::LOG << ['debug', message.inspect]
+    Shoes.logger.debug(message.inspect)
   end
 
   module BuiltinMethods
@@ -19,7 +20,6 @@ class Shoes
 
     %w(info debug warn error).each do |log_level|
       define_method(log_level) do |message = ''|
-        Shoes::LOG << [log_level, message]
         Shoes.logger.public_send(log_level, message)
       end
     end

data/lib/shoes/button.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 class Shoes
-  class Button
-    include Common::UIElement
+  class Button < Common::UIElement
     include Common::Clickable
     include Common::State
 

data/lib/shoes/check_button.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 class Shoes
-  class CheckButton
-    include Common::UIElement
+  class CheckButton < Common::UIElement
     include Common::Clickable
     include Common::State
 

data/lib/shoes/color.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   class Color
     include Common::Inspect

data/lib/shoes/color/dsl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   # Create all of the built-in Shoes colors
   COLORS = {}

data/lib/shoes/color/dsl_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   class Color
     module DSLHelpers

data/lib/shoes/color/hex_converter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   class Color
     class HexConverter

data/lib/shoes/common/art_element.rb

@@ -1,20 +1,17 @@
+# frozen_string_literal: true
 class Shoes
   module Common
-    module ArtElement
-      include Common::UIElement
+    class ArtElement < UIElement
       include Common::Clickable
       include Common::Fill
       include Common::Rotate
       include Common::Stroke
       include Common::Translate
 
-      # Modules that muck with class methods need to be included like this
-      #
-      # We also can't rely on Common::UIElement providing these, as it gets
-      # ArtElement, not the destination class to add things to!
-      def self.included(base)
-        base.include Common::Hover
-        base.include Common::Style
+      def self.inherited(child)
+        # Hover's inclusion generates a styling class per child class.
+        # We need to include it at inheritance time to get that behavior.
+        child.include Common::Hover
       end
     end
   end

data/lib/shoes/common/attachable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module Attachable

data/lib/shoes/common/background_element.rb

@@ -1,16 +1,7 @@
+# frozen_string_literal: true
 class Shoes
   module Common
-    module BackgroundElement
-      include Common::UIElement
-
-      # Modules that muck with class methods need to be included like this
-      #
-      # We also can't rely on Common::UIElement providing these, as it gets
-      # BackgroundElement, not the destination class to add things to!
-      def self.included(base)
-        base.include Common::Style
-      end
-
+    class BackgroundElement < Common::UIElement
       def create_dimensions(*_)
         @dimensions = ParentDimensions.new @parent, @style
       end

data/lib/shoes/common/changeable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     # Changeable elements are elements that receive `change' events.

data/lib/shoes/common/clickable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module Clickable

data/lib/shoes/common/fill.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module Fill

data/lib/shoes/common/hover.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module Hover
@@ -53,7 +54,7 @@ class Shoes
       end
 
       def eval_hover_block(blk)
-        blk.call(self) if blk
+        safely_evaluate(self, &blk) if blk
       end
 
       def apply_style_from_hover_class

data/lib/shoes/common/inspect.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module Inspect

data/lib/shoes/common/link_finder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module LinkFinder

data/lib/shoes/common/positioning.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module Positioning

data/lib/shoes/common/registration.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module Registration

data/lib/shoes/common/remove.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module Remove

data/lib/shoes/common/rotate.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module Rotate

data/lib/shoes/common/safely_evaluate.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+class Shoes
+  module Common
+    module SafelyEvaluate
+      def safely_evaluate(*args)
+        yield(*args) if block_given?
+      rescue => e
+        Shoes.logger.error(e.message)
+        raise e if Shoes.configuration.fail_fast
+      end
+    end
+  end
+end

data/lib/shoes/common/state.rb

@@ -1,29 +1,23 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module State
-      DISABLED_STATE = "disabled".freeze
+      DISABLED_STATE = "disabled"
 
       def after_initialize(*_)
         super
-        update_enabled
+        update_from_state
       end
 
       def state=(value)
         style(state: value)
-        update_enabled
       end
 
-      def state_options(opts)
-        self.state = opts[:state]
-      end
-
-      private
-
       def enabled?
         !(state.to_s == DISABLED_STATE)
       end
 
-      def update_enabled
+      def update_from_state
         @gui.enabled(enabled?)
       end
     end

data/lib/shoes/common/stroke.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module Stroke

data/lib/shoes/common/style.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The general Style module handles the many optional styles that may be passed
 # to shoes elements upon creates as well as the fact that they can later on be
 # altered through the #style method.
@@ -122,13 +123,15 @@ class Shoes
 
       def update_style(new_styles)
         normalized_style = StyleNormalizer.new.normalize(new_styles)
+        @style.merge! normalized_style
+
         set_dimensions(new_styles)
         set_visibility(new_styles)
         set_coloring(new_styles)
         set_hovers(new_styles)
         set_translate(new_styles)
-        click(&new_styles[:click]) if new_styles.key?(:click)
-        @style.merge! normalized_style
+        set_click(new_styles)
+        set_state(new_styles)
       end
 
       # if dimension is set via style, pass info on to the dimensions setter
@@ -140,7 +143,6 @@ class Shoes
 
       def set_visibility(new_styles)
         return unless new_styles.include?(:hidden)
-        @style[:hidden] = new_styles[:hidden]
         update_visibility
       end
 
@@ -158,6 +160,14 @@ class Shoes
         clear_translate if new_styles.include?(:translate)
       end
 
+      def set_click(new_styles)
+        click(&new_styles[:click]) if new_styles.key?(:click)
+      end
+
+      def set_state(new_styles)
+        update_from_state if new_styles.include?(:state)
+      end
+
       def update_dimensions # so that @style hash matches actual values
         STYLE_GROUPS[:dimensions].each do |style|
           if respond_to?(style)

data/lib/shoes/common/style_normalizer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     class StyleNormalizer

data/lib/shoes/common/translate.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Shoes
   module Common
     module Translate

data/lib/shoes/common/ui_element.rb

@@ -1,17 +1,79 @@
+# frozen_string_literal: true
 class Shoes
   module Common
-    module UIElement
+    class UIElement
       include Common::Attachable
-      include Common::Initialization
       include Common::Inspect
       include Common::Visibility
       include Common::Positioning
       include Common::Remove
       include DimensionsDelegations
+      include Common::SafelyEvaluate
+      include Common::Style
 
-      # Modules that muck with class methods need to be included like this
-      def self.included(base)
-        base.include Common::Style
+      attr_reader :app, :parent, :dimensions, :gui
+
+      def initialize(app, parent, *args)
+        blk    = args.pop if args.last.is_a?(Proc) || args.last.nil?
+        styles = args.last.is_a?(Hash) ? args.pop : {}
+
+        before_initialize(styles, *args)
+
+        @app = app
+        @parent = parent
+
+        style_init(styles)
+        create_dimensions(*args)
+        update_dimensions if styles_with_dimensions?
+
+        create_backend
+        add_to_parent(*args)
+
+        handle_block(blk)
+        update_visibility
+
+        after_initialize(*args)
+      end
+
+      # This method will get called with the incoming styles hash and the
+      # other arguments passed to initialize.
+      #
+      # It is intended for performing any additions to the styles hash before
+      # that gets sent on to style_init.
+      def before_initialize(_styles, *_)
+      end
+
+      # Set the dimensions for the element. Defaults to using the Dimensions
+      # class, but is expected to be overridden in other types (art elements,
+      # text blocks) that require different dimensioning.
+      def create_dimensions(*_)
+        @dimensions = Dimensions.new @parent, @style
+      end
+
+      # Call to create the backend (aka @gui)
+      def create_backend
+        @gui = Shoes.backend_for self
+      end
+
+      # Calls to add child in parent, after the backend has been created.
+      # Can be overridden for operations that must happen after backend, but
+      # before addition to parent (and hence positioning)
+      def add_to_parent(*_)
+        @parent.add_child self
+      end
+
+      # This method handles the block passed in at creation of the DSL element.
+      # By default it will treat things as clickable, and assumes the
+      # necessary methods are there.
+      #
+      # Override if DSL element uses that block for something else (i.e. slot)
+      def handle_block(blk)
+        register_click blk if respond_to?(:register_click)
+      end
+
+      # Final method called in initialize. Intended for any final setup after
+      # the rest of the object has been set up fully.
+      def after_initialize(*_)
       end
 
       # Nobody rotates by default, but we need to let you check