pocket_jekyll_auth0 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d928798cbf226e7b58fb87b773cd6ff5bb0cd3f2b84c36eff10143be426f6c2
-  data.tar.gz: 4d43d42bde71dd535f5b05489f81c10819f43f03f76a28c76531499bccbe8520
+  metadata.gz: 7695ac8fd543c59b27ecc7424046e342a31a69dd719dda14f14685d0789e7ced
+  data.tar.gz: 0a2955c79ab7c701c0727e1c12087b2143d208bb64e015e69271847eda0fe24c
 SHA512:
-  metadata.gz: 42a3a1fb9720cbc73a51003e661b1badc3c5c55550f0feadb0863908498d96bd8a1fa0aaf111786f92c40bce4cf5b1a034da22c8407c6960730cdb79ac1d364c
-  data.tar.gz: e003c00d33218e0cf783c5686f8de400de5497ee1af3409d0639b0985e613c91c25cdcea10313bfca78b5f89ce85c9bd8da7b73884871cdd75efac6271d3568e
+  metadata.gz: 912ba4d09495bf22ca459e30477c83f227775c43ed4994389a6b0cb8178e3b18cab928b57e11168b3a0288de41ff93ac0275860d5b62a733d5c377f5812aca78
+  data.tar.gz: 28e4a6e9446755b4d5d1d319af3788010f13c5de47f4ef49b4a8f607be555a3f51bf47121287dfc3b2e17e29d5d39c0797d5b559c2efd8a73558fdf39af84afc

data/lib/pocket_jekyll_auth0.rb

@@ -1,3 +1,4 @@
+require 'pocket_jekyll_auth0/version'
 require 'jekyll'
 require 'auth0_machine_to_machine'
 require 'uri'
@@ -133,11 +134,35 @@ module PocketJekyllAuth0
         template_path = File.join __dir__, '_includes', 'pocket.html'
         template = File.read template_path
       end
+
       Liquid::Template.parse template
     end
 
-    def renderTemplate(site, pocket_list)
-      getTemplate.render site.site_payload.merge!({'pocket_list' => pocket_list})
+    def renderTemplate(context, pocket_list)
+      site = context.registers[:site]
+      payload = Jekyll::Utils.deep_merge_hashes(
+        site.site_payload,
+        # Copy context['page'] from Jekyll to pocket.html template context so it's available for custom Liquid tags inside it like jekyll-timeago.
+        'page' => context['page'],
+        'pocket_list' => pocket_list
+      )
+      getTemplate.render!(payload)
+    end
+
+    def preparePocketListForTemplate raw_list
+      raw_list
+        .map { |item_id, item_value| item_value }
+        .sort_by { |item_value| item_value['time_updated'] }
+        .map do |item_value|
+          item_value.map do |item_value_key, item_value_value|
+            if item_value_key =~ /\Atime_/
+              [item_value_key, Time.at(item_value_value.to_i)]
+            else
+              [item_value_key, item_value_value]
+            end
+          end
+          .to_h
+        end
     end
 
     def render(context)
@@ -167,20 +192,18 @@ module PocketJekyllAuth0
         pocket_list = getFillPocketList(bearer_token, pocket_api_url, pocket_list_filter, cache_timeout)
 
         if pocket_list != false
-          # TODO: only get new bearer token when current was rejected instead of getting it on every error
+          # TODO: Only get new bearer token when current was rejected instead of getting it on every error.
           token_object = getFillTokenCache(context)
           pocket_list = getFillPocketList(bearer_token, pocket_api_url, pocket_list_filter, cache_timeout)[:list]
 
-          ordered_pocket_list = []
-          pocket_list.each { |item_id, item_value| ordered_pocket_list << item_value }
-          ordered_pocket_list.sort_by { |item_value| item_value['time_updated'] }
+          ordered_pocket_list = preparePocketListForTemplate(pocket_list)
 
-          render = renderTemplate(site, ordered_pocket_list)
+          render = renderTemplate(context, ordered_pocket_list)
         else
-          render = renderTemplate(site, [])
+          render = renderTemplate(context, [])
         end
       else
-        render = renderTemplate(site, [])
+        render = renderTemplate(context, [])
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pocket_jekyll_auth0
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - playfulcorgi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-14 00:00:00.000000000 Z
+date: 2020-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: auth0_machine_to_machine
@@ -58,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="