ubersmith 1.0.1 → 1.0.2

data/lib/ubersmith/client.rb

@@ -1,5 +1,7 @@
 require 'net/https'
 require 'uri'
+require 'json'
+require 'fileutils'
 require 'ubersmith/url_maker'
 
 """
@@ -23,7 +25,6 @@ module Ubersmith
     def initialize(options)
       @config_file_path = options[:config_file_path]
       @debug = options[:debug]
-      puts "debug: #{@debug}"
     end
     
     def method_missing(method, *args)
@@ -34,27 +35,21 @@ module Ubersmith
       options ||= {}
       cache = options.delete(:cache)
       cache = true if cache.nil?
-      ret = do_get(build_url(BASE_URL, { 
+      ret = call_api(build_url(BASE_URL, { 
                                :method => components[0] + '.' + components[1],
                              }.merge(options)), :cache => cache)
-      JSON.parse(ret)['data']
+      ret = JSON.parse(ret)
+      raise ret['error_message'] if ret['status'] == false
+      ret['data']
     end
     
     private
-    def do_get(url, options = {})
+    def call_api(url, options = {})
       options[:filename] ||= tmp_dir + "/" + safe_filename(url) if options[:cache]
       if options[:filename] && File.exists?(options[:filename])
         ret = File.read(options[:filename])
       else
-        uri = URI.parse(url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = (uri.scheme == 'https')
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        puts "HTTP GET #{uri.request_uri}" if @debug
-        req = Net::HTTP::Get.new(uri.request_uri)
-        req.basic_auth auth_params['api_login'], auth_params['api_pass']
-        res = http.start { |http| http.request(req) }
-        ret = res.body
+        ret = get(url)
         if options[:filename]
           FileUtils.makedirs(File.dirname(options[:filename]))
           File.open(options[:filename], "wb") { |f| f.write(ret) }
@@ -62,11 +57,23 @@ module Ubersmith
       end
       ret
     end
-    
+
+    def get(url)
+      uri = URI.parse(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = (uri.scheme == 'https')
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      puts "HTTP GET #{uri.request_uri}" if @debug
+      req = Net::HTTP::Get.new(uri.request_uri)
+      req.basic_auth auth_params['api_login'], auth_params['api_pass']
+      res = http.start { |http| http.request(req) }
+      res.body
+    end
+
     def config
       return @config unless @config.nil?
       @config = File.open(@config_file_path) { |f| YAML::load(f) } rescue nil
-      if @config.blank?
+      if @config.nil?
         puts "Could not load ubersmith config from #{@config_file_path}"
         return {}
       end

data/lib/ubersmith/url_maker.rb

@@ -12,7 +12,7 @@ module Ubersmith
     end
     
     def append_url_param(url, param)
-      return url if param.blank?
+      return url if param.to_s =~ /^\s*$/
       joiner = url.index('?') ? '&' : '?'
       [url, param].join(joiner)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - David Wegman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 -08:00
+date: 2011-12-05 00:00:00 -08:00
 default_executable: 
 dependencies: []