tangerine 0.5.3 → 0.5.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/Gemfile +1 -1
  2. data/Gemfile.lock +2 -2
  3. data/VERSION +1 -1
  4. data/lib/tangerine/backlot/video.rb +14 -4
  5. data/tangerine.gemspec +6 -6
  6. metadata +60 -60
data/Gemfile CHANGED
@@ -2,7 +2,7 @@ source "http://rubygems.org"
2
2
 
3
3
  gem "httparty", "0.7.4"
4
4
  gem "activesupport", "3.0.5"
5
- gem "json", '= 1.4.6'
5
+ gem "json", "1.5.1"
6
6
  gem "i18n", "0.5.0"
7
7
 
8
8
  # Add dependencies to develop your gem here.
data/Gemfile.lock CHANGED
@@ -15,7 +15,7 @@ GEM
15
15
  bundler (~> 1.0.0)
16
16
  git (>= 1.2.5)
17
17
  rake
18
- json (1.4.6)
18
+ json (1.5.1)
19
19
  linecache (0.43)
20
20
  rake (0.8.7)
21
21
  rcov (0.9.9)
@@ -47,7 +47,7 @@ DEPENDENCIES
47
47
  httparty (= 0.7.4)
48
48
  i18n (= 0.5.0)
49
49
  jeweler (~> 1.5.2)
50
- json (= 1.4.6)
50
+ json (= 1.5.1)
51
51
  rcov
52
52
  rspec (~> 2.3.0)
53
53
  ruby-debug (= 0.10.4)
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.5.3
1
+ 0.5.4
data/lib/tangerine/backlot/video.rb CHANGED
@@ -42,10 +42,20 @@ class Tangerine::Video < Tangerine::Base
42
42
 
43
43
  def self.where(options)
44
44
  embed_codes = options[:embed_code].join(',')
45
- result = Tangerine.query('embedCode' => embed_codes, 'fields' => 'labels,metadata')
46
- items = result.parsed_response['list']['item']
47
- items = Tangerine::Base.prepare_items(items)
48
- items.collect { |item| Tangerine::Video.new(item) }
45
+ result = Tangerine.query('embedCode' => embed_codes, 'fields' => 'labels,metadata')
46
+ items = result.parsed_response['list']['item']
47
+ items = Tangerine::Base.prepare_items(items)
48
+ videos = items.collect { |item| Tangerine::Video.new(item) }
49
+
50
+ Tangerine::Video.order_videos!(videos, options[:embed_code])
51
+ end
52
+
53
+ def self.order_videos!(videos, embed_codes)
54
+ ordered = []
55
+ embed_codes.each do |code|
56
+ ordered << videos.select { |video| video.embed_code == code }
57
+ end
58
+ ordered.flatten
49
59
  end
50
60
 
51
61
  def as_json(options = {})
data/tangerine.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{tangerine}
8
- s.version = "0.5.3"
8
+ s.version = "0.5.4"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Anthony Navarre", "Craig Williams"]
12
- s.date = %q{2011-03-23}
12
+ s.date = %q{2011-03-26}
13
13
  s.description = %q{Ooyala Backlot API Wrapper. Read more about the Ooyala Backlot API at http://www.ooyala.com/support/docs/backlot_api}
14
14
  s.email = %q{anthony.navarre@factorylabs.com}
15
15
  s.extra_rdoc_files = [
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
55
55
  s.homepage = %q{http://github.com/factorylabs/tangerine}
56
56
  s.licenses = ["MIT"]
57
57
  s.require_paths = ["lib"]
58
- s.rubygems_version = %q{1.6.0}
58
+ s.rubygems_version = %q{1.5.0}
59
59
  s.summary = %q{Ooyala Backlot API Wrapper}
60
60
  s.test_files = [
61
61
  "spec/spec_helper.rb",
@@ -77,7 +77,7 @@ Gem::Specification.new do |s|
77
77
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
78
78
  s.add_runtime_dependency(%q<httparty>, ["= 0.7.4"])
79
79
  s.add_runtime_dependency(%q<activesupport>, ["= 3.0.5"])
80
- s.add_runtime_dependency(%q<json>, ["= 1.4.6"])
80
+ s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
81
81
  s.add_runtime_dependency(%q<i18n>, ["= 0.5.0"])
82
82
  s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
83
83
  s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
@@ -95,7 +95,7 @@ Gem::Specification.new do |s|
95
95
  else
96
96
  s.add_dependency(%q<httparty>, ["= 0.7.4"])
97
97
  s.add_dependency(%q<activesupport>, ["= 3.0.5"])
98
- s.add_dependency(%q<json>, ["= 1.4.6"])
98
+ s.add_dependency(%q<json>, ["= 1.5.1"])
99
99
  s.add_dependency(%q<i18n>, ["= 0.5.0"])
100
100
  s.add_dependency(%q<rspec>, ["~> 2.3.0"])
101
101
  s.add_dependency(%q<yard>, ["~> 0.6.0"])
@@ -114,7 +114,7 @@ Gem::Specification.new do |s|
114
114
  else
115
115
  s.add_dependency(%q<httparty>, ["= 0.7.4"])
116
116
  s.add_dependency(%q<activesupport>, ["= 3.0.5"])
117
- s.add_dependency(%q<json>, ["= 1.4.6"])
117
+ s.add_dependency(%q<json>, ["= 1.5.1"])
118
118
  s.add_dependency(%q<i18n>, ["= 0.5.0"])
119
119
  s.add_dependency(%q<rspec>, ["~> 2.3.0"])
120
120
  s.add_dependency(%q<yard>, ["~> 0.6.0"])
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tangerine
3
3
  version: !ruby/object:Gem::Version
4
- hash: 13
4
+ hash: 3
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 5
9
- - 3
10
- version: 0.5.3
9
+ - 4
10
+ version: 0.5.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - Anthony Navarre
@@ -16,11 +16,12 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2011-03-23 00:00:00 -06:00
19
+ date: 2011-03-26 00:00:00 -06:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
- requirement: &id001 !ruby/object:Gem::Requirement
23
+ name: httparty
24
+ version_requirements: &id001 !ruby/object:Gem::Requirement
24
25
  none: false
25
26
  requirements:
26
27
  - - "="
@@ -31,12 +32,12 @@ dependencies:
31
32
  - 7
32
33
  - 4
33
34
  version: 0.7.4
34
- version_requirements: *id001
35
- name: httparty
36
35
  prerelease: false
37
36
  type: :runtime
37
+ requirement: *id001
38
38
  - !ruby/object:Gem::Dependency
39
- requirement: &id002 !ruby/object:Gem::Requirement
39
+ name: activesupport
40
+ version_requirements: &id002 !ruby/object:Gem::Requirement
40
41
  none: false
41
42
  requirements:
42
43
  - - "="
@@ -47,28 +48,28 @@ dependencies:
47
48
  - 0
48
49
  - 5
49
50
  version: 3.0.5
50
- version_requirements: *id002
51
- name: activesupport
52
51
  prerelease: false
53
52
  type: :runtime
53
+ requirement: *id002
54
54
  - !ruby/object:Gem::Dependency
55
- requirement: &id003 !ruby/object:Gem::Requirement
55
+ name: json
56
+ version_requirements: &id003 !ruby/object:Gem::Requirement
56
57
  none: false
57
58
  requirements:
58
59
  - - "="
59
60
  - !ruby/object:Gem::Version
60
- hash: 11
61
+ hash: 1
61
62
  segments:
62
63
  - 1
63
- - 4
64
- - 6
65
- version: 1.4.6
66
- version_requirements: *id003
67
- name: json
64
+ - 5
65
+ - 1
66
+ version: 1.5.1
68
67
  prerelease: false
69
68
  type: :runtime
69
+ requirement: *id003
70
70
  - !ruby/object:Gem::Dependency
71
- requirement: &id004 !ruby/object:Gem::Requirement
71
+ name: i18n
72
+ version_requirements: &id004 !ruby/object:Gem::Requirement
72
73
  none: false
73
74
  requirements:
74
75
  - - "="
@@ -79,12 +80,12 @@ dependencies:
79
80
  - 5
80
81
  - 0
81
82
  version: 0.5.0
82
- version_requirements: *id004
83
- name: i18n
84
83
  prerelease: false
85
84
  type: :runtime
85
+ requirement: *id004
86
86
  - !ruby/object:Gem::Dependency
87
- requirement: &id005 !ruby/object:Gem::Requirement
87
+ name: rspec
88
+ version_requirements: &id005 !ruby/object:Gem::Requirement
88
89
  none: false
89
90
  requirements:
90
91
  - - ~>
@@ -95,12 +96,12 @@ dependencies:
95
96
  - 3
96
97
  - 0
97
98
  version: 2.3.0
98
- version_requirements: *id005
99
- name: rspec
100
99
  prerelease: false
101
100
  type: :development
101
+ requirement: *id005
102
102
  - !ruby/object:Gem::Dependency
103
- requirement: &id006 !ruby/object:Gem::Requirement
103
+ name: yard
104
+ version_requirements: &id006 !ruby/object:Gem::Requirement
104
105
  none: false
105
106
  requirements:
106
107
  - - ~>
@@ -111,12 +112,12 @@ dependencies:
111
112
  - 6
112
113
  - 0
113
114
  version: 0.6.0
114
- version_requirements: *id006
115
- name: yard
116
115
  prerelease: false
117
116
  type: :development
117
+ requirement: *id006
118
118
  - !ruby/object:Gem::Dependency
119
- requirement: &id007 !ruby/object:Gem::Requirement
119
+ name: bundler
120
+ version_requirements: &id007 !ruby/object:Gem::Requirement
120
121
  none: false
121
122
  requirements:
122
123
  - - ~>
@@ -127,12 +128,12 @@ dependencies:
127
128
  - 0
128
129
  - 0
129
130
  version: 1.0.0
130
- version_requirements: *id007
131
- name: bundler
132
131
  prerelease: false
133
132
  type: :development
133
+ requirement: *id007
134
134
  - !ruby/object:Gem::Dependency
135
- requirement: &id008 !ruby/object:Gem::Requirement
135
+ name: jeweler
136
+ version_requirements: &id008 !ruby/object:Gem::Requirement
136
137
  none: false
137
138
  requirements:
138
139
  - - ~>
@@ -143,12 +144,12 @@ dependencies:
143
144
  - 5
144
145
  - 2
145
146
  version: 1.5.2
146
- version_requirements: *id008
147
- name: jeweler
148
147
  prerelease: false
149
148
  type: :development
149
+ requirement: *id008
150
150
  - !ruby/object:Gem::Dependency
151
- requirement: &id009 !ruby/object:Gem::Requirement
151
+ name: rcov
152
+ version_requirements: &id009 !ruby/object:Gem::Requirement
152
153
  none: false
153
154
  requirements:
154
155
  - - ">="
@@ -157,12 +158,12 @@ dependencies:
157
158
  segments:
158
159
  - 0
159
160
  version: "0"
160
- version_requirements: *id009
161
- name: rcov
162
161
  prerelease: false
163
162
  type: :development
163
+ requirement: *id009
164
164
  - !ruby/object:Gem::Dependency
165
- requirement: &id010 !ruby/object:Gem::Requirement
165
+ name: vcr
166
+ version_requirements: &id010 !ruby/object:Gem::Requirement
166
167
  none: false
167
168
  requirements:
168
169
  - - "="
@@ -173,12 +174,12 @@ dependencies:
173
174
  - 7
174
175
  - 0
175
176
  version: 1.7.0
176
- version_requirements: *id010
177
- name: vcr
178
177
  prerelease: false
179
178
  type: :development
179
+ requirement: *id010
180
180
  - !ruby/object:Gem::Dependency
181
- requirement: &id011 !ruby/object:Gem::Requirement
181
+ name: fakeweb
182
+ version_requirements: &id011 !ruby/object:Gem::Requirement
182
183
  none: false
183
184
  requirements:
184
185
  - - "="
@@ -189,12 +190,12 @@ dependencies:
189
190
  - 3
190
191
  - 0
191
192
  version: 1.3.0
192
- version_requirements: *id011
193
- name: fakeweb
194
193
  prerelease: false
195
194
  type: :development
195
+ requirement: *id011
196
196
  - !ruby/object:Gem::Dependency
197
- requirement: &id012 !ruby/object:Gem::Requirement
197
+ name: timecop
198
+ version_requirements: &id012 !ruby/object:Gem::Requirement
198
199
  none: false
199
200
  requirements:
200
201
  - - "="
@@ -205,12 +206,12 @@ dependencies:
205
206
  - 3
206
207
  - 5
207
208
  version: 0.3.5
208
- version_requirements: *id012
209
- name: timecop
210
209
  prerelease: false
211
210
  type: :development
211
+ requirement: *id012
212
212
  - !ruby/object:Gem::Dependency
213
- requirement: &id013 !ruby/object:Gem::Requirement
213
+ name: factory_girl
214
+ version_requirements: &id013 !ruby/object:Gem::Requirement
214
215
  none: false
215
216
  requirements:
216
217
  - - "="
@@ -221,12 +222,12 @@ dependencies:
221
222
  - 3
222
223
  - 3
223
224
  version: 1.3.3
224
- version_requirements: *id013
225
- name: factory_girl
226
225
  prerelease: false
227
226
  type: :development
227
+ requirement: *id013
228
228
  - !ruby/object:Gem::Dependency
229
- requirement: &id014 !ruby/object:Gem::Requirement
229
+ name: ruby-debug
230
+ version_requirements: &id014 !ruby/object:Gem::Requirement
230
231
  none: false
231
232
  requirements:
232
233
  - - "="
@@ -237,12 +238,12 @@ dependencies:
237
238
  - 10
238
239
  - 4
239
240
  version: 0.10.4
240
- version_requirements: *id014
241
- name: ruby-debug
242
241
  prerelease: false
243
242
  type: :development
243
+ requirement: *id014
244
244
  - !ruby/object:Gem::Dependency
245
- requirement: &id015 !ruby/object:Gem::Requirement
245
+ name: httparty
246
+ version_requirements: &id015 !ruby/object:Gem::Requirement
246
247
  none: false
247
248
  requirements:
248
249
  - - ">="
@@ -251,12 +252,12 @@ dependencies:
251
252
  segments:
252
253
  - 0
253
254
  version: "0"
254
- version_requirements: *id015
255
- name: httparty
256
255
  prerelease: false
257
256
  type: :runtime
257
+ requirement: *id015
258
258
  - !ruby/object:Gem::Dependency
259
- requirement: &id016 !ruby/object:Gem::Requirement
259
+ name: activesupport
260
+ version_requirements: &id016 !ruby/object:Gem::Requirement
260
261
  none: false
261
262
  requirements:
262
263
  - - ">="
@@ -265,12 +266,12 @@ dependencies:
265
266
  segments:
266
267
  - 0
267
268
  version: "0"
268
- version_requirements: *id016
269
- name: activesupport
270
269
  prerelease: false
271
270
  type: :runtime
271
+ requirement: *id016
272
272
  - !ruby/object:Gem::Dependency
273
- requirement: &id017 !ruby/object:Gem::Requirement
273
+ name: json
274
+ version_requirements: &id017 !ruby/object:Gem::Requirement
274
275
  none: false
275
276
  requirements:
276
277
  - - "="
@@ -281,10 +282,9 @@ dependencies:
281
282
  - 4
282
283
  - 6
283
284
  version: 1.4.6
284
- version_requirements: *id017
285
- name: json
286
285
  prerelease: false
287
286
  type: :runtime
287
+ requirement: *id017
288
288
  description: Ooyala Backlot API Wrapper. Read more about the Ooyala Backlot API at http://www.ooyala.com/support/docs/backlot_api
289
289
  email: anthony.navarre@factorylabs.com
290
290
  executables: []
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
359
359
  requirements: []
360
360
 
361
361
  rubyforge_project:
362
- rubygems_version: 1.6.0
362
+ rubygems_version: 1.5.0
363
363
  signing_key:
364
364
  specification_version: 3
365
365
  summary: Ooyala Backlot API Wrapper