lib/chuckle/client.rb in chuckle-1.0.7 vs lib/chuckle/client.rb in chuckle-1.0.9

- old
+ new

@@ -1,16 +1,17 @@ -require "uri" +require 'English' +require 'uri' module Chuckle class Client include Chuckle::Options attr_accessor :options, :cache def initialize(options = {}) self.options = DEFAULT_OPTIONS.dup - options.each { |k, v| self.options[k] = v if v != nil } + options.each { |k, v| self.options[k] = v if !v.nil? } self.cache = Cache.new(self) sanity! end # @@ -48,11 +49,11 @@ protected # make sure curl command exists def sanity! - system("which curl > /dev/null") - raise "Chuckle requires curl. Please install it." if $? != 0 + system('which curl > /dev/null') + raise 'Chuckle requires curl. Please install it.' if $CHILD_STATUS != 0 end def curl(request) vputs request.uri rate_limit!(request)