mudbug 0.4.6.6 → 0.4.6.7

data/README.md

@@ -19,7 +19,7 @@ Install the gem:
 
 Or, if using bundler, add to your Gemfile:
 
-    gem 'bateman'
+    gem 'mudbug', '~> 0'
 
 Quick Start
 -----------
@@ -40,6 +40,7 @@ Usage
 -----
 You can pass through persistent [options to rest-client](https://github.com/rest-client/rest-client/blob/master/lib/restclient/request.rb):
 
+    require 'mudbug'
     mb = Mudbug.new 'google.com', max_redirects: 3
 
 Declare what you accept: (optional, default shown)
@@ -74,7 +75,7 @@ Call Mudbug#resource directly for finer-grained response handling:
     # process resp.body
     # etc.
 
-Here is the heart of the Mudbug's [response processing](https://github.com/rickhull/mudbug/blob/master/lib/mudbug.rb#L37):
+Here is the heart of the Mudbug's [response processing](https://github.com/rickhull/mudbug/blob/master/lib/mudbug.rb#L45):
 
     # this structure declares what we support in the request Accept: header
     # and defines automatic processing of the response based on the

data/VERSION

@@ -1 +1 @@
-0.4.6.6
+0.4.6.7

data/examples/accepts_and_methods.rb

@@ -20,9 +20,8 @@ unless ARGV.shift == 'skip'
     accepts.each { |acp|
       b.accept(acp)
 
-      print "GET #{url}  [#{acp}] "
+      puts "GET #{url}  [#{acp}]"
       b.get path
-      puts
     }
     puts
   }

data/lib/mudbug.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require 'rest-client'
 require 'json'
 
@@ -28,6 +29,43 @@ class Mudbug
     },
   }
 
+  def self.log_to dest=nil
+    case dest
+    when nil, 'stderr', 'STDERR'
+      dest = $stderr
+    when 'stdout', 'STDOUT'
+      dest = $stdout
+    when IO
+      # do nothing
+    when String
+      # assume file path, do nothing
+    else
+      raise "unable to log_to #{dest} (#{dest.class})"
+    end
+    if defined?(@@log)
+      l = Logger.new dest
+      l.formatter = @@log.formatter
+      l.level = @@log.level
+      @@log = l
+    else
+      @@log = Logger.new dest
+      @@log.formatter = proc { |sev, time, progname, msg|
+        line = "[#{time.strftime('%Y-%m-%d %H:%M:%S')}] #{sev.to_s.upcase}: "
+        line << "(#{progname}) " if progname
+        line << msg << "\n"
+      }
+      @@log.level = Logger::WARN
+    end
+    @@log
+  end
+
+  def self.log_level=(sym)
+    log_to unless defined?(@@log)
+    level = Logger.const_get(sym.to_s.upcase)
+    raise "unknown log level #{sym}" unless level
+    @@log.level = level
+  end
+
   # map our internal symbols to HTTP content types
   # assign q scores based on the parameter order
   # construct the right side of the Accept: header
@@ -43,39 +81,45 @@ class Mudbug
   # do stuff based on response's Content-type
   #
   def self.process(resp, accept = nil)
-    case resp.code
-    when 200..299
-      # 2xx, OK
-    else
-      warn "proceeding with HTTP Status Code #{resp.code}"
+    log_to unless defined?(@@log)
+
+    @@log.debug { "response code: #{resp.code}" }
+    @@log.debug { "response headers:\n" << resp.raw_headers.inspect }
+
+    unless (200..299).include?(resp.code)
+      @@log.warn { "processing with HTTP Status Code #{resp.code}" }
     end
 
     # do you even Content-type, bro?
     ct = resp.headers[:content_type]
     unless ct
-      warn "process NOOP -- no response Content-type"
+      @@log.warn { "abort processing -- no response Content-type" }
       return resp.body
     end
 
     # warn if we got Content-type we didn't ask for
     ct, charset = ct.split(';').map { |s| s.strip }
-    warn "Asked for #{accept} but got #{ct}" if accept and !accept.include?(ct)
+    if accept and !accept.include?(ct)
+      @@log.warn { "Asked for #{accept} but got #{ct}" }
+    end
 
     # process the response for known content types
     CONTENT.each { |sym, hsh|
       return hsh[:proc].call(resp.body) if ct == hsh[:type]
     }
 
-    warn "process NOOP -- unrecognized Content-type: #{ct}"
-    return response.body
+    @@log.warn { "abort processing -- unrecognized Content-type: #{ct}" }
+    return resp.body
   end
 
+
   attr_reader :options
   attr_accessor :host
 
-  def initialize(host, options = nil)
+  def initialize(host, options = {})
+    self.class.log_to options.delete :log_to
     @host = host
-    @options = options || {}
+    @options = options
     accept :json, :html, :text
   end
 
@@ -98,10 +142,7 @@ class Mudbug
   #
   def resource(path, options = {})
     path = "/#{path}" unless path[0,1] == '/'
-    url = "http://#{@host}#{path}"
-    options = @options.merge(options)
-
-    RestClient::Resource.new(url, options)
+    RestClient::Resource.new "http://#{@host}#{path}", @options.merge(options)
   end
 
   # no payload

data/rakefile.rb

@@ -39,6 +39,7 @@ task :build do
 
     s.add_runtime_dependency  "rest-client", ["~> 1"]
     s.add_runtime_dependency         "json", ["~> 1"]
+    s.add_runtime_dependency        "lager", [">= 0"]
     s.add_development_dependency "minitest", [">= 0"]
     s.add_development_dependency     "rake", [">= 0"]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mudbug
 version: !ruby/object:Gem::Version
-  version: 0.4.6.6
+  version: 0.4.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: lager
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement