shoesgem 0.1424.0 → 0.1426.0

data/shoes/lib/shoes/image.rb

@@ -1,25 +1,25 @@
-require 'digest/sha1'
-
-class Shoes
-  def self.image_temp_path uri, uext
-    File.join(Dir::tmpdir, "#{uri.host}-#{Time.now.usec}" + uext)
-  end
-  def self.image_cache_path hash, ext
-    dir = File.join(CACHE_DIR, hash[0,2])
-    Dir.mkdir(dir) unless File.exists?(dir)
-    File.join(dir, hash[2..-1]) + ext.downcase
-  end
-  def snapshot(options = {}, &block)
-    options[:format]   ||= :svg
-
-    options[:filename] ||= ( tf_path = ( require 'tempfile'
-                 tf = Tempfile.new(File.basename(__FILE__)).path ))
-
-    _snapshot options do
-      block.call
-    end
-    return File.read(options[:filename])
-  ensure
-    File.unlink(tf_path) if tf_path
-  end
-end
+require 'digest/sha1'
+
+class Shoes
+  def self.image_temp_path uri, uext
+    File.join(Dir::tmpdir, "#{uri.host}-#{Time.now.usec}" + uext)
+  end
+  def self.image_cache_path hash, ext
+    dir = File.join(CACHE_DIR, hash[0,2])
+    Dir.mkdir(dir) unless File.exists?(dir)
+    File.join(dir, hash[2..-1]) + ext.downcase
+  end
+  def snapshot(options = {}, &block)
+    options[:format]   ||= :svg
+
+    options[:filename] ||= ( tf_path = ( require 'tempfile'
+                 tf = Tempfile.new(File.basename(__FILE__)).path ))
+
+    _snapshot options do
+      block.call
+    end
+    return File.read(options[:filename])
+  ensure
+    File.unlink(tf_path) if tf_path
+  end
+end

data/shoes/lib/shoes/inspect.rb

@@ -1,128 +1,128 @@
-module Kernel
-    def inspect(hits = {})
-        return "(#{self.class} ...)" if hits[self]
-        hits[self] = true
-        if instance_variables.empty?
-            "(#{self.class})"
-        else
-            "(#{self.class} " + 
-                instance_variables.map do |x|
-                    v = instance_variable_get(x)
-                    "#{x}=" + (v.method(:inspect).arity == 0 ? v.inspect : v.inspect(hits))
-                end.join(' ') +
-            ")"
-        end
-      end
-    #def to_html
-    # obj = self
-    #  Web.Bit {
-    #    h1 "A #{obj.class}"
-    #  }
-    #end
-    def to_s; inspect end
-end
-
-class Array
-    def inspect(hits = {})
-        return "[...]" if hits[self]
-        hits[self] = true
-        "[" + map { |x| x.method(:inspect).arity == 0 ? x.inspect : x.inspect(hits) }.join(', ') + "]"
-    end
-    def to_html
-      ary = self
-      Web.Bit {
-        h5 "A List of Things"
-        h1 "An Array"
-        unless ary.empty?
-          ol {
-            ary.map { |x| li { self << HTML(x) } }
-          }
-        end
-      }
-    end
-    def / len
-      a = []
-      each_with_index do |x, i|
-        a << [] if i % len == 0
-        a.last << x
-      end
-      a
-    end
-end
-
-class Hash
-    def inspect(hits = {})
-        return "{...}" if hits[self]
-        hits[self] = true
-        mappings = map do |k,v|
-            key = k.method(:inspect).arity == 0 ? k.inspect : k.inspect(hits)
-            val = v.method(:inspect).arity == 0 ? v.inspect : v.inspect(hits)
-            "#{key} => #{val}"
-        end
-        "{ #{mappings.join(', ')} }"
-    end
-    def to_html
-      h = self
-      Web.Bit {
-        h5 "Pairs of Things"
-        h1 "A Hash"
-        unless h.empty?
-          ul {
-            h.each { |k, v| li { self << "<div class='hashkey'>#{HTML(k)}</div><div class='hashvalue'>#{HTML(v)}</div>" } }
-          }
-        end
-      }
-    end
-end
-
-class File
-    def inspect(hits = nil)
-        "(#{self.class} #{path})"
-    end
-end
-
-class Proc
-    def inspect(hits = nil)
-        v = "a"
-        pvars = []
-        (arity < 0 ? -(arity+1) : arity).times do |i|
-            pvars << v
-            v = v.succ
-        end
-        pvars << "*#{v}" if arity < 0
-        "(Proc |#{pvars.join(',')}|)"
-    end
-end
-
-class Class
-    def make_inspect m = :inspect
-        alias_method :the_original_inspect, m
-        class_eval %{
-            def inspect(hits = nil)
-                the_original_inspect
-            end
-    }
-      #def to_html(hits = nil)
-      #  #{m} + " <div class='classname'>" + self.class.name + "</div>"
-      #end
-    end
-end
-
-class Module; make_inspect :name end
-class Regexp; make_inspect end
-class String; make_inspect end
-class Symbol; make_inspect end
-class Time; make_inspect end
-class Numeric; make_inspect :to_s end
-class Bignum; make_inspect :to_s end
-class Fixnum; make_inspect :to_s end
-class Float; make_inspect :to_s end
-class TrueClass; make_inspect :to_s end
-class FalseClass; make_inspect :to_s end
-class NilClass; make_inspect end
-
-class Shoes::App
-  def inspect(hits = nil)
-    "(#{self.class} #{name.dump})"
-  end
-end
+module Kernel
+    def inspect(hits = {})
+        return "(#{self.class} ...)" if hits[self]
+        hits[self] = true
+        if instance_variables.empty?
+            "(#{self.class})"
+        else
+            "(#{self.class} " + 
+                instance_variables.map do |x|
+                    v = instance_variable_get(x)
+                    "#{x}=" + (v.method(:inspect).arity == 0 ? v.inspect : v.inspect(hits))
+                end.join(' ') +
+            ")"
+        end
+      end
+    #def to_html
+    # obj = self
+    #  Web.Bit {
+    #    h1 "A #{obj.class}"
+    #  }
+    #end
+    def to_s; inspect end
+end
+
+class Array
+    def inspect(hits = {})
+        return "[...]" if hits[self]
+        hits[self] = true
+        "[" + map { |x| x.method(:inspect).arity == 0 ? x.inspect : x.inspect(hits) }.join(', ') + "]"
+    end
+    def to_html
+      ary = self
+      Web.Bit {
+        h5 "A List of Things"
+        h1 "An Array"
+        unless ary.empty?
+          ol {
+            ary.map { |x| li { self << HTML(x) } }
+          }
+        end
+      }
+    end
+    def / len
+      a = []
+      each_with_index do |x, i|
+        a << [] if i % len == 0
+        a.last << x
+      end
+      a
+    end
+end
+
+class Hash
+    def inspect(hits = {})
+        return "{...}" if hits[self]
+        hits[self] = true
+        mappings = map do |k,v|
+            key = k.method(:inspect).arity == 0 ? k.inspect : k.inspect(hits)
+            val = v.method(:inspect).arity == 0 ? v.inspect : v.inspect(hits)
+            "#{key} => #{val}"
+        end
+        "{ #{mappings.join(', ')} }"
+    end
+    def to_html
+      h = self
+      Web.Bit {
+        h5 "Pairs of Things"
+        h1 "A Hash"
+        unless h.empty?
+          ul {
+            h.each { |k, v| li { self << "<div class='hashkey'>#{HTML(k)}</div><div class='hashvalue'>#{HTML(v)}</div>" } }
+          }
+        end
+      }
+    end
+end
+
+class File
+    def inspect(hits = nil)
+        "(#{self.class} #{path})"
+    end
+end
+
+class Proc
+    def inspect(hits = nil)
+        v = "a"
+        pvars = []
+        (arity < 0 ? -(arity+1) : arity).times do |i|
+            pvars << v
+            v = v.succ
+        end
+        pvars << "*#{v}" if arity < 0
+        "(Proc |#{pvars.join(',')}|)"
+    end
+end
+
+class Class
+    def make_inspect m = :inspect
+        alias_method :the_original_inspect, m
+        class_eval %{
+            def inspect(hits = nil)
+                the_original_inspect
+            end
+    }
+      #def to_html(hits = nil)
+      #  #{m} + " <div class='classname'>" + self.class.name + "</div>"
+      #end
+    end
+end
+
+class Module; make_inspect :name end
+class Regexp; make_inspect end
+class String; make_inspect end
+class Symbol; make_inspect end
+class Time; make_inspect end
+class Numeric; make_inspect :to_s end
+class Bignum; make_inspect :to_s end
+class Fixnum; make_inspect :to_s end
+class Float; make_inspect :to_s end
+class TrueClass; make_inspect :to_s end
+class FalseClass; make_inspect :to_s end
+class NilClass; make_inspect end
+
+class Shoes::App
+  def inspect(hits = nil)
+    "(#{self.class} #{name.dump})"
+  end
+end

data/shoes/lib/shoes/log.rb

@@ -1,48 +1,48 @@
-module Shoes::LogWindow
-  def setup
-    stack do
-      flow do
-        background black
-        stack :width => -100 do
-          tagline "Shoes Console", :stroke => white
-        end
-        button "Clear", :margin => 6, :width => 80, :height => 40 do
-          Shoes.log.clear
-        end
-      end
-      @log, @hash = stack, nil
-      update
-      every(0.2) do
-        update
-      end
-    end
-  end
-  def update
-    if @hash != Shoes.log.hash
-      @hash = Shoes.log.hash
-      @log.clear do
-        i = 0
-        Shoes.log.each do |typ, msg, at, mid, rbf, rbl|
-          stack do
-            background "#f1f5e1" if i % 2 == 0
-            inscription strong(typ.to_s.capitalize, :stroke => "#05C"), " in ", 
-              span(rbf, " line ", rbl, :stroke => "#335"), " | ",
-              span(at, :stroke => "#777"), 
-              :stroke => "#059", :margin => 4, :margin_bottom => 0
-            flow do
-              stack :margin => 6, :width => 20 do
-                image "#{DIR}/static/icon-#{typ}.png"
-              end
-              stack :margin => 4, :width => -20 do
-                s = msg.to_s.force_encoding "UTF-8"
-                s << "\n#{msg.backtrace.join("\n")}" if msg.kind_of?(Exception)
-                para s, :margin => 4, :margin_top => 0
-              end
-            end
-          end
-          i += 1
-        end
-      end
-    end
-  end
-end
+module Shoes::LogWindow
+  def setup
+    stack do
+      flow do
+        background black
+        stack :width => -100 do
+          tagline "Shoes Console", :stroke => white
+        end
+        button "Clear", :margin => 6, :width => 80, :height => 40 do
+          Shoes.log.clear
+        end
+      end
+      @log, @hash = stack, nil
+      update
+      every(0.2) do
+        update
+      end
+    end
+  end
+  def update
+    if @hash != Shoes.log.hash
+      @hash = Shoes.log.hash
+      @log.clear do
+        i = 0
+        Shoes.log.each do |typ, msg, at, mid, rbf, rbl|
+          stack do
+            background "#f1f5e1" if i % 2 == 0
+            inscription strong(typ.to_s.capitalize, :stroke => "#05C"), " in ", 
+              span(rbf, " line ", rbl, :stroke => "#335"), " | ",
+              span(at, :stroke => "#777"), 
+              :stroke => "#059", :margin => 4, :margin_bottom => 0
+            flow do
+              stack :margin => 6, :width => 20 do
+                image "#{DIR}/static/icon-#{typ}.png"
+              end
+              stack :margin => 4, :width => -20 do
+                s = msg.to_s.force_encoding "UTF-8"
+                s << "\n#{msg.backtrace.join("\n")}" if msg.kind_of?(Exception)
+                para s, :margin => 4, :margin_top => 0
+              end
+            end
+          end
+          i += 1
+        end
+      end
+    end
+  end
+end