middleman-dato 0.5.16.3 → 0.5.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +3 -0
- data/.travis.yml +0 -1
- data/Gemfile +1 -0
- data/Rakefile +1 -0
- data/lib/middleman-dato.rb +2 -1
- data/lib/middleman_dato/meta_tags/article_modified_time.rb +1 -0
- data/lib/middleman_dato/meta_tags/article_publisher.rb +1 -0
- data/lib/middleman_dato/meta_tags/base.rb +3 -2
- data/lib/middleman_dato/meta_tags/description.rb +1 -0
- data/lib/middleman_dato/meta_tags/favicon.rb +7 -11
- data/lib/middleman_dato/meta_tags/image.rb +1 -0
- data/lib/middleman_dato/meta_tags/og_locale.rb +1 -0
- data/lib/middleman_dato/meta_tags/og_meta_tag.rb +1 -0
- data/lib/middleman_dato/meta_tags/og_site_name.rb +1 -0
- data/lib/middleman_dato/meta_tags/og_type.rb +1 -0
- data/lib/middleman_dato/meta_tags/robots.rb +1 -0
- data/lib/middleman_dato/meta_tags/title.rb +1 -0
- data/lib/middleman_dato/meta_tags/twitter_card.rb +1 -0
- data/lib/middleman_dato/meta_tags/twitter_meta_tag.rb +1 -0
- data/lib/middleman_dato/meta_tags/twitter_site.rb +1 -0
- data/lib/middleman_dato/meta_tags/url.rb +1 -0
- data/lib/middleman_dato/meta_tags_builder.rb +1 -0
- data/lib/middleman_dato/middleman_extension.rb +14 -5
- data/lib/middleman_dato/version.rb +2 -2
- data/middleman-dato.gemspec +3 -4
- data/spec/middleman_dato/meta_tags/article_modified_time_spec.rb +1 -0
- data/spec/middleman_dato/meta_tags/favicon_spec.rb +8 -7
- data/spec/middleman_dato/meta_tags/image_spec.rb +1 -0
- data/spec/middleman_dato/meta_tags/og_locale_spec.rb +1 -0
- data/spec/spec_helper.rb +7 -7
- data/spec/support/mock_builder.rb +1 -0
- metadata +8 -73
- data/lib/middleman_dato/client.rb +0 -68
- data/lib/middleman_dato/entities_repo.rb +0 -43
- data/lib/middleman_dato/field_type/boolean.rb +0 -9
- data/lib/middleman_dato/field_type/date.rb +0 -9
- data/lib/middleman_dato/field_type/date_time.rb +0 -9
- data/lib/middleman_dato/field_type/file.rb +0 -30
- data/lib/middleman_dato/field_type/float.rb +0 -9
- data/lib/middleman_dato/field_type/image.rb +0 -29
- data/lib/middleman_dato/field_type/integer.rb +0 -9
- data/lib/middleman_dato/field_type/lat_lon.rb +0 -20
- data/lib/middleman_dato/field_type/link.rb +0 -9
- data/lib/middleman_dato/field_type/links.rb +0 -9
- data/lib/middleman_dato/field_type/seo.rb +0 -21
- data/lib/middleman_dato/field_type/string.rb +0 -9
- data/lib/middleman_dato/field_type/text.rb +0 -9
- data/lib/middleman_dato/field_type/video.rb +0 -52
- data/lib/middleman_dato/item.rb +0 -121
- data/lib/middleman_dato/items_repo.rb +0 -107
- data/lib/middleman_dato/json_api_entity.rb +0 -75
- data/lib/middleman_dato/site.rb +0 -36
- data/spec/middleman_dato/entities_repo_spec.rb +0 -41
- data/spec/middleman_dato/field_type/file_spec.rb +0 -20
- data/spec/middleman_dato/field_type/image_spec.rb +0 -24
- data/spec/middleman_dato/field_type/lat_lon_spec.rb +0 -18
- data/spec/middleman_dato/field_type/seo_spec.rb +0 -31
- data/spec/middleman_dato/field_type/video_spec.rb +0 -32
- data/spec/middleman_dato/item_spec.rb +0 -188
- data/spec/middleman_dato/items_repo_spec.rb +0 -125
- data/spec/middleman_dato/json_api_entity_spec.rb +0 -123
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ed184400d9101ac6c8134233d09301e542e4ceee
|
4
|
+
data.tar.gz: 4af9ab976d777ab6206ad2db4c26ee27d4f735ba
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7b04769408e1ab40e01c6b41bc197ad03b8e0972c7ec95b49477ca99ada58532fa9548ac5dd67584eef904ace6e1ec4dd64b88179c0e75ef8f63c7311328ca5f
|
7
|
+
data.tar.gz: 4d75c15a402f2e8dfc71951707776a3c600db383918b8c8de80362f3e2e536682e9be13a8faffd0e4aeaf22a9bb272a553fc101fe01ae7a63e1bdc3e742a9cfc
|
data/.rubocop.yml
CHANGED
data/.travis.yml
CHANGED
data/Gemfile
CHANGED
data/Rakefile
CHANGED
data/lib/middleman-dato.rb
CHANGED
@@ -1,5 +1,6 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
require 'forwardable'
|
2
|
-
require '
|
3
|
+
require 'dato/local/field_type/seo'
|
3
4
|
|
4
5
|
module MiddlemanDato
|
5
6
|
module MetaTags
|
@@ -52,7 +53,7 @@ module MiddlemanDato
|
|
52
53
|
|
53
54
|
def fallback_seo
|
54
55
|
@fallback_seo ||= begin
|
55
|
-
FieldType::Seo.parse(global_seo[:fallback_seo], nil) if global_seo
|
56
|
+
Dato::Local::FieldType::Seo.parse(global_seo[:fallback_seo], nil) if global_seo
|
56
57
|
end
|
57
58
|
end
|
58
59
|
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module MiddlemanDato
|
2
3
|
module MetaTags
|
3
4
|
class Favicon
|
@@ -14,7 +15,7 @@ module MiddlemanDato
|
|
14
15
|
end
|
15
16
|
|
16
17
|
def image
|
17
|
-
|
18
|
+
Dato::Local::FieldType::Image.parse(favicon, nil) if favicon.present?
|
18
19
|
end
|
19
20
|
|
20
21
|
def url(width, height = nil)
|
@@ -27,8 +28,7 @@ module MiddlemanDato
|
|
27
28
|
builder.tag(:link,
|
28
29
|
rel: 'apple-touch-icon',
|
29
30
|
sizes: "#{size}x#{size}",
|
30
|
-
href: url(size)
|
31
|
-
)
|
31
|
+
href: url(size))
|
32
32
|
end
|
33
33
|
end
|
34
34
|
|
@@ -38,8 +38,7 @@ module MiddlemanDato
|
|
38
38
|
rel: 'icon',
|
39
39
|
type: "image/#{image.format}",
|
40
40
|
href: url(size),
|
41
|
-
sizes: "#{size}x#{size}"
|
42
|
-
)
|
41
|
+
sizes: "#{size}x#{size}")
|
43
42
|
end
|
44
43
|
end
|
45
44
|
|
@@ -47,12 +46,10 @@ module MiddlemanDato
|
|
47
46
|
APPLICATION_SIZES.map do |size|
|
48
47
|
builder.tag(:meta,
|
49
48
|
name: "msapplication-square#{size}x#{size}logo",
|
50
|
-
content: url(size)
|
51
|
-
)
|
49
|
+
content: url(size))
|
52
50
|
end + [builder.tag(:meta,
|
53
51
|
name: 'msapplication-wide310x150logo',
|
54
|
-
content: url(310, 150)
|
55
|
-
)]
|
52
|
+
content: url(310, 150))]
|
56
53
|
end
|
57
54
|
|
58
55
|
def main_tags
|
@@ -61,8 +58,7 @@ module MiddlemanDato
|
|
61
58
|
builder.tag(:meta, name: 'theme-color', content: theme_color),
|
62
59
|
builder.tag(:meta,
|
63
60
|
name: 'msapplication-TileColor',
|
64
|
-
content: theme_color
|
65
|
-
)
|
61
|
+
content: theme_color)
|
66
62
|
]
|
67
63
|
end
|
68
64
|
|
@@ -1,8 +1,10 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
require 'middleman-core'
|
2
3
|
require 'middleman-core/version'
|
3
4
|
require 'semantic'
|
5
|
+
require 'dato/site/client'
|
6
|
+
require 'dato/local/site'
|
4
7
|
require 'middleman_dato/meta_tags_builder'
|
5
|
-
require 'middleman_dato/site'
|
6
8
|
require 'middleman_dato/meta_tags/favicon'
|
7
9
|
|
8
10
|
module MiddlemanDato
|
@@ -11,7 +13,7 @@ module MiddlemanDato
|
|
11
13
|
|
12
14
|
option :domain, nil, 'Site domain (legacy)'
|
13
15
|
option :token, nil, 'Site API token'
|
14
|
-
option :
|
16
|
+
option :api_base_url, 'https://site-api.datocms.com', 'Site API host'
|
15
17
|
option :base_url, nil, 'Website base URL'
|
16
18
|
|
17
19
|
if Semantic::Version.new(Middleman::VERSION).major >= 4
|
@@ -21,11 +23,11 @@ module MiddlemanDato
|
|
21
23
|
def initialize(app, options_hash = {}, &block)
|
22
24
|
super
|
23
25
|
|
24
|
-
@site = site =
|
25
|
-
@site.
|
26
|
+
@site = site = Dato::Local::Site.new(client)
|
27
|
+
@site.load
|
26
28
|
|
27
29
|
app.before do
|
28
|
-
site.
|
30
|
+
site.load if !build? && !ENV.fetch('DISABLE_DATO_REFRESH', false)
|
29
31
|
true
|
30
32
|
end
|
31
33
|
|
@@ -34,6 +36,13 @@ module MiddlemanDato
|
|
34
36
|
end
|
35
37
|
end
|
36
38
|
|
39
|
+
def client
|
40
|
+
@client ||= Dato::Site::Client.new(
|
41
|
+
options[:token],
|
42
|
+
base_url: options[:api_base_url]
|
43
|
+
)
|
44
|
+
end
|
45
|
+
|
37
46
|
def dato
|
38
47
|
site.items_repo
|
39
48
|
end
|
data/middleman-dato.gemspec
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# -*- encoding: utf-8 -*-
|
2
|
+
# frozen_string_literal: true
|
2
3
|
$LOAD_PATH.push File.expand_path('../lib', __FILE__)
|
3
4
|
require 'middleman_dato/version'
|
4
5
|
|
@@ -20,9 +21,7 @@ Gem::Specification.new do |s|
|
|
20
21
|
s.require_paths = ['lib']
|
21
22
|
|
22
23
|
s.add_runtime_dependency('middleman-core', ['>= 3.3.12'])
|
23
|
-
s.add_runtime_dependency('
|
24
|
-
s.add_runtime_dependency('faraday_middleware', ['>= 0.9.0'])
|
25
|
-
s.add_runtime_dependency('imgix', ['>= 0.3.1'])
|
26
|
-
s.add_runtime_dependency('video_embed')
|
24
|
+
s.add_runtime_dependency('dato', ['>= 0.1.6'])
|
27
25
|
s.add_runtime_dependency('semantic')
|
26
|
+
s.add_runtime_dependency('activesupport')
|
28
27
|
end
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
require 'spec_helper'
|
2
3
|
require 'active_support/core_ext/hash/indifferent_access'
|
3
4
|
|
@@ -62,12 +63,12 @@ module MiddlemanDato
|
|
62
63
|
end
|
63
64
|
|
64
65
|
context 'else' do
|
65
|
-
let(:image_obj) { double('
|
66
|
+
let(:image_obj) { double('Dato::Local::FieldType::Image', format: image_format) }
|
66
67
|
|
67
|
-
it 'return the image parsed with
|
68
|
-
allow(
|
68
|
+
it 'return the image parsed with Dato::Local::FieldType::Image' do
|
69
|
+
allow(Dato::Local::FieldType::Image).to receive(:parse).and_return(image_obj)
|
69
70
|
image = meta_tag.image
|
70
|
-
expect(
|
71
|
+
expect(Dato::Local::FieldType::Image).to have_received(:parse)
|
71
72
|
.with(favicon, nil)
|
72
73
|
expect(image).to eq image_obj
|
73
74
|
end
|
@@ -75,7 +76,7 @@ module MiddlemanDato
|
|
75
76
|
end
|
76
77
|
|
77
78
|
describe '#url' do
|
78
|
-
let(:image) { instance_double('
|
79
|
+
let(:image) { instance_double('Dato::Local::FieldType::Image', file: file) }
|
79
80
|
let(:file) { instance_double('Imgix::Path') }
|
80
81
|
let(:width) { 1 }
|
81
82
|
let(:height) { 2 }
|
@@ -133,7 +134,7 @@ module MiddlemanDato
|
|
133
134
|
|
134
135
|
describe '#build_apple_icon_tags' do
|
135
136
|
let(:result) { meta_tag.build_icon_tags }
|
136
|
-
let(:image) { instance_double('
|
137
|
+
let(:image) { instance_double('Dato::Local::FieldType::Image', format: format) }
|
137
138
|
let(:format) { 'png' }
|
138
139
|
let(:image_url) { '/path/to/image' }
|
139
140
|
|
@@ -160,7 +161,7 @@ module MiddlemanDato
|
|
160
161
|
|
161
162
|
describe '#build_application_tags' do
|
162
163
|
let(:result) { meta_tag.build_application_tags }
|
163
|
-
let(:image) { instance_double('
|
164
|
+
let(:image) { instance_double('Dato::Local::FieldType::Image', format: format) }
|
164
165
|
let(:format) { 'png' }
|
165
166
|
let(:image_url) { '/path/to/image' }
|
166
167
|
|
data/spec/spec_helper.rb
CHANGED
@@ -1,16 +1,16 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
require 'simplecov'
|
2
|
-
require 'active_support/dependencies'
|
3
|
-
require 'i18n'
|
4
|
-
|
5
3
|
SimpleCov.start do
|
6
4
|
add_filter '/spec/'
|
7
5
|
end
|
8
6
|
|
9
|
-
|
7
|
+
$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
|
8
|
+
puts File.expand_path('../../lib', __FILE__)
|
10
9
|
|
11
|
-
|
12
|
-
|
13
|
-
|
10
|
+
require 'i18n'
|
11
|
+
require 'middleman-dato'
|
12
|
+
|
13
|
+
I18n.available_locales = [:it, :en, :ru]
|
14
14
|
|
15
15
|
Dir['spec/support/**/*.rb'].each do |f|
|
16
16
|
require_relative '../' + f
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: middleman-dato
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.17
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Stefano Verna
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2016-08-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: middleman-core
|
@@ -25,49 +25,21 @@ dependencies:
|
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: 3.3.12
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
|
-
name:
|
28
|
+
name: dato
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 0.
|
33
|
+
version: 0.1.6
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - ">="
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 0.
|
40
|
+
version: 0.1.6
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
|
-
name:
|
43
|
-
requirement: !ruby/object:Gem::Requirement
|
44
|
-
requirements:
|
45
|
-
- - ">="
|
46
|
-
- !ruby/object:Gem::Version
|
47
|
-
version: 0.9.0
|
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.0
|
55
|
-
- !ruby/object:Gem::Dependency
|
56
|
-
name: imgix
|
57
|
-
requirement: !ruby/object:Gem::Requirement
|
58
|
-
requirements:
|
59
|
-
- - ">="
|
60
|
-
- !ruby/object:Gem::Version
|
61
|
-
version: 0.3.1
|
62
|
-
type: :runtime
|
63
|
-
prerelease: false
|
64
|
-
version_requirements: !ruby/object:Gem::Requirement
|
65
|
-
requirements:
|
66
|
-
- - ">="
|
67
|
-
- !ruby/object:Gem::Version
|
68
|
-
version: 0.3.1
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
name: video_embed
|
42
|
+
name: semantic
|
71
43
|
requirement: !ruby/object:Gem::Requirement
|
72
44
|
requirements:
|
73
45
|
- - ">="
|
@@ -81,7 +53,7 @@ dependencies:
|
|
81
53
|
- !ruby/object:Gem::Version
|
82
54
|
version: '0'
|
83
55
|
- !ruby/object:Gem::Dependency
|
84
|
-
name:
|
56
|
+
name: activesupport
|
85
57
|
requirement: !ruby/object:Gem::Requirement
|
86
58
|
requirements:
|
87
59
|
- - ">="
|
@@ -110,25 +82,6 @@ files:
|
|
110
82
|
- README.md
|
111
83
|
- Rakefile
|
112
84
|
- lib/middleman-dato.rb
|
113
|
-
- lib/middleman_dato/client.rb
|
114
|
-
- lib/middleman_dato/entities_repo.rb
|
115
|
-
- lib/middleman_dato/field_type/boolean.rb
|
116
|
-
- lib/middleman_dato/field_type/date.rb
|
117
|
-
- lib/middleman_dato/field_type/date_time.rb
|
118
|
-
- lib/middleman_dato/field_type/file.rb
|
119
|
-
- lib/middleman_dato/field_type/float.rb
|
120
|
-
- lib/middleman_dato/field_type/image.rb
|
121
|
-
- lib/middleman_dato/field_type/integer.rb
|
122
|
-
- lib/middleman_dato/field_type/lat_lon.rb
|
123
|
-
- lib/middleman_dato/field_type/link.rb
|
124
|
-
- lib/middleman_dato/field_type/links.rb
|
125
|
-
- lib/middleman_dato/field_type/seo.rb
|
126
|
-
- lib/middleman_dato/field_type/string.rb
|
127
|
-
- lib/middleman_dato/field_type/text.rb
|
128
|
-
- lib/middleman_dato/field_type/video.rb
|
129
|
-
- lib/middleman_dato/item.rb
|
130
|
-
- lib/middleman_dato/items_repo.rb
|
131
|
-
- lib/middleman_dato/json_api_entity.rb
|
132
85
|
- lib/middleman_dato/meta_tags/article_modified_time.rb
|
133
86
|
- lib/middleman_dato/meta_tags/article_publisher.rb
|
134
87
|
- lib/middleman_dato/meta_tags/base.rb
|
@@ -147,18 +100,8 @@ files:
|
|
147
100
|
- lib/middleman_dato/meta_tags/url.rb
|
148
101
|
- lib/middleman_dato/meta_tags_builder.rb
|
149
102
|
- lib/middleman_dato/middleman_extension.rb
|
150
|
-
- lib/middleman_dato/site.rb
|
151
103
|
- lib/middleman_dato/version.rb
|
152
104
|
- middleman-dato.gemspec
|
153
|
-
- spec/middleman_dato/entities_repo_spec.rb
|
154
|
-
- spec/middleman_dato/field_type/file_spec.rb
|
155
|
-
- spec/middleman_dato/field_type/image_spec.rb
|
156
|
-
- spec/middleman_dato/field_type/lat_lon_spec.rb
|
157
|
-
- spec/middleman_dato/field_type/seo_spec.rb
|
158
|
-
- spec/middleman_dato/field_type/video_spec.rb
|
159
|
-
- spec/middleman_dato/item_spec.rb
|
160
|
-
- spec/middleman_dato/items_repo_spec.rb
|
161
|
-
- spec/middleman_dato/json_api_entity_spec.rb
|
162
105
|
- spec/middleman_dato/meta_tags/article_modified_time_spec.rb
|
163
106
|
- spec/middleman_dato/meta_tags/favicon_spec.rb
|
164
107
|
- spec/middleman_dato/meta_tags/image_spec.rb
|
@@ -189,18 +132,10 @@ signing_key:
|
|
189
132
|
specification_version: 4
|
190
133
|
summary: Fetches data from a Dato site
|
191
134
|
test_files:
|
192
|
-
- spec/middleman_dato/entities_repo_spec.rb
|
193
|
-
- spec/middleman_dato/field_type/file_spec.rb
|
194
|
-
- spec/middleman_dato/field_type/image_spec.rb
|
195
|
-
- spec/middleman_dato/field_type/lat_lon_spec.rb
|
196
|
-
- spec/middleman_dato/field_type/seo_spec.rb
|
197
|
-
- spec/middleman_dato/field_type/video_spec.rb
|
198
|
-
- spec/middleman_dato/item_spec.rb
|
199
|
-
- spec/middleman_dato/items_repo_spec.rb
|
200
|
-
- spec/middleman_dato/json_api_entity_spec.rb
|
201
135
|
- spec/middleman_dato/meta_tags/article_modified_time_spec.rb
|
202
136
|
- spec/middleman_dato/meta_tags/favicon_spec.rb
|
203
137
|
- spec/middleman_dato/meta_tags/image_spec.rb
|
204
138
|
- spec/middleman_dato/meta_tags/og_locale_spec.rb
|
205
139
|
- spec/spec_helper.rb
|
206
140
|
- spec/support/mock_builder.rb
|
141
|
+
has_rdoc:
|