pocket_jekyll_auth0 0.1.2 → 0.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/pocket_jekyll_auth0.rb +32 -9
  3. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6d928798cbf226e7b58fb87b773cd6ff5bb0cd3f2b84c36eff10143be426f6c2
4
- data.tar.gz: 4d43d42bde71dd535f5b05489f81c10819f43f03f76a28c76531499bccbe8520
3
+ metadata.gz: 7695ac8fd543c59b27ecc7424046e342a31a69dd719dda14f14685d0789e7ced
4
+ data.tar.gz: 0a2955c79ab7c701c0727e1c12087b2143d208bb64e015e69271847eda0fe24c
5
5
  SHA512:
6
- metadata.gz: 42a3a1fb9720cbc73a51003e661b1badc3c5c55550f0feadb0863908498d96bd8a1fa0aaf111786f92c40bce4cf5b1a034da22c8407c6960730cdb79ac1d364c
7
- data.tar.gz: e003c00d33218e0cf783c5686f8de400de5497ee1af3409d0639b0985e613c91c25cdcea10313bfca78b5f89ce85c9bd8da7b73884871cdd75efac6271d3568e
6
+ metadata.gz: 912ba4d09495bf22ca459e30477c83f227775c43ed4994389a6b0cb8178e3b18cab928b57e11168b3a0288de41ff93ac0275860d5b62a733d5c377f5812aca78
7
+ data.tar.gz: 28e4a6e9446755b4d5d1d319af3788010f13c5de47f4ef49b4a8f607be555a3f51bf47121287dfc3b2e17e29d5d39c0797d5b559c2efd8a73558fdf39af84afc
@@ -1,3 +1,4 @@
1
+ require 'pocket_jekyll_auth0/version'
1
2
  require 'jekyll'
2
3
  require 'auth0_machine_to_machine'
3
4
  require 'uri'
@@ -133,11 +134,35 @@ module PocketJekyllAuth0
133
134
  template_path = File.join __dir__, '_includes', 'pocket.html'
134
135
  template = File.read template_path
135
136
  end
137
+
136
138
  Liquid::Template.parse template
137
139
  end
138
140
 
139
- def renderTemplate(site, pocket_list)
140
- getTemplate.render site.site_payload.merge!({'pocket_list' => pocket_list})
141
+ def renderTemplate(context, pocket_list)
142
+ site = context.registers[:site]
143
+ payload = Jekyll::Utils.deep_merge_hashes(
144
+ site.site_payload,
145
+ # Copy context['page'] from Jekyll to pocket.html template context so it's available for custom Liquid tags inside it like jekyll-timeago.
146
+ 'page' => context['page'],
147
+ 'pocket_list' => pocket_list
148
+ )
149
+ getTemplate.render!(payload)
150
+ end
151
+
152
+ def preparePocketListForTemplate raw_list
153
+ raw_list
154
+ .map { |item_id, item_value| item_value }
155
+ .sort_by { |item_value| item_value['time_updated'] }
156
+ .map do |item_value|
157
+ item_value.map do |item_value_key, item_value_value|
158
+ if item_value_key =~ /\Atime_/
159
+ [item_value_key, Time.at(item_value_value.to_i)]
160
+ else
161
+ [item_value_key, item_value_value]
162
+ end
163
+ end
164
+ .to_h
165
+ end
141
166
  end
142
167
 
143
168
  def render(context)
@@ -167,20 +192,18 @@ module PocketJekyllAuth0
167
192
  pocket_list = getFillPocketList(bearer_token, pocket_api_url, pocket_list_filter, cache_timeout)
168
193
 
169
194
  if pocket_list != false
170
- # TODO: only get new bearer token when current was rejected instead of getting it on every error
195
+ # TODO: Only get new bearer token when current was rejected instead of getting it on every error.
171
196
  token_object = getFillTokenCache(context)
172
197
  pocket_list = getFillPocketList(bearer_token, pocket_api_url, pocket_list_filter, cache_timeout)[:list]
173
198
 
174
- ordered_pocket_list = []
175
- pocket_list.each { |item_id, item_value| ordered_pocket_list << item_value }
176
- ordered_pocket_list.sort_by { |item_value| item_value['time_updated'] }
199
+ ordered_pocket_list = preparePocketListForTemplate(pocket_list)
177
200
 
178
- render = renderTemplate(site, ordered_pocket_list)
201
+ render = renderTemplate(context, ordered_pocket_list)
179
202
  else
180
- render = renderTemplate(site, [])
203
+ render = renderTemplate(context, [])
181
204
  end
182
205
  else
183
- render = renderTemplate(site, [])
206
+ render = renderTemplate(context, [])
184
207
  end
185
208
  end
186
209
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pocket_jekyll_auth0
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - playfulcorgi
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-03-14 00:00:00.000000000 Z
11
+ date: 2020-03-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: auth0_machine_to_machine
@@ -58,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - ">="
60
60
  - !ruby/object:Gem::Version
61
- version: 2.7.0
61
+ version: 2.5.0
62
62
  required_rubygems_version: !ruby/object:Gem::Requirement
63
63
  requirements:
64
64
  - - ">="