vedeu 0.6.46 → 0.6.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ff740a5d8a382dc5f6e01353c52fc4c8785934d
-  data.tar.gz: fdf167026d1ab0633c6e7dbc17e4f13c6ead54c7
+  metadata.gz: 9cde5fb2877e792b48f59abe6f024102949acc50
+  data.tar.gz: eb2865895d814e117ddcba9b4f1c33126e6e337f
 SHA512:
-  metadata.gz: ecd1e62df7d6590cb80d159f749622495eab7984c34f3f880afdfa71ab1e790070915d09702e60d02778120d10c4b80cff864aced98e3cdf9882b922ea8a6d18
-  data.tar.gz: 8b72b7cf6dea8fb4c4343405f295c68f67b920ddf4574d95ba06cb2360066b4d6462d850c471804bdc15d96dba12c6fcc66b4ba624e9e6946d499b1059173734
+  metadata.gz: 5d248827101d024fed9e434ea22bcf19ebbf7e810a6d7b122b7f94c9379e6b97ca98866dcbc60af52ff4e511bbc100f438e3f6caf031a440466e2ac3fd67758b
+  data.tar.gz: b87c4f2e854d3b7ecf0a2faca524fd9fef494b79502fe358a270ef264ee223f4f58523d39f930138c92207553068009286bca535a71e7f837efa2be6445a058c

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.2.3
 cache: bundler
 script: 'bundle exec rake'
 sudo: false

data/examples/dsl_editor.rb

@@ -33,7 +33,7 @@ class EditorApp
     end
   end
 
-  # When pressing Return/Enter in the editor view, the :_command_
+  # When pressing Escape in the editor view, the :_command_
   # event will be triggered with any typed content you have provided.
   #
   # The :_command_ event in turn triggers the :command event. Bind to
@@ -45,7 +45,8 @@ class EditorApp
   #     end
   #
   Vedeu.keymap :editor_view do
-    key(:enter) { Vedeu.trigger(:_editor_execute_, :editor_view) }
+    key(:escape) { Vedeu.trigger(:_editor_execute_, :editor_view) }
+    key(:enter)  { Vedeu.trigger(:_editor_insert_line_, :editor_view) }
     key(:insert) do
       Vedeu.log(type:    :debug,
                 message: "Commands: #{Vedeu.all_commands.inspect}")
@@ -67,7 +68,7 @@ class EditorApp
     view(:help_view) do
       lines do
         line 'Type into the editor dialog above,'
-        line 'and press Return. This will trigger the'
+        line 'and press Escape. This will trigger the'
         line ':command event with the contents of '
         line 'the view.'
 

data/lib/vedeu/editor/all.rb

@@ -10,6 +10,7 @@ end # Vedeu
 
 require 'vedeu/editor/capture'
 require 'vedeu/editor/cropper'
+require 'vedeu/editor/delete'
 require 'vedeu/editor/editor'
 require 'vedeu/editor/insert'
 require 'vedeu/editor/line'

data/lib/vedeu/editor/delete.rb

@@ -0,0 +1,65 @@
+module Vedeu
+
+  module Editor
+
+    # Manipulate the lines of an Vedeu::Editor::Document.
+    #
+    class Delete
+
+      # @param (see #initialize)
+      # @return [Vedeu::Editor::Line|Vedeu::Editor::Lines]
+      def self.from(collection, index = nil, size = 0)
+        new(collection, index, size).delete
+      end
+
+      # Returns a new instance of Vedeu::Editor::Delete.
+      #
+      # @param collection [Vedeu::Editor::Line|Vedeu::Editor::Lines]
+      # @param index [Fixnum]
+      # @param size [Fixnum]
+      # @return [Vedeu::Editor::Delete]
+      def initialize(collection, index = nil, size = 0)
+        @collection = collection
+        @index      = index
+        @size       = size
+      end
+
+      # @return [Vedeu::Editor::Line|Vedeu::Editor::Lines]
+      def delete
+        return collection.dup.tap { |c| c.slice!(index) } if index
+
+        if collection.is_a?(Array)
+          collection.dup.tap(&:pop)
+
+        elsif collection.is_a?(String)
+          collection.chop
+
+        end
+      end
+
+      protected
+
+      # @!attribute [r] collection
+      # @return [Vedeu::Editor::Line|Vedeu::Editor::Lines]
+      attr_reader :collection
+
+      # @!attribute [r] size
+      # @return [Fixnum]
+      attr_reader :size
+
+      private
+
+      # @return [Fixnum]
+      def index
+        return nil unless @index
+
+        @index = 0        if @index < 0
+        @index = size - 1 if @index > size
+        @index
+      end
+
+    end # Delete
+
+  end # Editor
+
+end # Vedeu

data/lib/vedeu/editor/document.rb

@@ -60,12 +60,16 @@ module Vedeu
         elsif x - 1 < 0 && y > 0
           delete_line
 
+          return
+
         else
           @lines = lines.delete_character(y, x - 1)
 
           left
 
         end
+
+        refresh
       end
 
       # Delete a line.

data/lib/vedeu/editor/line.rb

@@ -68,15 +68,8 @@ module Vedeu
       def delete_character(index = nil)
         return self if line.empty? || (index && index < 0)
 
-        new_line = if index && index <= size
-                     line.dup.tap { |line| line.slice!(index) }
-
-                   else
-                     line.chop
-
-                   end
-
-        Vedeu::Editor::Line.coerce(new_line)
+        Vedeu::Editor::Line.coerce(Vedeu::Editor::Delete
+                                   .from(line, index, size))
       end
 
       # Returns a boolean indicating whether there are characters on

data/lib/vedeu/editor/lines.rb

@@ -73,15 +73,8 @@ module Vedeu
       def delete_line(index = nil)
         return self if lines.empty? || (index && index < 0)
 
-        new_lines = if index && index <= size
-                      lines.dup.tap { |lines| lines.slice!(index) }
-
-                    else
-                      lines.dup.tap(&:pop)
-
-                    end
-
-        Vedeu::Editor::Lines.coerce(new_lines)
+        Vedeu::Editor::Lines.coerce(Vedeu::Editor::Delete
+                                    .from(lines, index, size))
       end
 
       # Provides iteration over the collection.

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.46'.freeze
+  VERSION = '0.6.47'.freeze
 
 end

data/test/lib/vedeu/editor/delete_test.rb

@@ -0,0 +1,88 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Editor
+
+    describe Delete do
+
+      let(:described)  { Vedeu::Editor::Delete }
+      let(:instance)   { described.new(collection, index, size) }
+      let(:collection) {}
+      let(:index)      {}
+      let(:size)       {}
+
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@collection').must_equal(collection) }
+        it { instance.instance_variable_get('@index').must_equal(index) }
+        it { instance.instance_variable_get('@size').must_equal(size) }
+      end
+
+      describe '.from' do
+        subject { described.from(collection, index, size) }
+
+        context 'when the collection is a String' do
+          let(:collection) { 'Some text' }
+
+          context 'when an index is given' do
+            let(:index) { 2 }
+            let(:size) { collection.size }
+
+            it { subject.must_equal('Soe text') }
+
+            context 'when the index > size' do
+              let(:index) { size + 3 }
+
+              it { subject.must_equal('Some tex') }
+            end
+
+            context 'when the index < 0' do
+              let(:index) { -3 }
+
+              it { subject.must_equal('ome text') }
+            end
+          end
+
+          context 'when an index is not given' do
+            it { subject.must_equal('Some tex') }
+          end
+        end
+
+        context 'when the collection is an Array' do
+          let(:collection) { [:hydrogen, :helium, :lithium, :beryllium] }
+
+          context 'when an index is given' do
+            let(:index) { 2 }
+            let(:size) { collection.size }
+
+            it { subject.must_equal([:hydrogen, :helium, :beryllium]) }
+
+            context 'when the index > size' do
+              let(:index) { size + 3 }
+
+              it { subject.must_equal([:hydrogen, :helium, :lithium]) }
+            end
+
+            context 'when the index < 0' do
+              let(:index) { -3 }
+
+              it { subject.must_equal([:helium, :lithium, :beryllium]) }
+            end
+          end
+
+          context 'when an index is not given' do
+            it { subject.must_equal([:hydrogen, :helium, :lithium]) }
+          end
+        end
+      end
+
+      describe '#delete' do
+        it { instance.must_respond_to(:delete) }
+      end
+
+    end # Delete
+
+  end # Editor
+
+end # Vedeu

data/test/lib/vedeu/editor/document_test.rb

@@ -78,10 +78,10 @@ module Vedeu
       describe '#delete_character' do
         subject { instance.delete_character }
 
-        it { subject.must_be_instance_of(Vedeu::Editor::Cursor) }
+        it { subject.must_be_instance_of(Vedeu::Editor::Document) }
 
         context 'when on the first column of the first row' do
-          it { subject.must_be_instance_of(Vedeu::Editor::Cursor) }
+          it { subject.must_be_instance_of(Vedeu::Editor::Document) }
         end
 
         context 'when on the first column of not the first row' do

data/vedeu.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-minitest',     '2.4.4'
   spec.add_development_dependency 'guard-rubocop',      '1.2.0'
   spec.add_development_dependency 'minitest',           '5.8.2'
-  spec.add_development_dependency 'minitest-reporters', '1.1.4'
+  spec.add_development_dependency 'minitest-reporters', '1.1.5'
   spec.add_development_dependency 'mocha',              '1.1.0'
   spec.add_development_dependency 'pry',                '0.10.3'
   spec.add_development_dependency 'rubocop',            '0.34.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.46
+  version: 0.6.47
 platform: ruby
 authors:
 - Gavin Laking
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -383,6 +383,7 @@ files:
 - lib/vedeu/editor/capture.rb
 - lib/vedeu/editor/cropper.rb
 - lib/vedeu/editor/cursor.rb
+- lib/vedeu/editor/delete.rb
 - lib/vedeu/editor/document.rb
 - lib/vedeu/editor/editor.rb
 - lib/vedeu/editor/insert.rb
@@ -560,6 +561,7 @@ files:
 - test/lib/vedeu/editor/capture_test.rb
 - test/lib/vedeu/editor/cropper_test.rb
 - test/lib/vedeu/editor/cursor_test.rb
+- test/lib/vedeu/editor/delete_test.rb
 - test/lib/vedeu/editor/document_test.rb
 - test/lib/vedeu/editor/editor_test.rb
 - test/lib/vedeu/editor/insert_test.rb
@@ -762,6 +764,7 @@ test_files:
 - test/lib/vedeu/editor/capture_test.rb
 - test/lib/vedeu/editor/cropper_test.rb
 - test/lib/vedeu/editor/cursor_test.rb
+- test/lib/vedeu/editor/delete_test.rb
 - test/lib/vedeu/editor/document_test.rb
 - test/lib/vedeu/editor/editor_test.rb
 - test/lib/vedeu/editor/insert_test.rb