shoes-swt 4.0.0.pre2 → 4.0.0.pre3

data/lib/shoes/swt/swt_button.rb

@@ -20,7 +20,7 @@ class Shoes
         set_size
       end
 
-      def eval_block blk
+      def eval_block(blk)
         blk.call @dsl
       end
 
@@ -28,7 +28,7 @@ class Shoes
         @real.set_focus
       end
 
-      def click blk
+      def click(blk)
         remove_listeners
         @real.addSelectionListener { eval_block blk }
       end
@@ -45,6 +45,7 @@ class Shoes
       end
 
       private
+
       def set_size
         @real.pack
         @dsl.element_width ||= @real.size.x

data/lib/shoes/swt/text_block.rb

@@ -65,10 +65,10 @@ class Shoes
         last_segment = segments.last
 
         @dsl.absolute_right  = starting_left + last_segment.last_line_width +
-                               margin_right
+          margin_right
 
         @dsl.absolute_bottom = starting_top + last_segment.height +
-                               margin_top + margin_bottom
+          margin_top + margin_bottom
       end
 
       def bump_absolutes_to_next_line
@@ -79,7 +79,7 @@ class Shoes
       def set_calculated_sizes
         @dsl.calculated_width  = segments.last.width
         @dsl.calculated_height = segments.inject(0) do |total, segment|
-          total += segment.bounds.height
+          total + segment.bounds.height
         end
       end
 

data/lib/shoes/swt/text_block/cursor_painter.rb

@@ -22,7 +22,6 @@ class Shoes
 
           move_if_necessary(segment.element_left + position.x,
                             segment.element_top + position.y)
-
         end
 
         # It's important to only move when necessary to avoid constant redraws
@@ -33,7 +32,8 @@ class Shoes
         end
 
         def move_textcursor(x, y)
-          textcursor.move(x, y)
+          height = textcursor.height
+          textcursor.move(x, y, x, y + height)
           textcursor.show
         end
 

data/lib/shoes/swt/text_block/fitter.rb

@@ -84,7 +84,6 @@ class Shoes
 
           # Since we regenerate layouts, we must dispose of first try here.
           layout.dispose
-          layout = nil
 
           first_layout = generate_layout(width, first_text)
 
@@ -185,6 +184,9 @@ class Shoes
           segment
         end
 
+        # Splits the text into two pieces based on height. Allows one final
+        # line to exceed the requested height, which results in smoother
+        # flowing text between different sized fonts on a line.
         def split_text(layout, height)
           ending_offset = 0
           height_so_far = 0
@@ -192,9 +194,9 @@ class Shoes
           offsets = layout.line_offsets
           offsets[0...-1].each_with_index do |_, i|
             height_so_far += layout.line_bounds(i).height
-            break if height_so_far > height
+            ending_offset = offsets[i + 1]
 
-            ending_offset = offsets[i+1]
+            break if height_so_far > height
           end
           [layout.text[0...ending_offset], layout.text[ending_offset..-1]]
         end

data/lib/shoes/swt/text_block/painter.rb

@@ -30,15 +30,15 @@ class Shoes
 
         def default_text_styles
           {
-            :fg          => @style[:fg],
-            :bg          => @style[:bg],
-            :strikecolor => @style[:strikecolor],
-            :undercolor  => @style[:undercolor],
-            :font_detail => {
-            :name   => @dsl.font,
-            :size   => @dsl.size,
-            :styles => [::Swt::SWT::NORMAL]
-          }
+            fg: @style[:fg],
+            bg: @style[:bg],
+            strikecolor: @style[:strikecolor],
+            undercolor: @style[:undercolor],
+            font_detail: {
+              name: @dsl.font,
+              size: @dsl.size,
+              styles: [::Swt::SWT::NORMAL]
+            }
           }
         end
       end

data/lib/shoes/swt/text_block/text_font_factory.rb

@@ -29,9 +29,9 @@ class Shoes
         @fonts.find do |font|
           font.font_data.any? do |font_data|
             font_data.name == name &&
-            # Windows seems to create fonts of height 15.75 when requesting 16
-            font_data.height.round == size.round &&
-            font_data.style == styles
+              # Windows seems to create fonts of height 15.75 when requesting 16
+              font_data.height.round == size.round &&
+              font_data.style == styles
           end
         end
       end

data/lib/shoes/swt/text_block/text_segment.rb

@@ -18,7 +18,7 @@ class Shoes
 
         extend Forwardable
         def_delegators :@layout, :text, :text=, :bounds, :width, :spacing,
-                                 :line_bounds, :line_count, :line_offsets
+                       :line_bounds, :line_count, :line_offsets
 
         def initialize(dsl, text, width)
           @dsl = dsl
@@ -43,7 +43,7 @@ class Shoes
           self
         end
 
-        def get_location(cursor, trailing=false)
+        def get_location(cursor, trailing = false)
           @layout.get_location(cursor, trailing)
         end
 
@@ -51,15 +51,15 @@ class Shoes
           layout.justify = style[:justify]
           layout.spacing = (style[:leading] || DEFAULT_SPACING)
           layout.alignment = case style[:align]
-                             when 'center'; ::Swt::SWT::CENTER
-                             when 'right';  ::Swt::SWT::RIGHT
+                             when 'center' then ::Swt::SWT::CENTER
+                             when 'right' then  ::Swt::SWT::RIGHT
                              else           ::Swt::SWT::LEFT
                              end
 
           set_style(TextStyleFactory.apply_styles(default_text_styles, style))
         end
 
-        def set_style(styles, range=(0...text.length))
+        def set_style(styles, range = (0...text.length))
           # If we've been given an empty/nonsense range, just ignore it
           return unless range.count > 0
 
@@ -71,10 +71,10 @@ class Shoes
         def font_styling
           {
             font_detail: {
-            name: @dsl.font,
-            size: @dsl.size,
-            styles:[::Swt::SWT::NORMAL]
-          }
+              name: @dsl.font,
+              size: @dsl.size,
+              styles: [::Swt::SWT::NORMAL]
+            }
           }
         end
 

data/lib/shoes/swt/text_block/text_segment_collection.rb

@@ -83,6 +83,8 @@ class Shoes
         # segments apply, and what the relative ranges within each segment to use.
         def segment_ranges(text_range)
           return [] unless @segments.first # TODO WTF #636
+          return [] unless text_range.any?
+
           first_text = @segments.first.text
           slice = first_text[text_range]
 

data/lib/shoes/swt/text_block/text_style_factory.rb

@@ -47,12 +47,13 @@ class Shoes
       end
 
       private
+
       def set_rise(style)
         @gui_style.rise = style[:rise]
       end
 
       def set_underline(style)
-        @gui_style.underline = style[:underline].nil? || style[:underline] == "none" ? false : true
+        @gui_style.underline = style_present? style[:underline]
         @gui_style.underlineStyle = UNDERLINE_STYLES[style[:underline]]
       end
 
@@ -61,7 +62,7 @@ class Shoes
       end
 
       def set_strikethrough(style)
-        @gui_style.strikeout = style[:strikethrough].nil? || style[:strikethrough] == "none" ? false : true
+        @gui_style.strikeout = style_present? style[:strikethrough]
       end
 
       def set_strikecolor(style)
@@ -74,7 +75,7 @@ class Shoes
       end
 
       def color_from_dsl(dsl_color, default = nil)
-        return nil if dsl_color.nil? and default.nil?
+        return nil if dsl_color.nil? && default.nil?
         return color_from_dsl default if dsl_color.nil?
         color = ::Swt::Color.new(Shoes.display, dsl_color.red, dsl_color.green, dsl_color.blue)
 
@@ -83,6 +84,11 @@ class Shoes
 
         color
       end
+
+      private
+      def style_present?(style)
+        !style.nil? && !(style == 'none')
+      end
     end
   end
 end

data/lib/shoes/swt/timer.rb

@@ -3,7 +3,7 @@ class Shoes
     class Timer
       def initialize(dsl, app, blk)
         @blk = blk
-        task = Proc.new do
+        task = proc do
           unless app.real.disposed?
             eval_block
           end

data/lib/shoes/swt/version.rb

@@ -1,5 +1,5 @@
 class Shoes
   module Swt
-    VERSION = "4.0.0.pre2"
+    VERSION = "4.0.0.pre3"
   end
 end

data/shoes-swt.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-require_relative 'lib/shoes/swt/version'
-require_relative 'manifests/shoes-swt'
+require File.expand_path('lib/shoes/swt/version')
 
 Gem::Specification.new do |s|
   s.name        = "shoes-swt"
@@ -13,12 +12,14 @@ Gem::Specification.new do |s|
   s.description = %q{A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby. Shoes makes building for Mac, Windows, and Linux super simple.}
   s.license     = 'MIT'
 
-  s.files         = ShoesSwtManifest.files
-  s.test_files    = ShoesSwtManifest.test_files
+  s.files         = `git ls-files`.split($/)
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
   s.add_dependency "swt", "~>4.4"
   s.add_dependency "after_do", "~>0.3"
-  s.add_dependency "shoes-dsl", Shoes::Swt::VERSION
-  s.add_dependency "furoshiki", "~>0.2.0" # For packaging
+  s.add_dependency "shoes-core", Shoes::Swt::VERSION
+  s.add_dependency "shoes-package", Shoes::Swt::VERSION
+
+  s.executables   = ['shoes-swt']
 end

data/spec/shoes/cli_spec.rb

@@ -4,12 +4,12 @@ describe Shoes::CLI do
   subject {Shoes::CLI.new}
 
   before :each do
-    allow(subject).to receive :package
+    allow(subject.packager).to receive :run
   end
 
   it 'does not raise an error for a normal packaging command #624' do
     expect do
-      subject.run ['-p', 'swt:app', 'test/simple-sound.rb']
+      subject.run ['-p', 'swt:app', 'samples/simple-sound.rb']
     end.not_to raise_error
   end
 end

data/spec/{swt_shoes → shoes/swt}/animation_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Animation do
   include_context 'swt app'

data/spec/{swt_shoes → shoes/swt}/app_spec.rb

@@ -1,4 +1,4 @@
-require "swt_shoes/spec_helper"
+require "shoes/swt/spec_helper"
 
 describe Shoes::Swt::App do
   let(:opts) { {:background => Shoes::COLORS[:salmon], :resizable => true} }
@@ -24,10 +24,11 @@ describe Shoes::Swt::App do
   it_behaves_like "clickable backend" do
     let(:swt_app) { subject }
     let(:click_block_parameters) { click_block_coordinates }
+    let(:click_listener) { double("listener", add_click_listener: nil, add_release_listener: nil) }
 
     before do
       allow(dsl).to receive(:pass_coordinates?) { true }
-      allow(subject).to receive(:add_listener)
+      allow(subject).to receive(:click_listener) { click_listener }
     end
   end
 
@@ -70,7 +71,7 @@ describe Shoes::Swt::App do
 
   context "when attempting to copy text" do
     it "copies text to clipboard" do
-      skip 'Seems to be broken with tmux please see/fix #398'
+      # In case of failure when running tmux, please see #398
       text = "test"
       subject.clipboard = text
       expect(subject.clipboard).to eq(text)
@@ -81,4 +82,36 @@ describe Shoes::Swt::App do
   # which at the time is overkill imo
   it {is_expected.to respond_to :started?}
 
+  describe 'App dimensions' do
+    let(:client_area) {double 'client_area', width: width, height: height}
+    let(:vertical_bar) {double 'scroll bar', visible?: bar_visible}
+    let(:shell) {double('shell', client_area: client_area,
+                                 vertical_bar: vertical_bar)}
+    let(:width) {50}
+    let(:height) {80}
+    let(:bar_visible) {false}
+
+    before :each do
+      allow(subject).to receive(:shell).and_return(shell)
+    end
+
+    shared_examples_for 'reports client area dimensions' do
+      it 'always returns the client area width' do
+        expect(subject.width).to eq width
+      end
+
+      it 'returns the client area height' do
+        expect(subject.height).to eq height
+      end
+    end
+
+    it_behaves_like 'reports client area dimensions'
+
+    context 'with a scroll bar' do
+      let(:bar_visible) {true}
+
+      it_behaves_like 'reports client area dimensions'
+    end
+  end
+
 end

data/spec/{swt_shoes → shoes/swt}/arc_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Arc do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/background_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Background do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/border_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Border do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/button_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Button do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/check_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Check do
   include_context "swt app"

data/spec/shoes/swt/click_listener_spec.rb

@@ -0,0 +1,162 @@
+require 'shoes/swt/spec_helper'
+
+describe Shoes::Swt::ClickListener do
+  include_context 'swt app'
+
+  let(:dsl) { double('dsl', hidden?: false, pass_coordinates?: false) }
+
+  let(:click_block)   { double("click block", call: nil) }
+  let(:release_block) { double("release block", call: nil) }
+
+  subject   { Shoes::Swt::ClickListener.new(swt_app) }
+
+  before do
+    allow(swt_app).to receive(:add_listener)
+  end
+
+  describe "SWT event wireup" do
+    it "registers mouse down and mouse up" do
+      subject
+      expect(swt_app).to have_received(:add_listener).with(::Swt::SWT::MouseDown, subject)
+      expect(swt_app).to have_received(:add_listener).with(::Swt::SWT::MouseUp, subject)
+    end
+  end
+
+  describe "adding listeners" do
+    it "adds a click listener" do
+      subject.add_click_listener(dsl, click_block)
+      expect(subject.clickable_elements).to eq([dsl])
+    end
+
+    it "adds a release listener" do
+      subject.add_release_listener(dsl, release_block)
+      expect(subject.clickable_elements).to eq([dsl])
+    end
+
+    it "only reports each element once" do
+      subject.add_click_listener(dsl, click_block)
+      subject.add_release_listener(dsl, release_block)
+      expect(subject.clickable_elements).to eq([dsl])
+    end
+  end
+
+  describe "removing" do
+    it "removes safely when not added" do
+      subject.remove_listeners_for(dsl)
+      expect(subject.clickable_elements).to be_empty
+    end
+
+    it "removes element" do
+      subject.add_click_listener(dsl, click_block)
+      subject.add_release_listener(dsl, release_block)
+
+      subject.remove_listeners_for(dsl)
+
+      expect(subject.clickable_elements).to be_empty
+    end
+  end
+
+  describe "event handling" do
+    before do
+      subject.add_click_listener(dsl, click_block)
+      subject.add_release_listener(dsl, release_block)
+
+      allow(dsl).to receive(:in_bounds?) { false }
+      allow(dsl).to receive(:in_bounds?).with(10, 10) { true }
+    end
+
+    shared_examples_for "mouse event" do
+      it "triggers" do
+        event = double(type: event_type, x: 10, y: 10)
+        subject.handle_event(event)
+
+        expect(block).to have_received(:call)
+      end
+
+      it "doesn't trigger other block" do
+        event = double(type: event_type, x: 10, y: 10)
+        subject.handle_event(event)
+
+        expect(other_block).to_not have_received(:call)
+      end
+
+      it "doesn't trigger click out of bounds" do
+        event = double(type: event_type, x: 20, y: 10)
+        subject.handle_event(event)
+
+        expect(block).to_not have_received(:call)
+      end
+
+      it "re-registering an element's click overwrites old one" do
+        another_block = double("another block", call: nil)
+        subject.send(add_method, dsl, another_block)
+
+        event = double(type: event_type, x: 10, y: 10)
+        subject.handle_event(event)
+
+        expect(block).to_not     have_received(:call)
+        expect(another_block).to have_received(:call)
+      end
+
+      it "takes the last element to respond" do
+        other_dsl = double("other dsl", in_bounds?: true,
+                           hidden?: false, pass_coordinates?: false)
+        other_block = double("other block", call: nil)
+
+        subject.send(add_method, other_dsl, other_block)
+
+        event = double(type: event_type, x: 10, y: 10)
+        subject.handle_event(event)
+
+        expect(block).to_not   have_received(:call)
+        expect(other_block).to have_received(:call)
+      end
+
+      it "won't call on hidden elements" do
+        allow(dsl).to receive(:hidden?) { true }
+
+        event = double(type: event_type, x: 10, y: 10)
+        subject.handle_event(event)
+
+        expect(block).to_not have_received(:call)
+      end
+
+      it "passes dsl along by default to event" do
+        event = double(type: event_type, x: 10, y: 10)
+        subject.handle_event(event)
+
+        expect(block).to have_received(:call).with(dsl)
+      end
+
+      it "can pass coordinates if requested" do
+        allow(dsl).to receive(:pass_coordinates?) { true }
+
+        event = double(type: event_type, x: 10, y: 10, button: 1)
+        subject.handle_event(event)
+
+        expect(block).to have_received(:call).with(1, 10, 10)
+      end
+
+      it "ignores incorrect event types" do
+        event = double(type: ::Swt::SWT::KeyDown, x: 10, y: 10)
+        subject.handle_event(event)
+
+        expect(block).to_not have_received(:call)
+      end
+    end
+
+    it_behaves_like "mouse event" do
+      let(:event_type)  { ::Swt::SWT::MouseDown }
+      let(:block)       { click_block }
+      let(:other_block) { release_block }
+      let(:add_method)  { :add_click_listener }
+    end
+
+    it_behaves_like "mouse event" do
+      let(:event_type)  { ::Swt::SWT::MouseUp }
+      let(:block)       { release_block }
+      let(:other_block) { click_block }
+      let(:add_method)  { :add_release_listener }
+    end
+  end
+end