wunderbar 0.8.2 → 0.8.3

data/lib/wunderbar/html-methods.rb

@@ -163,9 +163,11 @@ class HtmlMarkup
           block.call
         rescue ::Exception => exception
           text = exception.inspect
+          Wunderbar.warn text
           exception.backtrace.each do |frame| 
             next if frame =~ %r{/wunderbar/}
             next if frame =~ %r{/gems/.*/builder/}
+            Wunderbar.warn "  #{frame}"
             text += "\n  #{frame}"
           end
     
@@ -202,6 +204,13 @@ class HtmlMarkup
     @x.declare!(*args)
   end
 
+  def _coffeescript(text)
+    require 'coffee-script'
+    _script CoffeeScript.compile(text)
+  rescue LoadError
+    _script text, :lang => 'text/coffeescript'
+  end
+
   def target!
     @x.target!
   end

data/lib/wunderbar/logger.rb

@@ -0,0 +1,54 @@
+require 'logger'
+
+module Wunderbar
+  def self.logger
+    return @logger if @logger
+    @logger = Logger.new(STDOUT)
+    @logger.level = Logger::WARN
+    @logger.formatter = proc { |severity, datetime, progname, msg|
+      "_#{severity} #{msg}\n"
+    }
+    @logger
+  end
+
+  def self.log_level=(level)
+    return unless level
+
+    case level.to_s.downcase
+    when 'debug'; logger.level = Logger::DEBUG
+    when 'info';  logger.level = Logger::INFO
+    when 'warn';  logger.level = Logger::WARN
+    when 'error'; logger.level = Logger::ERROR
+    when 'fatal'; logger.level = Logger::FATAL
+    else
+      warn "Invalid log_level specified: #{level}"
+    end
+  end
+
+  # convenience methods
+  def self.debug(*args, &block)
+    logger.debug *args, &block
+  end
+
+  def self.info(*args, &block)
+    logger.info *args, &block
+  end
+
+  def self.warn(*args, &block)
+    logger.warn *args, &block
+  end
+
+  def self.error(*args, &block)
+    logger.error *args, &block
+  end
+
+  def self.fatal(*args, &block)
+    logger.fatal *args, &block
+  end
+end
+
+Wunderbar.log_level = :debug  if ARGV.delete '--debug'
+Wunderbar.log_level = :info   if ARGV.delete '--info'
+Wunderbar.log_level = :warn   if ARGV.delete '--warn'
+Wunderbar.log_level = :error  if ARGV.delete '--error'
+Wunderbar.log_level = :fatal  if ARGV.delete '--fatal'

data/lib/wunderbar/version.rb

@@ -2,7 +2,7 @@ module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 8
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/wunderbar.rb

@@ -8,4 +8,5 @@ require 'wunderbar/html-methods'
 require 'wunderbar/job-control'
 require 'wunderbar/installation'
 require 'wunderbar/builder'
+require 'wunderbar/logger'
 

data/test/test_html_markup.rb

@@ -5,6 +5,12 @@ require 'wunderbar'
 class HtmlMarkupTest < Test::Unit::TestCase
   def setup
     $x = nil # until this hack is removed html-methods.rb
+    @original_log_level = Wunderbar.logger.level
+    Wunderbar.log_level = :fatal
+  end
+
+  def teardown
+    Wunderbar.logger.level = @original_log_level
   end
 
   def test_html
@@ -117,4 +123,17 @@ class HtmlMarkupTest < Test::Unit::TestCase
     x.declare! :DOCTYPE, 'html'
     assert_equal %{<!DOCTYPE "html">\n}, x.target!
   end
+
+  begin
+    require 'coffee-script'
+
+    def test_coffeescript
+      x = HtmlMarkup.new
+      x.html {_coffeescript 'alert "foo"'}
+      assert_match %r[<script\slang="text/javascript">\s+\(function\(\)\s
+        \{\s+alert\("foo"\);\s+\}\).call\(this\);\s+</script>]x, x.target!
+    end
+  rescue LoadError
+  end
+    
 end

data/test/test_logger.rb

@@ -0,0 +1,76 @@
+require 'test/unit'
+require 'rubygems'
+require 'wunderbar'
+require 'logger'
+
+class TestLogger
+  attr_accessor :messages
+  def initialize
+    @messages = Hash.new {|hash, key| hash[key] = Array.new}
+    @original_logger = Wunderbar.logger
+    logger = self
+    Wunderbar.instance_eval {@logger = logger}
+  end
+
+  def method_missing(method, *args)
+    if [:debug, :info, :warn, :error, :fatal].include? method
+      @messages[method] << args.first
+    else
+      @original_logger.send(method, *args)
+    end
+  end
+
+  def teardown
+    logger = @original_logger
+    Wunderbar.instance_eval {@logger = logger}
+  end
+end
+
+class LoggerTest < Test::Unit::TestCase
+  def setup
+    @logger = TestLogger.new
+  end
+
+  def teardown
+    @logger.teardown
+  end
+
+  def test_debug
+    Wunderbar.debug 'Sneezy'
+    assert @logger.messages[:debug].include? 'Sneezy'
+  end
+
+  def test_info
+    Wunderbar.info 'Sleepy'
+    assert @logger.messages[:info].include? 'Sleepy'
+  end
+
+  def test_warn
+    Wunderbar.warn 'Dopey'
+    assert @logger.messages[:warn].include? 'Dopey'
+  end
+
+  def test_error
+    Wunderbar.error 'Doc'
+    assert @logger.messages[:error].include? 'Doc'
+  end
+
+  def test_fatal
+    Wunderbar.fatal 'Happy'
+    assert @logger.messages[:fatal].include? 'Happy'
+  end
+
+  def test_loglevel
+    assert Wunderbar.logger.level == Logger::WARN
+    Wunderbar.log_level = 'debug'
+    assert Wunderbar.logger.level == Logger::DEBUG
+    Wunderbar.log_level = 'info'
+    assert Wunderbar.logger.level == Logger::INFO
+    Wunderbar.log_level = 'warn'
+    assert Wunderbar.logger.level == Logger::WARN
+    Wunderbar.log_level = 'error'
+    assert Wunderbar.logger.level == Logger::ERROR
+    Wunderbar.log_level = 'fatal'
+    assert Wunderbar.logger.level == Logger::FATAL
+  end
+end

data/wunderbar.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-02-04"
+  s.date = "2012-02-05"
   s.description = "    Provides a number of globals, helper methods, and monkey patches which\n    simplify the generation of HTML and the development of CGI scripts.\n"
   s.email = "rubys@intertwingly.net"
-  s.extra_rdoc_files = ["COPYING", "README", "lib/wunderbar.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/version.rb"]
-  s.files = ["COPYING", "README", "Rakefile", "lib/wunderbar.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/version.rb", "test/test_html_markup.rb", "Manifest", "wunderbar.gemspec", "test/test_builder.rb"]
+  s.extra_rdoc_files = ["COPYING", "README", "lib/wunderbar.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/version.rb"]
+  s.files = ["COPYING", "README", "Rakefile", "lib/wunderbar.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/version.rb", "test/test_builder.rb", "test/test_html_markup.rb", "test/test_logger.rb", "wunderbar.gemspec", "Manifest"]
   s.homepage = "http://github.com/rubys/wunderbar"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Wunderbar", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "wunderbar"
   s.rubygems_version = "1.8.15"
   s.summary = "HTML Generator and CGI application support"
-  s.test_files = ["test/test_html_markup.rb", "test/test_builder.rb"]
+  s.test_files = ["test/test_logger.rb", "test/test_html_markup.rb", "test/test_builder.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wunderbar
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-04 00:00:00 Z
+date: 2012-02-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -61,6 +61,7 @@ extra_rdoc_files:
 - lib/wunderbar/html-methods.rb
 - lib/wunderbar/installation.rb
 - lib/wunderbar/job-control.rb
+- lib/wunderbar/logger.rb
 - lib/wunderbar/version.rb
 files: 
 - COPYING
@@ -73,11 +74,13 @@ files:
 - lib/wunderbar/html-methods.rb
 - lib/wunderbar/installation.rb
 - lib/wunderbar/job-control.rb
+- lib/wunderbar/logger.rb
 - lib/wunderbar/version.rb
+- test/test_builder.rb
 - test/test_html_markup.rb
-- Manifest
+- test/test_logger.rb
 - wunderbar.gemspec
-- test/test_builder.rb
+- Manifest
 homepage: http://github.com/rubys/wunderbar
 licenses: []
 
@@ -118,5 +121,6 @@ signing_key:
 specification_version: 3
 summary: HTML Generator and CGI application support
 test_files: 
+- test/test_logger.rb
 - test/test_html_markup.rb
 - test/test_builder.rb