badpixxel-jekyll-flickr 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d77c937f86d982732c2f539894fbca4ce92e7736ad3b227d8ac6fe6f242d07f6
-  data.tar.gz: 25def66513b8056ade046ecfb1ce76f2c0bdfd405a9fe116ff956b62a7e2d69b
+  metadata.gz: fbfd68e854bb49ed120e0e9a3dee8c32fe2d731f2195108158e287732bed806f
+  data.tar.gz: b1fd7b5c8314a924e97d95cb14fa6f283268cd5bf1e0cae860d61349c47efce0
 SHA512:
-  metadata.gz: 651f69b924d62cb2593f2e52aa8d47ca29e7ffc815b99b4b63f2c21ba9a959f19b1178a33fce22b860d5e47e74b7bb449907d4bfcc91de0d7a54e6c0ceb100a7
-  data.tar.gz: 04fd17fb6109fb676df886b47e9678f1157e2ebf3bb448b4b0e5bdb4d365301cc82bf7786e05e3c0555f4949b3096a585803a5c4efdb340a177ef5b8cdfcdb40
+  metadata.gz: d6aa0bf69fdff1118dccf3fce8276fd67d53156fc7e9002bd76624a76956e28fab9bea0d7dbe9468ce8f7d0e41755fb4d1560c91d1bee077a704d4b6ea54c17c
+  data.tar.gz: 394958bcb08a0614e390f1e21e6d013e609f675b8a9761cb4946a9180ad64baa274d11dd0f416320f14bf2772da503e2300b5bbb90b3cdce7a144937ed9044b3

data/.gitignore

@@ -54,3 +54,4 @@ build-iPhoneSimulator/
 
 # Used by RuboCop. Remote config files pulled in from inherit_from directive.
 # .rubocop-https?--*
+/Gemfile.lock

data/.travis.yml

@@ -1,7 +1,26 @@
+language: ruby
+os: linux
+dist: xenial
+cache: bundler
+
+env:
+  matrix:
+    - JEKYLL_VERSION="~> 3.8"
+    
+################################################################################
+# After a build, deploy to Ruby Gem
 deploy:
     provider:   rubygems
+    gem:        badpixxel-jekyll-flickr
     gemspec:    badpixxel-jekyll-flickr.gemspec
     api_key:
         secure: Bok1ntaSXwMZG+Lrd4MhzP3ksUnlgWrsNaaBUkuwuLYlGc4dfrkEKUDfrztRvtACgiK+/6WuKe6FWMJI/ifeWNi7MEXREgkqwjXFbXFXJWmlQ2reXNlxJGv4UqZGv1kmG2WnauS4hDKc9TqKA36HzJwXQpbP4KQNslvbfdPlI5ptwTshzAuSrznC6AWPvzirsBXwXag8Zu8MPlQd7MJWl3QNaOOOJgylsGOIgikaZAucnO5qPOlTANhSP6pqEhrbqozVxUWf43diFvMUcOMKwk0woyEb37TuPLg4y9IFQYqnzg/BiE24Hcb6tE/ibawclt8Kp6pReerBw+XN7lNfy7MnEA+b6B50mZM1GvQHs5MI63E361hVoi7BvJWHeBr/112Ozqv2Z9KFiGwVBOeYUabzQrzL3YkXoWzSD2DotOd1MGp8XDtOYmxrrM5a3WxuBhmxPPXYfC3yppckFwsgCFmaAkdBq3ES1+up4azRA/8rw4vZYSCtEsVV9t8xFsz8eMZCdQojqVf+J0egM9y9LR94QFpxasDATkMHJNuMO0X0nEAqqXA/NbYEP35RUmcZEkyQzUqJgDBBbaKeX2558qUndFXaT531Vs/qGfv0hvwLX6mYXCgeSOhJdkj2EDFFxnqJ7c2U3897RbnmPEEPgmEYHE+JeQSuhXSa0TL+K38=
-    on:
-        tags:   true
+#    on:
+#        tags:   true
+        
+################################################################################
+# After a build, send email notification with the build results
+notifications:
+  email:         
+    on_success: never # default: change
+    on_failure: never # default: always

data/Gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 gemspec
 
+gem 'rake'
 gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"]
 
 install_if -> { Gem.win_platform? } do

data/Rakefile

@@ -1,3 +1,8 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/badpixxel-jekyll-flickr/filters.rb

@@ -16,41 +16,68 @@ module Jekyll
 
   	# Get All tags for a Flikr PhotoSet
     def flickr_ps_tags(photoset)
-        site = @context.registers[:site]
-    	Jekyll::flickr_setup(site)
+      site = @context.registers[:site]
+      Jekyll::flickr_setup(site)
     	photoset = Jekyll::flickr_get_photoset(site, photoset)
-		if !photoset
-			return []
-		end
+      if !photoset
+        return []
+      end
 
     	return photoset.get_tags() 
     end
 
   	# Get Most Used tags for a Flikr PhotoSet
     def flickr_ps_top_tags(photoset, count = 10)
-        site = @context.registers[:site]
-    	Jekyll::flickr_setup(site)
+      site = @context.registers[:site]
+      Jekyll::flickr_setup(site)
     	photoset = Jekyll::flickr_get_photoset(site, photoset)
-		if !photoset
-			return []
-		end
+      if !photoset
+        return []
+      end
 
     	return photoset.get_top_tags(count) 
     end
 
-
-  	# Get Flikr PhotoSet Photos
+  	# Get Flickr PhotoSet Photos
     def flickr_ps_photos(photoset, max = false)
-        site = @context.registers[:site]
+      site = @context.registers[:site]
     	Jekyll::flickr_setup(site)
     	photoset = Jekyll::flickr_get_photoset(site, photoset)
-		if !photoset
-			return []
-		end
+      if !photoset
+        return []
+      end
 
     	return photoset.get_photos_array(max) 
     end    
 
+  	# Get Flickr PhotoSet
+    def flickr_photoset(photoset)
+      site = @context.registers[:site]
+    	Jekyll::flickr_setup(site)
+    	photoset = Jekyll::flickr_get_photoset(site, photoset)
+      if !photoset
+        return []
+      end
+
+    	return photoset 
+    end    
+    
+  	# Get Flickr PhotoSet Photo
+    def flickr_ps_photo(photoset, photo_id = nil)
+      site = @context.registers[:site]
+    	Jekyll::flickr_setup(site)
+    	photoset = Jekyll::flickr_get_photoset(site, photoset)
+      if !photoset
+        return []
+      end
+
+      if photo_id
+        return photoset.get_photo(photo_id)
+      end
+      
+    	return photoset.get_primary_photo()
+    end     
+
 
   end
 

data/lib/badpixxel-jekyll-flickr/loader.rb

@@ -35,9 +35,9 @@ class FlickrLoader
     	puts "Flickr: Update of Photosets cache"
 
     	# Fetch list of Photosets
-        nsid = flickr.people.findByUsername(:username => site.config['flickr']['screen_name']).id
-        flickr_photosets = flickr.photosets.getList(:user_id => nsid)
-
+      nsid = flickr.people.findByUsername(:username => site.config['flickr']['screen_name']).id
+      flickr_photosets = flickr.photosets.getList(:user_id => nsid)
+        
     	# Update All Photosets Cache
         flickr_photosets.each do |flickr_photoset|
             photoset = Photoset.new(site, flickr_photoset)

data/lib/badpixxel-jekyll-flickr/photo.rb

@@ -142,7 +142,7 @@ class Photo
             'id' => self.id,
             'title' => self.title,
             'date' => self.date,
-            'decription' => self.description,
+            'description' => self.description,
             'tags' => self.tags,
             'tags_hash' => tags_hash,
             'url_full' =>  self.url_full,

data/lib/badpixxel-jekyll-flickr/photoset.rb

@@ -15,7 +15,7 @@ require 'flickraw'
 module Jekyll
 
 class Photoset
-    attr_accessor :id, :title, :description, :date_update, :date_update_str, :slug, :cache_dir, :cache_file, :photos, :photos_from_cache, :photos_from_flickr
+    attr_accessor :id, :title, :description, :primary, :date_update, :date_update_str, :slug, :cache_dir, :cache_file, :photos, :photos_from_cache, :photos_from_flickr
     
     def initialize(site, photoset)
         self.photos = Array.new
@@ -34,6 +34,7 @@ class Photoset
         self.id = flickr_photoset.id
         self.title = flickr_photoset.title
         self.description = flickr_photoset.description
+        self.primary = flickr_photoset.primary
         self.date_update = flickr_photoset.date_update
         self.date_update_str = DateTime.strptime(flickr_photoset.date_update, '%s').to_s
         self.slug = self.title.downcase.gsub(/ /, '-').gsub(/[^a-z\-]/, '')
@@ -84,6 +85,7 @@ class Photoset
         self.id = cached['id']
         self.title = cached['title']
         self.description = cached['description']
+        self.primary = cached['primary']
         self.date_update = cached['date_update']
         self.date_update_str = cached['date_update_str']
         self.slug = cached['slug']
@@ -102,6 +104,7 @@ class Photoset
         cached['id'] = self.id
         cached['title'] = self.title
         cached['description'] = self.description
+        cached['primary'] = self.primary
         cached['date_update'] = self.date_update
         cached['date_update_str'] = self.date_update_str
         cached['slug'] = self.slug
@@ -110,7 +113,19 @@ class Photoset
         
         File.open(self.cache_file, 'w') {|f| f.print(YAML::dump(cached))}
     end
-
+    
+    # Convert PhotoSet to liquid Format
+    def to_liquid
+        return [
+            'id' => self.id,
+            'title' => self.title,
+            'description' => self.description,
+            'primary' => self.primary,
+            'slug' => self.slug,
+            'date_update' =>  self.date_update,
+        ]
+    end  
+    
     # Get List of Most used tags    
     def get_top_tags(count)
         # Build List of tags [ "tag" => count ]
@@ -173,6 +188,27 @@ class Photoset
 
         return collection
     end 
+    
+    # Get Photoset Primary Photo   
+    def get_primary_photo()
+        photo = self.get_photo(self.primary)
+        if photo
+            return photo
+        end
+
+        return self.photos.first()
+    end
+    
+    # Get Photoset Photo   
+    def get_photo(photo_id)
+        self.photos.each do |photo|
+            if photo.id == photo_id
+                return photo
+            end
+        end
+
+        return nil
+    end 
 
     def gen_html
         content = ''

data/lib/badpixxel-jekyll-flickr/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-	FLICKR_VERSION = '0.0.2'
+	FLICKR_VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: badpixxel-jekyll-flickr
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - BadPixxel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -126,7 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to embed Flickr Sets & Photos in your Jekyll blog