middleman-generator-tag 0.2.5 → 0.2.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. checksums.yaml +5 -5
  2. data/.rubocop.yml +38 -0
  3. data/.travis.yml +3 -2
  4. data/README.md +0 -2
  5. data/Rakefile +2 -2
  6. data/bin/console +4 -4
  7. data/fixtures/lang-ja-app/config.rb +1 -0
  8. data/fixtures/lang-ja-app/source/index.html.erb +0 -3
  9. data/fixtures/lang-ja-app/source/sitemap.xml.builder +5 -9
  10. data/fixtures/tag-app/config.rb +1 -0
  11. data/fixtures/tag-app/source/index.html.erb +0 -3
  12. data/fixtures/tag-app/source/sitemap.xml.builder +5 -9
  13. data/lib/middleman-generator-tag/extension.rb +14 -7
  14. data/lib/middleman-generator-tag/version.rb +1 -1
  15. data/middleman-generator-tag.gemspec +18 -18
  16. metadata +34 -19
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 1599451a326e1f37478242b3742e7c9aaa0c0736
4
- data.tar.gz: f2b469354d1bdc83b95e64aa1cff90abb5a86689
2
+ SHA256:
3
+ metadata.gz: 8525af1798f5f7e1a0bac829afc4c97ee827365131c82ee87fb4ab3ffa937e00
4
+ data.tar.gz: d984d7cc68b3348944383dac45a5e57db4d79574b5358f7e149a6becf77249a6
5
5
  SHA512:
6
- metadata.gz: 346827b3b84cc9f7275f5f2c5d5eb4cf6ff58f4375ccb3fa2fe496428ecdfa15db9809f147b59e24054e649d703cf1e3a2c86676fa0322ee19cea9d52b5b6357
7
- data.tar.gz: 7d73bf691e36c0ba9aa22724fe863280f29a121dcc0804bf7be704b5401130b58e3b30e431dbb4a8f8c64dd41735e8942336ba0e96bf8b44c8a11704998928f4
6
+ metadata.gz: a5f4fcf3a969a53ce385bf6e885b65dce2e1b6811bc91e2a0fc8697959eb2081f1bcd6e10e3c547e7ffa15a6f2619ec714b37da78a1f50afc6398234cdc4e793
7
+ data.tar.gz: 91dd21c809497e931a00156f7eb866d72f51f1635169f130e0ae432c76c3528e141006ae3b707197c72f0bf8c65e0973ebd22e5c8af4788838ddce3664e46040
data/.rubocop.yml ADDED
@@ -0,0 +1,38 @@
1
+ AllCops:
2
+ Exclude:
3
+ - 'pkg/*'
4
+ - 'tmp/**/*'
5
+ - 'vendor/**/*'
6
+ TargetRubyVersion: 2.5
7
+ DisplayCopNames: true
8
+
9
+ Rails:
10
+ Enabled: false
11
+
12
+ Style/ClassAndModuleChildren:
13
+ Enabled: false
14
+
15
+ Style/Documentation:
16
+ Enabled: false
17
+
18
+ Style/FrozenStringLiteralComment:
19
+ Enabled: false
20
+
21
+ Style/RedundantSelf:
22
+ Enabled: false
23
+
24
+ Gemspec/RequiredRubyVersion:
25
+ Enabled: false
26
+
27
+ Metrics/LineLength:
28
+ Max: 120
29
+ Exclude:
30
+ - '*.gemspec'
31
+
32
+ Metrics/MethodLength:
33
+ Max: 20
34
+
35
+ Naming/FileName:
36
+ Enabled: true
37
+ Exclude:
38
+ - 'lib/middleman-generator-tag.rb'
data/.travis.yml CHANGED
@@ -2,8 +2,9 @@ language: ruby
2
2
  sudo: false
3
3
  rvm:
4
4
  - ruby-head
5
- - 2.3.1
6
- - 2.2.5
5
+ - 2.5.0
6
+ - 2.4.3
7
+ - 2.3.6
7
8
  os:
8
9
  - linux
9
10
  matrix:
data/README.md CHANGED
@@ -3,8 +3,6 @@
3
3
  middleman-generator-tag is a plugin for Middleman.
4
4
  This plugin always insert '<meta name='generator' content="Middleman vX.X.X">` into html.
5
5
 
6
- This plugin support Middleman v3-stable and v4.
7
-
8
6
  ## Installation
9
7
 
10
8
  Add this line to your application's Gemfile:
data/Rakefile CHANGED
@@ -1,8 +1,8 @@
1
- require "bundler/gem_tasks"
1
+ require 'bundler/gem_tasks'
2
2
 
3
3
  task default: :test
4
4
 
5
- desc "test command"
5
+ desc 'test command'
6
6
  task :test do
7
7
  sh 'cucumber features/'
8
8
  end
data/bin/console CHANGED
@@ -1,14 +1,14 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
- require "bundler/setup"
4
- require "middleman/generator/tag"
3
+ require 'bundler/setup'
4
+ require 'middleman/generator/tag'
5
5
 
6
6
  # You can add fixtures and/or initialization code here to make experimenting
7
7
  # with your gem easier. You can also use a different console, if you like.
8
8
 
9
9
  # (If you use this, don't forget to add pry to your Gemfile!)
10
- # require "pry"
10
+ # require 'pry'
11
11
  # Pry.start
12
12
 
13
- require "irb"
13
+ require 'irb'
14
14
  IRB.start
data/fixtures/lang-ja-app/config.rb CHANGED
@@ -1 +1,2 @@
1
+ set :layout, false
1
2
  activate :generator_tag
data/fixtures/lang-ja-app/source/index.html.erb CHANGED
@@ -1,6 +1,3 @@
1
- ---
2
- layout: false
3
- ---
4
1
  <!DOCTYPE html>
5
2
  <html lang="ja">
6
3
  <head>
data/fixtures/lang-ja-app/source/sitemap.xml.builder CHANGED
@@ -1,16 +1,12 @@
1
- ---
2
- layout: false
3
- ---
4
- site_url = config[:sitemap_url] || "http://localhost:4567/"
1
+ site_url = config[:sitemap_url] || 'http://localhost:4567/'
5
2
  xml.instruct!
6
- xml.urlset 'xmlns' => "http://www.sitemaps.org/schemas/sitemap/0.9" do
3
+ xml.urlset 'xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9' do
7
4
  sitemap.resources.select { |page| page.destination_path =~ /\.html/ }.each do |page|
8
5
  xml.url do
9
- xml.loc URI.escape(File.join(site_url, page.destination_path))
6
+ xml.loc CGI.escape(File.join(site_url, page.destination_path))
10
7
  xml.lastmod Time.now.iso8601
11
- xml.changefreq page.data.changefreq || "weekly"
12
- xml.priority page.data.priority || "0.5"
8
+ xml.changefreq page.data.changefreq || 'weekly'
9
+ xml.priority page.data.priority || '0.5'
13
10
  end
14
11
  end
15
12
  end
16
-
data/fixtures/tag-app/config.rb CHANGED
@@ -1 +1,2 @@
1
+ set :layout, false
1
2
  activate :generator_tag
data/fixtures/tag-app/source/index.html.erb CHANGED
@@ -1,6 +1,3 @@
1
- ---
2
- layout: false
3
- ---
4
1
  <!DOCTYPE html>
5
2
  <html>
6
3
  <head>
data/fixtures/tag-app/source/sitemap.xml.builder CHANGED
@@ -1,16 +1,12 @@
1
- ---
2
- layout: false
3
- ---
4
- site_url = config[:sitemap_url] || "http://localhost:4567/"
1
+ site_url = config[:sitemap_url] || 'http://localhost:4567/'
5
2
  xml.instruct!
6
- xml.urlset 'xmlns' => "http://www.sitemaps.org/schemas/sitemap/0.9" do
3
+ xml.urlset 'xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9' do
7
4
  sitemap.resources.select { |page| page.destination_path =~ /\.html/ }.each do |page|
8
5
  xml.url do
9
- xml.loc URI.escape(File.join(site_url, page.destination_path))
6
+ xml.loc CGI.escape(File.join(site_url, page.destination_path))
10
7
  xml.lastmod Time.now.iso8601
11
- xml.changefreq page.data.changefreq || "weekly"
12
- xml.priority page.data.priority || "0.5"
8
+ xml.changefreq page.data.changefreq || 'weekly'
9
+ xml.priority page.data.priority || '0.5'
13
10
  end
14
11
  end
15
12
  end
16
-
data/lib/middleman-generator-tag/extension.rb CHANGED
@@ -6,17 +6,13 @@ module Middleman
6
6
 
7
7
  extension = self
8
8
  app.after_render do |content|
9
- if %r{</html>} =~ content
10
- html = Nokogiri::HTML(content)
11
- if html.css("meta[name='generator']").length.zero?
12
- content = extension.insert_tag(html)
13
- end
14
- end
9
+ content = extension.insert_tag(content) if html?(content) && !generator?(content)
15
10
  content
16
11
  end
17
12
  end
18
13
 
19
- def insert_tag(html)
14
+ def insert_tag(content)
15
+ html = Nokogiri::HTML(content)
20
16
  title = html.at_css('title')
21
17
  meta = Nokogiri::XML::Node.new 'meta', html
22
18
  meta[:name] = 'generator'
@@ -24,6 +20,17 @@ module Middleman
24
20
  title.add_next_sibling(meta)
25
21
  html.to_s
26
22
  end
23
+
24
+ private
25
+
26
+ def html?(content)
27
+ %r{</html>} =~ content
28
+ end
29
+
30
+ def generator?(content)
31
+ html = Nokogiri::HTML(content)
32
+ html.css("meta[name='generator']").length.positive?
33
+ end
27
34
  end
28
35
  end
29
36
  end
data/lib/middleman-generator-tag/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Middleman
2
2
  module GeneratorTag
3
- VERSION = '0.2.5'
3
+ VERSION = '0.2.6'.freeze
4
4
  end
5
5
  end
data/middleman-generator-tag.gemspec CHANGED
@@ -1,32 +1,32 @@
1
- # coding: utf-8
2
1
  lib = File.expand_path('../lib', __FILE__)
3
2
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
3
  require 'middleman-generator-tag/version'
5
4
 
6
5
  Gem::Specification.new do |spec|
7
- spec.name = "middleman-generator-tag"
6
+ spec.name = 'middleman-generator-tag'
8
7
  spec.version = Middleman::GeneratorTag::VERSION
9
- spec.authors = ["Yuya Terajima"]
10
- spec.email = ["terra@e2esound.com"]
8
+ spec.authors = ['Yuya Terajima']
9
+ spec.email = ['terra@e2esound.com']
11
10
 
12
- spec.summary = %q{Add generator meta tag in html files.}
13
- spec.description = %q{Add generator meta tag in html files.}
14
- spec.homepage = "https://github.com/yterajima/middleman-generator-tag"
15
- spec.license = "MIT"
11
+ spec.summary = 'Add generator meta tag in html files.'
12
+ spec.description = 'Add generator meta tag in html files.'
13
+ spec.homepage = 'https://github.com/yterajima/middleman-generator-tag'
14
+ spec.license = 'MIT'
16
15
 
17
16
  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
18
- spec.bindir = "exe"
17
+ spec.bindir = 'exe'
19
18
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
20
- spec.require_paths = ["lib"]
19
+ spec.require_paths = ['lib']
21
20
 
22
- spec.required_ruby_version = '>= 2.0.0'
21
+ spec.required_ruby_version = '>= 2.2.0'
23
22
 
24
- spec.add_runtime_dependency "middleman", ">= 4.0"
25
- spec.add_runtime_dependency "nokogiri", ">= 1.6"
23
+ spec.add_runtime_dependency 'middleman', '>= 4.0'
24
+ spec.add_runtime_dependency 'nokogiri', '>= 1.6'
26
25
 
27
- spec.add_development_dependency "bundler", ">= 1.7"
28
- spec.add_development_dependency "capybara", ["~> 2.5.0"]
29
- spec.add_development_dependency "rake", ">= 10.0"
30
- spec.add_development_dependency "cucumber", ">= 1.3"
31
- spec.add_development_dependency "aruba", ">= 0.6"
26
+ spec.add_development_dependency 'aruba', '>= 0.14.3'
27
+ spec.add_development_dependency 'bundler', '>= 1.16'
28
+ spec.add_development_dependency 'capybara', '>= 2.18.0'
29
+ spec.add_development_dependency 'cucumber', '>= 3.1.0'
30
+ spec.add_development_dependency 'rake', '>= 12.3'
31
+ spec.add_development_dependency 'rubocop', '>= 0.52.1'
32
32
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-generator-tag
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.5
4
+ version: 0.2.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yuya Terajima
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-11-10 00:00:00.000000000 Z
11
+ date: 2018-02-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: middleman
@@ -38,76 +38,90 @@ dependencies:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '1.6'
41
+ - !ruby/object:Gem::Dependency
42
+ name: aruba
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - ">="
46
+ - !ruby/object:Gem::Version
47
+ version: 0.14.3
48
+ type: :development
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ">="
53
+ - !ruby/object:Gem::Version
54
+ version: 0.14.3
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: bundler
43
57
  requirement: !ruby/object:Gem::Requirement
44
58
  requirements:
45
59
  - - ">="
46
60
  - !ruby/object:Gem::Version
47
- version: '1.7'
61
+ version: '1.16'
48
62
  type: :development
49
63
  prerelease: false
50
64
  version_requirements: !ruby/object:Gem::Requirement
51
65
  requirements:
52
66
  - - ">="
53
67
  - !ruby/object:Gem::Version
54
- version: '1.7'
68
+ version: '1.16'
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: capybara
57
71
  requirement: !ruby/object:Gem::Requirement
58
72
  requirements:
59
- - - "~>"
73
+ - - ">="
60
74
  - !ruby/object:Gem::Version
61
- version: 2.5.0
75
+ version: 2.18.0
62
76
  type: :development
63
77
  prerelease: false
64
78
  version_requirements: !ruby/object:Gem::Requirement
65
79
  requirements:
66
- - - "~>"
80
+ - - ">="
67
81
  - !ruby/object:Gem::Version
68
- version: 2.5.0
82
+ version: 2.18.0
69
83
  - !ruby/object:Gem::Dependency
70
- name: rake
84
+ name: cucumber
71
85
  requirement: !ruby/object:Gem::Requirement
72
86
  requirements:
73
87
  - - ">="
74
88
  - !ruby/object:Gem::Version
75
- version: '10.0'
89
+ version: 3.1.0
76
90
  type: :development
77
91
  prerelease: false
78
92
  version_requirements: !ruby/object:Gem::Requirement
79
93
  requirements:
80
94
  - - ">="
81
95
  - !ruby/object:Gem::Version
82
- version: '10.0'
96
+ version: 3.1.0
83
97
  - !ruby/object:Gem::Dependency
84
- name: cucumber
98
+ name: rake
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
101
  - - ">="
88
102
  - !ruby/object:Gem::Version
89
- version: '1.3'
103
+ version: '12.3'
90
104
  type: :development
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
108
  - - ">="
95
109
  - !ruby/object:Gem::Version
96
- version: '1.3'
110
+ version: '12.3'
97
111
  - !ruby/object:Gem::Dependency
98
- name: aruba
112
+ name: rubocop
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
115
  - - ">="
102
116
  - !ruby/object:Gem::Version
103
- version: '0.6'
117
+ version: 0.52.1
104
118
  type: :development
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
122
  - - ">="
109
123
  - !ruby/object:Gem::Version
110
- version: '0.6'
124
+ version: 0.52.1
111
125
  description: Add generator meta tag in html files.
112
126
  email:
113
127
  - terra@e2esound.com
@@ -116,6 +130,7 @@ extensions: []
116
130
  extra_rdoc_files: []
117
131
  files:
118
132
  - ".gitignore"
133
+ - ".rubocop.yml"
119
134
  - ".travis.yml"
120
135
  - CODE_OF_CONDUCT.md
121
136
  - Gemfile
@@ -148,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
148
163
  requirements:
149
164
  - - ">="
150
165
  - !ruby/object:Gem::Version
151
- version: 2.0.0
166
+ version: 2.2.0
152
167
  required_rubygems_version: !ruby/object:Gem::Requirement
153
168
  requirements:
154
169
  - - ">="
@@ -156,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
156
171
  version: '0'
157
172
  requirements: []
158
173
  rubyforge_project:
159
- rubygems_version: 2.5.1
174
+ rubygems_version: 2.7.3
160
175
  signing_key:
161
176
  specification_version: 4
162
177
  summary: Add generator meta tag in html files.