shoes-core 4.0.0.pre3 → 4.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcbcba9d1c9969a08d30f3f2afef20d02ecc677e
-  data.tar.gz: 4c455368fa53653c7d1fb16e029625b8175ebcc0
+  metadata.gz: 84a2c73e863ae6a5e1d2c53484822830719a8e3e
+  data.tar.gz: e26555a20033558b5618a6be1821ce73ec0dbf1d
 SHA512:
-  metadata.gz: dee92066957d08625a5b0f785aa480d7596a4a33b1096a4a5203bcf83b36890c68215bd69cc82a7f748d233fa4766caace13944e8c0b1b9dddcdee2e17778dda
-  data.tar.gz: 5c231e8b80f0c5c0f93b1a4d44cf1702155b188c4fbc0c51e95137838689aeddd4043c24e9f66cbea0bbe00db58884f2f1ccc720867ab12f595ebb7e6ff1b294
+  metadata.gz: 775fbfd5702df09c69a035c02502f1c8db234eef54aaa7f9e72fe46f6fac2af59c698e7d40f86bf9d61ec6dfbc6fd49b2d14fb643a8a473f86fb598aeeb227f0
+  data.tar.gz: b4568bcb40bcc3e4c3e67b63d90b9d70f85905aba5ed0450add252ee22da124b6c4d64e847f81245636ac8d2c5de4a70b5c28fb0c93cd35f43b89ad2f41b61d9

data/bin/shoes

@@ -59,4 +59,4 @@ then
 fi
 
 BACKEND_COMMAND=$(cat $BACKEND_FILE)
-$BACKEND_COMMAND $@
+SHOES_BIN_DIR=$SCRIPTPATH $BACKEND_COMMAND $@

data/bin/shoes-picker

@@ -3,4 +3,8 @@ lib_directory = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH << lib_directory
 
 require 'shoes/ui/picker'
-Shoes::UI::Picker.new.run
+
+# On Windows getting odd paths with trailing double-quote
+bin_dir = ARGV[0].gsub('"', '')
+
+Shoes::UI::Picker.new.run(bin_dir)

data/bin/shoes-stub

@@ -59,4 +59,4 @@ then
 fi
 
 BACKEND_COMMAND=$(cat $BACKEND_FILE)
-$BACKEND_COMMAND $@
+SHOES_BIN_DIR=$SCRIPTPATH $BACKEND_COMMAND $@

data/ext/install/shoes.bat

@@ -10,6 +10,8 @@ if not exist !bin_dir!\shoes-backend (
   jruby --1.9 !bin_dir!\shoes-picker !bin_dir!
 )
 
+set shoes_bin_dir=!bin_dir!
 set /p command=<!bin_dir!/shoes-backend
+
 call !command! %*
 endlocal

data/lib/rubygems_plugin.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 # See ext/install/Rakefile for why this cleanup is our responsibility.
 # Decide if user uninstalled executables based on our actual Ruby script.
 Gem.post_uninstall do |gem|
-  uninstalling_shoes = gem.spec.name == "shoes"
+  uninstalling_shoes = gem.spec.name == "shoes-core"
   missing_executable = !File.exist?(File.join(Gem.bindir, "shoes-picker")) &&
                        !File.exist?(File.join(Gem.bindir, "shoes-picker.bat"))
 
@@ -19,6 +19,6 @@ Gem.post_uninstall do |gem|
     # Everybody potentially has a generated backend file in their bin
     puts "Removing shoes-backend"
     backend = File.join(Gem.bindir, "shoes-backend")
-    FileUtils.rm(backend) if File.exists?(backend)
+    FileUtils.rm(backend) if File.exist?(backend)
   end
 end

data/lib/shoes/app.rb

@@ -29,6 +29,7 @@ class Shoes
     include DSL
     include BuiltinMethods
     include Common::Inspect
+    extend  Forwardable
 
     # Instantiates a new Shoes app.
     #
@@ -60,38 +61,26 @@ class Shoes
       self.class.new(options, &block)
     end
 
-    def close
-      quit
-    end
-
     def quit
       Shoes.unregister self
       @__app__.quit
     end
 
+    alias_method :close, :quit
+
     def parent
       @__app__.current_slot.parent
     end
 
-    %w(
+    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
-    ).each do |method|
-      define_method method do |*args, &block|
-        @__app__.public_send method, *args, &block
-      end
-    end
-
-    alias_method :fullscreen?, :fullscreen
+      contents wait_until_closed gui
+    )
 
-    def to_s
-      super.insert(-2, " \"#{@__app__.app_title}\"")
-    end
+    def_delegators :@__app__, *delegated_to_internal_app
 
-    def inspect
-      super.insert(-2, " \"#{@__app__.app_title}\")")
-    end
+    alias_method :fullscreen?, :fullscreen
 
     def eval_with_additional_context(context, &blk)
       @__additional_context__ = context
@@ -108,6 +97,16 @@ class Shoes
       end
     end
 
+    private
+
+    def inspect_details
+      " \"#{@__app__.app_title}\""
+    end
+
+    def to_s_details
+      inspect_details
+    end
+
     DELEGATE_BLACKLIST = [:parent, :app]
 
     # class definitions are evaluated top to bottom, want to have all of them

data/lib/shoes/arc.rb

@@ -1,21 +1,21 @@
 class Shoes
   class Arc
     include Common::UIElement
+    include Common::Fill
+    include Common::Stroke
     include Common::Style
     include Common::Clickable
 
-    attr_reader :app, :parent, :dimensions, :gui
     style_with :angle1, :angle2, :art_styles, :center, :common_styles, :dimensions, :radius, :wedge
     STYLES = { wedge: false }
 
-    def initialize(app, parent, left, top, width, height, angle1, angle2, styles = {}, blk = nil)
-      @app = app
-      @parent = parent
-      style_init styles, angle1: angle1, angle2: angle2
+    def before_initialize(styles, left, top, width, height, angle1, angle2)
+      styles[:angle1] = angle1
+      styles[:angle2] = angle2
+    end
+
+    def create_dimensions(left, top, width, height, angle1, angle2)
       @dimensions = Dimensions.new parent, left, top, width, height, @style
-      @parent.add_child self
-      @gui = Shoes.backend_for self
-      register_click blk
     end
 
     def wedge?

data/lib/shoes/background.rb

@@ -2,19 +2,15 @@ class Shoes
   class Background
     include Common::UIElement
     include Common::BackgroundElement
+    include Common::Fill
+    include Common::Stroke
     include Common::Style
 
-    attr_reader :app, :parent, :dimensions, :gui
     style_with :angle, :common_styles, :curve, :dimensions, :fill
     STYLES = { angle: 0, curve: 0 }
 
-    def initialize(app, parent, color, styles = {})
-      @app = app
-      @parent = parent
-      style_init styles, fill: color
-      @dimensions = ParentDimensions.new parent, @style
-      @parent.add_child self
-      @gui = Shoes.backend_for self
+    def before_initialize(styles, color)
+      styles[:fill] = color
     end
   end
 end

data/lib/shoes/border.rb

@@ -2,19 +2,15 @@ class Shoes
   class Border
     include Common::UIElement
     include Common::BackgroundElement
+    include Common::Fill
+    include Common::Stroke
     include Common::Style
 
-    attr_reader :app, :parent, :dimensions, :gui
     style_with :angle, :common_styles, :curve, :dimensions, :stroke, :strokewidth
     STYLES = { angle: 0, curve: 0 }
 
-    def initialize(app, parent, color, styles = {})
-      @app = app
-      @parent = parent
-      style_init styles, stroke: color
-      @dimensions = ParentDimensions.new parent, @style
-      @parent.add_child self
-      @gui = Shoes.backend_for self
+    def before_initialize(styles, color)
+      styles[:stroke] = color
     end
   end
 end

data/lib/shoes/builtin_methods.rb

@@ -44,7 +44,7 @@ class Shoes
     end
 
     def ask_save_file
-      Shoes::Dialog.new.dialog_chooser 'Save File...'
+      Shoes::Dialog.new.dialog_chooser 'Save File...', false, :save
     end
 
     def ask_open_folder
@@ -52,7 +52,7 @@ class Shoes
     end
 
     def ask_save_folder
-      Shoes::Dialog.new.dialog_chooser 'Save Folder...', :folder
+      Shoes::Dialog.new.dialog_chooser 'Save Folder...', :folder, :save
     end
 
     def ask(msg, args = {})

data/lib/shoes/button.rb

@@ -4,17 +4,10 @@ class Shoes
     include Common::Style
     include Common::Clickable
 
-    attr_reader :app, :parent, :dimensions, :gui
     style_with :click, :common_styles, :dimensions, :state, :text
 
-    def initialize(app, parent, text, styles = {}, blk = nil)
-      @app = app
-      @parent = parent
-      style_init styles, text: text
-      @dimensions = Dimensions.new parent, @style
-      @parent.add_child self
-      @gui = Shoes.configuration.backend_for self, @parent.gui
-      register_click blk
+    def before_initialize(styles, text)
+      styles[:text] = text || 'Button'
     end
 
     def focus

data/lib/shoes/check_button.rb

@@ -4,18 +4,6 @@ class Shoes
     include Common::Style
     include Common::Clickable
 
-    attr_reader :app, :parent, :dimensions, :gui
-
-    def initialize(app, parent, styles = {}, blk = nil)
-      @app = app
-      @parent = parent
-      style_init styles
-      @dimensions = Dimensions.new parent, @style
-      @parent.add_child self
-      @gui = Shoes.configuration.backend_for self, @parent.gui
-      register_click blk
-    end
-
     def checked?
       @gui.checked?
     end

data/lib/shoes/color.rb

@@ -60,7 +60,6 @@ EOS
     end
 
     def <=>(other)
-      raise_class_mismatch_error(other) unless other.is_a?(self.class)
       if same_base_color?(other)
         @alpha <=> other.alpha
       else
@@ -79,12 +78,12 @@ EOS
       "rgb(#{red}, #{green}, #{blue})"
     end
 
-    def inspect
-      super.insert(-2, " #{self} alpha:#{@alpha}")
-    end
-
     private
 
+    def inspect_details
+      " #{self} alpha:#{@alpha}"
+    end
+
     def normalize_rgb(value)
       rgb = value.is_a?(Fixnum) ? value : (255 * value).round
       return 255 if rgb > 255
@@ -92,17 +91,12 @@ EOS
       rgb
     end
 
-    def raise_class_mismatch_error(other)
-      fail ArgumentError,
-           "can't compare #{self.class.name} with #{other.class.name}"
-    end
-
     def same_base_color?(other)
       @red == other.red && @green == other.green && @blue == other.blue
     end
 
     def less_or_greater_than(other)
-      own_sum   = @red + @green + @blue
+      own_sum = @red + @green + @blue
       other_sum = other.red + other.green + other.blue
       if own_sum > other_sum
         1
@@ -111,6 +105,7 @@ EOS
       end
     end
 
+
     class HexConverter
       def initialize(hex)
         @hex = validate(hex) || fail(ArgumentError, "Bad hex color: #{hex}")
@@ -145,16 +140,16 @@ EOS
         if args.length == 1
           arg = args.first
           case arg
-            when String
-              image_file?(arg) ? image_pattern(arg) : color(arg)
-            when Shoes::Color
-              color arg
-            when Range, Shoes::Gradient
-              gradient(arg)
-            when Shoes::ImagePattern
-              arg
-            else
-              fail ArgumentError, "Bad pattern: #{arg.inspect}"
+          when String
+            image_file?(arg) ? image_pattern(arg) : color(arg)
+          when Shoes::Color
+            color arg
+          when Range, Shoes::Gradient
+            gradient(arg)
+          when Shoes::ImagePattern
+            arg
+          else
+            fail ArgumentError, "Bad pattern: #{arg.inspect}"
           end
         else
           gradient(*args)
@@ -186,20 +181,20 @@ EOS
       #   @param [Range<String>] range min color to max color
       def gradient(*args)
         case args.length
-          when 1
-            arg = args[0]
-            case arg
-              when Gradient
-                min, max = arg.color1, arg.color2
-              when Range
-                min, max = arg.first, arg.last
-              else
-                fail ArgumentError, "Can't make gradient out of #{arg.inspect}"
-            end
-          when 2
-            min, max = args[0], args[1]
+        when 1
+          arg = args[0]
+          case arg
+          when Gradient
+            min, max = arg.color1, arg.color2
+          when Range
+            min, max = arg.first, arg.last
           else
-            fail ArgumentError, "Wrong number of arguments (#{args.length} for 1 or 2)"
+            fail ArgumentError, "Can't make gradient out of #{arg.inspect}"
+          end
+        when 2
+          min, max = args[0], args[1]
+        else
+          fail ArgumentError, "Wrong number of arguments (#{args.length} for 1 or 2)"
         end
         Shoes::Gradient.new(color(min), color(max))
       end

data/lib/shoes/common/background_element.rb

@@ -1,6 +1,10 @@
 class Shoes
   module Common
     module BackgroundElement
+      def create_dimensions(*_)
+        @dimensions = ParentDimensions.new @parent, @style
+      end
+
       def takes_up_space?
         false
       end

data/lib/shoes/common/fill.rb

@@ -0,0 +1,9 @@
+class Shoes
+  module Common
+    module Fill
+      def update_fill
+        gui.update_fill
+      end
+    end
+  end
+end

data/lib/shoes/common/initialization.rb

@@ -0,0 +1,59 @@
+class Shoes
+  module Common
+    module Initialization
+      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?
+
+        @parent.add_child self
+        @gui = Shoes.backend_for self
+
+        handle_block(blk)
+        update_visibility
+
+        after_initialize(*args)
+      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
+
+      # 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
+
+      # 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)
+        return unless blk
+        register_click blk
+      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
+    end
+  end
+end

data/lib/shoes/common/inspect.rb

@@ -2,12 +2,30 @@ class Shoes
   module Common
     module Inspect
       def to_s
-        "(#{self.class.name})"
+        "(#{self.class.name}#{to_s_details})"
       end
 
       # Object hex representation from https://github.com/michaeldv/awesome_print
+      # Example:
+      #   (Shoes::App:0x01234abc "Hello")
       def inspect
-        "(#{self.class.name}:#{'0x%08x' % (object_id * 2)})"
+        "(#{self.class.name}:#{hexy_object_id}#{inspect_details})"
+      end
+
+      private
+
+      # Additional details to include in the inspect representation.
+      def inspect_details
+        ''
+      end
+
+      # Additional details to include in the to_s representation.
+      def to_s_details
+        ''
+      end
+
+      def hexy_object_id
+        sprintf('0x%08x', object_id * 2)
       end
     end
   end

data/lib/shoes/common/rotate.rb

@@ -0,0 +1,10 @@
+class Shoes
+  module Common
+    module Rotate
+      # By default no one can rotate. Have to enable in particular classes.
+      def needs_rotate?
+        false
+      end
+    end
+  end
+end

data/lib/shoes/common/stroke.rb

@@ -0,0 +1,9 @@
+class Shoes
+  module Common
+    module Stroke
+      def update_stroke
+        gui.update_stroke
+      end
+    end
+  end
+end

data/lib/shoes/common/style.rb

@@ -8,7 +8,6 @@ class Shoes
   module Common
     module Style
       DEFAULT_STYLES = {
-        fill:        Shoes::COLORS[:black],
         rotate:      0,
         stroke:      Shoes::COLORS[:black],
         strokewidth: 1
@@ -29,17 +28,15 @@ class Shoes
       # Adds styles, or just returns current style if no argument
       def style(new_styles = nil)
         update_style(new_styles) if need_to_update_style?(new_styles)
-        update_dimensions if styles_with_dimensions?
         @style
       end
 
       def style_init(arg_styles, new_styles = {})
         default_element_styles = {}
-        default_element_styles = self.class::STYLES if defined? self.class::STYLES
-
+        default_element_styles = self.class::STYLES if defined?(self.class::STYLES)
         create_style_hash
-        merge_app_styles
         @style.merge!(default_element_styles)
+        merge_app_styles
         @style.merge!(@app.element_styles[self.class]) if @app.element_styles[self.class]
         @style.merge!(new_styles)
         @style.merge!(arg_styles)
@@ -109,7 +106,8 @@ class Shoes
         end
 
         private
-        def support_style group_style
+
+        def support_style(group_style)
           @supported_styles << group_style
         end
       end # end of StyleWith module
@@ -123,6 +121,8 @@ class Shoes
       def update_style(new_styles)
         normalized_style = StyleNormalizer.new.normalize(new_styles)
         set_dimensions(new_styles)
+        set_visibility(new_styles)
+        set_coloring(new_styles)
         click(&new_styles[:click]) if new_styles.key?(:click)
         @style.merge! normalized_style
       end
@@ -134,9 +134,23 @@ class Shoes
         end
       end
 
+      def set_visibility(new_styles)
+        return unless new_styles.include?(:hidden)
+        @style[:hidden] = new_styles[:hidden]
+        update_visibility
+      end
+
+      def set_coloring(new_styles)
+        update_fill   if new_styles.include?(:fill)
+        update_stroke if new_styles.include?(:stroke)
+      end
+
       def update_dimensions # so that @style hash matches actual values
         STYLE_GROUPS[:dimensions].each do |style|
-          @style[style] = send(style) if self.respond_to? style
+          if self.respond_to?(style)
+            value = send(style)
+            @style[style] = value if value
+          end
         end
       end
 

data/lib/shoes/common/style_normalizer.rb

@@ -5,9 +5,7 @@ class Shoes
       def normalize(orig_style)
         normalized_style = {}
         [:fill, :stroke].each do |s|
-          if orig_style[s]
-            normalized_style[s] = pattern(orig_style[s])
-          end
+          normalized_style[s] = pattern(orig_style[s]) if orig_style[s]
         end
         orig_style.merge(normalized_style)
       end

data/lib/shoes/common/ui_element.rb

@@ -1,11 +1,21 @@
 class Shoes
   module Common
     module UIElement
+      include Common::Initialization
       include Common::Inspect
       include Common::Visibility
       include Common::Positioning
       include Common::Remove
+      include Common::Rotate
       include DimensionsDelegations
+
+      # Expected to be overridden by pulling in Common::Fill or Common::Stroke
+      # if element needs to actually notify GUI classes of colors changes.
+      def update_fill
+      end
+
+      def update_stroke
+      end
     end
   end
 end

data/lib/shoes/common/visibility.rb

@@ -3,12 +3,12 @@ class Shoes
     module Visibility
       # Hides the element, so that it can't be seen. See also #show and #toggle.
       def hide
-        @hidden = true
+        style[:hidden] = true
         update_visibility
       end
 
       def hidden?
-        @hidden
+        style[:hidden]
       end
 
       alias_method :hidden, :hidden?
@@ -19,14 +19,14 @@ class Shoes
 
       # Reveals the element, if it is hidden. See also #hide and #toggle.
       def show
-        @hidden = false
+        style[:hidden] = false
         update_visibility
       end
 
       # Hides an element if it is shown. Or shows the element, if it is hidden.
       # See also #hide and #show.
       def toggle
-        @hidden = !@hidden
+        style[:hidden] = !style[:hidden]
         update_visibility
       end
 

data/lib/shoes/configuration.rb

@@ -43,8 +43,10 @@ class Shoes
       #   Shoes.configuration.backend_class(shoes_button) # => Shoes::Swt::Button
       def backend_class(shoes_object)
         class_name = shoes_object.class.name.split("::").last
-        fail ArgumentError, "#{shoes_object} does not have a backend class defined for #{backend}" unless backend.const_defined?(class_name)
-        backend.const_get(class_name)
+        # Lookup with false to not consult modules higher in the chain Object
+        # because Shoes::Swt.const_defined? 'Range' => true
+        fail ArgumentError, "#{shoes_object} does not have a backend class defined for #{backend}" unless backend.const_defined?(class_name, false)
+        backend.const_get(class_name, false)
       end
 
       # Creates an appropriate backend object, passing along additional arguments