cartodb-api 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 115e7af3d7d8e0810eca5fa32d4fd3157cde35f7
-  data.tar.gz: caa7a9e9f72f208875a127407a7782f3198beed5
+  metadata.gz: 7a0e23410a86f4c4a24185eec41dbd3ef464b23a
+  data.tar.gz: 4c3de01fba8a8d7ef1f1e9821210c2f05498c65a
 SHA512:
-  metadata.gz: 7154c5cb5870bf5c627838e7d38db990a8968a0e0b4cd554442f41a01fb9060fded4e1055dd96be054b9ae4e5deab9b35694ca80c860d11eae6642308a03ecb4
-  data.tar.gz: a89fb9e291d0a8ad5d8c689d0a7b855937dc6cdcc1bbad0c50343cb5254921f42c2f099bf5b760ca3c7ba9a64039b896dafc8a6ba8decd2eaad5a3997c200d88
+  metadata.gz: a4998d02cbe0c9fbcab481fb14a70c3d62f266d712f049059ca7f191f13331937fb893dd0d1b1b32bc66f20f8a476ce95a127dbbc7b455876624bdfd27486bbf
+  data.tar.gz: 1e647c9cbf906afca5a9e8d48d725bc115488f2d4b349c74bea6b9f6333a9cfc027c5d279fa0215325dcc338537d5cf099d94d19b9159d800e10f02958389b5c

data/lib/cartodb/api.rb

@@ -32,10 +32,18 @@ module CartoDB
         @@default_configuration = configuration
       end
 
+      def build_configuration(configuration = nil)
+        if configuration
+          default_configuration.dup.merge(configuration)
+        else
+          default_configuration.dup
+        end
+      end
+
       protected
 
       def build_request(configuration = nil)
-        configuration = configuration ? default_configuration.merge(configuration) : default_configuration.dup
+        configuration = build_configuration(configuration)
         CartoDB::Api::Request.new(configuration)
       end
 
@@ -44,7 +52,6 @@ module CartoDB
       def default_configuration
         @@default_configuration ||= CartoDB::Api::Configuration.new
       end
-
     end
   end
 end

data/lib/cartodb/api/error.rb

@@ -1,16 +1,35 @@
 module CartoDB
   module Api
-    class ConnectionFailed < StandardError
+    class CartoDBError < StandardError
+      attr_accessor :title, :details, :body, :raw_body, :status_code
     end
 
-    class InvalidConfiguration < StandardError
+    class ConnectionFailed < CartoDBError
     end
 
-    class Error < StandardError
-      attr_accessor :title, :details, :body, :raw_body, :status_code
+    class InvalidConfiguration < CartoDBError
+    end
+
+    class ApiError < CartoDBError
+      def to_s
+        whole_message = "the server responded with status #{status_code}"
+        whole_message = append_to_message(whole_message, title)
+        whole_message = append_to_message(whole_message, details)
+        append_to_message(whole_message, body)
+      end
+
+      private
+
+      def append_to_message(message, text)
+        if text && !text.empty?
+          "#{message}\n#{text}"
+        else
+          message
+        end
+      end
     end
 
-    class ParsingError < Error
+    class ParsingError < ApiError
     end
   end
 end

data/lib/cartodb/api/request.rb

@@ -3,24 +3,25 @@ module CartoDB
     class Request
       extend Forwardable
 
-      attr_accessor :configuration
+      attr_reader :path
 
       def_delegators :configuration, :protocol, :domain, :api_key,
                      :account, :base_url, :version, :timeout
 
-      def initialize(configuration)
-        self.configuration = configuration
-        reset
+      def initialize(configuration = nil)
+        self.configuration = CartoDB::Api.build_configuration(configuration)
+        reset_path
       end
 
       def method_missing(method, *args)
-        @path_steps << method.downcase
-        @path_steps << args if args.length > 0
-        @path_steps.flatten!
+        path_steps << method.downcase
+        path_steps << args unless args.empty?
+        path_steps.flatten!
         self
       end
 
       def create(params: nil, headers: nil, body: nil, payload: nil)
+        build_and_reset_path
         make_request(:post,
                      params: params,
                      headers: headers,
@@ -29,6 +30,7 @@ module CartoDB
       end
 
       def update(params: nil, headers: nil, body: nil, payload: nil)
+        build_and_reset_path
         make_request(:patch,
                      params: params,
                      headers: headers,
@@ -37,17 +39,32 @@ module CartoDB
       end
 
       def retrieve(params: nil, headers: nil)
+        build_and_reset_path
         make_request(:get, params: params, headers: headers)
       end
 
       def delete(params: nil, headers: nil)
+        build_and_reset_path
         make_request(:delete, params: params, headers: headers)
       end
 
       protected
 
-      def reset
-        @path_steps = []
+      attr_accessor :configuration
+
+      attr_accessor :path_steps
+
+      def reset_path
+        self.path_steps = []
+      end
+
+      def build_path
+        @path = path_steps.join('/')
+      end
+
+      def build_and_reset_path
+        build_path
+        reset_path
       end
 
       def client
@@ -109,12 +126,8 @@ module CartoDB
         "v#{version}/"
       end
 
-      def path
-        @path_steps.join('/')
-      end
-
       def rescue_error(exception)
-        cartodb_exception = Error.new(exception.message)
+        cartodb_exception = ApiError.new(exception.message)
 
         is_faraday_exception = exception.is_a?(Faraday::Error::ClientError)
         if is_faraday_exception && exception.response
@@ -122,14 +135,14 @@ module CartoDB
                                                        exception)
         end
 
-        raise cartodb_exception
+        fail cartodb_exception
       end
 
       def build_error_from_faraday(cartodb_exception, exception)
         cartodb_exception.status_code = exception.response[:status]
         begin
           response = MultiJson.load(exception.response[:body])
-          build_error(cartodb_exception,
+          cartodb_exception = build_error(cartodb_exception,
                       response['title'],
                       response['detail'],
                       response,
@@ -144,6 +157,7 @@ module CartoDB
         exception.details = details if details
         exception.body = body
         exception.raw_body = raw_body if raw_body
+        exception
       end
     end
   end

data/lib/cartodb/api/version.rb

@@ -1,5 +1,5 @@
 module CartoDB
   module Api
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cartodb-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Pablo Cárdenas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler