canis 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f94ffa2e37387dc50fb96d5f40cbd6b97cd60143
-  data.tar.gz: 2323ea61ad5c4403628a6932665aed0a5ab7901d
+  metadata.gz: d4779cdb032e8834979001fd88ebae06c9c1c3db
+  data.tar.gz: 7065221a532c59f322d51c4514ec48193d240988
 SHA512:
-  metadata.gz: 981c442662ac2c991dde00187fa1dc2210c5ce3a901a3d0d249599c08b56effc13929c1ae14b373c91f828a28b50c5b8d4664c9e338b3a710bc3b8342fe1f1be
-  data.tar.gz: 943dab012e46633bfe16fc35bab8dfad406abd700dae2bd4d97a44a22bff4ecfcd61e959cc99d552a1795a1c4e266300f412de3a177721b14bbe9693a1a451bf
+  metadata.gz: 8109f9043da601a306f3ebf12b1f5272853a8d6f9295cc649e26129063fdb3358d4619a0d8e255ada027dd0f4c0d10488c314b51cd7e7eec0c8132d0540de05e
+  data.tar.gz: bc1fd4348a75ddd4db70249715582aaa1f1b0d4b9f8b29613dfa45c5efbdd6c72c9a91b583c578dd210e1da196cfd7aa899f5b62b874c8c208c2e7bb45780e6a

data/CHANGES

@@ -65,3 +65,7 @@ Built 0.0.2 but i did not release it.
 2014-09-02
 - for 0.0.7
   rdialog.rb introduced a syntax error while adding names to windows, had to yank 0.0.6
+
+2014-09-11 
+- for 0.0.8
+  fix in colorparser.rb : wrong default was picked, now sending in textpads color and attr

data/lib/canis/core/include/colorparser.rb

@@ -5,7 +5,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/canis/
 #         Date: 07.11.11 - 12:31 
 #  Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2014-09-01 11:57
+#  Last update: 2014-09-11 19:51
 # ------------------------------------------------------------ #
 #
 
@@ -320,10 +320,12 @@ module Canis
       # parse array of Strings into array of Chunks (Chunklines)
       # @param [Array<String>] formatted text to be parsed into chunks
       # @return [Array<Abstractchunkline>] array of text in our native format (chunklines)
-      def parse_text formatted_text
+      # 2014-09-11 - 19:48 added colorp and attr so that incorrect default is not picked
+      #     object such as textpad can send in default, textdocument not does so.
+      def parse_text formatted_text, colorp=nil, attr=nil
         l = []
         formatted_text.each { |e| 
-          l << convert_to_chunk(e) 
+          l << convert_to_chunk(e, colorp, attr)
         }
         return l
       end

data/lib/canis/core/include/listbindings.rb

@@ -4,7 +4,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/canis/
 #         Date: 2011-12-11 - 12:58
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2014-06-03 14:10
+#  Last update: 2014-09-11 19:09
 # ----------------------------------------------------------------------------- #
 #
 module Canis
@@ -84,6 +84,80 @@ module Canis
       bind_key([?\C-x, ?e], :edit_external)
       
     end # def
+    # adding here so that textpad can also use. Earlier in textarea only
+    # Test out with textarea too TODO 
+    # 2014-09-03 - 12:49 
+    def saveas name=nil, config={}
+      unless name
+        name = rb_gets "File to save as: "
+        return if name.nil? || name == ""
+      end
+      overwrite_if_exists = config[:overwrite_if_exists] || false
+      unless overwrite_if_exists
+        exists = File.exists? name
+        if exists # need to prompt
+          return unless rb_confirm("Overwrite existing file? ")
+        end
+      end
+      # if it has been set do not prompt. or ask only if value is :ask
+      # But this should only be if there is someformatting provided, that is there 
+      # is a @document
+      l = @list
+      # the check for document is to see if it is some old widget like textarea that is calling this.
+      if @document
+        if config.key? :save_with_formatting
+          save_with_formatting = config[:save_with_formatting] 
+        else
+          save_with_formatting = rb_confirm("Save with formatting?")
+        end
+        if save_with_formatting
+          l = @list
+        else
+          l = @document.native_text().map do |w| w.to_s ; end
+        end
+      end
+      #l = getvalue
+      File.open(name, "w"){ |f|
+        l.each { |line| f.puts line }
+        #l.each { |line| f.write line.gsub(/\r/,"\n") }
+      }
+      rb_puts "#{name} written."
+    end
+    # save content of textpad overwriting if name exists
+    def saveas! name=nil, config={}
+      config[:overwrite_if_exists] = true
+      saveas name, config
+    end
+
+    # Edit the content of the textpad using external editor defaulting to EDITOR.
+    # copied from textarea, modified for textpad and document, needs to be tested TODO
+    # This should not be allowed as a default, some objects may not want to allow it.
+    # It should be enabled, or programmer should bind it to a key
+    def edit_external
+      require 'canis/core/include/appmethods'
+      require 'tempfile'
+      f = Tempfile.new("canis")
+      l = self.text
+      l.each { |line| f.puts line }
+      fp = f.path
+      f.flush
+
+      editor = ENV['EDITOR'] || 'vi'
+      vimp = %x[which #{editor}].chomp
+      ret = shell_out "#{vimp} #{fp}"
+      if ret
+        lines = File.open(f,'r').readlines
+        if @document
+          @document.text = lines
+          @document.parse_required
+          self.text(@document)
+          # next line works
+          #self.text(lines, :content_type => :tmux)
+        else
+          set_content(lines)
+        end
+      end
+    end
   end
 end
 include Canis::ListBindings

data/lib/canis/core/include/textdocument.rb

@@ -4,7 +4,7 @@
 #       Author: j kepler  http://github.com/mare-imbrium/canis/
 #         Date: 2014-06-25 - 12:52
 #      License: MIT
-#  Last update: 2014-07-08 13:11
+#  Last update: 2014-09-11 19:48
 # ----------------------------------------------------------------------------- #
 #  textdocument.rb  Copyright (C) 2012-2014 j kepler
 
@@ -26,7 +26,7 @@ module Canis
 
     # returns the native or transformed format of original content. +text+ gets transformed into
     #  native text. The renderer knows how to display native_text.
-    #attr_reader :native_text
+    # NOTE: native_text is currently Chunklines - chunks of text with information of color
     def native_text
       unless @native_text
         preprocess_text @text
@@ -35,6 +35,7 @@ module Canis
     end
     # specify a renderer if you do not want the DefaultRenderer to be installed.
     attr_accessor :renderer
+    # the source object using this document
     attr_reader :source
 
     def initialize hash
@@ -47,7 +48,7 @@ module Canis
       raise "textdoc recieves nil content_type in constructor" unless @content_type
     end
     # declare that transformation of entire content is required. Currently called by fire_dimension_changed event
-    #  of textpad.
+    #  of textpad. NOTE: not called from event, now called in text()
     def parse_required
       @parse_required = true
     end
@@ -97,7 +98,8 @@ module Canis
         create_default_content_type_handler
       end
       @parse_required = false
-      @native_text = @content_type_handler.parse_text formatted_text
+      # 2014-09-11 - 19:47 sending in color from here, otherwise the wrong default is picked. TEST 
+      @native_text = @content_type_handler.parse_text formatted_text, @source.color_pair, @source.attr
     end
     # returns title of document
     def title

data/lib/canis/core/widgets/textpad.rb

@@ -10,7 +10,7 @@
 #       Author: jkepler http://github.com/mare-imbrium/mancurses/
 #         Date: 2011-11-09 - 16:59
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2014-08-27 20:54
+#  Last update: 2014-09-03 17:54
 #
 #  == CHANGES
 #   - changed @content to @list since all multirow widgets use that and so do utils etc
@@ -553,6 +553,7 @@ module Canis
 
           @document = val[0]
           @document.source ||= self
+          @document.parse_required # added 2014-09-03 - 17:54 
           @list = @document.text
         when Array
           # This is the complex case which i would like to phase out.
@@ -596,6 +597,7 @@ module Canis
 
         @document = val
         @document.source ||= self
+        @document.parse_required # added 2014-09-03 - 17:54 
         @list = @document.text
       end
       @_populate_needed = true
@@ -683,6 +685,8 @@ module Canis
     # NOTE there are some cases where document can return a nil since native_text has not been
     #  calculated yet. Happens in back button of help. Earlier preprocess was done from +text+
     #  not it is only done from +repaint+
+    # NOTE: native_text is currently Chunklines - chunks of text with information of color, whereas
+    #  list contains whatever the user set, which can include markup for coloring (ansi/tmux).
     def _getarray
       if @document.nil?
         return @list

data/lib/canis/version.rb

@@ -1,3 +1,3 @@
 module Canis
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canis
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - kepler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler