jekyll-flickr 0.1.2 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +9 -0
  3. data/jekyll-flickr.gemspec +3 -5
  4. data/lib/jekyll-flickr/flickr_tag.rb +5 -8
  5. data/lib/jekyll-flickr/version.rb +2 -2
  6. metadata +20 -43
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 36695c3c9dde937ec527bf19b34865327ec83248d5acab73ba1e88b84f6f79a9
4
- data.tar.gz: 7092b44fc42b05d27716c2805f5fb5aa73be2d0fe264ff34d036d49a6dc4d996
3
+ metadata.gz: 881a1741332d21f044fadeecdb3fa58dab7e1ab16f9e6479de353543deca1014
4
+ data.tar.gz: a4db748b22cd0a44aa7e649dca5b518aac1fd3e5b53dc4cb0cc9f5d54d729326
5
5
  SHA512:
6
- metadata.gz: 7423f1d84db3884f2e2c2b9dcb5c266db713a33e71788ae478993bb141136f4961b4e310cc110d272f14a7c744522f00331b9fb09c875ef5e68441ed6bcc58dc
7
- data.tar.gz: 0a71a46c59c36f8f8708096360acc253cf9533adce08785f75371f8e5e3d57e768bcd8e43558658923217692cca91cec4acca70de3baa8544de92349846fbc09
6
+ metadata.gz: 9c1fe75600c0451107d435ee325889ef0317935329652d1e38e35993270bb1dc9afee2364feef7383ff3b865e052044e183b4a9ffd7c0ad11baf9ba0a50645f7
7
+ data.tar.gz: f24e90e92c7c4cda30a8d1ad83d7d34d5fb8b63df36058402c8eee799571b6155c7c5a71d4ffae560e7045163a78e200654b969b768f7b77ae0639dfd570ee7f
data/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  ## HEAD
2
2
 
3
+ ## master 0.2.0 / 2021-02-25
4
+
5
+ * dependencies: require Jekyll 4.x and use gem flickr instead of flickraw
6
+ * use native Jekyll cache API (<https://jekyllrb.com/tutorials/cache-api/>) instead of jekyll-cache
7
+
8
+ ## 0.1.3 / 2019-03-13
9
+
10
+ * refactor: use simpler API provided by gem flickraw 0.9.10
11
+
3
12
  ## 0.1.2 / 2019-03-06
4
13
 
5
14
  * feature: reduce overhead due to class variables
data/jekyll-flickr.gemspec CHANGED
@@ -7,7 +7,7 @@ require "jekyll-flickr/version"
7
7
 
8
8
  Gem::Specification.new do |spec|
9
9
  spec.name = "jekyll-flickr"
10
- spec.version = Jekyll::Onebox::VERSION
10
+ spec.version = Jekyll::Flickr::VERSION
11
11
  spec.authors = ["Robert Riemann"]
12
12
  spec.email = ["robert@riemann.cc"]
13
13
  spec.summary = "Liquid tag for responsive Flickr images using HTML5 srcset."
@@ -21,10 +21,8 @@ Gem::Specification.new do |spec|
21
21
  # spec.test_files = spec.files.grep(%r!^(test|spec|features)/!)
22
22
  spec.require_paths = ["lib"]
23
23
 
24
- spec.add_dependency "jekyll-cache", "~> 1.2"
25
- spec.add_dependency "flickraw-cached", ">= 20120701"
26
- spec.add_dependency "flickraw", "~> 0.9.9"
24
+ spec.add_dependency "flickr", "~> 2.0"
27
25
  spec.add_development_dependency "bundler", "~> 1.6"
28
- spec.add_development_dependency "jekyll", ">= 3.0"
26
+ spec.add_development_dependency "jekyll", "~>4.0", "< 5.0"
29
27
  spec.add_development_dependency "rake"
30
28
  end
data/lib/jekyll-flickr/flickr_tag.rb CHANGED
@@ -1,7 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'flickraw-cached'
4
- require 'jekyll-cache'
3
+ require 'flickr'
5
4
 
6
5
  module Jekyll
7
6
  module Flickr
@@ -73,15 +72,13 @@ module Jekyll
73
72
 
74
73
  def flickr
75
74
  @@flickr ||= begin
76
- FlickRaw.api_key = ENV['FLICKR_API_KEY'] || config['api_key']
77
- FlickRaw.shared_secret = ENV['FLICKR_API_SECRET'] || config['api_secret']
78
-
79
- @@flickr = FlickRaw::Flickr.new
75
+ # by default, Flickr uses ENV FLICKR_API_KEY and FLICKR_SHARED_SECRET, support here legacy name FLICKR_API_SECRET, too
76
+ @@flickr = ::Flickr.new(ENV['FLICKR_API_KEY'] || config['api_key'], ENV['FLICKR_SHARED_SECRET'] || ENV['FLICKR_API_SECRET'] || config['api_secret'])
80
77
  end
81
78
  end
82
79
 
83
80
  def cache
84
- @@cache ||= Jekyll::Cache::FileStore.new 'flickr'
81
+ @@cache ||= Jekyll::Cache.new("flickr")
85
82
  end
86
83
 
87
84
  def config
@@ -96,7 +93,7 @@ module Jekyll
96
93
  photo_caption = match.named_captures['caption']
97
94
  photo_attr = match.named_captures['attr']
98
95
 
99
- photo_data = cache.fetch photo_id, expires_in: -1 do # disable expiry in production and development environment
96
+ photo_data = cache.getset photo_id do
100
97
  {
101
98
  info: flickr.photos.getInfo(photo_id: photo_id),
102
99
  sizes: flickr.photos.getSizes(photo_id: photo_id)
data/lib/jekyll-flickr/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Jekyll
4
- module Onebox
5
- VERSION = "0.1.2".freeze
4
+ module Flickr
5
+ VERSION = "0.2.0".freeze
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,57 +1,29 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll-flickr
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Robert Riemann
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-03-08 00:00:00.000000000 Z
11
+ date: 2021-02-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: jekyll-cache
14
+ name: flickr
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.2'
19
+ version: '2.0'
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
- version: '1.2'
27
- - !ruby/object:Gem::Dependency
28
- name: flickraw-cached
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - ">="
32
- - !ruby/object:Gem::Version
33
- version: '20120701'
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - ">="
39
- - !ruby/object:Gem::Version
40
- version: '20120701'
41
- - !ruby/object:Gem::Dependency
42
- name: flickraw
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - "~>"
46
- - !ruby/object:Gem::Version
47
- version: 0.9.9
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - "~>"
53
- - !ruby/object:Gem::Version
54
- version: 0.9.9
26
+ version: '2.0'
55
27
  - !ruby/object:Gem::Dependency
56
28
  name: bundler
57
29
  requirement: !ruby/object:Gem::Requirement
@@ -70,16 +42,22 @@ dependencies:
70
42
  name: jekyll
71
43
  requirement: !ruby/object:Gem::Requirement
72
44
  requirements:
73
- - - ">="
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: '4.0'
48
+ - - "<"
74
49
  - !ruby/object:Gem::Version
75
- version: '3.0'
50
+ version: '5.0'
76
51
  type: :development
77
52
  prerelease: false
78
53
  version_requirements: !ruby/object:Gem::Requirement
79
54
  requirements:
80
- - - ">="
55
+ - - "~>"
56
+ - !ruby/object:Gem::Version
57
+ version: '4.0'
58
+ - - "<"
81
59
  - !ruby/object:Gem::Version
82
- version: '3.0'
60
+ version: '5.0'
83
61
  - !ruby/object:Gem::Dependency
84
62
  name: rake
85
63
  requirement: !ruby/object:Gem::Requirement
@@ -94,7 +72,7 @@ dependencies:
94
72
  - - ">="
95
73
  - !ruby/object:Gem::Version
96
74
  version: '0'
97
- description:
75
+ description:
98
76
  email:
99
77
  - robert@riemann.cc
100
78
  executables: []
@@ -115,7 +93,7 @@ homepage: https://github.com/rriemann/jekyll-flickr
115
93
  licenses:
116
94
  - MIT
117
95
  metadata: {}
118
- post_install_message:
96
+ post_install_message:
119
97
  rdoc_options: []
120
98
  require_paths:
121
99
  - lib
@@ -130,9 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
130
108
  - !ruby/object:Gem::Version
131
109
  version: '0'
132
110
  requirements: []
133
- rubyforge_project:
134
- rubygems_version: 2.7.9
135
- signing_key:
111
+ rubygems_version: 3.0.1
112
+ signing_key:
136
113
  specification_version: 4
137
114
  summary: Liquid tag for responsive Flickr images using HTML5 srcset.
138
115
  test_files: []