uploadcare-ruby 1.0.1.rc2 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc5991ac44cf2404d37ae2d374481b9f8bc2c0cc
-  data.tar.gz: 9873a042e14e976d083a6da3f03bfdb3036bd0f1
+  metadata.gz: af26486fc47d098d6568263844e15b5d6f6a4fca
+  data.tar.gz: fc9b11f7d79f0ee2b95f3e88e2f7588972f1df2b
 SHA512:
-  metadata.gz: d2efd43898961c03cb37287ffef0fd82b89b80a9d0fcfc496fb6876a11524d653d27c21929c08a6ddf05453f3a9304895d77e5d1f8b53df491615d9e9f5e3e00
-  data.tar.gz: cac80a83f934fc8fd21c09057af376712aa2d47c7766c1f10f8bf6f4ac5bcc37f7a396bdc79100dcee760314e9e997b5c69330b825ce8249f8ac87ea0ba6979f
+  metadata.gz: 9fb9293930f8af75f06ee7c3cce438c01dc8115634a0b2634a79ef796c1c9c2816642a6d06f61c1b8f3e99e98ab5bd5a5d981480a922e162f485b14a1b942f89
+  data.tar.gz: ce565ece9f629a809d5142380b7704ece6b0175f9257a894e92ee0ed59141ef4d602f2e2299be12dec12257b26afe890d44281b3601070e890a99a1aaeb6f383

data/.gitignore

@@ -1 +1,3 @@
 Gemfile.lock
+.ruby-gemset
+.ruby-version

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in uploadcare-ruby.gemspec
+gem 'uploadcare-ruby', path: "/Users/romanonthego/Code/uploadcare/uploadcare-ruby/"
 gemspec

data/README.md

@@ -371,6 +371,58 @@ New groups created by :create_group method is loaded by default.
 #     #<Uploadcare::Api::File uuid="7bb9efa4-05c0-4f36-b0ef-11a4221867f6" ...>]
 ```
 
+## Errors handling
+From version 1.0.2 we have a custom exceptions which will raise when Uploadcare service return something with 4xx or 5xx HTTP status.
+
+List of custom errors:
+
+```ruby
+400 => Uploadcare::Error::RequestError::BadRequest,
+401 => Uploadcare::Error::RequestError::Unauthorized,
+403 => Uploadcare::Error::RequestError::Forbidden,
+404 => Uploadcare::Error::RequestError::NotFound,
+406 => Uploadcare::Error::RequestError::NotAcceptable,
+408 => Uploadcare::Error::RequestError::RequestTimeout,
+422 => Uploadcare::Error::RequestError::UnprocessableEntity,
+429 => Uploadcare::Error::RequestError::TooManyRequests,
+500 => Uploadcare::Error::ServerError::InternalServerError,
+502 => Uploadcare::Error::ServerError::BadGateway,
+503 => Uploadcare::Error::ServerError::ServiceUnavailable,
+504 => Uploadcare::Error::ServerError::GatewayTimeout
+```
+
+so now you could escape particular error (in that case 404: Not Found error):
+
+```ruby
+begin
+  @connection.send :get, '/random_url/', {}
+rescue Uploadcare::Error::RequestError::NotFound => e
+  nil
+end
+```
+
+... any request error (covers all 4xx status codes): 
+
+```ruby
+begin
+  @connection.send :get, '/random_url/', {}
+rescue Uploadcare::Error::RequestError => e
+  nil
+end
+```
+
+...and actually any Uploadcare service errors:
+
+```ruby
+begin
+  @connection.send :get, '/random_url/', {}
+rescue Uploadcare::Error => e
+  nil
+end
+```
+
+Please note what almost all actions depends on Uploadcare servers and it will be wise of you to expect that servers will return error code (at least some times).
+
 ## Testing
 
 Run `bundle exec rspec`.

data/lib/uploadcare.rb

@@ -26,18 +26,4 @@ module Uploadcare
   def self.user_agent
     USER_AGENT
   end
-
-  UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
-  
-  GROUP_UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}~(?<count>\d+)$/
-  
-  CDN_URL_FILE_REGEX = /
-     (?<uuid>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})
-     (?:\/-\/(?<operations>.*?))?\/?$
-     /ix
-  
-  CDN_URL_GROUP_REGEX = /
-     (?<uuid>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}~(?<count>\d+))
-     (?:\/-\/(?<operations>.*?))?\/?$
-     /ix
 end

data/lib/uploadcare/api.rb

@@ -1,6 +1,9 @@
 require 'json'
 require 'ostruct'
-
+Dir[File.dirname(__FILE__) + '/utils/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/errors/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/rest/middlewares/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/rest/connections/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/api/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/resources/*.rb'].each {|file| require file }
 

data/lib/uploadcare/api/file_api.rb

@@ -1,5 +1,3 @@
-require "uri"
-
 module Uploadcare
   module FileApi
     def file uuid_or_cdn_url

data/lib/uploadcare/api/group_api.rb

@@ -31,8 +31,8 @@ module Uploadcare
       }
 
       data.merge! files
-      post = parse(upload_request :post, "/group/", data)
-      group = Uploadcare::Api::Group.new self, post["id"], post
+      post = @upload_connection.send :post, "/group/", data
+      group = Uploadcare::Api::Group.new self, post.body["id"], post.body
     end
   end
 end

data/lib/uploadcare/api/raw_api.rb

@@ -1,19 +1,19 @@
 require 'json'
 
-require 'uploadcare/api/connections'
-
 module Uploadcare
   module RawApi
 
     def initialize options={}
-      @options = Uploadcare::default_settings.merge(options)  
+      @options = Uploadcare::default_settings.merge(options)
+      @api_connection = Uploadcare::Connections::ApiConnection.new(@options)
+      @upload_connection = Uploadcare::Connections::UploadConnection.new(@options)
     end
 
 
     # basic request method 
     def request method = :get, path = "/files/", params = {}
-      response = send_request(method, path, params)
-      parse(response)
+      response = @api_connection.send method, path, params 
+      response.body
     end
     alias_method :api_request, :request
 
@@ -29,6 +29,7 @@ module Uploadcare
       request :post, path, params 
     end
 
+
     # request with PUT verb
     def put path= "/files/", params={}
       request :put, path, params
@@ -39,35 +40,5 @@ module Uploadcare
     def delete path= "/files/", params={}
       request :delete, path, params
     end
-
-
-    protected
-      def send_request method, path, params={}
-        connection = Uploadcare::Connections.api_connection(@options)
-        response = connection.send method, path, params
-      end
-
-
-      def parse response
-        begin
-          object = JSON.parse(response.body)
-        rescue JSON::ParserError
-          object = false
-        end
-
-        # and returning the object (file actually) or raise new error
-        if response.status < 300
-          object
-        else
-          message = "HTTP code #{response.status}"
-          if object # add active_support god damn it
-            message += ": #{object["detail"]}"
-          else
-            message += ": unknown error occured."
-          end
-
-          raise ArgumentError.new(message)
-        end
-      end
   end
 end

data/lib/uploadcare/api/uploading_api.rb

@@ -24,39 +24,33 @@ module Uploadcare
 
 
     def upload_files files
-      if files.select {|f| !f.kind_of?(File)}.any?
-        raise ArgumentError.new "one or more of given files is not actually files"
-      else
-        data = {
-          UPLOADCARE_PUB_KEY: @options[:public_key],
-        }
-
-        files.each_with_index do |f, i|
-          data["file[#{i}]"] = Faraday::UploadIO.new(f.path, extract_mime_type(f))
-        end
+      raise ArgumentError.new "one or more of given files is not actually files" if files.select {|f| !f.kind_of?(File)}.any?
 
-        response = upload_request :post, '/base/', data
-        uuids = upload_parse(response)
+      data = {UPLOADCARE_PUB_KEY: @options[:public_key]}
 
-        files = uuids.values.map! {|f| Uploadcare::Api::File.new self, f }
+      files.each_with_index do |file, i|
+        data["file[#{i}]"] = build_upload_io(file)
       end
+
+      response = @upload_connection.send :post, '/base/', data
+      uuids = response.body
+
+      files = uuids.values.map! {|f| Uploadcare::Api::File.new self, f }
     end
 
 
     # upload file to servise
     def upload_file file
-      if file.kind_of?(File)
-        mime_type = extract_mime_type(file)
-        
-        response = upload_request :post, '/base/', {
-          UPLOADCARE_PUB_KEY: @options[:public_key],
-          file: Faraday::UploadIO.new(file.path, mime_type)
-        }
-        uuid = upload_parse(response)["file"]
-        Uploadcare::Api::File.new self, uuid
-      else
-        raise ArgumentError.new 'expecting File object'
-      end
+      raise ArgumentError.new 'expecting File object' unless file.kind_of?(File)
+
+      response = @upload_connection.send :post, '/base/', {
+        UPLOADCARE_PUB_KEY: @options[:public_key],
+        file: build_upload_io(file)
+      }
+      
+      uuid = response.body["file"]
+
+      Uploadcare::Api::File.new self, uuid
     end
     
     # create file is the same as uplaod file
@@ -66,20 +60,19 @@ module Uploadcare
     #upload from url
     def upload_url url
       uri = URI.parse(url)
+
+      raise ArgumentError.new 'invalid url was given' unless uri.kind_of?(URI::HTTP)
       
-      if uri.kind_of?(URI::HTTP) # works both for HTTP and HTTPS as HTTPS inherits from HTTP
-        token = get_token(url)
-
-        while (response = get_status_response(token))['status'] == 'unknown'
-          sleep 0.5
-        end
-        
-        raise ArgumentError.new(response['error']) if response['status'] == 'error'
-        uuid = response['file_id']
-        Uploadcare::Api::File.new self, uuid
-      else
-        raise ArgumentError.new 'invalid url was given'
+      token = get_token(url)
+
+      while (response = get_status_response(token))['status'] == 'unknown'
+        sleep 0.5
       end
+      
+      raise ArgumentError.new(response['error']) if response['status'] == 'error'
+      
+      uuid = response['file_id']
+      Uploadcare::Api::File.new self, uuid
     end
     alias_method :upload_from_url, :upload_url
 
@@ -87,33 +80,29 @@ module Uploadcare
 
 
     protected
+      # DEPRECATRED but still works
       def upload_request method, path, params = {}
-        connection = Uploadcare::Connections.upload_connection(@options)
-        response = connection.send method, path, params
+        response = @upload_connection.send method, path, params
       end
 
-
-      def upload_parse response
-        raise ArgumentError.new(response.body) if response.status > 200
-        begin
-          JSON.parse(response.body)
-        rescue JSON::ParserError
-          response.body
-        end
+      def build_upload_io file
+        Faraday::UploadIO.new file.path, extract_mime_type(file)
       end
 
 
     private
       def get_status_response token
-        upload_parse(upload_request(:post, '/from_url/status/', {token: token}))
+        response = @upload_connection.send :post, '/from_url/status/', {token: token}
+        response.body
       end
 
 
       def get_token url
-        response = upload_request :post, '/from_url/', { source_url: url, pub_key: @options[:public_key] }
-        token = upload_parse(response)["token"]
+        response = @upload_connection.send :post, '/from_url/', { source_url: url, pub_key: @options[:public_key] }
+        token = response.body["token"]
       end
 
+
       def extract_mime_type file
         types = MIME::Types.of(file.path)
         types[0].content_type

data/lib/uploadcare/errors/errors.rb

@@ -0,0 +1,64 @@
+module Uploadcare
+  class Error < ::StandardError
+
+    def self.define_error code, klass, message
+      class_eval <<-EOD
+        class #{klass} < self
+          def initialize( message = nil )
+            super( message || "HTTP #{code} - #{message}" )
+          end
+        end
+      EOD
+    end
+
+    def self.errors
+      @errors ||= {
+        400 => Uploadcare::Error::RequestError::BadRequest,
+        401 => Uploadcare::Error::RequestError::Unauthorized,
+        403 => Uploadcare::Error::RequestError::Forbidden,
+        404 => Uploadcare::Error::RequestError::NotFound,
+        406 => Uploadcare::Error::RequestError::NotAcceptable,
+        408 => Uploadcare::Error::RequestError::RequestTimeout,
+        422 => Uploadcare::Error::RequestError::UnprocessableEntity,
+        429 => Uploadcare::Error::RequestError::TooManyRequests,
+        500 => Uploadcare::Error::ServerError::InternalServerError,
+        502 => Uploadcare::Error::ServerError::BadGateway,
+        503 => Uploadcare::Error::ServerError::ServiceUnavailable,
+        504 => Uploadcare::Error::ServerError::GatewayTimeout,
+      }
+    end
+
+
+    # Overall service error so you could escape it no matter what code is return
+
+    # all 4xx error
+    class RequestError < self;
+      def initialize( message = nil )
+        super( message || "HTTP 4xx - a request error occured." )
+      end
+
+      define_error 400, "BadRequest", "the request cannot be fulfilled due to bad syntax."
+      define_error 401, "Unauthorized", "authentication is required and has failed or has not yet been provided."
+      define_error 403, "Forbidden", "the request was a valid request, but the server is refusing to respond to it."
+      define_error 404, "NotFound", "the requested resource could not be found."
+      define_error 406, "NotAcceptable", "the requested resource is only capable of generating content"
+      define_error 408, "RequestTimeout", "the server timed out waiting for the request."
+      define_error 422, "UnprocessableEntity", "the request was well-formed but was unable to be followed due to semantic errors."
+      define_error 429, "TooManyRequests", "too many requests in a given amount of time."
+    end
+
+    # all 5xx error
+    class ServerError < self;
+      def initialize( message = nil )
+        super( message || "HTTP 5xx - a server error occured." )
+      end
+
+      define_error 500, "InternalServerError", "some error occured on server."
+      define_error 502, "BadGateway", "received an invalid response from the upstream server."
+      define_error 503, "ServiceUnavailable", "the server is currently unavailable."
+      define_error 504, "GatewayTimeout", "the server did not receive a timely response from the upstream server."
+    end
+
+    # specific error
+  end
+end

data/lib/uploadcare/resources/file.rb

@@ -4,15 +4,7 @@ module Uploadcare
   class Api
     class File < OpenStruct
       def initialize api, uuid_or_cdn_url, data=nil
-        result = Uploadcare::Parser.parse(uuid_or_cdn_url)
-
-        unless result.is_a?(Uploadcare::Parser::File)
-          msg = "invalid CDN URL or UUID was given for file: #{uuid_or_cdn_url}."
-          if result.is_a?(Uploadcare::Parser::Group)
-            msg = msg + "\n Group UUID was given. Try call @api.group if it is what you intended."
-          end
-          raise msg
-        end
+        result = Uploadcare::Parser.parse_file_string uuid_or_cdn_url
         
         file = {uuid: result["uuid"], operations: result["operations"]}
 

data/lib/uploadcare/resources/group.rb

@@ -4,18 +4,9 @@ module Uploadcare
   class Api
     class Group < OpenStruct
       def initialize api, uuid_or_cdn_url, data=nil
-        result = Uploadcare::Parser.parse(uuid_or_cdn_url)
-
-        unless result.is_a?(Uploadcare::Parser::Group)
-          msg = "invalid CDN URL or UUID was given for group: #{uuid_or_cdn_url}."
-          if result.is_a?(Uploadcare::Parser::File)
-            msg = msg + "\n File UUID was given. Try call @api.file if it is what you intended."
-          end
-          raise msg
-        end
+        result = Uploadcare::Parser.parse_group_string(uuid_or_cdn_url) 
 
         @api = api
-        # self.files_count = result["count"]
         group = {uuid: result["uuid"], files_count: result["count"]}
         super group
 

data/lib/uploadcare/rest/connections/api_connection.rb

@@ -0,0 +1,21 @@
+require 'faraday'
+require "faraday_middleware"
+module Uploadcare
+  module Connections
+    class ApiConnection < Faraday::Connection
+      def initialize options
+        super options[:api_url_base] do |frd|
+          frd.request :url_encoded
+          frd.use ::FaradayMiddleware::FollowRedirects, limit: 3
+          frd.adapter :net_http # actually, default adapter, just to be clear
+          frd.headers['Authorization'] = "Uploadcare.Simple #{options[:public_key]}:#{options[:private_key]}"
+          frd.headers['Accept'] = "application/vnd.uploadcare-v#{options[:api_version]}+json"
+          frd.headers['User-Agent'] = Uploadcare::user_agent
+
+          frd.response :raise_error
+          frd.response :parse_json
+        end
+      end
+    end
+  end
+end

data/lib/uploadcare/rest/connections/upload_connection.rb

@@ -0,0 +1,21 @@
+require "faraday"
+
+module Uploadcare
+  module Connections
+    class UploadConnection < Faraday::Connection
+      def initialize options
+        ca_path = '/etc/ssl/certs' if File.exists?('/etc/ssl/certs')
+
+        super ssl: { ca_path: ca_path }, url: options[:upload_url_base] do |frd|
+          frd.request :multipart
+          frd.request :url_encoded
+          frd.adapter :net_http
+          frd.headers['User-Agent'] = Uploadcare::user_agent
+
+          frd.response :raise_error
+          frd.response :parse_json
+        end
+      end
+    end
+  end
+end

data/lib/uploadcare/rest/middlewares/parse_json_middleware.rb

@@ -0,0 +1,31 @@
+require 'faraday'
+require 'json'
+
+module Uploadcare
+  module Connections
+    module Response
+      class ParseJson < Faraday::Response::Middleware
+        WHITESPACE_REGEX = /\A^\s*$\z/
+
+        def parse(body)
+          case body
+          when WHITESPACE_REGEX, nil
+            nil
+          else
+            JSON.parse(body)
+          end
+        end
+
+        def on_complete(response)
+          response[:body] = parse(response[:body]) if respond_to?(:parse) && !(response[:status] > 200) #!unparsable_status_codes.include?(response.status)
+        end
+
+        def unparsable_status_codes
+          [204, 301, 302, 304]
+        end
+      end
+    end
+  end
+end
+
+Faraday::Response.register_middleware :parse_json => Uploadcare::Connections::Response::ParseJson

data/lib/uploadcare/rest/middlewares/raise_error_middleware.rb

@@ -0,0 +1,21 @@
+require 'faraday'
+
+module Uploadcare
+  module Connections
+    module Response
+      class RaiseError < Faraday::Response::Middleware
+        def on_complete(response)
+          @error_codes = Uploadcare::Error.errors.keys
+          @status = response[:status]
+          
+          if @error_codes.include?(@status)
+            error = Uploadcare::Error.errors[@status].new
+            fail(error)
+          end
+        end
+      end
+    end
+  end
+end
+
+Faraday::Response.register_middleware :raise_error => Uploadcare::Connections::Response::RaiseError

data/lib/uploadcare/{api → utils}/parser.rb

@@ -9,6 +9,35 @@ module Uploadcare
         (?:\/-\/(?<operations>.*?))?\/?$ # optional operations
       /ix
 
+    def self.parse_file_string string
+      result = Uploadcare::Parser.parse(string)
+
+      unless result.is_a?(Uploadcare::Parser::File)
+        msg = "invalid CDN URL or UUID was given for file: #{uuid_or_cdn_url}."
+        if result.is_a?(Uploadcare::Parser::Group)
+          msg = msg + "\n Group UUID was given. Try call @api.group if it is what you intended."
+        end
+        raise msg
+      end
+
+      result
+    end
+
+
+    def self.parse_group_string string
+      result = Uploadcare::Parser.parse(string)
+
+      unless result.is_a?(Uploadcare::Parser::Group)
+        msg = "invalid CDN URL or UUID was given for group: #{uuid_or_cdn_url}."
+        if result.is_a?(Uploadcare::Parser::File)
+          msg = msg + "\n File UUID was given. Try call @api.file if it is what you intended."
+        end
+        raise msg
+      end
+
+      result
+    end
+
     def self.parse string
       matched = META_URL.match(string)
 

data/lib/uploadcare/version.rb

@@ -1,3 +1,3 @@
 module Uploadcare
-  VERSION = "1.0.1.rc2"
+  VERSION = "1.0.2"
 end

data/spec/parser_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Uploadcare::Api::File do
-  before :each do
+describe Uploadcare::Parser do
+  before :all do
     # http://www.ucarecdn.com/be4e24fb-2cad-476f-9417-ba95e3fefbf2~3/-/crop/123/-/fromat/png/
     @uuid = "be4e24fb-2cad-476f-9417-ba95e3fefbf2"
     @count = "12"

data/spec/rest/api_connection_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'uri'
+require 'socket'
+
+describe Uploadcare::Connections::ApiConnection do
+  before(:all) do
+    @settings = Uploadcare.default_settings
+  end
+
+  it 'should initialize api connection' do
+    expect {Uploadcare::Connections::ApiConnection.new(@settings)}.to_not raise_error
+  end
+
+  it 'should use ParseJson and RaiseError middlewares' do
+    connection = Uploadcare::Connections::ApiConnection.new(@settings)
+    connection.builder.handlers.include?(Uploadcare::Connections::Response::ParseJson).should == true
+    connection.builder.handlers.include?(Uploadcare::Connections::Response::RaiseError).should == true
+  end
+end

data/spec/rest/errors_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+require 'uri'
+require 'socket'
+
+describe Uploadcare::Error do
+  before(:all) do
+    @settings = Uploadcare.default_settings
+    @codes = [400,401,403,404,406,408,422,429,500,502,503,504]
+    @connection = Uploadcare::Connections::ApiConnection.new(@settings)
+  end
+
+  it 'Error codes should be accesbile' do
+    Uploadcare::Error.errors.keys.should == @codes
+  end
+
+  it 'Errors should be kind of requested codes' do
+    not_found = Uploadcare::Error.errors[404]
+    not_found.new('File not found').should be_kind_of(Uploadcare::Error::RequestError::NotFound)
+  end
+
+  it 'errors should have meaningfull messages' do
+    not_found = Uploadcare::Error.errors[404]
+    error = not_found.new
+    error.message.should == "HTTP 404 - the requested resource could not be found."
+  end
+
+  it 'Should raise an error' do
+    error = Uploadcare::Error::RequestError::NotFound
+    expect{ @connection.send :get, '/random_url/', {} }.to raise_error(error)
+  end
+
+  it "should escape particular error" do
+    error = Uploadcare::Error::RequestError::NotFound
+    expect do
+      begin
+        @connection.send :get, '/random_url/', {}
+      rescue error => e
+        nil
+      end
+    end.to_not raise_error
+  end
+
+  it 'should escape common request error' do
+    error = Uploadcare::Error::RequestError
+    expect do
+      begin
+        @connection.send :get, '/random_url/', {}
+      rescue error => e
+        nil
+      end
+    end.to_not raise_error
+  end
+
+  it 'should escape generic uploadcare service error' do
+    error = Uploadcare::Error
+    expect do
+      begin
+        @connection.send :get, '/random_url/', {}
+      rescue error => e
+        nil
+      end
+    end.to_not raise_error
+  end
+
+  it 'should escape generic uploadcare service error' do
+    error = StandardError
+    expect do
+      begin
+        @connection.send :get, '/random_url/', {}
+      rescue error => e
+        nil
+      end
+    end.to_not raise_error
+  end
+end

data/spec/rest/upload_connection_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'uri'
+require 'socket'
+
+describe Uploadcare::Connections::UploadConnection do
+  before(:all) do
+    @settings = Uploadcare.default_settings
+  end
+
+  it 'should initialize upload connection' do
+    expect {Uploadcare::Connections::UploadConnection.new(@settings)}.to_not raise_error
+  end
+
+  it 'should use ParseJson and RaiseError middleware' do
+    connection = Uploadcare::Connections::UploadConnection.new(@settings)
+    connection.builder.handlers.include?(Uploadcare::Connections::Response::ParseJson).should == true
+    connection.builder.handlers.include?(Uploadcare::Connections::Response::RaiseError).should == true
+  end
+end

data/uploadcare-ruby.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.version       = Uploadcare::VERSION
-  gem.add_runtime_dependency 'faraday'
-  gem.add_runtime_dependency 'faraday_middleware'
+  gem.add_runtime_dependency 'faraday', '~> 0.8'
+  gem.add_runtime_dependency 'faraday_middleware', '~> 0.9'
   gem.add_runtime_dependency 'multipart-post'
   gem.add_runtime_dependency 'mime-types'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadcare-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1.rc2
+  version: 1.0.2
 platform: ruby
 authors:
 - '@rastyagaev (Vadim Rastyagaev)'
@@ -10,36 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
@@ -113,20 +113,24 @@ files:
 - Rakefile
 - lib/uploadcare.rb
 - lib/uploadcare/api.rb
-- lib/uploadcare/api/connections.rb
 - lib/uploadcare/api/file_api.rb
 - lib/uploadcare/api/file_list_api.rb
 - lib/uploadcare/api/group_api.rb
 - lib/uploadcare/api/group_list_api.rb
-- lib/uploadcare/api/parser.rb
 - lib/uploadcare/api/project_api.rb
 - lib/uploadcare/api/raw_api.rb
 - lib/uploadcare/api/uploading_api.rb
+- lib/uploadcare/errors/errors.rb
 - lib/uploadcare/resources/file.rb
 - lib/uploadcare/resources/file_list.rb
 - lib/uploadcare/resources/group.rb
 - lib/uploadcare/resources/group_list.rb
 - lib/uploadcare/resources/project.rb
+- lib/uploadcare/rest/connections/api_connection.rb
+- lib/uploadcare/rest/connections/upload_connection.rb
+- lib/uploadcare/rest/middlewares/parse_json_middleware.rb
+- lib/uploadcare/rest/middlewares/raise_error_middleware.rb
+- lib/uploadcare/utils/parser.rb
 - lib/uploadcare/version.rb
 - spec/file_list_spec.rb
 - spec/file_spec.rb
@@ -136,6 +140,9 @@ files:
 - spec/parser_spec.rb
 - spec/project_spec.rb
 - spec/raw_api_spec.rb
+- spec/rest/api_connection_spec.rb
+- spec/rest/errors_spec.rb
+- spec/rest/upload_connection_spec.rb
 - spec/spec_helper.rb
 - spec/uploading_multiple_spec.rb
 - spec/uploading_spec.rb
@@ -159,9 +166,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.6
@@ -177,6 +184,9 @@ test_files:
 - spec/parser_spec.rb
 - spec/project_spec.rb
 - spec/raw_api_spec.rb
+- spec/rest/api_connection_spec.rb
+- spec/rest/errors_spec.rb
+- spec/rest/upload_connection_spec.rb
 - spec/spec_helper.rb
 - spec/uploading_multiple_spec.rb
 - spec/uploading_spec.rb

data/lib/uploadcare/api/connections.rb

@@ -1,32 +0,0 @@
-require 'faraday'
-require 'faraday_middleware'
-
-module Uploadcare
-  class Connections
-    def self.api_connection options
-      connection = Faraday.new url: options[:api_url_base] do |frd|
-        frd.request :url_encoded
-        frd.use FaradayMiddleware::FollowRedirects, limit: 3
-        frd.adapter :net_http # actually, default adapter, just to be clear
-        frd.headers['Authorization'] = "Uploadcare.Simple #{options[:public_key]}:#{options[:private_key]}"
-        frd.headers['Accept'] = "application/vnd.uploadcare-v#{options[:api_version]}+json"
-        frd.headers['User-Agent'] = Uploadcare::user_agent
-      end
-
-      connection
-    end
-
-    def self.upload_connection options
-      ca_path = '/etc/ssl/certs' if File.exists?('/etc/ssl/certs')
-
-      connection = Faraday.new ssl: { ca_path: ca_path }, url: options[:upload_url_base] do |frd|
-        frd.request :multipart
-        frd.request :url_encoded
-        frd.adapter Faraday.default_adapter
-        frd.headers['User-Agent'] = Uploadcare::user_agent
-      end
-
-      connection
-    end
-  end
-end