croudia 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6faf517b484c015bd638bfb3f87d03dd50058c63
-  data.tar.gz: 4bfa7828051298f954d02bc370c3304ed48ce1a3
+  metadata.gz: 35e3879bf61ffee0163b39e54634e1a8d9991813
+  data.tar.gz: cf39c427d33d8f07d54a50b1cf9622499f08ce40
 SHA512:
-  metadata.gz: a032e89cc85042b633bcb00a1c62cd02e3c9240f750322fbed68ad1d7cc4dba30bbf27a530bf2654cb5c5531b5cd45e5f85b1f3d68e75669fdc239700df63796
-  data.tar.gz: aa7fe928f57ca1b93908a3236abf0ff7bf8087987d90140b99fbc96552cb0dc7f96397ec0e676858f6ce916cb269263aa6f200f35916e6969cebe43336fd8549
+  metadata.gz: c88dc315377489afa9fafa63cf8041c5df7e1559b254bfa7e68e6e34d30ac6dd6caa438353abd3a3786afe235855f87549132188cdd68a7d735cc5f97ad80c94
+  data.tar.gz: 51e113458a23c95d517f85b67dd5cce947713ec1db00acf5300e323a063e2fb4756b2c7bb6894e6c6b29aab0ca6844b30263c38d75275b3568d0898995b48d8b

data/lib/croudia/api/account.rb

@@ -12,6 +12,17 @@ module Croudia
         Croudia::User.new(resp)
       end
       alias current_user verify_credentials
+
+      # Update profile image
+      #
+      # @param image [File] New profile image
+      # @param params [Hash]
+      # @return [Croudia::User] Authenticated user object with new image
+      def update_profile_image(image, params={})
+        merge_file!(params, image, :image)
+        resp = post('/account/update_profile_image.json', params)
+        Croudia::User.new(resp)
+      end
     end
   end
 end

data/lib/croudia/api/friendships.rb

@@ -1,3 +1,4 @@
+require 'croudia/relationship'
 require 'croudia/user'
 
 module Croudia
@@ -25,6 +26,19 @@ module Croudia
         Croudia::User.new(resp)
       end
 
+      # Show relationship between two users
+      #
+      # @param source [String, Integer, Croudia::User]
+      # @param target [String, Integer, Croudia::User]
+      # @param params [Hash]
+      # @return [Croudia::Relationship]
+      def friendship(source, target={}, params={})
+        merge_user!(params, source, :source_screen_name, :source_id)
+        merge_user!(params, target, :target_screen_name, :target_id)
+        resp = get('/friendships/show.json', params)
+        Croudia::Relationship.new(resp)
+      end
+
       # Lookup Friendships
       #
       # @param *users [String, Integer, Croudia::User]

data/lib/croudia/api/statuses.rb

@@ -15,6 +15,18 @@ module Croudia
         Croudia::Status.new(resp)
       end
 
+      # Update status with media
+      #
+      # @param status [String] Status text
+      # @param media [File] Image to upload with
+      # @return [Croudia::Status]
+      def update_with_media(status, media={}, params={})
+        merge_text!(params, status)
+        merge_file!(params, media, :media)
+        resp = post('/statuses/update_with_media.json', params)
+        Croudia::Status.new(resp)
+      end
+
       # Destroy a status
       #
       # @param status_id [String, Integer, Croudia::Status] Status to delete

data/lib/croudia/api/users.rb

@@ -13,6 +13,17 @@ module Croudia
         resp = get('/users/show.json', params)
         Croudia::User.new(resp)
       end
+
+      # Lookup Users
+      #
+      # @param *users [String, Integer, Croudia::User]
+      # @param params [Hash]
+      # @return [Array<Croudia::User>]
+      def users(*args)
+        merge_users!(params = {}, args)
+        resp = post('/users/lookup.json', params)
+        objects(Croudia::User, resp)
+      end
     end
   end
 end

data/lib/croudia/api/utils.rb

@@ -15,16 +15,28 @@ module Croudia
         end
       end
 
-      def merge_user!(params, user)
+      def merge_file!(params, file, key=:file)
+        case file
+        when Hash
+          params.merge!(file)
+        when File
+          params[key] = file
+        else
+          raise ArgumentError, "#{key} must be a File"
+        end
+        params
+      end
+
+      def merge_user!(params, user, sn_key=:screen_name, user_key=:user_id)
         case user
         when Hash
           params.merge!(user)
         when String
-          params[:screen_name] = user
+          params[sn_key] = user
         when Integer
-          params[:user_id] = user
+          params[user_key] = user
         when Croudia::User
-          params[:user_id] = user.id_str
+          params[user_key] = user.id_str
         else
           raise ArgumentError, 'user must be a String, Integer or User'
         end

data/lib/croudia/client.rb

@@ -60,7 +60,6 @@ module Croudia
     def request(method, path, params={})
       connection.send(method.to_sym, path, params) do |request|
         request.headers[:authorization] = "Bearer #{@access_token}" if @access_token
-        request.headers[:content_type] = 'application/x-www-form-urlencoded; charset=utf-8'
       end.body
     end
 

data/lib/croudia/default.rb

@@ -1,6 +1,7 @@
 require 'faraday'
 require 'faraday_middleware'
 require 'croudia/configurable'
+require 'croudia/request/multipart_with_file'
 require 'croudia/version'
 
 module Croudia
@@ -13,19 +14,21 @@ module Croudia
       },
       request: {
         open_timeout: 5,
-        timeout: 10,
+        timeout: 20,
       },
       ssl: {
         verify: true,
       },
     } unless defined? Croudia::Default::CONNECTION_OPTIONS
     MIDDLEWARE = Faraday::Builder.new do |builder|
+      builder.request :multipart_with_file
+      builder.request :multipart
       builder.request :url_encoded
 
       builder.response :json
       builder.response :raise_error
 
-      builder.adapter :net_http
+      builder.adapter Faraday.default_adapter
     end unless defined? Croudia::Default::MIDDLEWARE
 
     class << self

data/lib/croudia/relationship.rb

@@ -0,0 +1,20 @@
+require 'croudia/base'
+
+class Croudia::Relationship < Croudia::Base
+  KEYS = [
+    :souorce,
+    :target,
+  ]
+
+  def relationship
+    self
+  end
+
+  def source
+    @source ||= Croudia::User.new(@attrs['relationship']['source'])
+  end
+
+  def target
+    @target ||= Croudia::User.new(@attrs['relationship']['target'])
+  end
+end

data/lib/croudia/request/multipart_with_file.rb

@@ -0,0 +1,37 @@
+require 'faraday'
+
+module Croudia
+  module Request
+    class MultipartWithFile < Faraday::Middleware
+      CONTENT_TYPE = 'Content-Type'
+
+      def call(env)
+        env[:body].each do |key, value|
+          if value.respond_to?(:to_io)
+            env[:body][key] = Faraday::UploadIO.new(value, mime_type(value.path))
+          end
+        end if env[:body].is_a?(::Hash)
+        @app.call(env)
+      end
+
+    private
+
+      def mime_type(path)
+        case path
+        when /\.jpe?g\z/i
+          'image/jpeg'
+        when /\.gif\z/i
+          'image/gif'
+        when /\.png\z/i
+          'image/png'
+        else
+          'application/octet-stream'
+        end
+      end
+
+    end
+  end
+end
+
+Faraday.register_middleware :request,
+  :multipart_with_file => lambda { Croudia::Request::MultipartWithFile }

data/lib/croudia/user.rb

@@ -7,15 +7,19 @@ module Croudia
 
     KEYS = [
       :id_str,
+      :blocking,
       :connections,
       :description,
       :favorites_count,
       :follow_request_sent,
+      :followed_by,
+      :following,
       :followers_count,
       :friends_count,
       :location,
       :name,
       :profile_image_url_https,
+      :protected,
       :screen_name,
       :statuses_count,
       :url,

data/lib/croudia/version.rb

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

data/spec/croudia/api/account_spec.rb

@@ -22,4 +22,23 @@ describe Croudia::API::Account do
       expect(@client.verify_credentials).to be_a Croudia::User
     end
   end
+
+  describe '#update_profile_image' do
+    before do
+      stub_post('/account/update_profile_image.json').to_return(
+        body: fixture(:user),
+        headers: { content_type: 'application/json; charset=utf-8' }
+      )
+    end
+
+    it 'requests the correct resource' do
+      @client.update_profile_image(fixture('image.jpg'))
+      expect(a_post('/account/update_profile_image.json')).to have_been_made
+    end
+
+    it 'returns a Croudia::User' do
+      subject = @client.update_profile_image(fixture('image.jpg'))
+      expect(subject).to be_a Croudia::User
+    end
+  end
 end

data/spec/croudia/api/friendships_spec.rb

@@ -85,6 +85,49 @@ describe Croudia::API::Friendships do
     end
   end
 
+  describe '#friendship' do
+    before do
+      stub_get('/friendships/show.json').with(
+        query: {
+          source_id: '1234',
+          target_id: '3456',
+        }
+      ).to_return(
+        body: fixture(:friendship),
+        headers: { content_type: 'appplication/json; charset=utf-8' }
+      )
+    end
+
+    context 'when passing a Hash' do
+      it 'requests the correct resource' do
+        @client.friendship(source_id: 1234, target_id: 3456)
+        expect(a_get('/friendships/show.json').with(
+          query: {
+            source_id: '1234',
+            target_id: '3456',
+          }
+        )).to have_been_made
+      end
+    end
+
+    context 'when passing each argument' do
+      it 'requests the correct resource' do
+        @client.friendship(1234, 3456)
+        expect(a_get('/friendships/show.json').with(
+          query: {
+            source_id: '1234',
+            target_id: '3456',
+          }
+        )).to have_been_made
+      end
+    end
+
+    it 'returns a Relationship' do
+      subject = @client.friendship(1234, 3456)
+      expect(subject).to be_a Croudia::Relationship
+    end
+  end
+
   describe '#friendships' do
     context 'when String is passed' do
       before do

data/spec/croudia/api/statuses_spec.rb

@@ -49,6 +49,34 @@ describe Croudia::API::Statuses do
     end
   end
 
+  describe '#update_with_media' do
+    before do
+      stub_post('/statuses/update_with_media.json').to_return(
+        body: fixture(:status),
+        headers: { content_type: 'application/json; charset=utf-8' }
+      )
+    end
+
+    context 'when passing each argument' do
+      it 'requests the correct resource' do
+        @client.update_with_media('Hi', fixture('image.jpg'))
+        expect(a_post('/statuses/update_with_media.json')).to have_been_made
+      end
+    end
+
+    context 'when passing a Hash' do
+      it 'requests the correct resource' do
+        @client.update_with_media(status: 'Hi', media: fixture('image.jpg'))
+        expect(a_post('/statuses/update_with_media.json')).to have_been_made
+      end
+    end
+
+    it 'returns a Croudia::Status' do
+      subject = @client.update_with_media('Hi', fixture('image.jpg'))
+      expect(subject).to be_a Croudia::Status
+    end
+  end
+
   describe '#destroy_status' do
     before do
       stub_post('/statuses/destroy/1234.json').to_return(

data/spec/croudia/api/users_spec.rb

@@ -0,0 +1,155 @@
+require 'helper'
+
+describe Croudia::API::Users do
+  before do
+    @client = Croudia::Client.new
+  end
+
+  describe '#user' do
+    before do
+      stub_get('/users/show.json').with(
+        query: { screen_name: 'wktk' }
+      ).to_return(
+        body: fixture(:user),
+        headers: { content_type: 'application/json; chrset=utf-8' }
+      )
+
+      stub_get('/users/show.json').with(
+        query: { user_id: 1234 }
+      ).to_return(
+        body: fixture(:user),
+        headers: { content_type: 'application/json; chrset=utf-8' }
+      )
+    end
+
+    context 'when string is passed' do
+      it 'requests the correct resource' do
+        @client.user('wktk')
+        expect(a_get('/users/show.json').with(
+          query: { screen_name: 'wktk' }
+        )).to have_been_made
+      end
+    end
+
+    context 'when integer is passed' do
+      it 'requests the correct resource' do
+        @client.user(1234)
+        expect(a_get('/users/show.json').with(
+          query: { user_id: 1234 }
+        )).to have_been_made
+      end
+    end
+
+    context 'when hash is passed' do
+      it 'requests the correct resource' do
+        @client.user(screen_name: 'wktk')
+        expect(a_get('/users/show.json').with(
+          query: { screen_name: 'wktk' }
+        )).to have_been_made
+      end
+    end
+
+    it 'returns User object' do
+      expect(@client.user('wktk')).to be_a Croudia::User
+    end
+  end
+
+  describe '#users' do
+    context 'when String is passed' do
+      before do
+        stub_post('/users/lookup.json').with(
+          body: {
+            screen_name: 'wktk',
+          }
+        ).to_return(
+          body: fixture(:users),
+          headers: { content_type: 'application/json; charset=utf-8' }
+        )
+      end
+
+      it 'requests the correct resource' do
+        @client.users('wktk')
+        expect(a_post('/users/lookup.json')).to have_been_made
+      end
+
+      it 'returns array of Croudia::User' do
+        subject = @client.users('wktk')
+        expect(subject).to be_an Array
+        subject.each { |u| expect(u).to be_a Croudia::User }
+      end
+    end
+
+    context 'when Integer is passed' do
+      before do
+        stub_post('/users/lookup.json').with(
+          body: {
+            user_id: '1234',
+          }
+        ).to_return(
+          body: fixture(:users),
+          headers: { content_type: 'application/json; charset=utf-8' }
+        )
+      end
+
+      it 'requests the correct resource' do
+        @client.users(1234)
+        expect(a_post('/users/lookup.json')).to have_been_made
+      end
+    end
+
+    context 'when multiple Strings are passed' do
+      before do
+        stub_post('/users/lookup.json').with(
+          body: {
+            screen_name: 'wktk,croudia',
+          }
+        ).to_return(
+          body: fixture(:users),
+          headers: { content_type: 'application/json; charset=utf-8' }
+        )
+      end
+
+      it 'requests the correct resource' do
+        @client.users('wktk', 'croudia')
+        expect(a_post('/users/lookup.json')).to have_been_made
+      end
+    end
+
+    context 'when multiple Integers are passed' do
+      before do
+        stub_post('/users/lookup.json').with(
+          body: {
+            user_id: '1234,4567',
+          }
+        ).to_return(
+          body: fixture(:users),
+          headers: { content_type: 'application/json; charset=utf-8' }
+        )
+      end
+
+      it 'requests the correct resource' do
+        @client.users(1234, 4567)
+        expect(a_post('/users/lookup.json')).to have_been_made
+      end
+    end
+
+    context 'when multiple String and Integer are passed' do
+      before do
+        stub_post('/users/lookup.json').with(
+          body: {
+            user_id: '1234,4567',
+            screen_name: 'wktk,croudia',
+          }
+        ).to_return(
+          body: fixture(:users),
+          headers: { content_type: 'application/json; charset=utf-8' }
+        )
+      end
+
+      it 'requests the correct resource' do
+        @client.users('wktk', 1234, 'croudia', 4567)
+        expect(a_post('/users/lookup.json')).to have_been_made
+      end
+    end
+  end
+end

data/spec/fixtures/friendship.json

@@ -0,0 +1,20 @@
+{
+  "relationship": {
+    "source": {
+      "blocking": null,
+      "followed_by": true,
+      "following": false,
+      "id": 1234,
+      "id_str": "1234",
+      "screen_name": "wktk"
+    },
+    "target": {
+      "blocking": null,
+      "followed_by": true,
+      "following": false,
+      "id": 3456,
+      "id_str": "3456",
+      "screen_name": "croudia"
+    }
+  }
+}

data/spec/fixtures/users.json

@@ -0,0 +1 @@
+[{"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":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/"}]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: croudia
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - wktk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -126,6 +126,8 @@ files:
 - lib/croudia/default.rb
 - lib/croudia/ext/openssl.rb
 - lib/croudia/identity.rb
+- lib/croudia/relationship.rb
+- lib/croudia/request/multipart_with_file.rb
 - lib/croudia/secret_mail.rb
 - lib/croudia/source.rb
 - lib/croudia/status.rb
@@ -138,7 +140,7 @@ files:
 - spec/croudia/api/secret_mails_spec.rb
 - spec/croudia/api/statuses_spec.rb
 - spec/croudia/api/timelines_spec.rb
-- spec/croudia/api/user_spec.rb
+- spec/croudia/api/users_spec.rb
 - spec/croudia/base_spec.rb
 - spec/croudia/client_spec.rb
 - spec/croudia/identity_spec.rb
@@ -148,12 +150,15 @@ files:
 - spec/croudia/user_spec.rb
 - spec/croudia_spec.rb
 - spec/fixtures/access_token.json
+- spec/fixtures/friendship.json
 - spec/fixtures/friendships.json
+- spec/fixtures/image.jpg
 - spec/fixtures/secret_mail.json
 - spec/fixtures/secret_mails.json
 - spec/fixtures/status.json
 - spec/fixtures/timeline.json
 - spec/fixtures/user.json
+- spec/fixtures/users.json
 - spec/helper.rb
 homepage: https://github.com/wktk/croudia-gem
 licenses:
@@ -187,7 +192,7 @@ test_files:
 - spec/croudia/api/secret_mails_spec.rb
 - spec/croudia/api/statuses_spec.rb
 - spec/croudia/api/timelines_spec.rb
-- spec/croudia/api/user_spec.rb
+- spec/croudia/api/users_spec.rb
 - spec/croudia/base_spec.rb
 - spec/croudia/client_spec.rb
 - spec/croudia/identity_spec.rb
@@ -197,10 +202,13 @@ test_files:
 - spec/croudia/user_spec.rb
 - spec/croudia_spec.rb
 - spec/fixtures/access_token.json
+- spec/fixtures/friendship.json
 - spec/fixtures/friendships.json
+- spec/fixtures/image.jpg
 - spec/fixtures/secret_mail.json
 - spec/fixtures/secret_mails.json
 - spec/fixtures/status.json
 - spec/fixtures/timeline.json
 - spec/fixtures/user.json
+- spec/fixtures/users.json
 - spec/helper.rb

data/spec/croudia/api/user_spec.rb

@@ -1,56 +0,0 @@
-require 'helper'
-
-describe Croudia::API::Users do
-  before do
-    @client = Croudia::Client.new
-  end
-
-  describe '#user' do
-    before do
-      stub_get('/users/show.json').with(
-        query: { screen_name: 'wktk' }
-      ).to_return(
-        body: fixture(:user),
-        headers: { content_type: 'application/json; chrset=utf-8' }
-      )
-
-      stub_get('/users/show.json').with(
-        query: { user_id: 1234 }
-      ).to_return(
-        body: fixture(:user),
-        headers: { content_type: 'application/json; chrset=utf-8' }
-      )
-    end
-
-    context 'when string is passed' do
-      it 'requests the correct resource' do
-        @client.user('wktk')
-        expect(a_get('/users/show.json').with(
-          query: { screen_name: 'wktk' }
-        )).to have_been_made
-      end
-    end
-
-    context 'when integer is passed' do
-      it 'requests the correct resource' do
-        @client.user(1234)
-        expect(a_get('/users/show.json').with(
-          query: { user_id: 1234 }
-        )).to have_been_made
-      end
-    end
-
-    context 'when hash is passed' do
-      it 'requests the correct resource' do
-        @client.user(screen_name: 'wktk')
-        expect(a_get('/users/show.json').with(
-          query: { screen_name: 'wktk' }
-        )).to have_been_made
-      end
-    end
-
-    it 'returns User object' do
-      expect(@client.user('wktk')).to be_a Croudia::User
-    end
-  end
-end