Added Taskrabbit::Client class and refactored code.

lib/taskrabbit.rb

@@ -1,4 +1,5 @@
 module Taskrabbit
+  autoload :Client,      "taskrabbit/client"
   autoload :Association, "taskrabbit/association"
   autoload :Config,      "taskrabbit/config"
   autoload :Version,     "taskrabbit/version"

lib/taskrabbit/account.rb

@@ -1,7 +1,7 @@
 module Taskrabbit
   class Account < User
     def fetch
-      api.request('get', "account", self.class)
+      reload('get', "account")
     end
   end
 end

lib/taskrabbit/api.rb

@@ -1,6 +1,6 @@
 module Taskrabbit
   class Api
-    include APISmith::Client
+    include Client
     include Association
 
     attr_accessor :user_token
@@ -18,6 +18,10 @@ def self.collection_transformers
     has_many :tasks, Task
     has_many :cities, City
 
+    def account
+      @account ||= Account.new({}, self)
+    end
+
     def initialize(user_token = nil, attrs = {})
       attrs = Taskrabbit.options.merge(attrs)
       # set the configuration for the api
@@ -42,26 +46,9 @@ def request_params(transformer, options = {})
       }
     end
 
-    def check_response_errors(response)
-      if response and response.respond_to?(:response)
-        case response.response
-        when Net::HTTPClientError, Net::HTTPServerError
-          error = "#{response.response.code} #{response.response.message}"
-          if response.is_a?(Hash)
-            error = response['error']
-          end
-          raise Taskrabbit::Error.new(error)
-        end
-      end
-    end
-
     def request(method, path, transformer, options = {})
       send(method, path, request_params(transformer, options))
     end
 
-    def account
-      @account ||= Account.new({}, self)
-    end
-
   end
 end

lib/taskrabbit/city.rb

@@ -7,7 +7,7 @@ class City < Smash
     property :links
 
     def fetch
-      api.request('get', "cities/#{id.to_s}", self.class)
+      reload('get', "cities/#{id.to_s}")
     end
 
     class << self

lib/taskrabbit/client.rb

@@ -0,0 +1,38 @@
+module Taskrabbit
+  module Client
+    def self.included(base)
+      base.class_eval do
+        include APISmith::Client
+        include InstanceMethods
+      end
+    end
+
+    module InstanceMethods
+      def transform_response(response, options)
+        transformer = options[:transform] || options[:transformer]
+        if transformer
+          obj = transformer.call response
+          obj.api = self if obj.respond_to?(:api=)
+          obj
+        else
+          response
+        end
+      end
+
+      def check_response_errors(response)
+        if response and response.respond_to?(:response)
+          case response.response
+          when Net::HTTPClientError, Net::HTTPServerError
+            error = "#{response.response.code} #{response.response.message}"
+            if response.is_a?(Hash)
+              error = response['error']
+              # if errors key is present then it's a validation error
+              raise Smash::Error.new(error, response) if response['errors']
+            end
+            raise Taskrabbit::Error.new(error, response)
+          end
+        end
+      end
+    end
+  end
+end

lib/taskrabbit/smash.rb

@@ -21,18 +21,35 @@ def initialize(options = {}, api = nil)
     def request(*args)
       api.request *args
     end
-
-    def load
+
+    def valid?
+      errors.nil? and error.nil?
+    end
+
+    def clear_errors
+      %w{error errors}.map { |k| self.delete(k) }
+    end
+
+    def reload(method, path, options = {})
       self.loaded = true
-      self.merge!(fetch)
+      response = api.request(method, path, self.class, options)
+      self.merge!(response)
+      clear_errors
+      true
+    rescue Smash::Error => e
+      self.merge!(e.response) if e.response.is_a?(Hash)
+      false
     end
 
+    def fetch; end
+
     def [](property)
       value = nil
       return value unless (value = super(property)).nil?
       if api and !loaded
         # load the object if trying to access a property
-        load
+        self.loaded = true
+        fetch
       end
       super(property)
     end

lib/taskrabbit/user.rb

@@ -12,7 +12,7 @@ class User < Smash
     property :links
 
     def fetch
-      api.request('get', "users/#{id.to_s}", self.class)
+      reload('get', "users/#{id.to_s}")
     end
 
     has_many :tasks, Task

spec/taskrabbit/account_spec.rb

@@ -6,7 +6,7 @@
       tr = Taskrabbit::Api.new(TR_USERS[:with_card][:secret])
       VCR.use_cassette('account/properties', :record => :new_episodes) do
         @user = tr.account
-        @user.load
+        @user.fetch
       end
     end
 

spec/taskrabbit/city_spec.rb

@@ -8,7 +8,7 @@
       tr = Taskrabbit::Api.new
       VCR.use_cassette('cities/properties', :record => :new_episodes) do
         @city = tr.cities.find(3)
-        @city.load
+        @city.fetch
       end
     end
 

spec/taskrabbit/task_spec.rb

@@ -8,7 +8,7 @@
       tr = Taskrabbit::Api.new
       VCR.use_cassette('tasks/properties', :record => :new_episodes) do
         @tr_task = tr.tasks.find(22545)
-        @tr_task.load
+        @tr_task.fetch
       end
     end
 

spec/taskrabbit/user_spec.rb

@@ -8,7 +8,7 @@
       tr = Taskrabbit::Api.new(TR_USERS[:with_card][:secret])
       VCR.use_cassette('users/properties', :record => :new_episodes) do
         @user = tr.users.find(TR_USERS[:with_card][:id])
-        @user.load
+        @user.fetch
       end
     end