shoes-swt 4.0.0.pre5 → 4.0.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad850293dc338127cb8179643d1687913cb91fbb
-  data.tar.gz: e0fc3c0b500802b5f294ca454fc12955a9fc6462
+  metadata.gz: beac25befd7cf85ba03f9b1cd9826bb9f1e28930
+  data.tar.gz: e82b136fb081ce7f34a0a9c62e1683e42e1f46cc
 SHA512:
-  metadata.gz: e0e22591aded485f7bd61cfe8b0db70b92d9c1f50bb3b8f350cf11c42fc5b43b44d030983f82de0755d851a53601a36ae65ae8b208485acffdb1eeb1b4d0dcd0
-  data.tar.gz: 3f282218db6550e8dafb20d006f6f7c98aea3d33e0f602ddcbb4199088c903125fb851d77069c40316e47a799f8bf184e2696e85adb6588bffa753747f2afad0
+  metadata.gz: 11f22c3d4cf71dc857f7ce0314b1faeac57a8b4438c24b2fa4c32a5b186e1abd9ac804934eade0a1972dca958391c5a32d90eb52b4ac5f85dc9afcd3e36483a5
+  data.tar.gz: e44f05ba4c214ed613aacd03325c24f588e4a68ddf6d3118fac3070efcdd9f25d42144b21f9185c06f8d054d8507cb1d628bce93f5a4a1ba282f6a9da2a1efde

data/lib/shoes/swt/app.rb

@@ -199,7 +199,8 @@ class Shoes
         style  = ::Swt::SWT::CLOSE | ::Swt::SWT::MIN | ::Swt::SWT::V_SCROLL
         style |= ::Swt::SWT::RESIZE | ::Swt::SWT::MAX if @dsl.opts[:resizable]
         style |= ::Swt::SWT::APPLICATION_MODAL        if @dsl.opts[:modal]
-        style |= ::Swt::SWT::ON_TOP if @dsl.opts[:always_on_top]
+        style |= ::Swt::SWT::ON_TOP                   if @dsl.opts[:always_on_top]
+        style |= ::Swt::SWT::NO_TRIM                  unless @dsl.opts.fetch(:border, true)
         style
       end
 

data/lib/shoes/swt/button.rb

@@ -11,6 +11,10 @@ class Shoes
           button.set_text @dsl.text
         end
       end
+
+      def text=(value)
+        @real.text = value
+      end
     end
   end
 end

data/lib/shoes/swt/image.rb

@@ -89,11 +89,11 @@ class Shoes
       end
 
       def display_image(name_or_data)
-        if raw_image_data?(name_or_data)
-          data = load_raw_image_data(name_or_data)
-        else
-          data = name_or_data
-        end
+        data = if raw_image_data?(name_or_data)
+                 load_raw_image_data(name_or_data)
+               else
+                 name_or_data
+               end
         create_image(data)
       end
 

data/lib/shoes/swt/link_segment.rb

@@ -33,7 +33,7 @@ class Shoes
 
       def line_bounds
         (0..layout.line_count - 1).map do |index|
-          layout.line_bounds(index)
+          layout.get_line_bounds(index)
         end
       end
 

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

@@ -198,7 +198,7 @@ class Shoes
 
           offsets = layout.line_offsets
           offsets[0...-1].each_with_index do |_, i|
-            height_so_far += layout.line_bounds(i).height + TextBlock::NEXT_ELEMENT_OFFSET
+            height_so_far += layout.get_line_bounds(i).height + TextBlock::NEXT_ELEMENT_OFFSET
             ending_offset = offsets[i + 1]
 
             break if height_so_far >= height

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

@@ -12,14 +12,15 @@ class Shoes
       #
       # These are only expected to be called during contents_alignment
       class TextSegment
+        extend Forwardable
+
         DEFAULT_SPACING = 4
 
         attr_reader   :layout, :element_left, :element_top
         attr_accessor :fill_background
 
-        extend Forwardable
         def_delegators :@layout, :text, :text=, :bounds, :width, :spacing,
-                       :line_bounds, :line_count, :line_offsets
+                       :get_line_bounds, :line_count, :line_offsets
 
         def initialize(dsl, text, width)
           @dsl = dsl
@@ -88,11 +89,11 @@ class Shoes
         end
 
         def last_line_height
-          layout.line_bounds(layout.line_count - 1).height
+          layout.get_line_bounds(layout.line_count - 1).height
         end
 
         def last_line_width
-          layout.line_bounds(layout.line_count - 1).width
+          layout.get_line_bounds(layout.line_count - 1).width
         end
 
         def draw(graphics_context)

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

@@ -177,7 +177,7 @@ class Shoes
         end
 
         def height_from_segment(segment)
-          segment.line_bounds(0).height
+          segment.get_line_bounds(0).height
         end
       end
     end

data/lib/shoes/swt/version.rb

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

data/shoes-swt.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   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 "swt", "~>4.4.0"
+  s.add_dependency "after_do", "~>0.4.0"
   s.add_dependency "shoes-core", Shoes::Swt::VERSION
   s.add_dependency "shoes-package", Shoes::Swt::VERSION
 

data/spec/shoes/swt/app_spec.rb

@@ -2,34 +2,11 @@ require 'spec_helper'
 
 describe Shoes::Swt::App do
   let(:opts) { {background: Shoes::COLORS[:salmon], resizable: true} }
-  let(:app)  { double('app') }
-  let(:dsl)  { double('dsl', app: app,
-                             opts: opts,
-                             width: width,
-                             height: 0,
-                             app_title: 'double') }
-
-  let(:opts_unresizable) { { background: Shoes::COLORS[:salmon],
-                            resizable: false } }
-  let(:app_unresizable) { double('app', opts: opts_unresizable,
-                                        width: 0,
-                                        height: 0,
-                                        app_title: 'double') }
-  let(:opts_always_on_top) { {background: Shoes::COLORS[:salmon],
-                              always_on_top: true} }
-  let(:app_always_on_top) { double('app', opts: opts_always_on_top,
-                                          width: 0,
-                                          height: 0,
-                                          app_title: 'double') }
-  let(:plain_app) { double('app', opts: {},
-                                  width: 2,
-                                  height: 2,
-                                  app_title: 'double') }
   let(:width) {0}
+  let(:dsl) { dsl_app_with_opts(opts) }
+  let(:app) {double 'app' }
 
-  let(:swt_salmon) { Shoes::Swt::Color.new(Shoes::COLORS[:salmon]).real }
-
-  subject { Shoes::Swt::App.new(dsl) }
+  subject { described_class.new dsl }
 
   it { is_expected.to respond_to :clipboard }
   it { is_expected.to respond_to :clipboard= }
@@ -85,14 +62,19 @@ describe Shoes::Swt::App do
     end
 
     it "should return a bitmask that represents not being resizable" do
-      not_resizable = Shoes::Swt::App.new app_unresizable
+      not_resizable = app_with_opts resizable: false
       expect(not_resizable.send(:main_window_style)).to eq(BASE_BITMASK)
     end
 
     it "should return a bitmask that represents always being on top" do
-      always_on_top = Shoes::Swt::App.new app_always_on_top
+      always_on_top = app_with_opts always_on_top: true, resizable: false
       expect(always_on_top.send(:main_window_style)).to eq(BASE_BITMASK | Swt::SWT::ON_TOP)
     end
+
+    it "should return an bitmask that indicates no trim" do
+      no_border = app_with_opts(border: false, resizable: false)
+      expect(no_border.send(:main_window_style)).to eq(BASE_BITMASK | Swt::SWT::NO_TRIM)
+    end
   end
 
   context "when attempting to copy text" do
@@ -142,12 +124,12 @@ describe Shoes::Swt::App do
 
   describe 'App Background color' do
     it 'has the given background when specified' do
-      not_resizable = Shoes::Swt::App.new app_unresizable
-      background = not_resizable.shell.background
-      expect(background).to eq swt_salmon
+      color = Shoes::COLORS[:salmon]
+      colored = app_with_opts background: color
+      background = colored.shell.background
+      expect(background).to eq Shoes::Swt::Color.new(color).real
     end
 
-
     it 'has the default system background when unspecified' do
       default_background = ::Swt.display.getSystemColor(::Swt::SWT::COLOR_WIDGET_BACKGROUND)
       app = Shoes::Swt::App.new(Shoes::InternalApp.new(Shoes::App.new, {}))
@@ -165,4 +147,20 @@ describe Shoes::Swt::App do
       subject.class.setup_system_colors
     end
   end
+
+  def app_with_opts(opts)
+    dsl_app_double = dsl_app_with_opts(opts)
+
+    Shoes::Swt::App.new dsl_app_double
+  end
+
+  def dsl_app_with_opts(opts)
+    double('app',
+           app:       app,
+           opts:      Shoes::InternalApp::DEFAULT_OPTIONS.merge(opts),
+           width:     0,
+           height:    0,
+           app_title: 'double')
+  end
+
 end

data/spec/shoes/swt/button_spec.rb

@@ -94,4 +94,11 @@ describe Shoes::Swt::Button do
       subject.click block
     end
   end
+
+  describe ".text=" do
+    it "sets text on real element" do
+      expect(real).to receive(:text=).with("some text")
+      subject.text = "some text"
+    end
+  end
 end

data/spec/shoes/swt/link_segment_spec.rb

@@ -108,7 +108,7 @@ describe Shoes::Swt::LinkSegment do
   end
 
   def stub_line_bounds(index)
-    allow(layout).to receive(:line_bounds).with(index) {
+    allow(layout).to receive(:get_line_bounds).with(index) {
       double("line #{index}",
              x: 0,
              y: index * line_height,

data/spec/shoes/swt/link_spec.rb

@@ -12,10 +12,9 @@ describe Shoes::Swt::Link do
   it_behaves_like "clickable backend"
 
   context "creating link segments" do
-    let(:bounds)       { double("bounds", height: 0) }
+    let(:bounds)       { double("bounds", x: 0, y: 0, height: 0) }
     let(:inner_layout) { double("inner layout",
-                                get_line_bounds: bounds, line_count: 1,
-                                line_bounds: double(x: 0, y: 0, height: 0)) }
+                                get_line_bounds: bounds, line_count: 1) }
     let(:layout)       { double("layout",
                                 get_location: double("position", x: 0, y: 0),
                                 element_left: 0, element_top: 0,

data/spec/shoes/swt/text_block/fitter_spec.rb

@@ -76,15 +76,15 @@ describe Shoes::Swt::TextBlock::Fitter do
   describe "finding what didn't fit" do
     it "splits when one line past requested height" do
       segment = double('segment', line_offsets: [0, 5, 10], text: "Text Split")
-      allow(segment).to receive(:line_bounds) { double('line_bounds', height: 25)}
+      allow(segment).to receive(:get_line_bounds) { double('line_bounds', height: 25)}
 
       expect(subject.split_text(segment, 24)).to eq(["Text ", "Split"])
     end
 
     it "should be able to split text when too small" do
       segment = double('segment', line_offsets: [0, 10], text: "Text Split")
-      allow(segment).to receive(:line_bounds).with(0) { double('line_bounds', height: 21)}
-      allow(segment).to receive(:line_bounds).with(1) { raise "Boom" }
+      allow(segment).to receive(:get_line_bounds).with(0) { double('line_bounds', height: 21)}
+      allow(segment).to receive(:get_line_bounds).with(1) { raise "Boom" }
 
       expect(subject.split_text(segment, 33)).to eq(["Text Split", ""])
     end
@@ -118,7 +118,7 @@ describe Shoes::Swt::TextBlock::Fitter do
 
     context "to two segments" do
       before(:each) do
-        allow(segment).to receive_messages(line_count: 2, line_bounds: double(height: 15))
+        allow(segment).to receive_messages(line_count: 2, get_line_bounds: double(height: 15))
         allow(bounds).to receive_messages(width: 50)
         allow(dsl).to receive_messages(containing_width: :unused)
       end

data/spec/shoes/swt/text_block/text_segment_collection_spec.rb

@@ -238,7 +238,7 @@ describe Shoes::Swt::TextBlock::TextSegmentCollection do
     bounds = double("bounds", x: 0, y: 0, height: 0)
     layout = double(name, text: text,
                           :justify= => nil, :spacing= => nil, :alignment= => nil,
-                          line_bounds: bounds, line_count: 1)
+                          get_line_bounds: bounds, line_count: 1)
 
     allow_any_instance_of(Shoes::Swt::TextFontFactory).to receive(:create_font)
 

data/spec/shoes/swt/text_block_spec.rb

@@ -196,11 +196,11 @@ describe Shoes::Swt::TextBlock do
   end
 
   def create_segment(name = "segment", width = layout_width,
-                    height = layout_height, line_height = line_height)
+                    height = layout_height, last_line_height = line_height)
     bounds = double("bounds", width: width, height: height)
     double(name, disposed?: false, style_from: nil,
                  width: width, height: height,
-                 last_line_width: width, last_line_height: line_height,
+                 last_line_width: width, last_line_height: last_line_height,
                  bounds: bounds)
   end
 

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: shoes-swt
 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:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: 4.4.0
   name: swt
   prerelease: false
   type: :runtime
@@ -23,13 +23,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.0
   name: after_do
   prerelease: false
   type: :runtime
@@ -37,13 +37,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre5
+        version: 4.0.0.pre6
   name: shoes-core
   prerelease: false
   type: :runtime
@@ -51,13 +51,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre5
+        version: 4.0.0.pre6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre5
+        version: 4.0.0.pre6
   name: shoes-package
   prerelease: false
   type: :runtime
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre5
+        version: 4.0.0.pre6
 description: A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby. Shoes makes building for Mac, Windows, and Linux super simple.
 email:
 - shoes@librelist.com
@@ -231,7 +231,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: A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby.
@@ -296,4 +296,3 @@ test_files:
 - spec/shoes/swt/text_block/text_segment_spec.rb
 - spec/shoes/swt/text_block_spec.rb
 - spec/spec_helper.rb
-has_rdoc: