glimmer-cs-gladiator 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1de235cba50741874f8719322e8c35ffea667929d465e23f3fd2df8a4866acb4
-  data.tar.gz: 20273095f8e93bff72840e3094ff5f203bc57bf78e0c7ee8b14e0765f7025ca5
+  metadata.gz: d8a4a941695d12f14347c9892758f974e5909455a73020eee8d635c4c38e86a3
+  data.tar.gz: 929ff0b362ca29394e80f918b65fbdb911892449d9876a4eca14a7ec4c01b8df
 SHA512:
-  metadata.gz: 5aba5bf9ad1ba8f077486dbc0d04da40c2138bf02c32d0565e27a520935da088d811e51bd9c90f868ce24c0775add77914e3dbebdfa4abb89f9333719f79cdcb
-  data.tar.gz: cbb76756dae0901141a3c3b2d69849d1aed409e26d1f7a8ff1fa30a410c3e11edfecd93c4ff03e35023aa2ee64a7dccad276878bb563f94c1298c144e93dfc4d
+  metadata.gz: 993c7ae4684351d97b8b583cf5f59aef4a6d2aec5a68d8c121b6a95bc4e2ee035d6d21f677c8cd79febd5b4379e81808f4b0b977a1aadb388ddba4ab74694b4b
+  data.tar.gz: 32d823df2493950f822fdcfceb28fc5d2b6998152ab233dd0e8668f013d0bd5301dd6ec220d4719bd88683f53bbbd33ddbdceac03bb8d1f02fa77bee2cc432b6

data/README.md

@@ -1,5 +1,5 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.2.2 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
-## [Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer#custom-shell-gem)
+# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.2.3 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
+## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer#custom-shell-gem)
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
 ![Gladiator](images/glimmer-gladiator.png)
@@ -93,7 +93,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '~> 0.2.2'
+gem 'glimmer-cs-gladiator', '~> 0.2.3'
 ```
 
 Run:
@@ -152,11 +152,12 @@ The signal TERM is in use by the JVM and will not work correctly on this platfor
 
 ## Copyright
 
-Copyright (c) 2020 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for
-further details.
+[MIT](https://opensource.org/licenses/MIT)
+
+Copyright (c) 2020 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further details.
 
 --
 
-Built with [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library).
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built with [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library)
 
 Gladiator icon made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

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

@@ -9,29 +9,32 @@ module Glimmer
   
       class << self
         def local_dir
-          @local_dir ||= new(ENV['LOCAL_DIR'] || '.').tap do |dir|
-            dir.refresh
-            @filewatcher = Filewatcher.new(dir.path)
+          unless @local_dir
+            @local_dir = new(ENV['LOCAL_DIR'] || '.', true)
+            @local_dir.refresh
+            @filewatcher = Filewatcher.new(@local_dir.path)
             @thread = Thread.new(@filewatcher) do |fw| 
               fw.watch do |filename, event|
                 if @last_update.nil? || (Time.now.to_f - @last_update) > REFRESH_DELAY
-                  dir.refresh if !filename.include?('new_file') && !dir.selected_child_path_history.include?(filename) && filename != dir.selected_child_path
+                  @local_dir.refresh if !filename.include?('new_file') && !@local_dir.selected_child_path_history.include?(filename) && filename != @local_dir.selected_child_path
                 end
                 @last_update = Time.now.to_f
               end
             end
           end
+          @local_dir
         end        
       end
   
       attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :path, :display_path
       attr_reader :name, :parent
-      attr_writer :all_children, :children
+      attr_writer :all_children
   
-      def initialize(path)
+      def initialize(path, is_local_dir = false)
         @display_path = path
         @path = ::File.expand_path(@display_path)
         @name = ::File.basename(::File.expand_path(path))
+        @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '') unless is_local_dir
         self.filtered_path_options = []
       end
 
@@ -48,7 +51,15 @@ module Glimmer
       end
 
       def retrieve_children
-        ::Dir.glob(::File.join(@display_path, '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}.sort_by {|c| c.path.to_s.downcase }.sort_by {|c| c.class.name }
+        @children = ::Dir.glob(::File.join(@path, '*')).map do |p| 
+          ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)
+        end.sort_by do |c| 
+          c.path.to_s.downcase 
+        end.sort_by do |c| 
+          c.class.name
+        end.each do |child|
+          child.retrieve_children if child.is_a?(Dir)
+        end
       end
   
       def selected_child_path_history
@@ -65,11 +76,11 @@ module Glimmer
 
       def refresh(async: true, force: false)
         return if @refresh_paused && !force
-        new_all_children = retrieve_all_children
-        new_children = retrieve_children
+        retrieve_children
+        collect_all_children
         refresh_operation = lambda do
-          self.all_children = new_all_children
-          self.children = new_children
+          notify_observers(:children)
+          notify_observers(:all_children)
         end
         if async
           async_exec(&refresh_operation)
@@ -84,23 +95,31 @@ module Glimmer
         else
           @filter = value
         end
-        self.filtered_path_options = filtered.to_a.map(&:display_path)
+        @last_filtered = filtered.to_a
+        self.filtered_path_options = @last_filtered.map(&:display_path)
+        @last_filter = @filter
       end
   
       def filtered
         return if filter.nil?
-        all_children_files.select do |child| 
-          child.path.downcase.include?(filter.downcase) ||
-            child.path.downcase.gsub(/[_\/\.]/, '').include?(filter.downcase)
+        children_files = !@last_filter.to_s.empty? && filter.downcase.start_with?(@last_filter.downcase) ? @last_filtered : all_children_files
+        children_files.select do |child| 
+          child_path = child.path.to_s.sub(Dir.local_dir.path, '')
+          child_path.downcase.include?(filter.downcase) ||
+            child_path.downcase.gsub(/[_\/.-]/, '').include?(filter.downcase.gsub(/[_\/.-]/, ''))
         end.sort_by {|c| c.path.to_s.downcase}
       end
   
       def all_children
-        @all_children ||= retrieve_all_children
+        @all_children ||= collect_all_children
       end
   
-      def retrieve_all_children
-        ::Dir.glob(::File.join(@display_path, '**', '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}
+      def collect_all_children
+        @all_children = children.reduce([]) do |output, child|
+          addition = [child]
+          addition += child.collect_all_children if child.is_a?(Dir)
+          output + addition
+        end
       end
   
       def all_children_files
@@ -108,9 +127,11 @@ module Glimmer
       end
   
       def selected_child_path=(selected_path)
+        full_selected_path = selected_path.include?(Dir.local_dir.path) ? selected_path : ::File.join(Dir.local_dir.path, selected_path)
         return if selected_path.nil? || 
-                  ::Dir.exist?(selected_path) || 
-                  (selected_child && ::File.expand_path(selected_child.path) == ::File.expand_path(selected_path))
+                  ::Dir.exist?(full_selected_path) || 
+                  (selected_child && selected_child.path == full_selected_path)
+        selected_path = full_selected_path
         if ::File.file?(selected_path)
           @selected_child&.write_dirty_content
           new_child = Gladiator::File.new(selected_path)

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

@@ -14,6 +14,7 @@ module Glimmer
         @display_path = path
         @name = ::File.basename(path)
         @path = ::File.expand_path(path)
+        @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '')
         @top_index = 0
         @selection_count = 0
         @selection = Point.new(0, 0 + @selection_count)

data/lib/views/glimmer/gladiator.rb

@@ -20,7 +20,7 @@ module Glimmer
     class << self
       attr_accessor :drag_and_drop
       attr_accessor :drag
-    end    
+    end
 
     ## Add options like the following to configure CustomShell by outside consumers
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement