croudia 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35e3879bf61ffee0163b39e54634e1a8d9991813
-  data.tar.gz: cf39c427d33d8f07d54a50b1cf9622499f08ce40
+  metadata.gz: 68c388cfc2c0d3d69defbc84ffb59e370c2977c3
+  data.tar.gz: 1497af451bd3a78bc8642492bf1a6f090700698f
 SHA512:
-  metadata.gz: c88dc315377489afa9fafa63cf8041c5df7e1559b254bfa7e68e6e34d30ac6dd6caa438353abd3a3786afe235855f87549132188cdd68a7d735cc5f97ad80c94
-  data.tar.gz: 51e113458a23c95d517f85b67dd5cce947713ec1db00acf5300e323a063e2fb4756b2c7bb6894e6c6b29aab0ca6844b30263c38d75275b3568d0898995b48d8b
+  metadata.gz: e9863275f9486fc8de0e50aab75482aa4859ad2c2fd8946022b29782cd25e709e32d7419719e9ed5f6341bab570a300702704279c756d999a33bda0cabdfc90c
+  data.tar.gz: 885898faeab2a439c97b864be90aa7f1ccec545b9357bc67e85725d120cabc305290f2d65bcf5229075788297dfa322c353f420f3a85a37cb6d95aa771018406

data/lib/croudia/default.rb

@@ -2,6 +2,9 @@ require 'faraday'
 require 'faraday_middleware'
 require 'croudia/configurable'
 require 'croudia/request/multipart_with_file'
+require 'croudia/request/raise_error'
+require 'croudia/response/parse_json'
+require 'croudia/response/raise_error'
 require 'croudia/version'
 
 module Croudia
@@ -24,9 +27,10 @@ module Croudia
       builder.request :multipart_with_file
       builder.request :multipart
       builder.request :url_encoded
+      builder.request :raise_error
 
-      builder.response :json
       builder.response :raise_error
+      builder.response :parse_json
 
       builder.adapter Faraday.default_adapter
     end unless defined? Croudia::Default::MIDDLEWARE

data/lib/croudia/entities.rb

@@ -0,0 +1,17 @@
+require 'croudia/base'
+require 'croudia/entity/media'
+
+module Croudia
+  class Entities < Croudia::Base
+    KEYS = [
+      :media,
+    ]
+    attr_reader(*KEYS)
+
+    def initialize(attrs)
+      media = attrs.delete('media')
+      super(attrs)
+      @attrs['media'] = Croudia::Entity::Media.new(media) if media
+    end
+  end
+end

data/lib/croudia/entity/media.rb

@@ -0,0 +1,13 @@
+require 'croudia/base'
+
+module Croudia
+  module Entity
+    class Media < Croudia::Base
+      KEYS = [
+        :media_url_https,
+        :type,
+      ]
+      attr_reader(*KEYS)
+    end
+  end
+end

data/lib/croudia/error.rb

@@ -0,0 +1,48 @@
+module Croudia
+  class Error < StandardError
+
+    # Error connecting to server
+    class ConnectionFailed < Error
+      attr_reader :wrapped_exception
+
+      def initialize(e)
+        @wrapped_exception = e
+        super(e.respond_to?(:message) ? e.message : e.to_s)
+      end
+
+      def backtrace
+        if @wrapped_exception.respond_to?(:backtrace)
+          @wrapped_exception.backtrace
+        else
+          super
+        end
+      end
+    end
+
+    class Timeout < ConnectionFailed; end
+
+    # Error connected to server
+    class ConnectionError < Error
+      attr_reader :code, :env, :error
+
+      def initialize(env)
+        @code = env[:status]
+        @error = env[:body]['error'] rescue nil
+        @env = env
+        super(@error)
+      end
+    end
+
+    # 4xx: Client Errors
+    class ClientError < ConnectionError; end
+    class BadRequest < ClientError; end
+    class Unauthorized < ClientError; end
+    class Forbidden < ClientError; end
+    class NotFound < ClientError; end
+
+    # 5xx: Server Errors
+    class ServerError < ConnectionError; end
+    class BadGateway < ServerError; end
+    class Unavailable < ServerError; end
+  end
+end

data/lib/croudia/request/raise_error.rb

@@ -0,0 +1,19 @@
+require 'croudia/error'
+require 'faraday'
+
+module Croudia
+  module Request
+    class RaiseError < Faraday::Middleware
+      def call(env)
+        @app.call(env)
+      rescue Faraday::Error::TimeoutError => e
+        raise Croudia::Error::Timeout.new(e)
+      rescue Faraday::Error::ConnectionFailed => e
+        raise Croudia::Error::ConnectionFailed.new(e)
+      end
+    end
+  end
+end
+
+Faraday.register_middleware :request,
+  raise_error: lambda { Croudia::Request::RaiseError }

data/lib/croudia/response/parse_json.rb

@@ -0,0 +1,23 @@
+require 'faraday'
+require 'json'
+
+module Croudia
+  module Response
+    class ParseJSON < Faraday::Response::Middleware
+      def on_complete(env)
+        case env[:body]
+        when /\A\s*\z/, nil
+          env[:body] = nil
+        else
+          env[:body] = JSON.parse(env[:body])
+        end
+      rescue JSON::ParseError => e
+        raise e if env[:status] == 200
+        env[:body] = nil
+      end
+    end
+  end
+end
+
+Faraday.register_middleware :response,
+  parse_json: Croudia::Response::ParseJSON

data/lib/croudia/response/raise_error.rb

@@ -0,0 +1,36 @@
+require 'croudia/error'
+require 'faraday'
+
+module Croudia
+  module Response
+    class RaiseError < Faraday::Response::Middleware
+      def on_complete(env)
+        error_class = case env[:status]
+        when 400
+          Croudia::Error::BadRequest
+        when 401
+          Croudia::Error::Unauthorized
+        when 403
+          Croudia::Error::Forbidden
+        when 404
+          Croudia::Error::NotFound
+        when 400 .. 499
+          Croudia::Error::ClientError
+        when 502
+          Croudia::Error::BadGateway
+        when 503
+          Croudia::Error::Unavailable
+        when 500 .. 599
+          Croudia::Error::ServerError
+        else
+          return
+        end
+
+        raise error_class.new(env)
+      end
+    end
+  end
+end
+
+Faraday.register_middleware :response,
+  raise_error: lambda { Croudia::Response::RaiseError }

data/lib/croudia/status.rb

@@ -1,4 +1,5 @@
 require 'croudia/creatable'
+require 'croudia/entities'
 require 'croudia/identity'
 require 'croudia/source'
 require 'croudia/user'
@@ -9,6 +10,7 @@ module Croudia
 
     KEYS = [
       :id_str,
+      :entities,
       :favorited,
       :favorited_count,
       :in_reply_to_screen_name,
@@ -28,11 +30,13 @@ module Croudia
     attr_reader(*KEYS)
 
     def initialize(attrs={})
+      entities = attrs.delete('entities')
       user = attrs.delete('user')
       reply_status = attrs.delete('reply_status')
       spread_status = attrs.delete('spread_status')
       source = attrs.delete('source')
       super(attrs)
+      @attrs['entities'] = Croudia::Entities.new(entities) if entities
       @attrs['user'] = Croudia::User.new(user) if user
       @attrs['reply_status'] = Croudia::Status.new(reply_status) if reply_status
       @attrs['spread_status'] = Croudia::Status.new(spread_status) if spread_status

data/lib/croudia/version.rb

@@ -1,3 +1,3 @@
 module Croudia
-  VERSION = '1.0.9'
+  VERSION = '1.0.10'
 end

data/spec/croudia/error_spec.rb

@@ -0,0 +1,46 @@
+require 'faraday'
+require 'helper'
+
+describe Croudia::Error do
+  before do
+    @client = Croudia::Client.new
+  end
+
+  context 'connection error' do
+    before do
+      stub_get('/account/verify_credentials.json').to_raise Faraday::Error::ConnectionFailed
+    end
+
+    it 'raises Croudia::Error::ConnectionFailed' do
+      expect { @client.verify_credentials }.to raise_error Croudia::Error::ConnectionFailed
+    end
+  end
+
+  context 'client error' do
+    before do
+      stub_get('/account/verify_credentials.json').to_return(
+        status: 401,
+        body: fixture(:error),
+        headers: { content_type: 'application/json; charset=utf-8' }
+      )
+    end
+
+    it 'raises Croudia::Error::ClientError' do
+      expect { @client.verify_credentials }.to raise_error Croudia::Error::ClientError
+    end
+  end
+
+  context 'server error' do
+    before do
+      stub_get('/account/verify_credentials.json').to_return(
+        status: 502,
+        body: fixture(:error),
+        headers: { content_type: 'application/json; charset=utf-8' }
+      )
+    end
+
+    it 'raises Croudia::Error::ServerError' do
+      expect { @client.verify_credentials }.to raise_error Croudia::Error::ServerError
+    end
+  end
+end

data/spec/fixtures/error.json

@@ -0,0 +1,3 @@
+{
+  "error": "Hello, I'm an error!  How are you doing today?"
+}

data/spec/fixtures/status.json

@@ -1 +1 @@
-{"id":1228014,"id_str":"1228014","text":"さっき誤字してた……","created_at":"Tue, 25 Jun 2013 23:58:43 +0900","favorited":false,"favorited_count":0,"spread":false,"spread_count":0,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"source":{"name":"source","url":"https://croudia.com"},"user":{"id":7987,"id_str":"7987","name":"wktk","screen_name":"wktk","profile_image_url_https":"https://croudia.com/testimages/download/9423","created_at":"Sun, 29 Jul 2012 19:21:21 +0900","description":"気軽に fav ります。Twitter でも @wktk です。 \r\nhttps://twitter.com/wktk\r\nhttps://github.com/wktk","favorites_count":68,"follow_request_sent":"underdevelopment","followers_count":12,"following":"underdevelopment","friends_count":11,"location":"Japan","statuses_count":26,"protected":false,"url":"http://wktk.jp/"}}
+{"id":1228014,"id_str":"1228014","text":"さっき誤字してた……","created_at":"Tue, 25 Jun 2013 23:58:43 +0900","favorited":false,"favorited_count":0,"spread":false,"spread_count":0,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"source":{"name":"source","url":"https://croudia.com"},"user":{"id":7987,"id_str":"7987","name":"wktk","screen_name":"wktk","profile_image_url_https":"https://croudia.com/testimages/download/9423","created_at":"Sun, 29 Jul 2012 19:21:21 +0900","description":"気軽に fav ります。Twitter でも @wktk です。 \r\nhttps://twitter.com/wktk\r\nhttps://github.com/wktk","favorites_count":68,"follow_request_sent":"underdevelopment","followers_count":12,"following":"underdevelopment","friends_count":11,"location":"Japan","statuses_count":26,"protected":false,"url":"http://wktk.jp/"},"entities":{"media":{"media_url_https":"https://croudia.com/testimages/download/44983","type":"photo"}}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: croudia
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - wktk
@@ -124,10 +124,16 @@ files:
 - lib/croudia/configurable.rb
 - lib/croudia/creatable.rb
 - lib/croudia/default.rb
+- lib/croudia/entities.rb
+- lib/croudia/entity/media.rb
+- lib/croudia/error.rb
 - lib/croudia/ext/openssl.rb
 - lib/croudia/identity.rb
 - lib/croudia/relationship.rb
 - lib/croudia/request/multipart_with_file.rb
+- lib/croudia/request/raise_error.rb
+- lib/croudia/response/parse_json.rb
+- lib/croudia/response/raise_error.rb
 - lib/croudia/secret_mail.rb
 - lib/croudia/source.rb
 - lib/croudia/status.rb
@@ -143,6 +149,7 @@ files:
 - spec/croudia/api/users_spec.rb
 - spec/croudia/base_spec.rb
 - spec/croudia/client_spec.rb
+- spec/croudia/error_spec.rb
 - spec/croudia/identity_spec.rb
 - spec/croudia/secret_mail_spec.rb
 - spec/croudia/source_spec.rb
@@ -150,6 +157,7 @@ files:
 - spec/croudia/user_spec.rb
 - spec/croudia_spec.rb
 - spec/fixtures/access_token.json
+- spec/fixtures/error.json
 - spec/fixtures/friendship.json
 - spec/fixtures/friendships.json
 - spec/fixtures/image.jpg
@@ -195,6 +203,7 @@ test_files:
 - spec/croudia/api/users_spec.rb
 - spec/croudia/base_spec.rb
 - spec/croudia/client_spec.rb
+- spec/croudia/error_spec.rb
 - spec/croudia/identity_spec.rb
 - spec/croudia/secret_mail_spec.rb
 - spec/croudia/source_spec.rb
@@ -202,6 +211,7 @@ test_files:
 - spec/croudia/user_spec.rb
 - spec/croudia_spec.rb
 - spec/fixtures/access_token.json
+- spec/fixtures/error.json
 - spec/fixtures/friendship.json
 - spec/fixtures/friendships.json
 - spec/fixtures/image.jpg