shoes-core 4.0.0.pre5 → 4.0.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1ef269a6d0c75e333dd8592da3a015c91b94aed
-  data.tar.gz: 5f827551fdacff4074c2bb9050104c83e10ca5e8
+  metadata.gz: 3a1616fc9ee94998821bae34f5e523b6bb435e8c
+  data.tar.gz: 80be512d070e25a15b46fc9744dd005922bfc1fe
 SHA512:
-  metadata.gz: 742d48be0d8c9b7f6d17e8c9d96dc93ed5db1c8076d3430ac1e91d9126d948b996f54ed422a7a2a81e8e646cf1d374484cb457dcd554a370691eee700786e2ff
-  data.tar.gz: 7388924d45215cb1ae721ef6feed84562c4dd3050c4a35a587f80442258b4579b5006b0e70c445f1a03761ce421a22c66ae770749cc14e7b02780d63226a6925
+  metadata.gz: 40702d6e8e3ec2dbb2e7e34c98bdcfd37a741010f34d5a5b0c939c0da3c9ec251b7fe38971094cdbc5288cbde912e30fb04273030b752e0c1ceb149f1ee3dff7
+  data.tar.gz: 0dbc92f9dd5a7bd178d998a12456cdca348f8a7b28df320ee6adec3d9fb1d803d157b93302a6c528bbec4a4b14f80c0e4a010300ea2d7e86a6972f3beb1c2092

data/bin/shoes

@@ -0,0 +1 @@
+bin/shoes-stub

data/ext/install/Rakefile

@@ -20,11 +20,11 @@ task default: ['install_script']
 task :install_script do
   # If we're run via jruby-complete.jar, bindir is within the jar itself so
   # look for bin based on user directory. Otherwise, prefer Gem.bindir.
-  if Gem.bindir.start_with?("uri:classloader")
-    dest_dir = Gem.bindir(Gem.user_dir)
-  else
-    dest_dir = Gem.bindir
-  end
+  dest_dir = if Gem.bindir.start_with?("uri:classloader")
+               Gem.bindir(Gem.user_dir)
+             else
+               Gem.bindir
+             end
 
   if Gem.win_platform?
     source_path = File.join(Dir.pwd, "shoes.bat")

data/lib/shoes/app.rb

@@ -57,7 +57,7 @@ class Shoes
     end
 
     def window(options = {}, &block)
-      options.merge! owner: self
+      options[:owner] = self
       self.class.new(options, &block)
     end
 

data/lib/shoes/button.rb

@@ -14,5 +14,10 @@ class Shoes
     def focus
       @gui.focus
     end
+
+    def text=(value)
+      style(text: value.to_s)
+      @gui.text = value.to_s
+    end
   end
 end

data/lib/shoes/color/hex_converter.rb

@@ -3,13 +3,13 @@ class Shoes
     class HexConverter
       def initialize(hex)
         @hex = validate(hex) || fail(ArgumentError, "Bad hex color: #{hex}")
-        @red, @green, @blue = hex_to_rgb(pad_if_necessary @hex)
+        @red, @green, @blue = hex_to_rgb(pad_if_necessary(@hex))
       end
 
       def to_rgb
         [@red, @green, @blue]
       end
-      
+
       private
 
       def hex_to_rgb(hex)

data/lib/shoes/common/initialization.rb

@@ -25,7 +25,6 @@ class Shoes
         after_initialize(*args)
       end
 
-
       # This method will get called with the incoming styles hash and the
       # other arguments passed to initialize.
       #

data/lib/shoes/common/state.rb

@@ -18,6 +18,7 @@ class Shoes
       end
 
       private
+
       def enabled?
         !(state.to_s == DISABLED_STATE)
       end

data/lib/shoes/core.rb

@@ -1 +1,2 @@
+require 'logger'
 require 'shoes/dsl'

data/lib/shoes/core/version.rb

@@ -1,5 +1,5 @@
 class Shoes
   module Core
-    VERSION = "4.0.0.pre5"
+    VERSION = "4.0.0.pre6"
   end
 end

data/lib/shoes/dimension.rb

@@ -202,7 +202,7 @@ class Shoes
     end
 
     def int_from_string(result)
-      (result.gsub(' ', '')).to_i
+      result.delete(' ').to_i
     end
 
     NUMBER_REGEX = /^-?\s*\d+/

data/lib/shoes/dimensions.rb

@@ -88,7 +88,7 @@ class Shoes
     def margin=(margin)
       margin = [margin, margin, margin, margin] unless margin.is_a? Array
       self.margin_left, self.margin_top,
-      self.margin_right, self.margin_bottom =  margin
+      self.margin_right, self.margin_bottom = margin
     end
 
     def needs_positioning?

data/lib/shoes/dsl.rb

@@ -582,8 +582,8 @@ EOS
       Shoes::Keyrelease.new @__app__, &blk
     end
 
-    def append(&blk)
-      blk.call if blk
+    def append
+      yield if block_given?
     end
 
     def visit(url)

data/lib/shoes/input_box.rb

@@ -5,7 +5,6 @@ class Shoes
     include Common::Changeable
     include Common::State
 
-
     def before_initialize(styles, text)
       styles[:text] = text.to_s
     end

data/lib/shoes/internal_app.rb

@@ -13,10 +13,13 @@ class Shoes
 
     extend Forwardable
 
-    DEFAULT_OPTIONS = { width: 600,
-                        height: 500,
-                        title: "Shoes 4",
-                        resizable: true }.freeze
+    DEFAULT_OPTIONS = {
+                        width:     600,
+                        height:    500,
+                        title:     "Shoes 4",
+                        resizable: true,
+                        border:    true
+                      }.freeze
 
     def initialize(app, opts, &blk)
       @app = app
@@ -161,17 +164,15 @@ class Shoes
     end
 
     def create_execution_block(blk)
-      if blk
-        execution_blk = proc do
-          execute_block blk
-        end
-      elsif Shoes::URL.urls.keys.any? { |page| page.match '/' }
-        execution_blk = proc do
-          app.visit '/'
-        end
-      else
-        execution_blk = nil
-      end
+      execution_blk = if blk
+                        proc do
+                          execute_block blk
+                        end
+                      elsif Shoes::URL.urls.keys.any? { |page| page.match '/' }
+                        proc do
+                          app.visit '/'
+                        end
+                      end
       execution_blk
     end
 

data/lib/shoes/link.rb

@@ -26,12 +26,12 @@ class Shoes
     # Doesn't use Common::Clickable because of URL flavor option clicks
     def setup_click(blk)
       if blk.nil?
-        if @style[:click].respond_to? :call
-          blk = @style[:click]
-        else
-          # Slightly awkward, but we need App, not InternalApp, to call visit
-          blk = proc { app.app.visit @style[:click] }
-        end
+        blk = if @style[:click].respond_to? :call
+                @style[:click]
+              else
+                # Slightly awkward, but we need App, not InternalApp, to call visit
+                proc { app.app.visit @style[:click] }
+              end
       end
 
       click(&blk)

data/lib/shoes/logger/ruby.rb

@@ -2,7 +2,6 @@ class Shoes
   module Logger
     class Ruby < SimpleDelegator
       def initialize(device = STDERR)
-        require 'logger'
         logger = ::Logger.new(device)
         logger.formatter = proc do |severity, _datetime, _progname, message|
           "%s: %s\n" % [severity, message]

data/lib/shoes/slot.rb

@@ -166,8 +166,8 @@ class Shoes
 
     def position_contents
       @current_position = CurrentPosition.new element_left,
-                                             element_top,
-                                             element_top
+                                              element_top,
+                                              element_top
 
       contents.each do |element|
         next if element.hidden?
@@ -285,10 +285,10 @@ class Shoes
 
     def compute_content_height
       max_bottom = contents.
-                    select(&:takes_up_space?).
-                    reject(&:hidden?).
-                    map(&:absolute_bottom).
-                    max
+                   select(&:takes_up_space?).
+                   reject(&:hidden?).
+                   map(&:absolute_bottom).
+                   max
 
       if max_bottom
         max_bottom - self.element_top + NEXT_ELEMENT_OFFSET

data/lib/shoes/slot_contents.rb

@@ -21,10 +21,10 @@ class Shoes
       end
     end
 
-    def prepend(&blk)
+    def prepend
       @prepending_index = 0
       @prepending = true
-      blk.call
+      yield if block_given?
       @prepending = false
     end
 

data/lib/shoes/text_block.rb

@@ -33,6 +33,10 @@ class Shoes
       @gui.in_bounds?(*args)
     end
 
+    def takes_up_space?
+      @style[:align] != "right"
+    end
+
     def remove
       super
       links.each do |link|
@@ -101,11 +105,11 @@ class Shoes
 
           # If our endpoint is before our start, it's an empty string. We treat
           # those specially with the (0...0) range that has an empty count.
-          if end_point < start_point
-            range = (0...0)
-          else
-            range = start_point..end_point
-          end
+          range = if end_point < start_point
+                    (0...0)
+                  else
+                    start_point..end_point
+                  end
 
           styles[range]    ||= []
           styles[range] << text
@@ -125,7 +129,7 @@ class Shoes
       style_regex = /none|bold|normal|oblique|italic/i # TODO: add more
 
       font_family = type.gsub(style_regex, '').gsub(size_regex, '')
-                    .split(',').map { |x| x.strip.gsub(/["]/, '') }
+                        .split(',').map { |x| x.strip.gsub(/["]/, '') }
 
       @style[:font] = font_family.first unless (font_family.size == 1 &&
         font_family[0] == "") || font_family.size == 0

data/lib/shoes/text_block_dimensions.rb

@@ -35,13 +35,13 @@ class Shoes
     # If we've gotten an explicit width, use that but check that we fit still
     # Last but certainly not least, consult what's remaining in our parent.
     def desired_width(containing = nil)
-      if containing
-        desired = parent.absolute_left + containing - absolute_left
-      elsif element_width
-        desired = [element_width, remaining_in_parent].min
-      else
-        desired = remaining_in_parent
-      end
+      desired = if containing
+                  parent.absolute_left + containing - absolute_left
+                elsif element_width
+                  [element_width, remaining_in_parent].min
+                else
+                  remaining_in_parent
+                end
 
       desired - margin_left - margin_right
     end

data/lib/shoes/ui/picker.rb

@@ -74,8 +74,8 @@ class Shoes
       end
 
       def name_for_candidate(candidate)
-        /.*lib\/shoes\/(.*)\/generate-backend.rb/.match(candidate)
-        return "shoes-#{$1.gsub('/', '-')}"
+        /.*lib\/shoes\/(.*)\/generate-backend.rb/ =~ candidate
+        return "shoes-#{$1.tr('/', '-')}"
       end
 
       def write_backend(generator_file, bin_dir)

data/lib/shoes/version.rb

@@ -1,3 +1,3 @@
 class Shoes
-  VERSION = "4.0.0.pre5"
+  VERSION = "4.0.0.pre6"
 end

data/spec/shoes/button_spec.rb

@@ -23,6 +23,7 @@ describe Shoes::Button do
 
   it { is_expected.to respond_to :click }
   it { is_expected.to respond_to :focus }
+  it { is_expected.to respond_to :text= }
 
   describe "initialize" do
     its(:parent) { should eq(parent) }
@@ -32,6 +33,14 @@ describe Shoes::Button do
     its(:state) { should eq("disabled") }
   end
 
+  describe ".text=" do
+    it "changes the text" do
+      expect(subject.gui).to receive(:text=).with("something else")
+      subject.text = "something else"
+      expect(subject.text).to eq "something else"
+    end
+  end
+
   describe "relative dimensions" do
     subject { Shoes::Button.new(app, parent, "text", relative_opts, input_block) }
     it_behaves_like "object with relative dimensions"

data/spec/shoes/color_spec.rb

@@ -211,23 +211,23 @@ describe Shoes::Color do
     end
 
     describe "comparable" do
-      let(:color_1) { Shoes::Color.new(255, 69, 0) }
+      let(:color1) { Shoes::Color.new(255, 69, 0) }
       let(:red) {Shoes::Color.new 255, 0, 0}
       let(:green) {Shoes::Color.new 0, 255, 0}
 
       it "is equal when values are equal" do
-        color_2 = Shoes::Color.new(255, 69, 0)
-        expect(color_1).to eq(color_2)
+        color2 = Shoes::Color.new(255, 69, 0)
+        expect(color1).to eq(color2)
       end
 
       it "is less than when darker" do
-        color_2 = Shoes::Color.new(255, 70, 0)
-        expect(color_1).to be < color_2
+        color2 = Shoes::Color.new(255, 70, 0)
+        expect(color1).to be < color2
       end
 
       it "is greater than when lighter" do
-        color_2 = Shoes::Color.new(255, 68, 0)
-        expect(color_1).to be > color_2
+        color2 = Shoes::Color.new(255, 68, 0)
+        expect(color1).to be > color2
       end
 
       it 'does not claim for full red and full green to be equal' do
@@ -250,13 +250,13 @@ describe Shoes::Color do
       end
 
       context "same rgb values" do
-        let(:color_2) { Shoes::Color.new(255, 69, 0, 254) }
+        let(:color2) { Shoes::Color.new(255, 69, 0, 254) }
         it "is less than when less opaque" do
-          expect(color_2).to be < color_1
+          expect(color2).to be < color1
         end
 
         it "is greater than when more opaque" do
-          expect(color_1).to be > color_2
+          expect(color1).to be > color2
         end
       end
     end
@@ -309,8 +309,8 @@ describe "Shoes built in gray" do
   end
 
   it 'hangles 0.93 right as well' do
-    result_93 = (0.93 * 255).to_i
-    expect(app.gray(0.93)).to eq(Shoes::Color.new(result_93, result_93, result_93))
+    result93 = (0.93 * 255).to_i
+    expect(app.gray(0.93)).to eq(Shoes::Color.new(result93, result93, result93))
   end
 
   it 'also has a grey alias for our BE friends' do

data/spec/shoes/dimension_spec.rb

@@ -288,7 +288,7 @@ describe Shoes::Dimension do
   describe '#in_bounds?' do
     let(:absolute_start) {20}
     let(:extent) {100}
-    let(:absolute_end) {20 + 100 -ONE_PIXEL} # -1 due to pixel counting adjustment
+    let(:absolute_end) {20 + 100 - ONE_PIXEL} # -1 due to pixel counting adjustment
 
     before :each do
       subject.absolute_start = absolute_start

data/spec/shoes/gradient_spec.rb

@@ -9,23 +9,23 @@ describe Shoes::Gradient do
     let(:new_color) { Shoes::COLORS[:limegreen] }
 
     it "is equal when values are equal" do
-      gradient_2 = Shoes::Gradient.new(color1, color2)
-      expect(subject).to eq(gradient_2)
+      gradient2 = Shoes::Gradient.new(color1, color2)
+      expect(subject).to eq(gradient2)
     end
 
     it "is not equal when color 1 is different" do
-      gradient_2 = Shoes::Gradient.new(new_color, color2)
-      expect(subject).not_to eq(gradient_2)
+      gradient2 = Shoes::Gradient.new(new_color, color2)
+      expect(subject).not_to eq(gradient2)
     end
 
     it "is not equal when color 2 is different" do
-      gradient_2 = Shoes::Gradient.new(new_color, color2)
-      expect(subject).not_to eq(gradient_2)
+      gradient2 = Shoes::Gradient.new(new_color, color2)
+      expect(subject).not_to eq(gradient2)
     end
 
     it "is not equal to just a color" do
-      gradient_2 = Shoes::Gradient.new(color1, new_color)
-      expect(subject).not_to eq(gradient_2)
+      gradient2 = Shoes::Gradient.new(color1, new_color)
+      expect(subject).not_to eq(gradient2)
     end
   end
 end

data/spec/shoes/text_block_spec.rb

@@ -47,6 +47,22 @@ describe Shoes::TextBlock do
     end
   end
 
+  describe "#takes_up_space?" do
+    it "does with default alignment" do
+      expect(text_block.takes_up_space?).to eq(true)
+    end
+
+    it "does when left aligned" do
+      text_block.align = "left"
+      expect(text_block.takes_up_space?).to eq(true)
+    end
+
+    it "doesn't when right aligned" do
+      text_block.align = "right"
+      expect(text_block.takes_up_space?).to eq(false)
+    end
+  end
+
   describe "#to_s" do
     it "is the same as #text" do
       text = text_block.text

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoes-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre5
+  version: 4.0.0.pre6
 platform: ruby
 authors:
 - Team Shoes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies: []
 description: Shoes is the best little GUI toolkit for Ruby. Shoes makes building for Mac, Windows, and Linux super simple. This is the DSL for writing your app. You'll need a backend to run it.
 email:
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.6
 signing_key:
 specification_version: 4
 summary: The best little DSL for the best little GUI toolkit for Ruby.
@@ -376,4 +376,3 @@ test_files:
 - spec/shoes/widget_spec.rb
 - spec/shoes_spec.rb
 - spec/spec_helper.rb
-has_rdoc:

data/bin/shoes

@@ -1,62 +0,0 @@
-#!/usr/bin/env sh
-
-# This script is symlinked to be present as both bin/shoes and bin/shoes-stub
-# See ext/install/Rakefile for the full explanation of why we do that.
-
-# Don't try to cd on an empty $NEXT_DIR (link in same directory)
-mac_move_to_link_dir () {
-  # Skip if already in link directory
-  NEXT_DIR=$(dirname $1)
-  if [[ -n "$NEXT_DIR" ]]; then
-    cd $NEXT_DIR
-  fi
-}
-
-mac_readlink_f () {
-  # based on http://stackoverflow.com/questions/1055671/how-can-i-get-the-behavior-of-gnus-readlink-f-on-a-mac
-
-  # A relative or absolute path to a file, potentially a symlink
-  LINK=$1
-
-  if [ ! -L "$LINK" ] ; then
-    # Not a link, all good
-    echo $LINK
-    return
-  fi
-
-  # http://bosker.wordpress.com/2012/02/12/bash-scripters-beware-of-the-cdpath/
-  unset CDPATH
-
-  # Look up links until we find something that is not a symlink
-  while [ -L "$LINK" ] ; do
-    mac_move_to_link_dir $LINK
-    RELATIVE_LINK=$(basename $LINK)
-    LINK=$(readlink $RELATIVE_LINK)
-  done
-
-  # Now PATH is an unqualified file name, but we're in its directory, so turn
-  # it into an absolute path by prefixing with the current working directory.
-
-  PHYS_DIR=`pwd -P`
-  RESULT=$PHYS_DIR/$LINK
-  echo $RESULT
-}
-
-case "${MACHTYPE:-}${OSTYPE:-}" in
-  (*darwin*)
-    SCRIPT=$(mac_readlink_f $0);;
-  (*)
-    # see http://stackoverflow.com/a/1638397/1810896
-    SCRIPT=$(readlink -f "$0");;
-esac
-
-SCRIPTPATH=$(dirname "$SCRIPT")
-
-BACKEND_FILE="$SCRIPTPATH/shoes-backend"
-if [ ! -e "$BACKEND_FILE" ]
-then
-  $SCRIPTPATH/shoes-picker $SCRIPTPATH
-fi
-
-BACKEND_COMMAND=$(cat $BACKEND_FILE)
-SHOES_BIN_DIR=$SCRIPTPATH $BACKEND_COMMAND $@