redcar-filter-through-command 1.3.2-java → 1.3.4-java

data/changes.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+##1.3.4
+
+* Fix for variable substitution not working when input type set to 'None' with an edit tab focussed
+* Fix for selection variable persisting when unselecting text
+
 ##1.3.2
 
 * Fix for missing refactor for execute line function to pull most recent command from history

data/lib/filter_command/command_parser.rb

@@ -11,15 +11,16 @@ module Redcar
       end
 
       # Sets and inserts supported variables into the shell command enviroment
-      # and replaces shortened substitution characters
+      # and replaces shortened substitution characters. Supported variables
+      # require that an editable tab is focussed for substitution to occur.
       # @param [Redcar::Document] doc a document for use in the current command
       # @param [String] command the command to be executed
       def self.substitute_variables doc, command
         output = {}
-        ENV['REDCAR_SELECTION'] = doc.selected_text if doc.selection?
+        ENV['REDCAR_SELECTION'] = doc.selection? ? doc.selected_text : doc.get_line_without_end_of_line(doc.cursor_line)
         ENV['REDCAR_DOCUMENT'] = doc.get_all_text
         ENV['REDCAR_WORD'] = doc.current_word
-        ENV['REDCAR_LINE'] = doc.get_line(doc.cursor_line)
+        ENV['REDCAR_LINE'] = doc.get_line_without_end_of_line(doc.cursor_line)
         ENV['REDCAR_SCOPE'] = doc.cursor_scope
         supported_variables.each do |var|
           unless ENV['REDCAR_'+var].nil?

data/lib/filter_command/evaluator.rb

@@ -18,32 +18,31 @@ module Redcar
         win = Redcar.app.focussed_window
         tab = win.focussed_notebook_tab
         original_command = command.clone
-        unless input == "None"
-          if tab and tab.is_a?(Redcar::EditTab) and doc = tab.edit_view.document
-            case input
-            when "Selection"
-              if doc.selection?
-                selection = doc.selected_text
-              else
-                selection = doc.get_line_without_end_of_line(doc.cursor_line)
-              end
-              command = pipe_text(selection, command)
-            when "Document"
-              command  = pipe_text(doc.get_all_text, command)
-            when "Cursor Line"
-              command  = pipe_text(doc.get_line_without_end_of_line(doc.cursor_line), command)
-            when "Cursor Word"
-              command  = pipe_text(doc.current_word, command)
+        if tab and tab.is_a?(Redcar::EditTab) and doc = tab.edit_view.document
+          case input
+          when "None" # do nothing
+          when "Selection"
+            if doc.selection?
+              selection = doc.selected_text
             else
-              raise "Unknown input type found: #{input}"
+              selection = doc.get_line_without_end_of_line(doc.cursor_line)
             end
-            result  = FilterCommand::CommandParser.substitute_variables(doc,command)
-            command = result['command']
-            temp    = result['temp']
+            command = pipe_text(selection, command)
+          when "Document"
+            command  = pipe_text(doc.get_all_text, command)
+          when "Cursor Line"
+            command  = pipe_text(doc.get_line_without_end_of_line(doc.cursor_line), command)
+          when "Cursor Word"
+            command  = pipe_text(doc.current_word, command)
           else
-            tab_type_error input
-            return
+            raise "Unknown input type found: #{input}"
           end
+          result  = FilterCommand::CommandParser.substitute_variables(doc,command)
+          command = result['command']
+          temp    = result['temp']
+        elsif input != "None"
+          tab_type_error input
+          return
         end
         execute_command win, command, input, output
         if temp and File.exist?(temp)

data/plugin.rb

@@ -1,6 +1,6 @@
 Plugin.define do
   name    "Filter Through Command"
-  version "1.3.2"
+  version "1.3.4"
   file    "lib", "filter_command"
   object  "Redcar::FilterCommand"
   dependencies "redcar", ">0",

metadata

@@ -2,7 +2,7 @@
 name: redcar-filter-through-command
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.2
+  version: 1.3.4
 platform: java
 authors: 
   - Delisa Mason
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 Z
+date: 2011-09-10 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: redcar-dev