print_r 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd79e6aeb0a29ecf4dbf971839a6f4fb93263bf6
-  data.tar.gz: f9d7486ca23a0d10023d8571935083a41d475e28
+  metadata.gz: 95a0b85b80910af7d15324eb9397d7df64967137
+  data.tar.gz: 93182c01723a4cb3a6c6e61383613ac77a3c46b5
 SHA512:
-  metadata.gz: f8d48dc90b64d79641f36e4bfe60e72f2549c6fdb22544b4654e4609f17fea57093a2b0de0a86334eac5c4ffed33cdea950525a74727f87c1aa818777163eba5
-  data.tar.gz: 1d14a942a7bc65dd386cb5df3eaf520cf9c7e894dd1ae02df92a757edd5d37d8213a2b8bb990c30d6392a09764ae9983b680bec8a94e970209e125c770d41a7a
+  metadata.gz: 9c314098e50af28b1dbb4cb32f0d4493c103875a085315dab02f8b982ebe854d89f628de34bb5e791cacb8d26840f2d8151390972c57b4dd1ad836622c4c79fc
+  data.tar.gz: e39bd908b173380d7023ebe8313ec61670529741818e76beeb771c39d184627705cbf625e9a02c578d1058ccb83591171834655acb824d53e813b13671cbfd66

data/lib/print_r/generator.rb

@@ -7,43 +7,85 @@ module PrintR
 
     def initialize(object)
       @object = object
+      @recursive_objects = nil
     end
 
     def generate
-      _to_str(object, 0)
+      begin
+        @recursive_objects = Hash.new(0)
+        _to_str(object, 0)
+      ensure
+        @recursive_objects = nil
+      end
     end
 
     def _to_str(obj, indent)
       tab1 = "    " * indent
       tab2 = "    " * (indent+1)
       str = nil
-      type = obj.class.name
+      object_type = obj.class.name
+
+      is_recursive = 1<@recursive_objects[obj.object_id]
+      @recursive_objects[obj.object_id] += 1
 
-      if obj.kind_of?(Array)
+      case obj
+      when Array
+        # hash of values with index
         obj2 = {}
         obj.each_with_index do |value,i|
           obj2[i] = value
         end
         obj = obj2
-      elsif obj.kind_of?(Hash)
-      elsif obj.kind_of?(String)
-      elsif obj.respond_to?(:instance_variables)
-        obj = obj.instance_variables.inject({}) {|h,key|
-          key_str = key.to_s.sub("@", "")
-          h[key_str] = obj.instance_variable_get(key)
-          h
+      when Hash
+        # do nothing
+      when TrueClass
+        # fixnum 1
+        obj = 1
+      when FalseClass
+        # fixnum 0
+        # not compatible with print_r() of PHP
+        obj = 0
+      when NilClass
+        # empty string
+        obj = ""
+      when Exception
+        # to hash
+        obj = obj.instance_eval{
+          {
+            :message => self.message,
+            :backtrace => self.backtrace,
+          }
         }
+      else
+        if obj.respond_to?(:instance_variables) && 0<obj.instance_variables.length
+          # instance_variables
+          obj = obj.instance_variables.inject({}) {|h,key|
+            key_str = key.to_s.sub("@", "")
+            h[key_str] = obj.instance_variable_get(key)
+            h
+          }
+        elsif obj.respond_to?(:to_s)
+          # to_s
+          obj = obj.to_s
+        end
       end
 
-      if obj.kind_of?(Hash)
-        str = "#{type} Object\n"
-        str += tab1 + "(\n"
-        obj.each_pair do |key,value|
-          str += sprintf("%s[%s] => %s\n", tab2, key, _to_str(value, indent+2))
+      # to string
+      case obj
+      when Hash
+        str = "#{object_type} Object\n"
+
+        if is_recursive
+          str += " *RECURSION*"
+        else
+          str += tab1 + "(\n"
+          obj.each_pair do |key,value|
+            str += sprintf("%s[%s] => %s\n", tab2, key, _to_str(value, indent+2))
+          end
+          str += tab1 + ")\n"
         end
-        str += tab1 + ")\n"
       else
-        str = obj.to_s
+        str = "#{obj}"
       end
 
       str

data/lib/print_r/parser.rb

@@ -16,8 +16,9 @@ module PrintR
     def _to_object(str, indent)
       str = str.strip
       tab = "    " * indent
-      md = str.match(/^(?:Array|.*? Object)\n#{tab}\(\n(.*)#{tab}\)$/m)
-      if md
+      if md = str.match(/^(Array|[^ ]*? Object)\n \*RECURSION\*$/m)
+        obj = Recursion.new(md[1])
+      elsif md = str.match(/^(?:Array|[^ ]*? Object)\n#{tab}\(\n(.*)#{tab}\)$/m)
         obj = _to_key_values(md[1].split(/(\r\n|\r|\n)/), indent+1)
 
         obj.each do |key, value|

data/lib/print_r/recursion.rb

@@ -0,0 +1,14 @@
+module PrintR
+  class Recursion < RuntimeError
+    attr_reader :object_type
+
+    def initialize(error_message=nil)
+      @object_type = error_message
+      super(error_message)
+    end
+
+    def to_s
+      "#{object_type} *RECURSION*"
+    end
+  end
+end

data/lib/print_r/version.rb

@@ -1,3 +1,3 @@
 module PrintR
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/print_r.rb

@@ -3,6 +3,7 @@
 
 require 'print_r/parser'
 require 'print_r/generator'
+require 'print_r/recursion'
 require 'print_r/version'
 
 module PrintR

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: print_r
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies: []
 description: This is a print_r() implementation.
 email:
@@ -24,6 +24,7 @@ files:
 - lib/print_r/core_ext.rb
 - lib/print_r/generator.rb
 - lib/print_r/parser.rb
+- lib/print_r/recursion.rb
 - lib/print_r/version.rb
 - print_r.gemspec
 homepage: https://github.com/yoshida-eth0/ruby-print_r