diff --git a/.env.sample b/.env.sample index 20b9a50..e5cdca7 100644 --- a/.env.sample +++ b/.env.sample @@ -7,6 +7,7 @@ ALGOLIA_API_KEY= ALGOLIA_SEARCH_KEY= ALGOLIA_PREFIX=devsite-dev- GOOGLE_ANALYTICS= +GOOGLE_API= ROLLBAR_CLIENT_TOKEN= RACK_ENV=development SKIP_DOCS=false diff --git a/Gemfile b/Gemfile index 463ac08..4b82a66 100644 --- a/Gemfile +++ b/Gemfile @@ -13,32 +13,32 @@ # limitations under the License. source 'https://rubygems.org' -ruby '2.2.9' +ruby '3.3.7' -gem 'slugize', '>= 0.0.3' -gem 'jekyll', '>= 3.0.3' +gem 'slugize' +gem 'jekyll' gem 'jekyll-paginate' -gem 'bundler', '>= 1.7.9' -gem 'rack', '< 1.6.0' -gem 'rack-contrib', '>= 1.2.0' -gem 'nokogiri', '>= 1.6.3.1' -gem 'algoliasearch', '>= 1.6.1' -gem 'htmlentities', '>= 4.3.2' -gem 'rubyzip', '>=1.1.6' -gem 'dotenv', '>= 0.11.1' -gem 'newrelic_rpm', '>= 3.9.8.273' -gem 'rack-wwwhisper', '>= 1.0' -gem 'uglifier', '>= 2.7.0' -gem 'googlestaticmap', '>= 1.2.2' -gem 'rack-rewrite', '>= 1.5.0' -gem 'rack-ssl-enforcer', '>= 0.2.9' -gem 'rack-xframe-options', '>= 0.1.2' +gem 'bundler' +gem 'rack' +gem 'rack-contrib' +gem 'nokogiri' +gem 'algoliasearch' +gem 'htmlentities' +gem 'rubyzip' +gem 'dotenv' +gem 'newrelic_rpm' +gem 'rack-wwwhisper' +gem 'uglifier' +gem 'googlestaticmap' +gem 'rack-rewrite' +gem 'rack-ssl-enforcer' +gem 'rack-xframe-options' gem 'rack-host-redirect' gem 'pygments.rb' gem 'redcarpet' group :development, :test do - gem 'rspec', '>= 3.1.0' - gem 'simplecov', '>= 0.9.1' - gem 'rubocop', '>= 0.28.0' + gem 'rspec' + gem 'simplecov' + gem 'rubocop' end diff --git a/Gemfile.lock b/Gemfile.lock index 77ea19b..b59725d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,138 +1,244 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.3.8) - algoliasearch (1.7.0) - httpclient (~> 2.4) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) - ast (2.2.0) - colorator (0.1) - diff-lcs (1.2.5) - docile (1.1.5) - dotenv (2.1.0) - execjs (2.6.0) - ffi (1.9.10) - git-version-bump (0.15.1) - googlestaticmap (1.2.2) + ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.9) + colorator (1.1.0) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + csv (3.3.2) + diff-lcs (1.6.0) + docile (1.4.1) + dotenv (3.1.7) + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + eventmachine (1.2.7) + execjs (2.10.0) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-aarch64-linux-musl) + ffi (1.17.1-arm-linux-gnu) + ffi (1.17.1-arm-linux-musl) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.1-x86_64-linux-musl) + forwardable-extended (2.6.0) + google-protobuf (4.29.3) + bigdecimal + rake (>= 13) + google-protobuf (4.29.3-aarch64-linux) + bigdecimal + rake (>= 13) + google-protobuf (4.29.3-arm64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.29.3-x86_64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.29.3-x86_64-linux) + bigdecimal + rake (>= 13) + googlestaticmap (1.2.6) htmlentities (4.3.4) - httpclient (2.7.1) - jekyll (3.1.2) - colorator (~> 0.1) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) - mercenary (~> 0.3.3) - rouge (~> 1.7) + http_parser.rb (0.8.0) + httpclient (2.9.0) + mutex_m + i18n (1.14.7) + concurrent-ruby (~> 1.0) + jekyll (4.4.1) + addressable (~> 2.4) + base64 (~> 0.2) + colorator (~> 1.0) + csv (~> 3.0) + em-websocket (~> 0.5) + i18n (~> 1.0) + jekyll-sass-converter (>= 2.0, < 4.0) + jekyll-watch (~> 2.0) + json (~> 2.6) + kramdown (~> 2.3, >= 2.3.1) + kramdown-parser-gfm (~> 1.0) + liquid (~> 4.0) + mercenary (~> 0.3, >= 0.3.6) + pathutil (~> 0.9) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-paginate (1.1.0) - jekyll-sass-converter (1.4.0) - sass (~> 3.4) - jekyll-watch (1.3.1) + jekyll-sass-converter (3.1.0) + sass-embedded (~> 1.75) + jekyll-watch (2.2.1) listen (~> 3.0) - json (1.8.3) - kramdown (1.9.0) - liquid (3.0.6) - listen (3.0.6) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) - mercenary (0.3.5) - mini_portile2 (2.0.0) - net-http-persistent (2.9.4) - newrelic_rpm (3.14.2.312) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - parser (2.3.0.2) - ast (~> 2.2) - posix-spawn (0.3.11) - powerpack (0.1.1) - pygments.rb (0.6.3) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.2.0) - rack (1.5.5) - rack-contrib (1.4.0) - git-version-bump (~> 0.15) - rack (~> 1.4) - rack-host-redirect (1.2.1) + json (2.10.1) + kramdown (2.5.1) + rexml (>= 3.3.9) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + language_server-protocol (3.17.0.4) + lint_roller (1.1.0) + liquid (4.0.4) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mercenary (0.4.0) + mutex_m (0.3.0) + net-http-persistent (4.0.5) + connection_pool (~> 2.2) + newrelic_rpm (9.17.0) + nokogiri (1.18.3-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.3-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.3-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.3-arm-linux-musl) + racc (~> 1.4) + nokogiri (1.18.3-arm64-darwin) + racc (~> 1.4) + nokogiri (1.18.3-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.18.3-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.3-x86_64-linux-musl) + racc (~> 1.4) + parallel (1.26.3) + parser (3.3.7.1) + ast (~> 2.4.1) + racc + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (6.0.1) + pygments.rb (3.0.0) + racc (1.8.1) + rack (3.1.10) + rack-contrib (2.5.0) + rack (< 4) + rack-host-redirect (1.3.0) rack rack-rewrite (1.5.1) rack-ssl-enforcer (0.2.9) - rack-wwwhisper (1.1.9) + rack-wwwhisper (1.1.16) addressable (~> 2.0) - net-http-persistent - rack (~> 1.0) + net-http-persistent (< 5.0) + rack (>= 1.0) rack-xframe-options (0.1.2) rack (>= 0.9.1) - rainbow (2.1.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - redcarpet (3.3.4) - rouge (1.10.1) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.2) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rainbow (3.1.1) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) + redcarpet (3.6.1) + regexp_parser (2.10.0) + rexml (3.4.1) + rouge (4.5.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.3) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - rubocop (0.36.0) - parser (>= 2.3.0.0, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.2) + rubocop (1.73.1) + json (~> 2.3) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) + parallel (~> 1.10) + parser (>= 3.3.0.2) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.38.0, < 2.0) ruby-progressbar (~> 1.7) - ruby-progressbar (1.7.5) - rubyzip (1.1.7) - safe_yaml (1.0.4) - sass (3.4.21) - simplecov (0.11.1) - docile (~> 1.1.0) - json (~> 1.8) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.38.1) + parser (>= 3.3.1.0) + ruby-progressbar (1.13.0) + rubyzip (2.4.1) + safe_yaml (1.0.5) + sass-embedded (1.85.1-aarch64-linux-gnu) + google-protobuf (~> 4.29) + sass-embedded (1.85.1-aarch64-linux-musl) + google-protobuf (~> 4.29) + sass-embedded (1.85.1-arm-linux-gnueabihf) + google-protobuf (~> 4.29) + sass-embedded (1.85.1-arm-linux-musleabihf) + google-protobuf (~> 4.29) + sass-embedded (1.85.1-arm64-darwin) + google-protobuf (~> 4.29) + sass-embedded (1.85.1-x86_64-darwin) + google-protobuf (~> 4.29) + sass-embedded (1.85.1-x86_64-linux-gnu) + google-protobuf (~> 4.29) + sass-embedded (1.85.1-x86_64-linux-musl) + google-protobuf (~> 4.29) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.1) + simplecov_json_formatter (0.1.4) slugize (0.0.3) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - yajl-ruby (1.2.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + uglifier (4.2.1) + execjs (>= 0.3.0, < 3) + unicode-display_width (2.6.0) + webrick (1.9.1) PLATFORMS - ruby + aarch64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-gnueabihf + arm-linux-musl + arm-linux-musleabihf + arm64-darwin + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES - algoliasearch (>= 1.6.1) - bundler (>= 1.7.9) - dotenv (>= 0.11.1) - googlestaticmap (>= 1.2.2) - htmlentities (>= 4.3.2) - jekyll (>= 3.0.3) + algoliasearch + bundler + dotenv + googlestaticmap + htmlentities + jekyll jekyll-paginate - newrelic_rpm (>= 3.9.8.273) - nokogiri (>= 1.6.3.1) + newrelic_rpm + nokogiri pygments.rb - rack (< 1.6.0) - rack-contrib (>= 1.2.0) + rack + rack-contrib rack-host-redirect - rack-rewrite (>= 1.5.0) - rack-ssl-enforcer (>= 0.2.9) - rack-wwwhisper (>= 1.0) - rack-xframe-options (>= 0.1.2) + rack-rewrite + rack-ssl-enforcer + rack-wwwhisper + rack-xframe-options redcarpet - rspec (>= 3.1.0) - rubocop (>= 0.28.0) - rubyzip (>= 1.1.6) - simplecov (>= 0.9.1) - slugize (>= 0.0.3) - uglifier (>= 2.7.0) + rspec + rubocop + rubyzip + simplecov + slugize + uglifier RUBY VERSION - ruby 2.2.9p480 + ruby 3.3.7p123 BUNDLED WITH - 1.14.6 + 2.6.5 diff --git a/_config.yml b/_config.yml index 0c6d145..2534af4 100644 --- a/_config.yml +++ b/_config.yml @@ -27,7 +27,7 @@ plugins_dir: plugins/ debug: true -gems: [jekyll-paginate] +plugins: [jekyll-paginate] # Blog Options permalink: none diff --git a/plugins/generator_meetups.rb b/plugins/generator_meetups.rb index 4bdb428..df2194c 100644 --- a/plugins/generator_meetups.rb +++ b/plugins/generator_meetups.rb @@ -21,7 +21,7 @@ def initialize(config) def generate(site) @site = site - map = GoogleStaticMap.new(:width => 700, :height => 500) + map = GoogleStaticMap.new(:api_key => site.config['google_maps'], :width => 700, :height => 500) site.data['meetups'].each do |meetup| map.markers << MapMarker.new(:color => "0x9D49D5FF", :location => MapLocation.new(:latitude => meetup['pin']['latitude'], diff --git a/plugins/jekyll_document.rb b/plugins/jekyll_document.rb index 4fb6c5b..6b40e62 100644 --- a/plugins/jekyll_document.rb +++ b/plugins/jekyll_document.rb @@ -23,10 +23,11 @@ class Document alias_method :parent_to_liquid, :to_liquid def to_liquid - Utils.deep_merge_hashes parent_to_liquid, { - 'toc' => toc, - 'related_docs' => related_docs - } + parent_to_liquid + # Utils.deep_merge_hashes parent_to_liquid, { + # 'toc' => toc, + # 'related_docs' => related_docs + # } end private diff --git a/source/_data/env.yaml b/source/_data/env.yaml index f6d6310..7550115 100644 --- a/source/_data/env.yaml +++ b/source/_data/env.yaml @@ -34,6 +34,8 @@ env: DOCS_URL - config: google_analytics env: GOOGLE_ANALYTICS +- config: google_maps + env: GOOGLE_MAPS - config: debug env: DEBUG - config: sdk_bucket diff --git a/source/_includes/mainmenu.html b/source/_includes/mainmenu.html index 5fafbe3..b1e81ec 100644 --- a/source/_includes/mainmenu.html +++ b/source/_includes/mainmenu.html @@ -1,23 +1,37 @@ {% comment %} - Copyright 2025 Google LLC +Copyright 2025 Google LLC - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 +http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. {% endcomment %} - - - - - - - + + + + + + + diff --git a/source/_includes/search.html b/source/_includes/search.html index 264b26e..551f617 100644 --- a/source/_includes/search.html +++ b/source/_includes/search.html @@ -1,22 +1,23 @@ {% comment %} - Copyright 2025 Google LLC +Copyright 2025 Google LLC - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 +http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. {% endcomment %} diff --git a/source/_layouts/sidebar_narrow.html b/source/_layouts/sidebar_narrow.html index cea1e22..119fc46 100644 --- a/source/_layouts/sidebar_narrow.html +++ b/source/_layouts/sidebar_narrow.html @@ -5,7 +5,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -16,7 +16,8 @@ layout: master --- -