croudia 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0347fb33dca00cf9f17791001f8ce93c8fcca18
-  data.tar.gz: 73a1c169329a27b582821c7b8c4ca4e006218004
+  metadata.gz: cf93c107da3e67e76893d1ad119b53d1b6e111b3
+  data.tar.gz: 423b2e63ad81479d8d4c1666a99dd084f007a340
 SHA512:
-  metadata.gz: e5167ca9e3ecaa4f14fc17070e2ac568a832b1780db500926568bcec1225f737ec1595bfce16282d24d0f594b32139b5d5b6f1631312cbd56cd32e26ae92a710
-  data.tar.gz: 1d57c97c48f7a984f07fd43d324d887cb435ba2a7ce3c8af0348d7cc2fa530b7e43d9c64dd7d1d2249b9ccfbf2bb348e1f8e0dd5e857a39b0fc9edce8e2b00c9
+  metadata.gz: dc0deaa61d80e277e8346209188b63e75cccbc27d5fadacea9ee1abf8d037b3f897560ec64e28bb278f079fa997b569c4e6dbd8d0f99efae32cb8eb92646877e
+  data.tar.gz: eb4fd9578e55b0c5468dd92776ffb8f871705956457d5acfbc4f198941f2715b51a72471ef28e9615aff210dbe128158ace2838f849bfb15c4eb75510d62a77a

data/lib/croudia/api/search.rb

@@ -0,0 +1,30 @@
+require 'croudia/search_results'
+require 'croudia/user'
+
+module Croudia
+  module API
+    module Search
+      # Search for statuses
+      #
+      # @param q [String] Search query
+      # @param params [Hash] Optional params
+      # @return [Croudia::SearchResults]
+      def search(q, params={})
+        merge_query!(params, q)
+        resp = get('/search/voices.json', params)
+        Croudia::SearchResults.new(resp)
+      end
+
+      # Search for users
+      #
+      # @param q [String] Search query
+      # @param params [Hash] Optional params
+      # @return [Array<Croudia::User>]
+      def search_user(q, params={})
+        merge_query!(params, q)
+        resp = get('/users/search.json', params)
+        objects(Croudia::User, resp)
+      end
+    end
+  end
+end

data/lib/croudia/api/utils.rb

@@ -27,6 +27,18 @@ module Croudia
         params
       end
 
+      def merge_query!(params, query)
+        case query
+        when Hash
+          params.merge!(query)
+        when String
+          params[:q] = query
+        else
+          raise ArgumentError, 'Search query must be a String'
+        end
+        params
+      end
+
       def merge_user!(params, user, sn_key=:screen_name, user_key=:user_id)
         case user
         when Hash

data/lib/croudia/client.rb

@@ -2,6 +2,7 @@ require 'croudia/api/account'
 require 'croudia/api/favorites'
 require 'croudia/api/friendships'
 require 'croudia/api/oauth'
+require 'croudia/api/search'
 require 'croudia/api/secret_mails'
 require 'croudia/api/statuses'
 require 'croudia/api/timelines'
@@ -18,6 +19,7 @@ module Croudia
     include Croudia::API::Favorites
     include Croudia::API::Friendships
     include Croudia::API::OAuth
+    include Croudia::API::Search
     include Croudia::API::SecretMails
     include Croudia::API::Statuses
     include Croudia::API::Timelines

data/lib/croudia/search_metadata.rb

@@ -0,0 +1,19 @@
+require 'croudia/base'
+
+module Croudia
+  class SearchMetadata < Croudia::Base
+    KEYS = [
+      :completed_in,
+      :count,
+      :max_id,
+      :max_id_str,
+      :next_results,
+      :query,
+      :refresh_url,
+      :since_id,
+      :since_ids_str,
+    ]
+
+    attr_reader(*KEYS)
+  end
+end

data/lib/croudia/search_results.rb

@@ -0,0 +1,22 @@
+require 'croudia/base'
+require 'croudia/search_metadata'
+require 'croudia/status'
+
+module Croudia
+  class SearchResults < Croudia::Base
+    KEYS = [
+      :search_metadata,
+      :statuses,
+    ]
+
+    attr_reader(*KEYS)
+
+    def initialize(attrs)
+      statuses = attrs.delete('statuses')
+      metadata = attrs.delete('search_metadata')
+      attrs['statuses'] = statuses.map { |s| Croudia::Status.new(s) }
+      attrs['search_metadata'] = Croudia::SearchMetadata.new(metadata)
+      super(attrs)
+    end
+  end
+end

data/lib/croudia/version.rb

@@ -1,3 +1,3 @@
 module Croudia
-  VERSION = '1.0.13'
+  VERSION = '1.0.14'
 end

data/spec/croudia/api/search_spec.rb

@@ -0,0 +1,54 @@
+require 'helper'
+
+describe Croudia::API::Search do
+  before do
+    @client = Croudia::Client.new
+  end
+
+  describe '#search' do
+    before do
+      stub_get('/search/voices.json').with(query: {
+        q: 'hoge',
+      }).to_return(
+        body: fixture(:search_results),
+        headers: { content_type: 'application/json; charset=utf-8' }
+      )
+    end
+
+    it 'requests the correct resource' do
+      @client.search('hoge')
+      expect(a_get('/search/voices.json').with(query: {
+        q: 'hoge',
+      })).to have_been_made
+    end
+
+    it 'returns Croudia::SearchResults' do
+      subject = @client.search('hoge')
+      expect(subject).to be_a Croudia::SearchResults
+    end
+  end
+
+  describe '#search_user' do
+    before do
+      stub_get('/users/search.json').with(query: {
+        q: 'hoge',
+      }).to_return(
+        body: fixture(:users),
+        headers: { content_type: 'application/json; charset=utf-8' }
+      )
+    end
+
+    it 'requests the correct resource' do
+      @client.search_user('hoge')
+      expect(a_get('/users/search.json').with(query: {
+        q: 'hoge',
+      })).to have_been_made
+    end
+
+    it 'returns an array of Croudia::User' do
+      subject = @client.search_user('hoge')
+      expect(subject).to be_a Array
+      subject.each { |user| expect(user).to be_a Croudia::User }
+    end
+  end
+end

data/spec/fixtures/search_results.json

@@ -0,0 +1,89 @@
+{
+  "statuses": [
+    {
+      "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": 1228009,
+      "id_str": "1228009",
+      "text": ": ;(∩´﹏`∩);:",
+      "created_at": "Tue, 25 Jun 2013 23:58:15 +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/"
+      }
+    }
+  ],
+  "search_metadata": {
+    "completed_in": 1,
+    "count": 10,
+    "max_id": 893114514,
+    "max_id_str": "893114514",
+    "next_results": "hoge",
+    "query": "hoge",
+    "refresh_url": "hoge",
+    "since_id": 8104545,
+    "since_ids_str": "8104545"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: croudia
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - wktk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -114,6 +114,7 @@ files:
 - lib/croudia/api/favorites.rb
 - lib/croudia/api/friendships.rb
 - lib/croudia/api/oauth.rb
+- lib/croudia/api/search.rb
 - lib/croudia/api/secret_mails.rb
 - lib/croudia/api/statuses.rb
 - lib/croudia/api/timelines.rb
@@ -135,6 +136,8 @@ files:
 - lib/croudia/request/raise_error.rb
 - lib/croudia/response/parse_json.rb
 - lib/croudia/response/raise_error.rb
+- lib/croudia/search_metadata.rb
+- lib/croudia/search_results.rb
 - lib/croudia/secret_mail.rb
 - lib/croudia/source.rb
 - lib/croudia/status.rb
@@ -144,6 +147,7 @@ files:
 - spec/croudia/api/favorites_spec.rb
 - spec/croudia/api/friendships_spec.rb
 - spec/croudia/api/oauth_spec.rb
+- spec/croudia/api/search_spec.rb
 - spec/croudia/api/secret_mails_spec.rb
 - spec/croudia/api/statuses_spec.rb
 - spec/croudia/api/timelines_spec.rb
@@ -164,6 +168,7 @@ files:
 - spec/fixtures/friendships.json
 - spec/fixtures/ids_with_cursor.json
 - spec/fixtures/image.jpg
+- spec/fixtures/search_results.json
 - spec/fixtures/secret_mail.json
 - spec/fixtures/secret_mails.json
 - spec/fixtures/status.json
@@ -201,6 +206,7 @@ test_files:
 - spec/croudia/api/favorites_spec.rb
 - spec/croudia/api/friendships_spec.rb
 - spec/croudia/api/oauth_spec.rb
+- spec/croudia/api/search_spec.rb
 - spec/croudia/api/secret_mails_spec.rb
 - spec/croudia/api/statuses_spec.rb
 - spec/croudia/api/timelines_spec.rb
@@ -221,6 +227,7 @@ test_files:
 - spec/fixtures/friendships.json
 - spec/fixtures/ids_with_cursor.json
 - spec/fixtures/image.jpg
+- spec/fixtures/search_results.json
 - spec/fixtures/secret_mail.json
 - spec/fixtures/secret_mails.json
 - spec/fixtures/status.json