gg 0.9.12 → 0.9.13

data/lib/gg.rb

@@ -6,7 +6,7 @@ require 'gg/rack_plugin'
 require 'gg/demo_app'
 require 'gg/core'
 require 'gg/logger'
-require 'gg/history'
+require 'gg/state'
 require 'gg/stack'
 require 'gg/stack_line'
 

data/lib/gg/core.rb

@@ -7,14 +7,15 @@ module Kernel
     GG::Stack.new(caller(start+1))
   end
 
-  def gg(*args)
+  def gg(*args, &block)
     #ap args
     #ap caller
     #$gg << "<h1>JFKLDJSKLFSDJKL</h1>"
     #ap '======================'
     #ap args.size
     stack = gg_caller
-    history = GG::History.new
+    history = GG::State.new
+    history.instance_eval(&block) if block
     # case args.size
     # when 1
       # $gg << GG.render( 'slim/logger.slim', { stack: stack } ) do
@@ -31,18 +32,23 @@ module Kernel
     )
     
     # RENDER CONSOLE
-    $gg.console_array << <<-EOF
-#{'-'*79}
-#{caller[0]}
-#{stack[0].code_line.strip}
-#{'.'*79}
-#{args.ai({})}
-    EOF
-    # end
+    begin
+      $gg.console_array << '-'*79
+      $gg.console_array << caller[0]
+      $gg.console_array << stack[0].code_line.strip
+      $gg.console_array << '-'*79
+      $gg.console_array << args.ai({})
+    rescue => e
+      $gg.console_array << e.inspect
+    end
   end
   
   def gg_render_error(e)
-    e.inspect
+    "<span class=\"gg-error\">error in gg: #{Rack::Utils.escape_html(e.inspect)}</span>"
+  end
+  
+  def gg_render_recursive
+    "<span class=\"gg-recursive\">...recursive...</span>"
   end
   
 end
@@ -50,8 +56,7 @@ end
 class Object
   
   def to_hi_html(history)
-    return "...recursive..." if history[self]
-    history[self] = true
+    return gg_render_recursive if history.exists?(self)#[self]
     if self.instance_variables.size == 0                                                        
       GG.render('slim/object.slim',
         object: self, 
@@ -59,6 +64,7 @@ class Object
         history: history
       )
     else
+      history.add(self)#[self] = true
       GG.render('slim/object_with_instance_variables.slim', 
         object: self, 
         classname: "hi-#{ self.class }", 
@@ -96,8 +102,8 @@ end
 class Array
   
   def to_hi_html(history)
-    return "...recursive..." if history[self]
-    history[self] = true
+    return gg_render_recursive if history.exists?(self)#[self]
+    history.add(self)#[self] = true
     GG.render('slim/array.slim', object: self, history: history)
   rescue => e
     gg_render_error(e)
@@ -108,8 +114,8 @@ end
 class Hash
   
   def to_hi_html(history)
-    return "...recursive..." if history[self]
-    history[self] = true
+    return gg_render_recursive if history.exists?(self)#self
+    history.add(self) #[self] = true
     GG.render('slim/hash.slim', object: self, history: history)
   rescue => e
     gg_render_error(e)

data/lib/gg/demo_app.rb

@@ -12,6 +12,12 @@ class GG::DemoApp
     
   end
   
+  class CustomWithError
+    def class
+      throw "Class Call Error"
+    end
+  end
+  
   def call(env)
     case env[ 'PATH_INFO' ]
     when '/'
@@ -78,8 +84,19 @@ class GG::DemoApp
       }
     }
     gg hash
+    
     custom = Custom.new( 'cube', [ 5, 3 ], 'yellow' )
     gg custom
+    
+    custom_with_error = CustomWithError.new
+    gg custom_with_error
+    
+    hash_with_error = {
+      'a' => 'alpha',
+      'custom' => CustomWithError.new
+    }
+    gg hash_with_error
+    
     recursive_hash = { a: 'alpha', b: 'bravo' }
     recursive_array = [ :a, :b, recursive_hash ] 
     recursive_hash[ :array ] = recursive_array
@@ -89,6 +106,12 @@ class GG::DemoApp
     gg recursive_hash
     gg recursive_array
     gg recursive_object
+    
+    non_recursive_hash = {
+      'a' => {1 => true, 2 => true},
+      'b' => {1 => true, 2 => true}
+    }
+    gg non_recursive_hash
   end
   
 end

data/lib/gg/public/gg.css

@@ -64,7 +64,16 @@
 
 /* OBJECTS */
 
-.hi-string {
+.gg-recursive {
+  font-style: italic;
+}
+
+.gg-error {
+  color: #C00;
+  font-style: italic;
+}
+
+.gg-String {
   color: #048;
 }
 

data/lib/gg/slim/string.slim

@@ -1,3 +1,3 @@
 - id = rand( 1000000000 )
-span.hi-string
+span.gg-String
   = self.inspect

data/lib/gg/state.rb

@@ -0,0 +1,44 @@
+class GG::State
+  
+  attr_reader :hash
+  
+  def initialize
+    @hash = {}
+    @depth = 2
+  end
+  
+  def exists?(value)
+    hash.key?(value.object_id)
+  end
+  
+  def add(value)
+    hash[value.object_id] = true
+  end
+  
+  def depth(value=nil)
+    if value.nil?
+      @depth
+    else
+      @depth = depth
+    end
+  end
+  
+  
+  # SHOW_LIMIT = 15
+#   
+  # def initialize
+    # @show_count = 0
+    # super
+  # end
+#   
+  # attr_accessor :show_count
+#   
+  # def inc
+    # @show_count += 1
+  # end
+#   
+  # def continue?
+    # @show_count <= SHOW_LIMIT
+  # end
+  
+end

data/lib/gg/version.rb

@@ -1,3 +1,3 @@
 class GG
-  VERSION = "0.9.12"
+  VERSION = "0.9.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gg
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
   prerelease: 
 platform: ruby
 authors:
@@ -91,7 +91,6 @@ files:
 - lib/gg.rb
 - lib/gg/core.rb
 - lib/gg/demo_app.rb
-- lib/gg/history.rb
 - lib/gg/logger.rb
 - lib/gg/public/gg.css
 - lib/gg/rack_plugin.rb
@@ -108,6 +107,7 @@ files:
 - lib/gg/slim/string.slim
 - lib/gg/stack.rb
 - lib/gg/stack_line.rb
+- lib/gg/state.rb
 - lib/gg/version.rb
 - public/images/accept.png
 homepage: ''

data/lib/gg/history.rb

@@ -1,20 +0,0 @@
-class GG::History < Hash
-  
-  # SHOW_LIMIT = 15
-#   
-  # def initialize
-    # @show_count = 0
-    # super
-  # end
-#   
-  # attr_accessor :show_count
-#   
-  # def inc
-    # @show_count += 1
-  # end
-#   
-  # def continue?
-    # @show_count <= SHOW_LIMIT
-  # end
-  
-end