editor_core 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec52d9db82e48638cbc82762edbfc019f825beda5eafa66475f18254c69e1f4e
-  data.tar.gz: 354a5ae6fb35b9bb195df0ace5c579a1643b61dbd0e8449ce7428c62b9fefd98
+  metadata.gz: 29e9723ed92a39ab0c10d9b0e6c849fdf05c041886ad185e7c66c642fdec7e2f
+  data.tar.gz: 62c86e0365372fbda74a9d7b303cdb0d41ba0993890fcc213a569ae84692231c
 SHA512:
-  metadata.gz: 1d65ef8b4ca8ca3138a67e0684bd3f315569423d715fc6fff022edb2d1c3b717db1efedfb4892711992107056c9afe29e30114beef2fb7c4d3c5350ea3ea8ba1
-  data.tar.gz: 483e3d2feb7dda1c78b5634612b92eb3f946c86921ae7898a81a3c73b665fd2d26c1edac0a724faed232b4ee190fcc1c3a1f37f72e979862132c95c400262775
+  metadata.gz: 97bf696d944a8c50fc5c961e925e6604ffafb806b3e430a4d6755921d3090ef4fa2b6fdf73b520a8896fe8faddb3f2d07f1e625df6aeabe68e48fa27221e306b
+  data.tar.gz: 14c4caf205a01dcb4328840df72d1037db7ec780d2cb2dace5d23bfa9831310b7cdb981cf6dd223e6d47f2951d5e171f0be6f5acd97ce3f02fcfe9ce3a11f8e6

data/README.md

@@ -28,7 +28,11 @@ TODO: Write usage instructions here
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake
+install`. To release a new version, update the version number in
+`version.rb`, and then run `bundle exec rake release`, which will create
+a git tag for the version, push git commits and tags, and push the `.gem`
+file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/lib/editor_core/buffer.rb

@@ -10,9 +10,11 @@ module EditorCore
 
     attr_reader :name, :created_at, :history
     attr_accessor :buffer_id
-    attr_writer :created_at
 
-    def initialize(id,name, lines, created_at = 0)
+    def created_at= t
+      @created_at = t
+    end
+    def initialize(id,name, lines, created_at = Time.at(0))
       @buffer_id   = id  # An id for this buffer unique for this session
       @name = name
       @history = History.new
@@ -20,12 +22,12 @@ module EditorCore
       @created_at = case created_at
         when Numeric
           Time.at(created_at)
-        when Time
+        when Time, DateTime
           created_at
         when String
           DateTime.parse(created_at)
         else
-          raise "Unknown time format: #{created_at}"
+          raise "Unknown time format: #{created_at.inspect} / #{created_at.class}"
       end
     end
 
@@ -79,7 +81,7 @@ module EditorCore
 
     def join_lines(cursor,offset=0)
       row=cursor.row+offset
-      modify(cursor, row..row+1) {|l| l.join }
+      modify(cursor, row..row+1, row..row) {|l| l.join }
     end
 
     def indent(cursor, row, pos)
@@ -101,31 +103,31 @@ module EditorCore
     end
 
     def undo(old_cursor)
-      cursor, rowrange, rows = @history.undo_snapshot
-      store_snapshot(old_cursor,rowrange, false)
-      cursor, rowrange, rows = @history.undo
-      @lines[rowrange] = rows
+      cursor, oldrowrange, newrowrange, rows = @history.undo_snapshot
+      store_snapshot(old_cursor,oldrowrange, newrowrange, false)
+      cursor, oldrowrange, newrowrange, rows = @history.undo
+      @lines[newrowrange] = rows
       cursor
     end
 
     def redo
-      cursor, rowrange, rows = @history.redo
-      @lines[rowrange] = rows
+      cursor, oldrowrange, newrowrange, rows = @history.redo
+      @lines[oldrowrange] = rows
       cursor
     end
 
     private
 
-    def store_snapshot(cursor, rowrange, advance = true)
-      @history.save([cursor, rowrange, @lines[rowrange]], advance)
+    def store_snapshot(cursor, oldrowrange, newrowrange, advance = true)
+      @history.save([cursor, oldrowrange, newrowrange, @lines[oldrowrange]], advance)
     end
 
-    def modify(cursor, rowrange)
-      lines = @lines[rowrange].dup
+    def modify(cursor, oldrowrange, newrowrange = oldrowrange)
+      lines = @lines[oldrowrange].dup
       lines ||= ""
       new_lines = yield(lines)
-      store_snapshot(cursor, rowrange, true)
-      @lines[rowrange] = new_lines
+      store_snapshot(cursor, oldrowrange, newrowrange, true)
+      @lines[oldrowrange] = new_lines
       changed
       notify_observers(self)
     end

data/lib/editor_core/core.rb

@@ -58,7 +58,7 @@ module EditorCore
 
     def page_down
       lines = view_down(view.height-1)
-      @cursor = cursor.down(buffer, lines)
+      #@cursor = cursor.down(buffer, lines)
     end
 
     def page_up
@@ -70,6 +70,7 @@ module EditorCore
       oldtop = view.top
       view.top -= offset
       view.top = 0 if view.top < 0
+      up(offset)
       oldtop - view.top
     end
 
@@ -79,6 +80,7 @@ module EditorCore
       if view.top > buffer.lines_count
         view.top = buffer.lines_count
       end
+      down(offset)
       view.top - oldtop
     end
 
@@ -91,6 +93,8 @@ module EditorCore
     end
 
     # ## Complex navigation ##
+
+    # FIXME: Rewrite like prev_word
     def next_word
       line = current_line
       c = cursor.col
@@ -114,25 +118,55 @@ module EditorCore
       off
     end
 
+    def delete_next_word
+      start = cursor
+      next_word
+      finish = cursor
+      startcol = start.col
+      finishcol = finish.row > start.row ? -1 : finish.col-1
+      @cursor = start
+      buffer.delete(cursor, startcol, finishcol)
+    end
 
-    def prev_word
-      return if cursor.col == 0
-      line = current_line
-      c = cursor.col
-      if c > 0
-        c -= 1
-      end
-      while c > 0 && line[c] && line[c].match(/[ \t]/)
-        c -= 1
+    def delete_prev_word
+      prev_word
+      delete_next_word
+    end
+
+    def beginning_of_file?
+      cursor&.beginning_of_file?
+    end
+
+    def current_char
+      current_line[cursor.col]
+    end
+
+    def left_until_match(r)
+      off = -1
+      loop do
+        left
+        off +=1
+        break if beginning_of_file? || current_char&.match(r)
       end
-      while c > 0 && !(line[c-1].match(/[ \t\-]/))
-        c -= 1
+      off
+    end
+
+    def left_while_match(r)
+      off = 0
+      while !beginning_of_file? && current_char&.match(r)
+        left
+        off +=1
       end
-      off = cursor.col - c
-      @cursor = Cursor.new(cursor.row, c)
+      # Because we'll advance once too far left
+      right if !current_char&.match(r)
       off
     end
 
+    def prev_word
+      word = /[A-Za-z]/
+      left_until_match(word) + left_while_match(word)
+    end
+
     # ## Mutation ##
 
     def delete_before

data/lib/editor_core/version.rb

@@ -1,3 +1,3 @@
 module EditorCore
-  VERSION = "0.2.0"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editor_core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2025-06-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Core model functionality for a simple editor