zendesk_api 1.2.10 → 1.3.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -2
- data/Gemfile.lock +59 -66
- data/lib/zendesk_api/client.rb +4 -3
- data/lib/zendesk_api/middleware/request/encode_json.rb +26 -0
- data/lib/zendesk_api/middleware/request/etag_cache.rb +6 -6
- data/lib/zendesk_api/middleware/request/upload.rb +2 -3
- data/lib/zendesk_api/middleware/response/deflate.rb +7 -9
- data/lib/zendesk_api/middleware/response/gzip.rb +5 -8
- data/lib/zendesk_api/middleware/response/logger.rb +1 -3
- data/lib/zendesk_api/middleware/response/parse_json.rb +24 -0
- data/lib/zendesk_api/resources.rb +3 -16
- data/lib/zendesk_api/version.rb +1 -1
- data/spec/core/client_spec.rb +1 -4
- data/spec/core/middleware/request/upload_spec.rb +3 -16
- data/spec/core/middleware/response/deflate_spec.rb +7 -1
- data/spec/core/middleware/response/gzip_spec.rb +7 -1
- data/zendesk_api.gemspec +5 -6
- metadata +11 -23
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 37993d2aec43f1b8538a953d838660820b4163a6
|
4
|
+
data.tar.gz: f1b34e91d733700adf842c8c86170d29912f6e3a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0f0cab0ca0fd0037ecde030639f20308455318d03640d4b2d481962aca0a47b632784d38378b9850d93a8f5b772a199ef121201c69b5d685ee3231124b131f39
|
7
|
+
data.tar.gz: 9d7ffdde12ee76c0b1f9ccf8a689f2d19e78fac02ad044e33d390f0590fccfeefb8b44799fd01777122864e51e6f5c81d7a1822315438115c2651829147ad0f6
|
data/.travis.yml
CHANGED
data/Gemfile.lock
CHANGED
@@ -1,121 +1,114 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
zendesk_api (1.
|
5
|
-
faraday (~> 0.
|
6
|
-
faraday_middleware (~> 0.8.7)
|
4
|
+
zendesk_api (1.3.0.rc1)
|
5
|
+
faraday (~> 0.9)
|
7
6
|
hashie (>= 1.2)
|
8
7
|
inflection
|
9
|
-
mime-types (~>
|
8
|
+
mime-types (~> 2.0)
|
10
9
|
multi_json
|
11
|
-
multipart-post (~>
|
10
|
+
multipart-post (~> 2.0)
|
12
11
|
|
13
12
|
GEM
|
14
13
|
remote: https://rubygems.org/
|
15
14
|
specs:
|
16
|
-
activemodel (3.2.
|
17
|
-
activesupport (= 3.2.
|
15
|
+
activemodel (3.2.16)
|
16
|
+
activesupport (= 3.2.16)
|
18
17
|
builder (~> 3.0.0)
|
19
|
-
activesupport (3.2.
|
20
|
-
i18n (
|
18
|
+
activesupport (3.2.16)
|
19
|
+
i18n (~> 0.6, >= 0.6.4)
|
21
20
|
multi_json (~> 1.0)
|
22
|
-
addressable (2.3.
|
23
|
-
backports (3.
|
21
|
+
addressable (2.3.5)
|
22
|
+
backports (3.5.0)
|
24
23
|
bond (0.4.3)
|
25
|
-
|
26
|
-
bootstrap-sass (2.3.2.0)
|
24
|
+
bootstrap-sass (3.1.0.2)
|
27
25
|
sass (~> 3.2)
|
28
|
-
bouncy-castle-java (1.5.0147)
|
29
26
|
builder (3.0.4)
|
30
|
-
bump (0.
|
31
|
-
chunky_png (1.
|
32
|
-
coderay (1.0
|
27
|
+
bump (0.5.0)
|
28
|
+
chunky_png (1.3.0)
|
29
|
+
coderay (1.1.0)
|
33
30
|
coderay_bash (1.0.5)
|
34
31
|
coderay (>= 1.0)
|
35
32
|
compass (0.12.2)
|
36
33
|
chunky_png (~> 1.2)
|
37
34
|
fssm (>= 0.2.7)
|
38
35
|
sass (~> 3.1)
|
39
|
-
crack (0.4.
|
40
|
-
safe_yaml (~> 0.
|
36
|
+
crack (0.4.2)
|
37
|
+
safe_yaml (~> 1.0.0)
|
41
38
|
daemons (1.1.9)
|
42
|
-
database_cleaner (1.0
|
43
|
-
diff-lcs (1.2.
|
39
|
+
database_cleaner (1.2.0)
|
40
|
+
diff-lcs (1.2.5)
|
41
|
+
docile (1.1.3)
|
44
42
|
eventmachine (1.0.3)
|
45
|
-
|
46
|
-
|
47
|
-
multipart-post (~> 1.2.0)
|
48
|
-
faraday_middleware (0.8.8)
|
49
|
-
faraday (>= 0.7.4, < 0.9)
|
43
|
+
faraday (0.9.0)
|
44
|
+
multipart-post (>= 1.2, < 3)
|
50
45
|
fssm (0.2.10)
|
51
|
-
haml (4.0.
|
46
|
+
haml (4.0.5)
|
52
47
|
tilt
|
53
|
-
hashie (2.
|
54
|
-
i18n (0.6.
|
48
|
+
hashie (2.0.5)
|
49
|
+
i18n (0.6.9)
|
55
50
|
inflection (1.0.0)
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
mime-types (1.25.1)
|
60
|
-
mongoid (3.1.4)
|
51
|
+
json (1.8.1)
|
52
|
+
mime-types (2.1)
|
53
|
+
mongoid (3.1.6)
|
61
54
|
activemodel (~> 3.2)
|
62
55
|
moped (~> 1.4)
|
63
56
|
origin (~> 1.0)
|
64
|
-
tzinfo (~> 0.3.
|
65
|
-
moped (1.5.
|
66
|
-
multi_json (1.
|
67
|
-
multipart-post (
|
68
|
-
newrelic_rpm (3.
|
57
|
+
tzinfo (~> 0.3.29)
|
58
|
+
moped (1.5.2)
|
59
|
+
multi_json (1.8.4)
|
60
|
+
multipart-post (2.0.0)
|
61
|
+
newrelic_rpm (3.7.2.192)
|
69
62
|
origin (1.1.0)
|
70
63
|
rack (1.5.2)
|
71
|
-
rack-protection (1.5.
|
64
|
+
rack-protection (1.5.2)
|
72
65
|
rack
|
73
|
-
rack-ssl-enforcer (0.2.
|
66
|
+
rack-ssl-enforcer (0.2.6)
|
74
67
|
rack-test (0.6.2)
|
75
68
|
rack (>= 1.0)
|
76
|
-
rake (10.1.
|
77
|
-
redcarpet (
|
69
|
+
rake (10.1.1)
|
70
|
+
redcarpet (3.0.0)
|
78
71
|
ripl (0.7.0)
|
79
72
|
bond (~> 0.4.2)
|
80
|
-
rspec (2.
|
81
|
-
rspec-core (~> 2.
|
82
|
-
rspec-expectations (~> 2.
|
83
|
-
rspec-mocks (~> 2.
|
84
|
-
rspec-core (2.
|
85
|
-
rspec-expectations (2.
|
73
|
+
rspec (2.14.1)
|
74
|
+
rspec-core (~> 2.14.0)
|
75
|
+
rspec-expectations (~> 2.14.0)
|
76
|
+
rspec-mocks (~> 2.14.0)
|
77
|
+
rspec-core (2.14.7)
|
78
|
+
rspec-expectations (2.14.5)
|
86
79
|
diff-lcs (>= 1.1.3, < 2.0)
|
87
|
-
rspec-mocks (2.
|
88
|
-
safe_yaml (0.
|
89
|
-
sass (3.2.
|
90
|
-
simplecov (0.
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
80
|
+
rspec-mocks (2.14.5)
|
81
|
+
safe_yaml (1.0.1)
|
82
|
+
sass (3.2.14)
|
83
|
+
simplecov (0.8.2)
|
84
|
+
docile (~> 1.1.0)
|
85
|
+
multi_json
|
86
|
+
simplecov-html (~> 0.8.0)
|
87
|
+
simplecov-html (0.8.0)
|
88
|
+
sinatra (1.4.4)
|
95
89
|
rack (~> 1.4)
|
96
90
|
rack-protection (~> 1.4)
|
97
91
|
tilt (~> 1.3, >= 1.3.4)
|
98
|
-
sinatra-contrib (1.4.
|
92
|
+
sinatra-contrib (1.4.2)
|
99
93
|
backports (>= 2.0)
|
100
|
-
|
94
|
+
multi_json
|
101
95
|
rack-protection
|
102
96
|
rack-test
|
103
|
-
sinatra (~> 1.4.
|
97
|
+
sinatra (~> 1.4.0)
|
104
98
|
tilt (~> 1.3)
|
105
|
-
thin (1.
|
99
|
+
thin (1.6.1)
|
106
100
|
daemons (>= 1.0.9)
|
107
|
-
eventmachine (>= 0.
|
101
|
+
eventmachine (>= 1.0.0)
|
108
102
|
rack (>= 1.0.0)
|
109
103
|
tilt (1.4.1)
|
110
|
-
tzinfo (0.3.
|
111
|
-
vcr (2.
|
104
|
+
tzinfo (0.3.38)
|
105
|
+
vcr (2.8.0)
|
112
106
|
webmock (1.9.3)
|
113
107
|
addressable (>= 2.2.7)
|
114
108
|
crack (>= 0.3.2)
|
115
|
-
yard (0.8.
|
109
|
+
yard (0.8.7.3)
|
116
110
|
|
117
111
|
PLATFORMS
|
118
|
-
java
|
119
112
|
ruby
|
120
113
|
|
121
114
|
DEPENDENCIES
|
data/lib/zendesk_api/client.rb
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
require 'faraday'
|
2
|
-
require 'faraday_middleware'
|
3
2
|
|
4
3
|
require 'zendesk_api/version'
|
5
4
|
require 'zendesk_api/sideloading'
|
@@ -9,10 +8,12 @@ require 'zendesk_api/lru_cache'
|
|
9
8
|
require 'zendesk_api/middleware/request/etag_cache'
|
10
9
|
require 'zendesk_api/middleware/request/retry'
|
11
10
|
require 'zendesk_api/middleware/request/upload'
|
11
|
+
require 'zendesk_api/middleware/request/encode_json'
|
12
12
|
require 'zendesk_api/middleware/response/callback'
|
13
13
|
require 'zendesk_api/middleware/response/deflate'
|
14
14
|
require 'zendesk_api/middleware/response/gzip'
|
15
15
|
require 'zendesk_api/middleware/response/parse_iso_dates'
|
16
|
+
require 'zendesk_api/middleware/response/parse_json'
|
16
17
|
require 'zendesk_api/middleware/response/raise_error'
|
17
18
|
require 'zendesk_api/middleware/response/logger'
|
18
19
|
require 'zendesk_api/delegator'
|
@@ -134,7 +135,7 @@ module ZendeskAPI
|
|
134
135
|
builder.use ZendeskAPI::Middleware::Response::Callback, self
|
135
136
|
builder.use ZendeskAPI::Middleware::Response::Logger, config.logger if config.logger
|
136
137
|
builder.use ZendeskAPI::Middleware::Response::ParseIsoDates
|
137
|
-
builder.
|
138
|
+
builder.use ZendeskAPI::Middleware::Response::ParseJson
|
138
139
|
|
139
140
|
adapter = config.adapter || Faraday.default_adapter
|
140
141
|
|
@@ -156,7 +157,7 @@ module ZendeskAPI
|
|
156
157
|
|
157
158
|
builder.use ZendeskAPI::Middleware::Request::Upload
|
158
159
|
builder.request :multipart
|
159
|
-
builder.
|
160
|
+
builder.use ZendeskAPI::Middleware::Request::EncodeJson
|
160
161
|
builder.use ZendeskAPI::Middleware::Request::Retry, :logger => config.logger if config.retry # Should always be first in the stack
|
161
162
|
|
162
163
|
builder.adapter *adapter
|
@@ -0,0 +1,26 @@
|
|
1
|
+
module ZendeskAPI
|
2
|
+
# @private
|
3
|
+
module Middleware
|
4
|
+
# @private
|
5
|
+
module Request
|
6
|
+
class EncodeJson < Faraday::Middleware
|
7
|
+
CONTENT_TYPE = 'Content-Type'.freeze
|
8
|
+
MIME_TYPE = 'application/json'.freeze
|
9
|
+
dependency 'json'
|
10
|
+
|
11
|
+
def call(env)
|
12
|
+
type = env[:request_headers][CONTENT_TYPE].to_s
|
13
|
+
type = type.split(';', 2).first if type.index(';')
|
14
|
+
type
|
15
|
+
|
16
|
+
if env[:body] && !(env[:body].respond_to?(:to_str) && env[:body].empty?) && (type.empty? || type == MIME_TYPE)
|
17
|
+
env[:body] = JSON.dump(env[:body])
|
18
|
+
env[:request_headers][CONTENT_TYPE] ||= MIME_TYPE
|
19
|
+
end
|
20
|
+
|
21
|
+
@app.call(env)
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
@@ -18,17 +18,17 @@ module ZendeskAPI
|
|
18
18
|
[@cache_key_prefix, env[:url].to_s]
|
19
19
|
end
|
20
20
|
|
21
|
-
def call(
|
22
|
-
return @app.call(
|
21
|
+
def call(environment)
|
22
|
+
return @app.call(environment) unless [:get, :head].include?(environment[:method])
|
23
23
|
|
24
24
|
# send known etag
|
25
|
-
cached = @cache.read(cache_key(
|
25
|
+
cached = @cache.read(cache_key(environment))
|
26
26
|
|
27
27
|
if cached
|
28
|
-
|
28
|
+
environment[:request_headers]["If-None-Match"] ||= cached[:response_headers]["Etag"]
|
29
29
|
end
|
30
30
|
|
31
|
-
@app.call(
|
31
|
+
@app.call(environment).on_complete do |env|
|
32
32
|
if cached && env[:status] == 304 # not modified
|
33
33
|
env[:body] = cached[:body]
|
34
34
|
env[:response_headers].merge!(
|
@@ -38,7 +38,7 @@ module ZendeskAPI
|
|
38
38
|
:content_encoding => cached[:response_headers][:content_encoding]
|
39
39
|
)
|
40
40
|
elsif env[:status] == 200 && env[:response_headers]["Etag"] # modified and cacheable
|
41
|
-
@cache.write(cache_key(env), env)
|
41
|
+
@cache.write(cache_key(env), env.to_h)
|
42
42
|
end
|
43
43
|
end
|
44
44
|
end
|
@@ -38,7 +38,6 @@ module ZendeskAPI
|
|
38
38
|
else
|
39
39
|
if defined?(ActionDispatch) && file.is_a?(ActionDispatch::Http::UploadedFile)
|
40
40
|
path = file.tempfile.path
|
41
|
-
mime_type = file.content_type
|
42
41
|
else
|
43
42
|
warn "WARNING: Passed invalid filename #{file} of type #{file.class} to upload"
|
44
43
|
end
|
@@ -50,7 +49,7 @@ module ZendeskAPI
|
|
50
49
|
hash = hash[key]
|
51
50
|
end
|
52
51
|
|
53
|
-
mime_type
|
52
|
+
mime_type = MIME::Types.type_for(path).first || "application/octet-stream"
|
54
53
|
|
55
54
|
hash[:filename] ||= if file.respond_to?(:original_filename)
|
56
55
|
file.original_filename
|
@@ -58,7 +57,7 @@ module ZendeskAPI
|
|
58
57
|
File.basename(path)
|
59
58
|
end
|
60
59
|
|
61
|
-
hash[:uploaded_data] = Faraday::UploadIO.new(path, mime_type
|
60
|
+
hash[:uploaded_data] = Faraday::UploadIO.new(path, mime_type)
|
62
61
|
end
|
63
62
|
end
|
64
63
|
|
@@ -1,17 +1,15 @@
|
|
1
|
-
require 'faraday_middleware/response_middleware'
|
2
|
-
|
3
1
|
module ZendeskAPI
|
2
|
+
# @private
|
4
3
|
module Middleware
|
4
|
+
# @private
|
5
5
|
module Response
|
6
6
|
# Faraday middleware to handle content-encoding = inflate
|
7
7
|
# @private
|
8
|
-
class Deflate <
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
def parse_response?(env)
|
14
|
-
super && env[:response_headers]['content-encoding'] == "deflate"
|
8
|
+
class Deflate < Faraday::Response::Middleware
|
9
|
+
def on_complete(env)
|
10
|
+
if env.body.respond_to?(:to_str) && !env.body.strip.empty? && env[:response_headers]['content-encoding'] == "deflate"
|
11
|
+
env.body = Zlib::Inflate.inflate(env.body)
|
12
|
+
end
|
15
13
|
end
|
16
14
|
end
|
17
15
|
end
|
@@ -1,4 +1,3 @@
|
|
1
|
-
require 'faraday_middleware/response_middleware'
|
2
1
|
require 'zlib'
|
3
2
|
require 'stringio'
|
4
3
|
|
@@ -8,13 +7,11 @@ module ZendeskAPI
|
|
8
7
|
# @private
|
9
8
|
module Response
|
10
9
|
# Faraday middleware to handle content-encoding = gzip
|
11
|
-
class Gzip <
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
def parse_response?(env)
|
17
|
-
super && env[:response_headers]['content-encoding'] == "gzip"
|
10
|
+
class Gzip < Faraday::Response::Middleware
|
11
|
+
def on_complete(env)
|
12
|
+
if env[:body].respond_to?(:to_str) && !env[:body].strip.empty? && env[:response_headers]['content-encoding'] == "gzip"
|
13
|
+
env[:body] = Zlib::GzipReader.new(StringIO.new(env[:body])).read
|
14
|
+
end
|
18
15
|
end
|
19
16
|
end
|
20
17
|
end
|
@@ -1,11 +1,9 @@
|
|
1
|
-
require 'faraday_middleware/response_middleware'
|
2
|
-
|
3
1
|
module ZendeskAPI
|
4
2
|
module Middleware
|
5
3
|
module Response
|
6
4
|
# Faraday middleware to handle logging
|
7
5
|
# @private
|
8
|
-
class Logger < Faraday::
|
6
|
+
class Logger < Faraday::Middleware
|
9
7
|
def initialize(app, logger = nil)
|
10
8
|
super(app)
|
11
9
|
|
@@ -0,0 +1,24 @@
|
|
1
|
+
module ZendeskAPI
|
2
|
+
# @private
|
3
|
+
module Middleware
|
4
|
+
# @private
|
5
|
+
module Response
|
6
|
+
class ParseJson < Faraday::Response::Middleware
|
7
|
+
CONTENT_TYPE = 'Content-Type'.freeze
|
8
|
+
dependency 'json'
|
9
|
+
|
10
|
+
def on_complete(env)
|
11
|
+
type = env[:response_headers][CONTENT_TYPE].to_s
|
12
|
+
type = type.split(';', 2).first if type.index(';')
|
13
|
+
type
|
14
|
+
|
15
|
+
if type == 'application/json' && env[:body].respond_to?(:to_str) && !env[:body].strip.empty?
|
16
|
+
env[:body] = JSON.parse(env[:body])
|
17
|
+
else
|
18
|
+
env[:body] = nil
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
@@ -31,7 +31,6 @@ module ZendeskAPI
|
|
31
31
|
include Destroy
|
32
32
|
|
33
33
|
alias :name :id
|
34
|
-
alias :to_param :id
|
35
34
|
|
36
35
|
def path(opts = {})
|
37
36
|
raise "tags must have parent resource" unless association.options.parent
|
@@ -114,7 +113,7 @@ module ZendeskAPI
|
|
114
113
|
|
115
114
|
has_many Ticket
|
116
115
|
has_many User
|
117
|
-
has_many Tag, :extend => Tag::Update
|
116
|
+
has_many Tag, :extend => Tag::Update
|
118
117
|
end
|
119
118
|
|
120
119
|
class ForumSubscription < Resource
|
@@ -170,7 +169,7 @@ module ZendeskAPI
|
|
170
169
|
has_many :comments, :class => TopicComment
|
171
170
|
has_many :subscriptions, :class => TopicSubscription
|
172
171
|
has :vote, :class => TopicVote
|
173
|
-
has_many Tag, :extend => Tag::Update
|
172
|
+
has_many Tag, :extend => Tag::Update
|
174
173
|
|
175
174
|
def votes(opts = {})
|
176
175
|
return @votes if @votes && !opts[:reload]
|
@@ -323,7 +322,7 @@ module ZendeskAPI
|
|
323
322
|
has :last_comment, :class => Comment, :inline => true
|
324
323
|
has_many :last_comments, :class => Comment, :inline => true
|
325
324
|
|
326
|
-
has_many Tag, :extend => Tag::Update
|
325
|
+
has_many Tag, :extend => Tag::Update
|
327
326
|
|
328
327
|
has_many :incidents, :class => Ticket
|
329
328
|
|
@@ -542,18 +541,6 @@ module ZendeskAPI
|
|
542
541
|
class PhoneNumber < Resource
|
543
542
|
namespace "channels/voice"
|
544
543
|
end
|
545
|
-
|
546
|
-
class CertificationAddress < Resource
|
547
|
-
namespace "channels/voice"
|
548
|
-
end
|
549
|
-
|
550
|
-
class Greeting < Resource
|
551
|
-
namespace "channels/voice"
|
552
|
-
end
|
553
|
-
|
554
|
-
class GreetingCategory < Resource
|
555
|
-
namespace "channels/voice"
|
556
|
-
end
|
557
544
|
end
|
558
545
|
|
559
546
|
class TicketForm < Resource
|
data/lib/zendesk_api/version.rb
CHANGED
data/spec/core/client_spec.rb
CHANGED
@@ -240,10 +240,7 @@ describe ZendeskAPI::Client do
|
|
240
240
|
end
|
241
241
|
|
242
242
|
it "manages namespace correctly" do
|
243
|
-
|
244
|
-
client.phone_numbers.path.should match(/channels\/voice\/phone_numbers/)
|
245
|
-
client.greetings.path.should match(/channels\/voice\/greetings/)
|
246
|
-
client.greeting_categories.path.should match(/channels\/voice\/greeting_categories/)
|
243
|
+
ZendeskAPI::Voice::PhoneNumber.new(subject, {}).path.should match(/channels\/voice\/phone_numbers/)
|
247
244
|
end
|
248
245
|
end
|
249
246
|
end
|
@@ -10,7 +10,7 @@ describe ZendeskAPI::Middleware::Request::Upload do
|
|
10
10
|
end
|
11
11
|
|
12
12
|
it "should handle body with no file" do
|
13
|
-
subject.call(:body => {})[:body].should == {}
|
13
|
+
subject.call(:body => {})[:body].should == {}
|
14
14
|
end
|
15
15
|
|
16
16
|
it "should handle invalid types" do
|
@@ -58,7 +58,7 @@ describe ZendeskAPI::Middleware::Request::Upload do
|
|
58
58
|
|
59
59
|
context "with an ActionDispatch::Http::UploadedFile" do
|
60
60
|
before(:each) do
|
61
|
-
@upload = ActionDispatch::Http::UploadedFile.new(:filename => "hello
|
61
|
+
@upload = ActionDispatch::Http::UploadedFile.new(:filename => "hello", :tempfile => Tempfile.new(File.basename(filename)))
|
62
62
|
@env = subject.call(:body => { :file => @upload })
|
63
63
|
end
|
64
64
|
|
@@ -71,21 +71,8 @@ describe ZendeskAPI::Middleware::Request::Upload do
|
|
71
71
|
end
|
72
72
|
|
73
73
|
it "should add filename if none exist" do
|
74
|
-
@env[:body][:filename].should == "hello
|
74
|
+
@env[:body][:filename].should == "hello"
|
75
75
|
end
|
76
|
-
|
77
|
-
it "should pass correct filename to Faraday::UploadIO" do
|
78
|
-
@env[:body][:filename].should == "hello.jpg"
|
79
|
-
@env[:body][:uploaded_data].original_filename.should == @env[:body][:filename]
|
80
|
-
end
|
81
|
-
|
82
|
-
# context "when path does not resolve a mime_type" do
|
83
|
-
# it "should use the content_type of ActionDispatch::Http::UploadedFile " do
|
84
|
-
# @upload.tempfile.path = "XXX"
|
85
|
-
# @env = subject.call(:body => { :file => @upload })
|
86
|
-
# @env[:body][:uploaded_data][:content_type].should == "image/jpeg"
|
87
|
-
# end
|
88
|
-
# end
|
89
76
|
end
|
90
77
|
end
|
91
78
|
|
@@ -5,7 +5,13 @@ describe ZendeskAPI::Middleware::Response::Deflate do
|
|
5
5
|
subject { '{ "TESTDATA": true }' }
|
6
6
|
|
7
7
|
before(:each) do
|
8
|
-
stub_request(:get, %r{blergh}).to_return(
|
8
|
+
stub_request(:get, %r{blergh}).to_return(
|
9
|
+
:headers => {
|
10
|
+
:content_encoding => "deflate",
|
11
|
+
:content_type => "application/json"
|
12
|
+
},
|
13
|
+
:body => Zlib::Deflate.deflate(subject)
|
14
|
+
)
|
9
15
|
end
|
10
16
|
|
11
17
|
it "should inflate returned body" do
|
@@ -9,7 +9,13 @@ describe ZendeskAPI::Middleware::Response::Gzip do
|
|
9
9
|
gz.write(subject)
|
10
10
|
gz.close
|
11
11
|
|
12
|
-
stub_request(:get, %r{blergh}).to_return(
|
12
|
+
stub_request(:get, %r{blergh}).to_return(
|
13
|
+
:headers => {
|
14
|
+
:content_encoding => "gzip",
|
15
|
+
:content_type => "application/json"
|
16
|
+
},
|
17
|
+
:body => encoded_data.string
|
18
|
+
)
|
13
19
|
end
|
14
20
|
|
15
21
|
it "should inflate returned body" do
|
data/zendesk_api.gemspec
CHANGED
@@ -25,16 +25,15 @@ Gem::Specification.new do |s|
|
|
25
25
|
s.add_development_dependency "webmock", "~> 1.9.0"
|
26
26
|
s.add_development_dependency "yard"
|
27
27
|
|
28
|
-
|
29
|
-
|
28
|
+
# Optional. Only used for uploads testing.
|
29
|
+
# s.add_development_dependency "actionpack"
|
30
30
|
|
31
|
-
s.add_runtime_dependency "faraday", "~> 0.
|
32
|
-
s.add_runtime_dependency "faraday_middleware", "~> 0.8.7"
|
31
|
+
s.add_runtime_dependency "faraday", "~> 0.9"
|
33
32
|
s.add_runtime_dependency "hashie", ">= 1.2"
|
34
33
|
s.add_runtime_dependency "inflection"
|
35
34
|
s.add_runtime_dependency "multi_json"
|
36
|
-
s.add_runtime_dependency "mime-types", "~>
|
37
|
-
s.add_runtime_dependency "multipart-post", "~>
|
35
|
+
s.add_runtime_dependency "mime-types", "~> 2.0"
|
36
|
+
s.add_runtime_dependency "multipart-post", "~> 2.0"
|
38
37
|
|
39
38
|
s.files = `git ls-files -x Gemfile.lock`.split("\n") rescue ''
|
40
39
|
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: zendesk_api
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.3.0.rc1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Steven Davidovitz
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-
|
12
|
+
date: 2014-02-10 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bump
|
@@ -101,28 +101,14 @@ dependencies:
|
|
101
101
|
requirements:
|
102
102
|
- - "~>"
|
103
103
|
- !ruby/object:Gem::Version
|
104
|
-
version: 0.
|
104
|
+
version: '0.9'
|
105
105
|
type: :runtime
|
106
106
|
prerelease: false
|
107
107
|
version_requirements: !ruby/object:Gem::Requirement
|
108
108
|
requirements:
|
109
109
|
- - "~>"
|
110
110
|
- !ruby/object:Gem::Version
|
111
|
-
version: 0.
|
112
|
-
- !ruby/object:Gem::Dependency
|
113
|
-
name: faraday_middleware
|
114
|
-
requirement: !ruby/object:Gem::Requirement
|
115
|
-
requirements:
|
116
|
-
- - "~>"
|
117
|
-
- !ruby/object:Gem::Version
|
118
|
-
version: 0.8.7
|
119
|
-
type: :runtime
|
120
|
-
prerelease: false
|
121
|
-
version_requirements: !ruby/object:Gem::Requirement
|
122
|
-
requirements:
|
123
|
-
- - "~>"
|
124
|
-
- !ruby/object:Gem::Version
|
125
|
-
version: 0.8.7
|
111
|
+
version: '0.9'
|
126
112
|
- !ruby/object:Gem::Dependency
|
127
113
|
name: hashie
|
128
114
|
requirement: !ruby/object:Gem::Requirement
|
@@ -171,28 +157,28 @@ dependencies:
|
|
171
157
|
requirements:
|
172
158
|
- - "~>"
|
173
159
|
- !ruby/object:Gem::Version
|
174
|
-
version: '
|
160
|
+
version: '2.0'
|
175
161
|
type: :runtime
|
176
162
|
prerelease: false
|
177
163
|
version_requirements: !ruby/object:Gem::Requirement
|
178
164
|
requirements:
|
179
165
|
- - "~>"
|
180
166
|
- !ruby/object:Gem::Version
|
181
|
-
version: '
|
167
|
+
version: '2.0'
|
182
168
|
- !ruby/object:Gem::Dependency
|
183
169
|
name: multipart-post
|
184
170
|
requirement: !ruby/object:Gem::Requirement
|
185
171
|
requirements:
|
186
172
|
- - "~>"
|
187
173
|
- !ruby/object:Gem::Version
|
188
|
-
version: '
|
174
|
+
version: '2.0'
|
189
175
|
type: :runtime
|
190
176
|
prerelease: false
|
191
177
|
version_requirements: !ruby/object:Gem::Requirement
|
192
178
|
requirements:
|
193
179
|
- - "~>"
|
194
180
|
- !ruby/object:Gem::Version
|
195
|
-
version: '
|
181
|
+
version: '2.0'
|
196
182
|
description: Ruby wrapper for the REST API at http://www.zendesk.com. Documentation
|
197
183
|
at http://developer.zendesk.com.
|
198
184
|
email:
|
@@ -231,6 +217,7 @@ files:
|
|
231
217
|
- lib/zendesk_api/error.rb
|
232
218
|
- lib/zendesk_api/helpers.rb
|
233
219
|
- lib/zendesk_api/lru_cache.rb
|
220
|
+
- lib/zendesk_api/middleware/request/encode_json.rb
|
234
221
|
- lib/zendesk_api/middleware/request/etag_cache.rb
|
235
222
|
- lib/zendesk_api/middleware/request/retry.rb
|
236
223
|
- lib/zendesk_api/middleware/request/upload.rb
|
@@ -239,6 +226,7 @@ files:
|
|
239
226
|
- lib/zendesk_api/middleware/response/gzip.rb
|
240
227
|
- lib/zendesk_api/middleware/response/logger.rb
|
241
228
|
- lib/zendesk_api/middleware/response/parse_iso_dates.rb
|
229
|
+
- lib/zendesk_api/middleware/response/parse_json.rb
|
242
230
|
- lib/zendesk_api/middleware/response/raise_error.rb
|
243
231
|
- lib/zendesk_api/resource.rb
|
244
232
|
- lib/zendesk_api/resources.rb
|
@@ -521,7 +509,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
521
509
|
version: 1.3.6
|
522
510
|
requirements: []
|
523
511
|
rubyforge_project:
|
524
|
-
rubygems_version: 2.2.
|
512
|
+
rubygems_version: 2.2.0.rc.1
|
525
513
|
signing_key:
|
526
514
|
specification_version: 4
|
527
515
|
summary: Zendesk REST API Client
|