Skip to content

Commit 34da882

Browse files
committed
Fix bug
1 parent f65449c commit 34da882

File tree

6 files changed

+42
-25
lines changed

6 files changed

+42
-25
lines changed

Qiita.alfredworkflow

85 Bytes
Binary file not shown.

README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,30 @@ Double-click `Qiita.alfredworkflow` to install Alfred workflow.
1414

1515
## Commands
1616

17-
### Search items
17+
### Search articles
1818

1919
```
2020
qiita search <query>
2121
```
2222

23-
### Fetch authentication token from Qiita
23+
### Login and save token
2424

2525
```
2626
qiita setup <name> <password>
2727
```
2828

29-
### Search stocked items from Qiita
29+
### Search stocked articles
3030

3131
```
3232
qiita stocks <query>
3333
```
3434

35+
### Search your own articles
36+
37+
```
38+
qiita my <query:optional>
39+
```
40+
3541
## Contributing
3642

3743
### Fork project

commands/my.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
exit
1717
end
1818

19-
data = Qiita::API.items(:token => config.token)
19+
data = Qiita::API.get(:items, :token => config.token)
2020
data.select!{|a| a['title'].scan(QUERY).size > 0 } if QUERY
2121

2222
results = []

commands/stocks.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
exit
1717
end
1818

19-
data = Qiita::API.search(QUERY, :token => config.token, :stocked => 1)
19+
data = !QUERY.empty? ? Qiita::API.search(QUERY, :token => config.token, :stocked => 1) : Qiita::API.get(:stocks, :token => config.token)
2020
data.sort! {|a, b| b['stock_count'] <=> a['stock_count'] }
2121

2222
results = []

info.plist

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
<key>subtext</key>
152152
<string>Search Qiita for "{query}"</string>
153153
<key>title</key>
154-
<string>Seatch Qiita</string>
154+
<string>Qiita Search Articles</string>
155155
<key>type</key>
156156
<integer>0</integer>
157157
<key>withspace</key>
@@ -185,7 +185,7 @@
185185
<key>config</key>
186186
<dict>
187187
<key>argumenttype</key>
188-
<integer>0</integer>
188+
<integer>1</integer>
189189
<key>escaping</key>
190190
<integer>0</integer>
191191
<key>keyword</key>
@@ -195,9 +195,9 @@
195195
<key>script</key>
196196
<string>ruby ./commands/stocks.rb "{query}"</string>
197197
<key>subtext</key>
198-
<string>Search Qiita stocks for "{query}"</string>
198+
<string>Search stocks for "{query}"</string>
199199
<key>title</key>
200-
<string>Search Qiita Stocks</string>
200+
<string>Qiita Stocks</string>
201201
<key>type</key>
202202
<integer>0</integer>
203203
<key>withspace</key>
@@ -219,8 +219,14 @@
219219
<integer>0</integer>
220220
<key>keyword</key>
221221
<string>qiita my</string>
222+
<key>runningsubtext</key>
223+
<string>Searching for "{query}" ...</string>
222224
<key>script</key>
223225
<string>ruby ./commands/my.rb "{query}"</string>
226+
<key>subtext</key>
227+
<string>Search my articles for "{query}"</string>
228+
<key>title</key>
229+
<string>Qiita My Articles</string>
224230
<key>type</key>
225231
<integer>0</integer>
226232
<key>withspace</key>

lib/qiita/api.rb

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,6 @@ class API
99

1010
ENDPOINT = "https://qiita.com/api/v1/"
1111

12-
def self.auth(name, password)
13-
uri = URI.join(ENDPOINT, 'auth')
14-
params = {:url_name => name, :password => password}
15-
fetch uri, params, method: :post
16-
end
17-
18-
def self.search(query, args={})
19-
uri = URI.join(ENDPOINT, 'search')
20-
fetch uri, {:q => query}.update(args)
21-
end
22-
23-
def self.items(args={})
24-
uri = URI.join(ENDPOINT, 'items')
25-
fetch uri, args
26-
end
27-
2812
def self.fetch(uri, params={}, *args)
2913
defaults = { method: :get, limit: 10 }
3014
opt = args.last.kind_of?(Hash)? defaults.update(args.pop) : defaults
@@ -69,5 +53,26 @@ def self.fetch(uri, params={}, *args)
6953
response.value
7054
end
7155
end
56+
57+
def self.get(path, args={})
58+
uri = URI.join(ENDPOINT, path.to_s)
59+
fetch uri, args
60+
end
61+
62+
def self.post(path, args={})
63+
uri = URI.join(ENDPOINT, path.to_s)
64+
fetch uri, args, method: :post
65+
end
66+
67+
def self.auth(name, password)
68+
uri = URI.join(ENDPOINT, 'auth')
69+
params = {:url_name => name, :password => password}
70+
fetch uri, params, method: :post
71+
end
72+
73+
def self.search(query, args={})
74+
uri = URI.join(ENDPOINT, 'search')
75+
fetch uri, {:q => query}.update(args)
76+
end
7277
end
7378
end

0 commit comments

Comments
 (0)