actv 2.5.2 → 2.6.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: 000d9116d7e6b06fd21d07f56d8f92b7fdc155c2
4
- data.tar.gz: ca18346f0125b80b5410d6b4fe6a6231094d7faf
3
+ metadata.gz: 00e49e36011201dab079ac5b7e1606aa7c22b01f
4
+ data.tar.gz: a6cc5f93fa4675cb5d68618acbba1ff930dc45a5
5
5
  SHA512:
6
- metadata.gz: 8d0aff895ce58459d750eadccd88373aeb8b9e6c84fbc41e35dd3530a95e80a690b962660dddbe72b43a4ac5ca0fc2e407415249badd0b60a0989e6f9f027cfc
7
- data.tar.gz: 359cb296be9ea922ecb9c30e5a0183a08db5996b62188e4fbf0869879cffc257281388667beb93185d5a8e0c875ba14ed39b135ace3ca6abf954642bf6ae65d1
6
+ metadata.gz: 545f9a4a663cbb7964ff6787a150a9d8b21196d027c24f19e84fa84c844c0a2e034cecd48ac9e351abf58940f7847419b1c30bb6e4dc7678794b23741148d198
7
+ data.tar.gz: a47b90797b772d7b2e70207928c4045e0f6d833861fa22db964c8a72c9fa3998fc0bb9739ffa4a2810aed3a0f9ff0d313821344ecac6c94e17d0d8ea6f0d7fb2
data/lib/actv/article.rb CHANGED
@@ -1,10 +1,11 @@
1
1
  require 'actv/asset'
2
2
  require 'nokogiri'
3
3
  require 'active_support/core_ext/module/delegation'
4
+ require 'actv/authorable'
4
5
 
5
6
  module ACTV
6
7
  class Article < Asset
7
- attr_reader :author
8
+ include Authorable
8
9
  delegate :image_url, :footer, :bio, :photo, :name_from_footer, to: :author, prefix: true
9
10
 
10
11
  def self.valid? response
@@ -40,41 +41,12 @@ module ACTV
40
41
  end
41
42
  alias inline_ad? inline_ad
42
43
 
43
- def author
44
- @author ||= author_from_reference || author_from_article
45
- end
46
-
47
- def by_line
48
- @by_line ||= description_by_type 'articleByLine'
49
- end
50
-
51
44
  def is_article?
52
45
  true
53
46
  end
54
47
 
55
- def author_name_from_by_line
56
- author_name_regex = /by (.*)/i.match by_line
57
- author_name_regex[1].strip if author_name_regex.present?
58
- end
59
-
60
48
  private
61
49
 
62
- def author_from_article
63
- ACTV::Author.build_from_article self.to_hash
64
- end
65
-
66
- def author_from_reference
67
- if author_reference
68
- ACTV.asset(author_reference.id).first
69
- end
70
- rescue ACTV::Error::NotFound
71
- nil
72
- end
73
-
74
- def author_reference
75
- references.find { |reference| reference.type == "author" }
76
- end
77
-
78
50
  def resolve_inline_ad_tag
79
51
  tag = tag_by_description 'inlinead'
80
52
  return false if tag && tag.downcase != 'true'
@@ -0,0 +1,37 @@
1
+ module ACTV
2
+ module Authorable
3
+
4
+ def author
5
+ @author ||= author_from_reference || author_from_article
6
+ end
7
+
8
+ def by_line
9
+ @by_line ||= description_by_type 'articleByLine'
10
+ end
11
+
12
+ def author_name_from_by_line
13
+ author_name_regex = /by (.*)/i.match by_line
14
+ author_name_regex[1].strip if author_name_regex.present?
15
+ end
16
+
17
+ private
18
+
19
+ def author_from_article
20
+ ACTV::Author.build_from_article self.to_hash
21
+ end
22
+
23
+ def author_from_reference
24
+ if author_reference
25
+ ACTV.asset(author_reference.id).first
26
+ end
27
+ rescue ACTV::Error::NotFound
28
+ nil
29
+ end
30
+
31
+ def author_reference
32
+ references.find { |reference| reference.type == "author" }
33
+ end
34
+ end
35
+ end
36
+
37
+
data/lib/actv/quiz.rb CHANGED
@@ -1,5 +1,7 @@
1
1
  module ACTV
2
2
  class Quiz < Asset
3
+ include Authorable
4
+
3
5
  def self.valid? response
4
6
  ACTV::QuizValidator.new(response).valid?
5
7
  end
data/lib/actv/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ACTV
2
- VERSION = "2.5.2"
2
+ VERSION = "2.6.0"
3
3
  end
metadata CHANGED
@@ -1,237 +1,237 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: actv
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.2
4
+ version: 2.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathaniel Barnes
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-12-09 00:00:00.000000000 Z
11
+ date: 2016-01-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.9.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.9.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: multi_json
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: '1.3'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ~>
39
39
  - !ruby/object:Gem::Version
40
40
  version: '1.3'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: simple_oauth
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ~>
46
46
  - !ruby/object:Gem::Version
47
47
  version: 0.3.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ~>
53
53
  - !ruby/object:Gem::Version
54
54
  version: 0.3.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: nokogiri
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: json
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">="
80
+ - - '>='
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: maruku
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: pry
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ">="
108
+ - - '>='
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: rake
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - '>='
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rspec
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - "~>"
129
+ - - ~>
130
130
  - !ruby/object:Gem::Version
131
131
  version: 2.14.1
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - "~>"
136
+ - - ~>
137
137
  - !ruby/object:Gem::Version
138
138
  version: 2.14.1
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: rspec-core
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - '>='
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - '>='
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: simplecov
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - '>='
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - '>='
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: timecop
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ">="
171
+ - - '>='
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ">="
178
+ - - '>='
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: webmock
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ">="
185
+ - - '>='
186
186
  - !ruby/object:Gem::Version
187
187
  version: '0'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - '>='
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: yard
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ">="
199
+ - - '>='
200
200
  - !ruby/object:Gem::Version
201
201
  version: '0'
202
202
  type: :development
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - ">="
206
+ - - '>='
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: guard-rspec
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - ">="
213
+ - - '>='
214
214
  - !ruby/object:Gem::Version
215
215
  version: '0'
216
216
  type: :development
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - ">="
220
+ - - '>='
221
221
  - !ruby/object:Gem::Version
222
222
  version: '0'
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: activesupport
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - ">="
227
+ - - '>='
228
228
  - !ruby/object:Gem::Version
229
229
  version: '0'
230
230
  type: :development
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - ">="
234
+ - - '>='
235
235
  - !ruby/object:Gem::Version
236
236
  version: '0'
237
237
  description: A Ruby wrapper for the Active API
@@ -241,9 +241,9 @@ executables: []
241
241
  extensions: []
242
242
  extra_rdoc_files: []
243
243
  files:
244
- - ".gitignore"
245
- - ".rspec"
246
- - ".travis.yml"
244
+ - .gitignore
245
+ - .rspec
246
+ - .travis.yml
247
247
  - CHANGELOG.md
248
248
  - Gemfile
249
249
  - Guardfile
@@ -271,6 +271,7 @@ files:
271
271
  - lib/actv/asset_tag.rb
272
272
  - lib/actv/asset_topic.rb
273
273
  - lib/actv/author.rb
274
+ - lib/actv/authorable.rb
274
275
  - lib/actv/base.rb
275
276
  - lib/actv/channel.rb
276
277
  - lib/actv/client.rb
@@ -402,17 +403,17 @@ require_paths:
402
403
  - lib
403
404
  required_ruby_version: !ruby/object:Gem::Requirement
404
405
  requirements:
405
- - - ">="
406
+ - - '>='
406
407
  - !ruby/object:Gem::Version
407
408
  version: '0'
408
409
  required_rubygems_version: !ruby/object:Gem::Requirement
409
410
  requirements:
410
- - - ">="
411
+ - - '>='
411
412
  - !ruby/object:Gem::Version
412
413
  version: '0'
413
414
  requirements: []
414
415
  rubyforge_project:
415
- rubygems_version: 2.4.5
416
+ rubygems_version: 2.4.3
416
417
  signing_key:
417
418
  specification_version: 4
418
419
  summary: Active API