jekyll-google-photos 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4adcab6389d74279f43e50c63312cce573f7d6d2
-  data.tar.gz: aa245f98c010fcf3d786006fcf2bdb010513f79c
+  metadata.gz: 3fe68c97c44ab51081e25a9601f378cfeccbf261
+  data.tar.gz: b0f516a1e5cec8261eb3f28d022816fb2b129179
 SHA512:
-  metadata.gz: 8ebedcde5633762d541ef07015a89cabd5b05f345aa5fc58b5c2586494e611fe72ea8829cbceda1724ac5a2fcd952d0a1f099f1ae77dc600a4622966e8348c9c
-  data.tar.gz: d34415433391bdb72760ad448bf5f015bcdd3256b6d78de00993f0b1ad81c86560475efdd2ddf38a5a9d6c35572e037f09269c99c38bc786363f0413e1dfc5a1
+  metadata.gz: 20567c39f741858f611a579bdd9ab05e27e229929e82ec54adac8d88b533d17312684b7233e44e834f46fe2e4fb3dcf8c16b11e6362c850c86c323b1bbd32563
+  data.tar.gz: 69b9a35bd59ea14e6941597e72225dd81ceb0aeebe62511f6f462a137691bf2d2b9b46c782781c9e29c56a4d3efd405fff88ae0d31b8d55ad3dec041410a7b82

data/README.md

@@ -5,6 +5,8 @@
 
 [Check out the Demo](http://chira.ga/trip-to-annecy/)
 
+> :warning: Please note that this plugin is **NOT** supported by GitHub pages. Here is a [list of all plugins supported](https://pages.github.com/versions/). However you can follow [this GitHub guide](https://help.github.com/articles/adding-jekyll-plugins-to-a-github-pages-site/) to enable it or by using [Travis CI](https://ayastreb.me/deploy-jekyll-to-github-pages-with-travis-ci/). GitLab supposedly supports [any plugin](https://about.gitlab.com/comparison/gitlab-pages-vs-github-pages.html). 
+
 # Installing
 
 Install the gem using:

data/_posts/2018-02-22-welcome-to-jekyll.markdown

@@ -6,11 +6,19 @@ categories: jekyll update
 gallery_urls:
   - https://photos.app.goo.gl/bhWukds8QVodFU246
   - https://photos.app.goo.gl/bhWukds8QVodFU246
+album_settings:
+  delay: 5
+  title: "Trip to Annecy"
+  image_width: 0
+  image_height: 0
+  frame_height: "200px"
+  frame_width: "300px"
 ---
 
-{% google_photos page.gallery_urls none %}
+{% google_photos page.gallery_urls page.album_settings %}
 
 <script src="https://cdn.jsdelivr.net/npm/publicalbum@latest/embed-ui.min.js" async></script>
+
 <div class="pa-gallery-player-widget" style="width:100%; height:480px; display:none;"
   data-link="<Album link>"
   data-title="<Album Name>"
@@ -18,12 +26,11 @@ gallery_urls:
   data-delay="5"
   id="MyAlbum1">
 </div>
+
 <script>
   let MyAlbum1 = document.getElementById('MyAlbum1');
   let imageWidth = '0';
   for(var i in googlePhotos.urls) {
-    console.log(googlePhotos.urls[i]);
-    console.log(MyAlbum1);
     let picture = document.createElement('object');
     picture.setAttribute("data", googlePhotos.urls[i] + '=w' + imageWidth);
     MyAlbum1.appendChild(picture);

data/lib/jekyll-google-photos/tag.rb

@@ -3,6 +3,7 @@ require 'open-uri'
 require 'nokogiri'
 require 'net/http'
 require_relative 'css'
+require_relative 'js'
 
 module JekyllGooglePhotos
   class Tag < Liquid::Tag
@@ -10,21 +11,20 @@ module JekyllGooglePhotos
       super
       args = args.split(" ")
       @albumUrls = args[0]
-      @maxWidth = args[1]
+      @albumSettings = args[1]
     end
 
     def getImageLinks(url)
       doc = Nokogiri::HTML(open(url.strip).read)
       scripts = doc.xpath("//script")
+      jsonString = ""
       for x in scripts do
         if x.inner_html.match(/initDataCallback\(/)
           jsonString = x.inner_html
-          jsonString = jsonString.sub(/.*function\(\)\{return /,"")
-          jsonString["\n}});"] = ""
+          jsonString = jsonString.scan(/\[\"(http.*googleusercontent.com\/[^((?!\/a\/).)*$].*)\"/)
         end
       end
-      json = JSON.parse(jsonString)
-      return json[1]
+      return jsonString
     end
 
     def flexbinCSS()
@@ -33,39 +33,40 @@ module JekyllGooglePhotos
     end
 
     def URLsInJSON()
-      sp = "googlePhotos.urls = ["
-      for x in @imgLinks
-        sp += "\"#{x}\","
-      end
-      sp += "];"
+      sp = 'googlePhotos.urls = ["'
+      newImgLinks = @imgLinks.uniq.join('", "')
+      sp += "#{newImgLinks}"
+      sp += '"];'
       return sp
     end
 
-    def createDOM()
+    def createDOM(albumSettings)
       sp = "<script>"
       sp += "googlePhotos = {};"
       sp += URLsInJSON()
       sp += "</script>"
-      if(@maxWidth != "none")
-        sp += %Q{<style>}
-        sp += flexbinCSS()
-        sp += %Q{</style>}
-        sp += addImages()
-      end
+      #puts albumSettings
+      ##if(albumSettings != "none")
+        ##sp += JekyllGooglePhotos::PublicalbumJS()
+        ##sp += addImages(albumSettings)
+      ##end
       return sp
     end
-
-    def addImages()
-      sp = %Q{<div class="flexbin">}
-      idx = 0
+    
+    def imageObject(url)
+      sp = %Q{
+        <object data="#{url}=w#{@maxWidth}"></object>
+      }
+      return sp
+    end
+    
+    def addImages(albumSettings)
+      sp = %Q{<div class="pa-gallery-player-widget" style="width:#{albumSettings["frame_width"]}; height:#{albumSettings["frame_height"]}; display:none;"
+          data-title="#{albumSettings["title"]}"
+          data-delay="#{albumSettings["delay"]}">
+      }
       for x in @imgLinks
-        link = x + "=w#{@maxWidth}"
-        sp += %Q{
-                  <div onclick="showSlides(#{idx});" class="slideImgs">
-                      <img src="#{link}" />
-                  </div>
-        }
-        idx += 1
+        sp += %Q{<object data="#{x}=w#{albumSettings["image_width"]}-h#{albumSettings["image_height"]}"></object>}
       end
       sp += %Q{</div>}
       return sp
@@ -83,11 +84,15 @@ module JekyllGooglePhotos
       end
       for albumUrl in albumUrls
           imageLinks = getImageLinks(albumUrl)
+          #puts imageLinks[0]
           for link in imageLinks
-            @imgLinks.push(link[1][0])
+            @imgLinks.push(link)
           end
+      end 
+      if @albumSettings != "none"
+        albumSettings = context[@albumSettings.strip]
       end
-      createDOM()
+      createDOM(albumSettings)
     end
   end
 end

data/lib/jekyll-google-photos/version.rb

@@ -1,3 +1,3 @@
 module JekyllGooglePhotos
-  VERSION = "1.4.1".freeze
+  VERSION = "1.4.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-google-photos
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Chirag Arora
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll