zendesk_api 1.3.1 → 1.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
- ---
2
- SHA512:
3
- data.tar.gz: 8a7289f36dedcd3186968115caa3ced03a37597de57ac741ebbf46fadaa252f1613a43cf0f128b9810182c3059920db92cfabcd8daaaf29d165904ab0340cd76
4
- metadata.gz: a90d90ca818547fa156ba9f269f2c5da2f941c04f40c9e621a911b1b3c1106babdf962aa8d3448213d79554688ad105c4c7beffb5b2a9f65073649af905b332a
5
- SHA1:
6
- data.tar.gz: 494e6366c596e337b826dc24926062d409b797fa
7
- metadata.gz: 55b47410a74195c0813ae67cf9a2f822c9f2674b
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 4cde723abc0cc58787561891e1538dc454f0a4ea
4
+ data.tar.gz: d8b0bfe0638257feb439ee6e9c2007797af5cc04
5
+ SHA512:
6
+ metadata.gz: 2d3dded2e4e03b69ddd6d582d602be3079d432ccbeeb2f8e78ab1a8807d509dbdf74b15a9dc1f59fdba129da188d1e2ee8c6d0559591af448a476734cd22d47e
7
+ data.tar.gz: 6d647eae9f4b56ba947cb7c0a761f1d50cbd376c55865f5cbf31a0c00196649b166c476fa5e3e6a40cf8630034f754fedef44ff5ad67c3fdbe20de4cdbf4024e
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- zendesk_api (1.3.1)
4
+ zendesk_api (1.3.2)
5
5
  faraday (~> 0.9)
6
6
  hashie (>= 1.2)
7
7
  inflection
data/README.md CHANGED
@@ -14,6 +14,7 @@ Please check out the [wiki](https://github.com/zendesk/zendesk_api_client_rb/wik
14
14
  * Version 0.3.0 changed the license from MIT to Apache Version 2.
15
15
  * Version 0.3.2 introduced a regression when side-loading roles on users. This was fixed in 0.3.4.
16
16
  * Version 1.0.0 changes the way errors are handled. Please see the [wiki page](https://github.com/zendesk/zendesk_api_client_rb/wiki/Errors) for more info.
17
+ * Version 1.3.0 updates the Faraday dependency to 0.9. Since Faraday did not bump a major version we have not either, but there is no guarantee >= 1.3.0 works with Faraday < 0.9
17
18
 
18
19
  ## Installation
19
20
 
data/bin/zendesk CHANGED
@@ -6,6 +6,7 @@ ARGV[0] ||= "console"
6
6
  if %w(s server).include?(ARGV[0])
7
7
  Bundler.setup(:default, :server)
8
8
 
9
+ require 'optparse'
9
10
  require 'zendesk_api'
10
11
  require 'zendesk_api/server/base'
11
12
 
@@ -305,6 +305,7 @@ module ZendeskAPI
305
305
  end
306
306
 
307
307
  put :mark_as_spam
308
+ post :merge
308
309
 
309
310
  has :requester, :class => User, :inline => :create
310
311
  has :submitter, :class => User
@@ -1,3 +1,3 @@
1
1
  module ZendeskAPI
2
- VERSION = "1.3.1"
2
+ VERSION = "1.3.2"
3
3
  end
metadata CHANGED
@@ -1,140 +1,196 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: zendesk_api
3
- version: !ruby/object:Gem::Version
4
- version: 1.3.1
3
+ version: !ruby/object:Gem::Version
4
+ version: 1.3.2
5
5
  platform: ruby
6
- authors:
6
+ authors:
7
7
  - Steven Davidovitz
8
8
  - Michael Grosser
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
-
13
- date: 2014-02-19 00:00:00 Z
14
- dependencies:
15
- - !ruby/object:Gem::Dependency
12
+ date: 2014-03-03 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
16
15
  name: bump
17
- prerelease: false
18
- requirement: &id001 !ruby/object:Gem::Requirement
19
- requirements:
20
- - &id002
21
- - ">="
22
- - !ruby/object:Gem::Version
23
- version: "0"
16
+ requirement: !ruby/object:Gem::Requirement
17
+ requirements:
18
+ - - ">="
19
+ - !ruby/object:Gem::Version
20
+ version: '0'
24
21
  type: :development
25
- version_requirements: *id001
26
- - !ruby/object:Gem::Dependency
27
- name: rake
28
22
  prerelease: false
29
- requirement: &id003 !ruby/object:Gem::Requirement
30
- requirements:
31
- - *id002
23
+ version_requirements: !ruby/object:Gem::Requirement
24
+ requirements:
25
+ - - ">="
26
+ - !ruby/object:Gem::Version
27
+ version: '0'
28
+ - !ruby/object:Gem::Dependency
29
+ name: rake
30
+ requirement: !ruby/object:Gem::Requirement
31
+ requirements:
32
+ - - ">="
33
+ - !ruby/object:Gem::Version
34
+ version: '0'
32
35
  type: :development
33
- version_requirements: *id003
34
- - !ruby/object:Gem::Dependency
35
- name: rspec
36
36
  prerelease: false
37
- requirement: &id004 !ruby/object:Gem::Requirement
38
- requirements:
39
- - *id002
37
+ version_requirements: !ruby/object:Gem::Requirement
38
+ requirements:
39
+ - - ">="
40
+ - !ruby/object:Gem::Version
41
+ version: '0'
42
+ - !ruby/object:Gem::Dependency
43
+ name: rspec
44
+ requirement: !ruby/object:Gem::Requirement
45
+ requirements:
46
+ - - ">="
47
+ - !ruby/object:Gem::Version
48
+ version: '0'
40
49
  type: :development
41
- version_requirements: *id004
42
- - !ruby/object:Gem::Dependency
43
- name: vcr
44
50
  prerelease: false
45
- requirement: &id005 !ruby/object:Gem::Requirement
46
- requirements:
47
- - *id002
51
+ version_requirements: !ruby/object:Gem::Requirement
52
+ requirements:
53
+ - - ">="
54
+ - !ruby/object:Gem::Version
55
+ version: '0'
56
+ - !ruby/object:Gem::Dependency
57
+ name: vcr
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - ">="
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
48
63
  type: :development
49
- version_requirements: *id005
50
- - !ruby/object:Gem::Dependency
51
- name: webmock
52
64
  prerelease: false
53
- requirement: &id006 !ruby/object:Gem::Requirement
54
- requirements:
55
- - - ~>
56
- - !ruby/object:Gem::Version
65
+ version_requirements: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - ">="
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
70
+ - !ruby/object:Gem::Dependency
71
+ name: webmock
72
+ requirement: !ruby/object:Gem::Requirement
73
+ requirements:
74
+ - - "~>"
75
+ - !ruby/object:Gem::Version
57
76
  version: 1.9.0
58
77
  type: :development
59
- version_requirements: *id006
60
- - !ruby/object:Gem::Dependency
61
- name: yard
62
78
  prerelease: false
63
- requirement: &id007 !ruby/object:Gem::Requirement
64
- requirements:
65
- - *id002
79
+ version_requirements: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - "~>"
82
+ - !ruby/object:Gem::Version
83
+ version: 1.9.0
84
+ - !ruby/object:Gem::Dependency
85
+ name: yard
86
+ requirement: !ruby/object:Gem::Requirement
87
+ requirements:
88
+ - - ">="
89
+ - !ruby/object:Gem::Version
90
+ version: '0'
66
91
  type: :development
67
- version_requirements: *id007
68
- - !ruby/object:Gem::Dependency
69
- name: faraday
70
92
  prerelease: false
71
- requirement: &id008 !ruby/object:Gem::Requirement
72
- requirements:
73
- - - ~>
74
- - !ruby/object:Gem::Version
75
- version: "0.9"
93
+ version_requirements: !ruby/object:Gem::Requirement
94
+ requirements:
95
+ - - ">="
96
+ - !ruby/object:Gem::Version
97
+ version: '0'
98
+ - !ruby/object:Gem::Dependency
99
+ name: faraday
100
+ requirement: !ruby/object:Gem::Requirement
101
+ requirements:
102
+ - - "~>"
103
+ - !ruby/object:Gem::Version
104
+ version: '0.9'
76
105
  type: :runtime
77
- version_requirements: *id008
78
- - !ruby/object:Gem::Dependency
79
- name: hashie
80
106
  prerelease: false
81
- requirement: &id009 !ruby/object:Gem::Requirement
82
- requirements:
107
+ version_requirements: !ruby/object:Gem::Requirement
108
+ requirements:
109
+ - - "~>"
110
+ - !ruby/object:Gem::Version
111
+ version: '0.9'
112
+ - !ruby/object:Gem::Dependency
113
+ name: hashie
114
+ requirement: !ruby/object:Gem::Requirement
115
+ requirements:
83
116
  - - ">="
84
- - !ruby/object:Gem::Version
85
- version: "1.2"
117
+ - !ruby/object:Gem::Version
118
+ version: '1.2'
86
119
  type: :runtime
87
- version_requirements: *id009
88
- - !ruby/object:Gem::Dependency
89
- name: inflection
90
120
  prerelease: false
91
- requirement: &id010 !ruby/object:Gem::Requirement
92
- requirements:
93
- - *id002
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ requirements:
123
+ - - ">="
124
+ - !ruby/object:Gem::Version
125
+ version: '1.2'
126
+ - !ruby/object:Gem::Dependency
127
+ name: inflection
128
+ requirement: !ruby/object:Gem::Requirement
129
+ requirements:
130
+ - - ">="
131
+ - !ruby/object:Gem::Version
132
+ version: '0'
94
133
  type: :runtime
95
- version_requirements: *id010
96
- - !ruby/object:Gem::Dependency
97
- name: multi_json
98
134
  prerelease: false
99
- requirement: &id011 !ruby/object:Gem::Requirement
100
- requirements:
101
- - *id002
135
+ version_requirements: !ruby/object:Gem::Requirement
136
+ requirements:
137
+ - - ">="
138
+ - !ruby/object:Gem::Version
139
+ version: '0'
140
+ - !ruby/object:Gem::Dependency
141
+ name: multi_json
142
+ requirement: !ruby/object:Gem::Requirement
143
+ requirements:
144
+ - - ">="
145
+ - !ruby/object:Gem::Version
146
+ version: '0'
102
147
  type: :runtime
103
- version_requirements: *id011
104
- - !ruby/object:Gem::Dependency
105
- name: mime-types
106
148
  prerelease: false
107
- requirement: &id012 !ruby/object:Gem::Requirement
108
- requirements:
109
- - - ~>
110
- - !ruby/object:Gem::Version
111
- version: "1.0"
149
+ version_requirements: !ruby/object:Gem::Requirement
150
+ requirements:
151
+ - - ">="
152
+ - !ruby/object:Gem::Version
153
+ version: '0'
154
+ - !ruby/object:Gem::Dependency
155
+ name: mime-types
156
+ requirement: !ruby/object:Gem::Requirement
157
+ requirements:
158
+ - - "~>"
159
+ - !ruby/object:Gem::Version
160
+ version: '1.0'
112
161
  type: :runtime
113
- version_requirements: *id012
114
- - !ruby/object:Gem::Dependency
115
- name: multipart-post
116
162
  prerelease: false
117
- requirement: &id013 !ruby/object:Gem::Requirement
118
- requirements:
119
- - - ~>
120
- - !ruby/object:Gem::Version
121
- version: "2.0"
163
+ version_requirements: !ruby/object:Gem::Requirement
164
+ requirements:
165
+ - - "~>"
166
+ - !ruby/object:Gem::Version
167
+ version: '1.0'
168
+ - !ruby/object:Gem::Dependency
169
+ name: multipart-post
170
+ requirement: !ruby/object:Gem::Requirement
171
+ requirements:
172
+ - - "~>"
173
+ - !ruby/object:Gem::Version
174
+ version: '2.0'
122
175
  type: :runtime
123
- version_requirements: *id013
124
- description: Ruby wrapper for the REST API at http://www.zendesk.com. Documentation at http://developer.zendesk.com.
125
- email:
176
+ prerelease: false
177
+ version_requirements: !ruby/object:Gem::Requirement
178
+ requirements:
179
+ - - "~>"
180
+ - !ruby/object:Gem::Version
181
+ version: '2.0'
182
+ description: Ruby wrapper for the REST API at http://www.zendesk.com. Documentation
183
+ at http://developer.zendesk.com.
184
+ email:
126
185
  - support@zendesk.com
127
186
  executables: []
128
-
129
187
  extensions: []
130
-
131
188
  extra_rdoc_files: []
132
-
133
- files:
134
- - .gitignore
135
- - .rspec
136
- - .travis.yml
137
- - .yardopts
189
+ files:
190
+ - ".gitignore"
191
+ - ".rspec"
192
+ - ".travis.yml"
193
+ - ".yardopts"
138
194
  - Gemfile
139
195
  - Gemfile.lock
140
196
  - LICENSE
@@ -436,33 +492,30 @@ files:
436
492
  - util/verb_handler.rb
437
493
  - zendesk_api.gemspec
438
494
  homepage: http://developer.zendesk.com
439
- licenses:
495
+ licenses:
440
496
  - Apache License Version 2.0
441
497
  metadata: {}
442
-
443
498
  post_install_message:
444
499
  rdoc_options: []
445
-
446
- require_paths:
500
+ require_paths:
447
501
  - lib
448
- required_ruby_version: !ruby/object:Gem::Requirement
449
- requirements:
502
+ required_ruby_version: !ruby/object:Gem::Requirement
503
+ requirements:
450
504
  - - ">="
451
- - !ruby/object:Gem::Version
505
+ - !ruby/object:Gem::Version
452
506
  version: 1.8.7
453
- required_rubygems_version: !ruby/object:Gem::Requirement
454
- requirements:
507
+ required_rubygems_version: !ruby/object:Gem::Requirement
508
+ requirements:
455
509
  - - ">="
456
- - !ruby/object:Gem::Version
510
+ - !ruby/object:Gem::Version
457
511
  version: 1.3.6
458
512
  requirements: []
459
-
460
513
  rubyforge_project:
461
- rubygems_version: 2.1.1
514
+ rubygems_version: 2.2.0.rc.1
462
515
  signing_key:
463
516
  specification_version: 4
464
517
  summary: Zendesk REST API Client
465
- test_files:
518
+ test_files:
466
519
  - spec/core/association_spec.rb
467
520
  - spec/core/client_spec.rb
468
521
  - spec/core/collection_spec.rb