zendesk_api 1.9.6 → 1.10.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: eacb42e0c2633d103613e2599756158b0681d0ff
4
- data.tar.gz: 9d963ed17977f4e49d2c1d901c132fb5f2f03773
3
+ metadata.gz: da5e205a53c59a1cdccc0a3f67bf6208e5d37133
4
+ data.tar.gz: e64ed5636f4614e4e479c5171d5098ab324d6658
5
5
  SHA512:
6
- metadata.gz: 0cb6a37290dafb6ed727220b189e9f3a72f4a8d15cdd7e9f8bf58bd4579cc48e66ff25e762b5dc3972fc7d6d16d84b959db3b1a4f8f1d0e69f0eaaed5aee7cad
7
- data.tar.gz: 0620eda1af21db8c402478e39d03387d750ecbd36a168d057520a50ad307376ab90354b44e61eb4d72a3b18693285e8bd9f3a6dd4de0b8b45a81de31f75e4292
6
+ metadata.gz: f645fd48ebb0412eb4e60393333913c49a5872ab05d79d4d4305423cd08cd4d9234996d4fd73b7a6b968cb3767b78bbf61d35a503f7ed7d6ec72dfd90f72a54f
7
+ data.tar.gz: 5d46573d73d32acadbf7be41f10db1b29bda215661b61a0c90ec1c370c223c05d9cc9c036efab76b8911ed31f712aad81b1cce58c1073279e35a3fa391f203b9
@@ -53,7 +53,7 @@ module ZendeskAPI
53
53
  :headers => {
54
54
  :accept => 'application/json',
55
55
  :accept_encoding => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
56
- :user_agent => "ZendeskAPI API #{ZendeskAPI::VERSION}"
56
+ :user_agent => "ZendeskAPI Ruby #{ZendeskAPI::VERSION}"
57
57
  },
58
58
  :request => {
59
59
  :open_timeout => 10
@@ -182,8 +182,7 @@ module ZendeskAPI
182
182
 
183
183
  class Topic < Resource
184
184
  class TopicComment < TopicComment
185
- extend Read
186
-
185
+ include Read
187
186
  include Create
188
187
  include Update
189
188
  include Destroy
@@ -326,8 +325,12 @@ module ZendeskAPI
326
325
  has :author, :class => User
327
326
 
328
327
  def save
329
- save_associations
330
- true
328
+ if new_record?
329
+ save_associations
330
+ true
331
+ else
332
+ false
333
+ end
331
334
  end
332
335
 
333
336
  alias :save! :save
@@ -352,7 +355,7 @@ module ZendeskAPI
352
355
  class TicketField < Resource; end
353
356
 
354
357
  class TicketMetric < DataResource
355
- extend Read
358
+ include Read
356
359
  end
357
360
 
358
361
  class TicketRelated < DataResource; end
@@ -394,8 +397,12 @@ module ZendeskAPI
394
397
  has :author, :class => User
395
398
 
396
399
  def save
397
- save_associations
398
- true
400
+ if new_record?
401
+ save_associations
402
+ true
403
+ else
404
+ false
405
+ end
399
406
  end
400
407
 
401
408
  alias :save! :save
@@ -627,7 +634,7 @@ module ZendeskAPI
627
634
 
628
635
  class User < Resource
629
636
  class TopicComment < TopicComment
630
- extend Read
637
+ include Read
631
638
  end
632
639
 
633
640
  class Identity < Resource
@@ -1,3 +1,3 @@
1
1
  module ZendeskAPI
2
- VERSION = "1.9.6"
2
+ VERSION = "1.10.0"
3
3
  end
@@ -14,7 +14,7 @@ describe ZendeskAPI::Configuration do
14
14
  end
15
15
 
16
16
  it "should set user agent header properly" do
17
- expect(subject.options[:headers][:user_agent]).to match(/ZendeskAPI API/)
17
+ expect(subject.options[:headers][:user_agent]).to match(/ZendeskAPI Ruby/)
18
18
  end
19
19
 
20
20
  it "should set a default open_timeout" do
@@ -32,7 +32,7 @@ describe ZendeskAPI::CreateResource do
32
32
  end
33
33
 
34
34
  it "should raise if save fails" do
35
- expect { subject.create!(client, :test_field => "blah") }.to raise_error
35
+ expect { subject.create!(client, :test_field => "blah") }.to raise_error(ZendeskAPI::Error::NetworkError)
36
36
  end
37
37
  end
38
38
  end
@@ -8,7 +8,7 @@ describe ZendeskAPI::Middleware::Response::Callback do
8
8
  env[:body] = response
9
9
  end
10
10
 
11
- stub_request(:get, %r{test_endpoint}).to_return(:body => MultiJson.dump({ "ABC" => "DEF" }))
11
+ stub_request(:get, %r{test_endpoint}).to_return(:body => JSON.dump({ "ABC" => "DEF" }))
12
12
  end
13
13
 
14
14
  it "should call callbacks " do
@@ -79,7 +79,7 @@ describe ZendeskAPI::Middleware::Response::RaiseError do
79
79
  end
80
80
 
81
81
  context "with a body" do
82
- let(:body) { MultiJson.dump(:details => "hello") }
82
+ let(:body) { JSON.dump(:details => "hello") }
83
83
 
84
84
  it "should return RecordInvalid with proper message" do
85
85
  begin
@@ -102,7 +102,7 @@ describe ZendeskAPI::Middleware::Response::RaiseError do
102
102
  end
103
103
 
104
104
  context "with a body" do
105
- let(:body) { MultiJson.dump(:details => "big file is big") }
105
+ let(:body) { JSON.dump(:details => "big file is big") }
106
106
 
107
107
  it "should return RecordInvalid with proper message" do
108
108
  begin
@@ -103,7 +103,7 @@ describe ZendeskAPI::Resource do
103
103
  end
104
104
 
105
105
  it "should raise if save fails" do
106
- expect { subject.save! }.to raise_error
106
+ expect { subject.save! }.to raise_error(ZendeskAPI::Error::RecordInvalid)
107
107
  end
108
108
  end
109
109
 
@@ -13,7 +13,6 @@ require 'zendesk_api'
13
13
  require 'vcr'
14
14
  require 'logger'
15
15
  require 'stringio'
16
- require 'multi_json'
17
16
 
18
17
  begin
19
18
  require 'byebug'
@@ -114,7 +113,7 @@ module TestHelper
114
113
  end
115
114
 
116
115
  def json(body = {})
117
- MultiJson.dump(body)
116
+ JSON.dump(body)
118
117
  end
119
118
 
120
119
  def stub_json_request(verb, path_matcher, body = json, options = {})
Binary file
@@ -29,10 +29,10 @@ describe ZendeskAPI::AppInstallation do
29
29
 
30
30
  app.id = body["app_id"]
31
31
 
32
- attributes = { :app_id => app.id, :settings => {
33
- :name => "My App",
34
- "Custom_Field_ID" => "123",
35
- "Custom_Field_Default" => "Default"
32
+ attributes = {
33
+ :app_id => app.id,
34
+ :settings => {
35
+ :name => "My App"
36
36
  }
37
37
  }
38
38
 
@@ -25,9 +25,7 @@ describe ZendeskAPI::Ticket do
25
25
  context "recent tickets" do
26
26
  before(:all) do
27
27
  VCR.use_cassette("visit_recent_ticket") do
28
- client.connection.get("/tickets/1") do |req|
29
- req.headers[:Accept] = "*/*"
30
- end
28
+ client.tickets.find(id: 1)
31
29
 
32
30
  sleep(5)
33
31
  end
data/zendesk_api.gemspec CHANGED
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
28
28
  s.add_runtime_dependency "faraday", "~> 0.9"
29
29
  s.add_runtime_dependency "hashie", ">= 1.2", "< 4.0", "!= 3.3.0"
30
30
  s.add_runtime_dependency "inflection"
31
- s.add_runtime_dependency "multi_json"
32
31
  s.add_runtime_dependency "multipart-post", "~> 2.0"
33
32
  s.add_runtime_dependency "mime-types"
34
33
 
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.9.6
4
+ version: 1.10.0
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: 2015-07-16 00:00:00.000000000 Z
12
+ date: 2015-07-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bump
@@ -149,20 +149,6 @@ dependencies:
149
149
  - - ">="
150
150
  - !ruby/object:Gem::Version
151
151
  version: '0'
152
- - !ruby/object:Gem::Dependency
153
- name: multi_json
154
- requirement: !ruby/object:Gem::Requirement
155
- requirements:
156
- - - ">="
157
- - !ruby/object:Gem::Version
158
- version: '0'
159
- type: :runtime
160
- prerelease: false
161
- version_requirements: !ruby/object:Gem::Requirement
162
- requirements:
163
- - - ">="
164
- - !ruby/object:Gem::Version
165
- version: '0'
166
152
  - !ruby/object:Gem::Dependency
167
153
  name: multipart-post
168
154
  requirement: !ruby/object:Gem::Requirement