ruby-debug-ide 0.4.23.beta11 → 0.4.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmU0ZmRkMjViNTc1YjIzNDQ3ZmYxMzRlZTI0NWM4Y2MwMjU1NWVjYQ==
+    NjRjOTFkYzU1MWZiMmE5MGY3NDEzZWVhZmRlMzZjMDBhNmFjODJmNA==
   data.tar.gz: !binary |-
-    NmRmMzE2ZTA5MzY2MmM5NzcxYmUzMGE0ZThkMTk3MzA5ZTBjNDViZg==
+    YjVmM2NlM2FmZjNmN2JhZWIzNzI0MWUzMTkzYTcxYjFjODAyMTI2OQ==
 SHA512:
   metadata.gz: !binary |-
-    MTE2NzVhYmVmNjM0OWVjNWIwOTIyZmUyZDNmOWY4OTQ0M2I0ODkwMzg3ZDVk
-    NDA4N2MwNmQ0Y2JkMDFmM2Y1YzExMTYxMmQ5N2YxYTIwYjRiZTU3YzFlMDgw
-    NTg2ZjhmZjZiYWY5ZmY4Yzc5NTQ3ZjIxZjk1YjhhODVhZWRiMjc=
+    NDAxYjlhNDY2YzhiN2Y0M2Y1YzMzOTRmZThiYjMyZThjMmQ1ZjA3N2YxMDVm
+    ZWZhMzU1NTdiZTQ5YmUzYjNmMTUyYjc1NmY0ZjI0NzQ0MTc4MDlhNGRkNjYw
+    ZDM2ZmNlNzEzODZlMTk0MDVkZjlmYmM0OTg4M2M3MDc2MjU0YmM=
   data.tar.gz: !binary |-
-    OWJkODc5MWJmMDljYzRiMzNmMjVhNzVjZjA4YjIwMGQ5ODFiMzg4NjQ3OTY2
-    ZjcxMzdlZDNkOGNjNDNiNTU1MjY3ZGY5YjA2ZDU2MDEyYjRmOTgwYTJlOWY1
-    YjA5ZjYyNzBlNDEwODA2YTMxYjdmMDc2NzU4ZTEwYmNlNWM3OGQ=
+    YzkyNWUzODdkNTFlOTMxNWQ5ODU0ZTNiYWQ2YmNmYzI5NTcwNDE0MWE0NWZk
+    ZjA0ZWJjNDE2YzI4N2I4ZjBmMDFjYjM0MmFiZjkxZGU3ZmQzNjIyMTczOThm
+    NTE4ZDQwM2U1YTkxOGYwMDY5N2UwMTFjNTE3NTMwNDU1Y2Y2YTY=

data/ChangeLog.md

@@ -1,3 +1,8 @@
+## [0.4.23](https://github.com/ruby-debug/ruby-debug-ide/compare/v0.4.23.beta11...v0.4.23)
+
+* fixed problem with compact name for binary params (strings with invalid encoding)
+  [RUBY-15960](https://youtrack.jetbrains.com/issue/RUBY-15960)
+
 ## [0.4.23.beta11](https://github.com/ruby-debug/ruby-debug-ide/compare/v0.4.23.beta10...v0.4.23.beta11)
 
 * adding breakpoint in non-existing file should not break debugger

data/lib/ruby-debug-ide/version.rb

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.4.23.beta11'
+  IDE_VERSION='0.4.23'
 end

data/lib/ruby-debug-ide/xml_printer.rb

@@ -91,8 +91,7 @@ module Debugger
     end
     
     def print_context(context)
-      current = 'current="yes"' if context.thread == Thread.current
-      print "<thread id=\"%s\" status=\"%s\" pid=\"%s\" #{current}/>", context.thnum, context.thread.status, Process.pid
+      print "<thread id=\"%s\" status=\"%s\" pid=\"%s\" #{current_thread_attr(context)}/>", context.thnum, context.thread.status, Process.pid
     end
     
     def print_variables(vars, kind)
@@ -147,30 +146,31 @@ module Debugger
       end
       if value.is_a?(Array) || value.is_a?(Hash)
         has_children = !value.empty?
-        unless has_children
-          value_str = "Empty #{value.class}"
-        else
-          size = value.size
+        if has_children
+          size      = value.size
           value_str = "#{value.class} (#{value.size} element#{size > 1 ? "s" : "" })"
+        else
+          value_str = "Empty #{value.class}"
         end
       elsif value.is_a?(String)
         has_children = value.respond_to?('bytes') || value.respond_to?('encoding')
         value_str = value
       else  
         has_children = !value.instance_variables.empty? || !value.class.class_variables.empty?
-        value_str = value.to_s || 'nil' rescue "<#to_s method raised exception: #$!>"
+        value_str = value.to_s || 'nil' rescue "<#to_s method raised exception: #{$!}>"
         unless value_str.is_a?(String)
           value_str = "ERROR: #{value.class}.to_s method returns #{value_str.class}. Should return String." 
         end
       end
 
       if value_str.respond_to?('encode')
+        # noinspection RubyEmptyRescueBlockInspection
         begin
          value_str = value_str.encode("UTF-8")
         rescue
-        end 
+        end
       end
-      value_str = "[Binary Data]" if (value_str.respond_to?('is_binary_data?') && value_str.is_binary_data?)
+      value_str = handle_binary_data(value_str)
       compact_value_str = build_compact_name(value_str, value)
       print("<variable name=\"%s\" compactValue=\"%s\" kind=\"%s\" value=\"%s\" type=\"%s\" hasChildren=\"%s\" objectId=\"%#+x\">",
           CGI.escapeHTML(name), CGI.escapeHTML(compact_value_str), kind, CGI.escapeHTML(value_str), value.class,
@@ -184,13 +184,13 @@ module Debugger
       if value.is_a?(Array)
         slice = value[0..10]
         compact = slice.inspect
-        if (value.size != slice.size)
+        if value.size != slice.size
           compact = compact[0..compact.size-2] + ", ...]"
         end
       end
       if value.is_a?(Hash)
-        slice = value.sort_by { |k,v| k.to_s }[0..5]
-        compact = slice.map {|kv| "#{kv[0]}: #{kv[1]}"}.join(", ")
+        slice = value.sort_by { |k, _| k.to_s }[0..5]
+        compact = slice.map {|kv| "#{kv[0]}: #{handle_binary_data(kv[1])}"}.join(", ")
         compact = "{" + compact + (slice.size != value.size ? ", ..." : "") + "}"
       end
       compact
@@ -255,7 +255,7 @@ module Debugger
     
     def print_list(b, e, file, line)
       print "[%d, %d] in %s\n", b, e, file
-      if lines = Debugger.source_for(file)
+      if (lines = Debugger.source_for(file))
         b.upto(e) do |n|
           if n > 0 && lines[n-1]
             if n == line
@@ -266,7 +266,7 @@ module Debugger
           end
         end
       else
-        print "No sourcefile available for %s\n", file
+        print "No source-file available for %s\n", file
       end
     end
     
@@ -280,7 +280,7 @@ module Debugger
     
     # Events
     
-    def print_breakpoint(n, breakpoint)
+    def print_breakpoint(_, breakpoint)
       print("<breakpoint file=\"%s\" line=\"%s\" threadId=\"%d\"/>", 
       breakpoint.source, breakpoint.pos, Debugger.current_context.thnum)
     end
@@ -302,7 +302,7 @@ module Debugger
         File.expand_path(file), line, context.thnum, context.stack_size
     end
     
-    def print_exception(exception, binding)
+    def print_exception(exception, _)
       print_element("variables") do
         proxy = ExceptionProxy.new(exception)
         InspectCommand.reference_result(proxy)
@@ -343,6 +343,20 @@ module Debugger
       @interface.print(*params)
     end
 
+    def handle_binary_data(value)
+      return '[Binary Data]' if (value.respond_to?('is_binary_data?') && value.is_binary_data?)
+      return '[Invalid encoding]' if (value.respond_to?('valid_encoding?') && !value.valid_encoding?)
+      value
+    end
+
+    def current_thread_attr(context)
+      if context.thread == Thread.current
+        'current="yes"'
+      else
+        ''
+      end
+    end
+
     instance_methods.each do |m|
       if m.to_s.index('print_') == 0
         protect m

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.4.23.beta11
+  version: 0.4.23
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,9 +86,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: debug-commons
 rubygems_version: 2.2.2