glimmer-dsl-tk 0.0.47 → 0.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a534fbbe0b7c850fe702b42bf16eb4bc1854f68baa736b73ebf0bf6d5cc29f28
-  data.tar.gz: b38740259743b4e579ec72251dee2018f826007dc975b3efe8a4b90d9b5031da
+  metadata.gz: 8c99ac84c772515736f995d5a5ab31aaa38bbbe986d26d1c1566c8d49c5347c9
+  data.tar.gz: 192d47da74f8630c268f52f7601b67126cbe07d2284defc8a8a6174a068b6274
 SHA512:
-  metadata.gz: 03d144a49d2494ce0ff6576aaf510157d15086868f69d14bf70c27b3c7ed08e68125a86892ace5c9c178b52255252ad44a3b90ba49e7ff91e71d5e47af301f7c
-  data.tar.gz: 7543abee9889820cea1911ec3f6c395ea61ad96e761b8f7ad384cc17b50140854fb524852055e34eea7d221a38047bd1d3f053866a6d8b17363066739383529a
+  metadata.gz: 950ef28b2882ee22d7adf49528eb8fe0e3aa3c1949ea92ec319274af09bd5c10b5832a78ace63b1e77404fa26c9f0e0fe29ba78d398162150ca235b0441566fa
+  data.tar.gz: 65f424fc3206e9bbd30bbae63da5a249f259c4619d5e987b1ab19b5e608442f0502f3b9ec5b2aac92c6cf92dfc67fa08727297d8b06aee22c3d910a865458c01

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.0.48
+
+- Moved `OS` class to `Glimmer::Tk::OS` to avoid clashing with os gem when installed for users
+- Moved `DragAndDropEvent` from `Glimmer::Tk::DraggableAndDroppable` into `Glimmer::Tk` namespace directly as `Glimmer::Tk::DragAndDropEvent`
+
 ## 0.0.47
 
 - Upgrade to glimmer 2.5.1 (includes more advanced data-binding/observer features)

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Tk 0.0.47
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Tk 0.0.48
 ## MRI Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-tk.svg)](http://badge.fury.io/rb/glimmer-dsl-tk)
 [![Ruby](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml/badge.svg)](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml)
@@ -53,7 +53,7 @@ Glimmer app:
 
 NOTE: Glimmer DSL for Tk is currently in early alpha mode (incomplete). Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
+Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems you might be interested in:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
 - [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)
 - [glimmer-dsl-libui](https://github.com/AndyObtiva/glimmer-dsl-libui): Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)
@@ -182,7 +182,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '0.0.47'
+gem 'glimmer-dsl-tk', '0.0.48'
 ```
 
 And, then run:

data/VERSION

@@ -1 +1 @@
-0.0.47
+0.0.48

data/lib/glimmer/tk/drag_and_drop_event.rb

@@ -0,0 +1,23 @@
+module Glimmer
+  module Tk
+    DragAndDropEvent = Struct.new(:source, :target, :tooltip, :x_root, :y_root, :data, :drop_accepted) do
+      alias drop_accepted? drop_accepted
+      
+      def as_json(*)
+        klass = self.class.name
+        {
+          JSON.create_id => klass,
+          "v" => [values[0].object_id, values[1].object_id, values[2].object_id].concat(values.drop 3),
+        }
+      end
+
+      def to_json(*args)
+        as_json.to_json(*args)
+      end
+
+      def self.json_create(object)
+        new(*[ObjectSpace._id2ref(object["v"][0]), ObjectSpace._id2ref(object["v"][1]).proxy, ObjectSpace._id2ref(object["v"][2])].concat(object["v"].drop 3))
+      end
+    end
+  end
+end

data/lib/glimmer/tk/draggable_and_droppable.rb

@@ -19,6 +19,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require_relative 'drag_and_drop_event'
 require "json"
 
 module Glimmer
@@ -65,11 +66,11 @@ module Glimmer
       def on_drop_block=(value)
         @on_drop_block = value
         self.tk.bind("<DropEvent>", proc { |tk_event|
-          drop_event = DragAndDropEvent.json_create(JSON.parse("{" + tk_event.detail + "}"))
+          drop_event = Glimmer::Tk::DragAndDropEvent.json_create(JSON.parse("{" + tk_event.detail + "}"))
           @on_drop_block.call(drop_event) if self == drop_event.target
         })
         self.tk.bind("<DropCheckEvent>", proc { |tk_event|
-          drop_check_event = DragAndDropEvent.json_create(JSON.parse("{" + tk_event.detail + "}"))
+          drop_check_event = Glimmer::Tk::DragAndDropEvent.json_create(JSON.parse("{" + tk_event.detail + "}"))
           drop_check_event.source.event_generate("<DropAcceptedEvent>")
         })
       end
@@ -86,7 +87,7 @@ module Glimmer
             tooltip = WidgetProxy.new('toplevel', root_parent_proxy, [])
             tooltip.overrideredirect(1) #create tooltip window to display dragged data
             tooltip.geometry("+#{tk_event.x_root + 10}+#{tk_event.y_root - 2}")
-            drag_event = DragAndDropEvent.new(self, nil, tooltip, tk_event.x_root, tk_event.y_root, nil, false)
+            drag_event = Glimmer::Tk::DragAndDropEvent.new(self, nil, tooltip, tk_event.x_root, tk_event.y_root, nil, false)
             if @drag_source
               tk_event.widget.configure(:cursor => "hand2")
               # Default data to drag is text
@@ -159,26 +160,6 @@ module Glimmer
         @tk.bind_remove('<DropCheckEvent>')
         @on_drop_block = nil
       end
-
-      DragAndDropEvent = Struct.new(:source, :target, :tooltip, :x_root, :y_root, :data, :drop_accepted) do
-        alias drop_accepted? drop_accepted
-        
-        def as_json(*)
-          klass = self.class.name
-          {
-            JSON.create_id => klass,
-            "v" => [values[0].object_id, values[1].object_id, values[2].object_id].concat(values.drop 3),
-          }
-        end
-
-        def to_json(*args)
-          as_json.to_json(*args)
-        end
-
-        def self.json_create(object)
-          new(*[ObjectSpace._id2ref(object["v"][0]), ObjectSpace._id2ref(object["v"][1]).proxy, ObjectSpace._id2ref(object["v"][2])].concat(object["v"].drop 3))
-        end
-      end
     end
   end
 end

data/lib/{os.rb → glimmer/tk/os.rb}

@@ -19,18 +19,30 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class OS
-  class << self
-    def mac?
-      Tk.windowingsystem == 'aqua'
-    end
-    
-    def windows?
-      Tk.windowingsystem == 'win32'
-    end
-    
-    def linux?
-      Tk.windowingsystem == 'x11'
+require 'tk'
+
+module Glimmer
+  module Tk
+    class OS
+      class << self
+        def mac?
+          ::Tk.windowingsystem == 'aqua'
+        end
+        
+        def windows?
+          ::Tk.windowingsystem == 'win32'
+        end
+        
+        def linux?
+          ::Tk.windowingsystem == 'x11'
+        end
+      end
     end
   end
 end
+
+begin
+  OS
+rescue
+  ::OS = Glimmer::Tk::OS
+end

data/lib/glimmer-dsl-tk.rb

@@ -29,7 +29,6 @@ require 'puts_debuggerer' if ENV['pd'].to_s.downcase == 'true'
 require 'tk'
 #require 'tkextlib/bwidget' # does not work on Windows
 #require 'tkextlib/iwidgets' # does not work on Windows
-require 'os'
 require 'facets/hash/symbolize_keys'
 require 'facets/string/underscore'
 require 'facets/string/camelcase'
@@ -38,6 +37,7 @@ require 'delegate'
 # Internal requires
 # require 'ext/glimmer/config'
 # require 'ext/glimmer'
+require 'glimmer/tk/os'
 require 'glimmer/dsl/tk/dsl'
 
 Glimmer::Config.loop_max_count = -1
@@ -48,11 +48,11 @@ Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   result ||= method == 'load_iseq'
 end
 
-Tk::Tile::Style.theme_use 'clam' if OS.linux?
+::Tk::Tile::Style.theme_use 'clam' if OS.linux?
 
 ::TkOption.add '*tearOff', 0
 
-class ::Tk::TkSysMenu_Window < Tk::Menu
-  include Tk::SystemMenu
+class ::Tk::TkSysMenu_Window < ::Tk::Menu
+  include ::Tk::SystemMenu
   SYSMENU_NAME = 'window'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.47
+  version: 0.0.48
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -208,6 +208,7 @@ files:
 - lib/glimmer/dsl/tk/widget_expression.rb
 - lib/glimmer/tk/checkbutton_proxy.rb
 - lib/glimmer/tk/combobox_proxy.rb
+- lib/glimmer/tk/drag_and_drop_event.rb
 - lib/glimmer/tk/draggable_and_droppable.rb
 - lib/glimmer/tk/entry_proxy.rb
 - lib/glimmer/tk/frame_proxy.rb
@@ -217,6 +218,7 @@ files:
 - lib/glimmer/tk/menu_item_proxy.rb
 - lib/glimmer/tk/menu_proxy.rb
 - lib/glimmer/tk/notebook_proxy.rb
+- lib/glimmer/tk/os.rb
 - lib/glimmer/tk/radiobutton_proxy.rb
 - lib/glimmer/tk/root_proxy.rb
 - lib/glimmer/tk/scrollbar_frame_proxy.rb
@@ -228,7 +230,6 @@ files:
 - lib/glimmer/tk/variable_owner.rb
 - lib/glimmer/tk/widget.rb
 - lib/glimmer/tk/widget_proxy.rb
-- lib/os.rb
 - samples/elaborate/meta_sample.rb
 - samples/hello/hello_built_in_dialog.rb
 - samples/hello/hello_button.rb
@@ -293,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.31
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Tk