glimmer-cs-gladiator 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18bd05231ab3815f4432ee79395284dbe6e5cd34244b1642b7bff4f7a3921c29
-  data.tar.gz: f2b2a7d6faf0154d878a3c25944a9b3a59c256a45feaf5b2b975379b357f598b
+  metadata.gz: d1fedd5416ae759bea0cbfa6d14572cedd58f74d14c544a187efb9310c5954c3
+  data.tar.gz: fd0d141721cb77e391c6a07aea9bbb637d326c22374ffc5e2f157487116f59a2
 SHA512:
-  metadata.gz: e82f4d0a5306bb03d767fa3dd1f7b23b970ba5fc5fbc87010c3388d2fcaec010134d3780d0fcc7d29b0c85113bb9f5c8daf8ef6284d4fc6b561064ccdd6ba88d
-  data.tar.gz: fb7a4b16181113d96478f0458a6abebe7c85c6be6d1b3568b39f412d56e278641a58d61e6aea1c977246aa21433f6084da7787db38ae3ee322d1ff5b1f1109f9
+  metadata.gz: 19c5ae152d5bbe45f434c06da679b1779b844ad180cca79a945f4368d05bb50a2342ca5d085a1ad7c8b06b6aa5a97548c98d4487ee66f0b0be3f4a16089c7d74
+  data.tar.gz: 3acdffb642c32c894af12b9f4fa27f51a4b04eba7c13dbedc6a5c89e6dc97da7dd1cd79c3c93a75c2c0e7318866d3de33b58ad269ffee29b221632ff21b02348

data/README.md

@@ -1,4 +1,4 @@
-# Gladiator (Glimmer Editor) 0.1.7 - Glimmer Custom Shell
+# Gladiator (Glimmer Editor) 0.1.8 - Glimmer Custom Shell
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
 ![Gladiator](images/glimmer-gladiator.png)
@@ -35,8 +35,9 @@ Gladiator currently supports the following text editing features:
 
 ## Pre-requisites
 
-- JRuby 9.2.11.1 (supporting Ruby 2.5.x syntax) (find at https://www.jruby.org/download)
-- Java SE Runtime Environment 7 or higher (find at https://www.oracle.com/java/technologies/javase-downloads.html)
+- [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library): '>= 0.8.0', '< 2.0.0' (dependency included in Ruby gem).
+- [JRuby](https://www.jruby.org/download): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer)
+- [JDK](https://www.oracle.com/java/technologies/javase-downloads.html): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer)
 
 ## Setup Instructions
 
@@ -60,7 +61,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '0.1.7'
+gem 'glimmer-cs-gladiator', '0.1.8'
 ```
 
 Run:

data/VERSION

@@ -0,0 +1 @@
+0.1.8

data/lib/models/glimmer/gladiator/command.rb

@@ -0,0 +1,75 @@
+module Glimmer
+  class Gladiator
+    class Command
+      class << self
+        def command_history
+          @command_history ||= {}
+        end
+        
+        def command_history_for(file)
+          # keeping a first command to make redo support work by remembering next command after undoing all
+          command_history[file] ||= [Command.new(file)] 
+        end
+        
+        def do(file, method = nil, command: nil)
+          command ||= Command.new(file, method)
+          command_history_for(file)&.last&.next_command = command
+          command.do
+          command_history_for(file) << command
+        end
+        
+        def undo(file)
+          return if command_history_for(file).size <= 1        
+          command_history_for(file).pop.undo
+        end
+        
+        def redo(file)
+          command_history_for(file).last&.redo
+        end
+      end
+    
+      attr_accessor :file, :method, :next_command, :previous_file_content, :previous_file_caret_position, :previous_file_selection_count
+    
+      def initialize(file, method = nil)
+        @file = file
+        @method = method
+      end
+      
+      def native?
+        @method.nil?
+      end
+      
+      def do
+        return if native?
+        backup
+        execute
+      end
+      
+      def undo
+        return if native?
+        restore
+      end
+      
+      def redo
+        return if next_command.nil?# || next_command.native?
+        Command.do(next_command.file, command: next_command)
+      end
+      
+      def backup
+        @previous_file_dirty_content = @file.dirty_content.clone
+        @previous_file_caret_position = @file.caret_position
+        @previous_file_selection_count = @file.selection_count
+      end
+      
+      def restore
+        @file.dirty_content = @previous_file_dirty_content.clone
+        @file.caret_position = @previous_file_caret_position
+        @file.selection_count = @previous_file_selection_count
+      end
+      
+      def execute
+        @file.send(@method)
+      end
+    end
+  end
+end

data/lib/models/glimmer/gladiator/file.rb

@@ -5,11 +5,12 @@ module Glimmer
     class File
       include Glimmer
   
-      attr_accessor :line_numbers_content, :selection, :selection_count, :line_number, :find_text, :replace_text, :top_index, :path, :display_path
-      attr_reader :name, :dirty_content
+      attr_accessor :dirty_content, :line_numbers_content, :selection, :selection_count, :line_number, :find_text, :replace_text, :top_index, :path, :display_path, :case_sensitive
+      attr_reader :name
   
       def initialize(path)
         raise "Not a file path: #{path}" unless ::File.file?(path)
+        @command_history = []
         @display_path = path
         @name = ::File.basename(path)
         @path = ::File.expand_path(path)
@@ -40,6 +41,16 @@ module Glimmer
           # no op in case of a binary file
         end
       end
+      
+      # to use for widget data-binding
+      def content=(value)
+        Command.do(self) # record a native (OS-widget) operation
+        self.dirty_content = value
+      end
+
+      def content
+        dirty_content
+      end
 
       def caret_position=(value)
         self.selection = Point.new(value, value + selection_count.to_i)
@@ -64,6 +75,7 @@ module Glimmer
       
       def dirty_content=(the_content)
         @dirty_content = the_content if ::File.exist?(path)
+        notify_observers(:content)
       end
   
       def start_filewatcher
@@ -264,7 +276,7 @@ module Glimmer
       end
   
       def find_next
-        return if find_text.to_s.empty?
+        return if find_text.to_s.empty?        
         all_lines = lines
         the_line_index = line_index_for_caret_position(caret_position)
         line_position = line_position_for_caret_position(caret_position)
@@ -275,8 +287,8 @@ module Glimmer
             the_index = (the_index + rotation)%all_lines.size
             start_position = 0
             start_position = line_position + find_text.to_s.size if i == 0 && the_index == the_line_index && found_text?(caret_position)
-            text_to_find_in = the_line.downcase[start_position..-1]
-            occurrence_index = text_to_find_in&.index(find_text.to_s.downcase)
+            text_to_find_in = the_line[start_position..-1]
+            occurrence_index = case_sensitive ? text_to_find_in&.index(find_text.to_s) : text_to_find_in&.downcase&.index(find_text.to_s.downcase)
             if occurrence_index
               self.caret_position = caret_position_for_line_index(the_index) + start_position + occurrence_index
               self.selection_count = find_text.to_s.size
@@ -340,10 +352,12 @@ module Glimmer
       end
   
       def home
+        self.selection_count = 0
         self.line_number = 1
       end
   
       def end
+        self.selection_count = 0
         self.line_number = lines.size
       end
   

data/lib/views/glimmer/gladiator.rb

@@ -8,6 +8,7 @@ require 'os'
 
 require 'models/glimmer/gladiator/dir'
 require 'models/glimmer/gladiator/file'
+require 'models/glimmer/gladiator/command'
 
 require 'views/glimmer/gladiator/text_editor'
 
@@ -37,7 +38,7 @@ module Glimmer
       @display = display {
         on_event_keydown { |key_event|
           if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'f'
-            if @text_editor.text_widget.getSelectionText && @text_editor.text_widget.getSelectionText.size > 0
+            if @text_editor&.text_widget&.getSelectionText && @text_editor&.text_widget&.getSelectionText&.size.to_i > 0
               @find_text.swt_widget.setText @text_editor.text_widget.getSelectionText
             end
             @find_text.swt_widget.selectAll
@@ -54,7 +55,7 @@ module Glimmer
             @tab_item = @text_editor = Dir.local_dir.selected_child = nil 
             @filter_text.swt_widget.selectAll     
             @filter_text.swt_widget.setFocus            
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && key_event.character == 8721
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :alt) && extract_char(key_event) == 'w'
             other_tab_items.each do |tab_item|
               Dir.local_dir.selected_child_path_history.delete(tab_item.getData('file_path'))
               tab_item.getData('proxy').dispose
@@ -72,10 +73,10 @@ module Glimmer
               end
             end
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == ']'
-            @tab_folder.swt_widget.setSelection([@tab_folder.swt_widget.getSelectionIndex() + 1, @tab_folder.swt_widget.getItemCount - 1].min) if @tab_folder.swt_widget.getItemCount > 0
+            @tab_folder.swt_widget.setSelection((@tab_folder.swt_widget.getSelectionIndex() + 1) % @tab_folder.swt_widget.getItemCount) if @tab_folder.swt_widget.getItemCount > 0
             @text_editor.text_widget.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == '['
-            @tab_folder.swt_widget.setSelection([@tab_folder.swt_widget.getSelectionIndex() - 1, 0].max) if @tab_folder.swt_widget.getItemCount > 0
+            @tab_folder.swt_widget.setSelection((@tab_folder.swt_widget.getSelectionIndex() - 1) % @tab_folder.swt_widget.getItemCount) if @tab_folder.swt_widget.getItemCount > 0
             @text_editor.text_widget.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '1'
             @tab_folder.swt_widget.setSelection(0) if @tab_folder.swt_widget.getItemCount >= 1
@@ -220,12 +221,11 @@ module Glimmer
             }    
           }
           composite {
+            fill_layout(:vertical) {
+              spacing 5
+            }
             layout_data(:fill, :fill, true, true)
             @list = list(:border, :h_scroll, :v_scroll) {
-              layout_data(:fill, :fill, true, true) {
-                #exclude bind(Gladiator::Dir.local_dir, :filter) {|f| !f}
-                minimum_height 400
-              }
               #visible bind(Gladiator::Dir, 'local_dir.filter') {|f| !!f}
               selection bind(Gladiator::Dir.local_dir, :filtered_path)
               on_mouse_up {
@@ -234,14 +234,11 @@ module Glimmer
               on_key_pressed { |key_event|
                 if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
                   Gladiator::Dir.local_dir.selected_child_path = @list.swt_widget.getSelection.first
-                  @text_editor.text_widget.setFocus
+                  @text_editor&.text_widget&.setFocus
                 end
               }
             }
             @tree = tree(:virtual, :border, :h_scroll, :v_scroll) {
-              layout_data(:fill, :fill, true, true) {
-                #exclude bind(Gladiator::Dir.local_dir, :filter) {|f| !!f}
-              }
               #visible bind(Gladiator::Dir, 'local_dir.filter') {|f| !f}
               items bind(Gladiator::Dir, :local_dir), tree_properties(children: :children, text: :name)
               menu {
@@ -317,10 +314,13 @@ module Glimmer
           grid_layout 1, false
           layout_data :fill, :fill, true, true
           composite {
-            grid_layout 2, false
+            grid_layout 3, false
+            
+            # row 1
+            
             @file_path_label = styled_text(:none) {
               layout_data(:fill, :fill, true, false) {
-                horizontal_span 2
+                horizontal_span 3
               }
               background color(:widget_background)
               editable false
@@ -333,6 +333,9 @@ module Glimmer
                 @file_path_label.swt_widget.setSelection(0, 0)
               }
             }
+            
+            # row 2
+            
             label {
               text 'Line:'
             }
@@ -343,13 +346,17 @@ module Glimmer
               text bind(Gladiator::Dir.local_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
               on_key_pressed { |key_event|
                 if key_event.keyCode == swt(:cr)
-                  @text_editor.text_widget.setFocus
+                  @text_editor&.text_widget&.setFocus
                 end
               }
               on_verify_text { |event|
                 event.doit = !event.text.match(/^\d*$/).to_a.empty? 
               }
             }
+            label
+            
+            # row 3
+
             label {
               text 'Find:'
             }
@@ -359,11 +366,32 @@ module Glimmer
               }
               text bind(Gladiator::Dir.local_dir, 'selected_child.find_text')
               on_key_pressed { |key_event|
+                if key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
+                  Dir.local_dir.selected_child.case_sensitive = !Dir.local_dir.selected_child.case_sensitive
+                  Gladiator::Dir.local_dir.selected_child&.find_next
+                end
                 if key_event.keyCode == swt(:cr)
-                  Gladiator::Dir.local_dir.selected_child.find_next
+                  Gladiator::Dir.local_dir.selected_child&.find_next
                 end
               }
             }
+            composite {
+              row_layout
+              button(:check) {
+                selection bind(Dir.local_dir, 'selected_child.case_sensitive')
+                on_key_pressed { |key_event|
+                  if key_event.keyCode == swt(:cr)
+                    Gladiator::Dir.local_dir.selected_child&.find_next
+                  end
+                }                
+              }
+              label {
+                text 'Case-sensitive'
+              }
+            }
+            
+            # row 4
+            
             label {
               text 'Replace:'
             }
@@ -373,14 +401,17 @@ module Glimmer
               }
               text bind(Gladiator::Dir.local_dir, 'selected_child.replace_text')
               on_focus_gained {              
-                Gladiator::Dir.local_dir.selected_child.ensure_find_next
+                Gladiator::Dir.local_dir.selected_child&.ensure_find_next
               }
               on_key_pressed { |key_event|
                 if key_event.keyCode == swt(:cr)
-                  Gladiator::Dir.local_dir.selected_child.replace_next!
+                  if Gladiator::Dir.local_dir.selected_child
+                    Command.do(Gladiator::Dir.local_dir.selected_child, :replace_next!)
+                  end
                 end
               }
             }
+            label
           }
           @tab_folder = tab_folder {
             layout_data(:fill, :fill, true, true) 
@@ -456,7 +487,7 @@ module Glimmer
     def delete_tree_item(tree_item)
       file = tree_item.getData
       parent_path = ::File.dirname(file.path)
-      file.delete!
+      file.delete! # TODO consider supporting command undo/redo
       Dir.local_dir.refresh(async: false)
       parent_tree_item = @tree.depth_first_search {|ti| ti.getData.path == parent_path}.first
       @tree.swt_widget.showItem(parent_tree_item)

data/lib/views/glimmer/gladiator/text_editor.rb

@@ -36,7 +36,7 @@ module Glimmer
             layout_data :fill, :fill, true, true
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
-            text bind(file, 'dirty_content')
+            text bind(file, :content)
             focus true
             selection bind(file, 'selection')
             selection_count bind(file, 'selection_count')
@@ -45,26 +45,30 @@ module Glimmer
               file&.write_dirty_content
             }
       	     on_key_pressed { |key_event|
-              if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '/'
-                file.comment_line!
-        	key_event.doit = false
+              if (Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'z') || (key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'y')                
+                key_event.doit = !Command.redo(file)
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'z'
+                key_event.doit = !Command.undo(file)
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '/'
+                Command.do(file, :comment_line!)
+                key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'k'
-                file.kill_line!
+                Command.do(file, :kill_line!)
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'd'
-                file.duplicate_line!
+                Command.do(file, :duplicate_line!)
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '['
-                file.outdent!
+                Command.do(file, :outdent!)
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == ']'
-                file.indent!
+                Command.do(file, :indent!)
                 key_event.doit = false
               elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && key_event.keyCode == swt(:cr)
-                file.prefix_new_line!
+                Command.do(file, :prefix_new_line!)
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
-                file.insert_new_line!
+                Command.do(file, :insert_new_line!)
                 key_event.doit = false
               elsif key_event.keyCode == swt(:page_up)
                 file.page_up
@@ -79,10 +83,10 @@ module Glimmer
                 file.end
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_up)
-                file.move_up!
+                Command.do(file, :move_up!)
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_down)
-                file.move_down!
+                Command.do(file, :move_down!)
                 key_event.doit = false
               end
             }
@@ -95,7 +99,7 @@ module Glimmer
                 end
               when swt(:tab)
                 if file.selection_count.to_i > 0
-                  file.indent!
+                  Command.do(file, :indent!)
                   verify_event.doit = false
                 else
                   verify_event.text = '  '

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -130,9 +130,11 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.md
+- VERSION
 - bin/gladiator
 - bin/gladiator_runner.rb
 - lib/glimmer-cs-gladiator.rb
+- lib/models/glimmer/gladiator/command.rb
 - lib/models/glimmer/gladiator/dir.rb
 - lib/models/glimmer/gladiator/file.rb
 - lib/views/glimmer/gladiator.rb