pageflow-chart 2.4.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eaf6b87c76738d2e7efa81a3732a96ef09820bc1b2ca74e9a6e79c71532862c
-  data.tar.gz: 8ad985582dbd2205427546becca4aaa6033394f6c5b6b91e6be69f248bf7f9e4
+  metadata.gz: 37c0ed62a0b2f6cdc20c35554be884a13c8d784dee430b4f35d7844b3a350ef3
+  data.tar.gz: 4e003683b187ea0dd1b7df9a7a7e8408fe2ccb7997a23e052de3a8d8022d5ba1
 SHA512:
-  metadata.gz: f95634d293e9fe2c59600172e89e07ca177166ae1da0224bdbb96c8331a4406e68d7650fcc89c360f8ddbdeca5f81deaa66fe030a97470d7dd5f4c49f5baacb6
-  data.tar.gz: 5127f6494bd7819de6f6203b96f4cf5a6074db0953ee5d06fff2c5b0337f699bd5794fc0070267a9cfbb8c86c314e94707a235f81fc8e6fd9c199b6a2100f032
+  metadata.gz: 8bf0e9acaa44d3333ad97cd8c44a66d34f9d62c8e52b89e173f6ecbbb39697d460a9798a77aee5a684fb2eb1d7e96c6d699058f9b83dcee932e0dbc0519c3918
+  data.tar.gz: 9fa7d5e26a90167110a89601425e92ca21abf042c1bbe591f1d5a6f8b3718bca3ec7714eb089a1a5c8cb57887471018b1e3785e230385626f1608419f7a28dcd

data/.github/workflows/tests.yml

@@ -0,0 +1,6 @@
+name: tests
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  call-workflow:
+    uses: codevise/pageflow/.github/workflows/reusable-workflow-rspec.yml@master

data/CHANGELOG.md

@@ -1,20 +1,15 @@
 # CHANGELOG
 
-### Version 2.4.0
+### Version 2.6.0
 
-2022-07-18
+2024-01-15
 
-[Compare changes](https://github.com/codevise/pageflow-chart/compare/2-3-stable...v2.4.0)
+[Compare changes](https://github.com/codevise/pageflow-chart/compare/2-5-stable...v2.6.0)
 
-- Use rebrushed button style in editor
-  ([#61](https://github.com/codevise/pageflow-chart/pull/61))
-- Make chart urls protocol relative
-  ([#60](https://github.com/codevise/pageflow-chart/pull/60))
-- Display original chart instead of scraped site
-  ([#59](https://github.com/codevise/pageflow-chart/pull/59))
-- Embed opt-in
-  ([#58](https://github.com/codevise/pageflow-chart/pull/58))
+- Support Pageflow 17
+  ([#64](https://github.com/codevise/pageflow-chart/pull/64),
+   [#63](https://github.com/codevise/pageflow-chart/pull/63))
 
 See
-[2-3-stable branch](https://github.com/codevise/pageflow-chart/blob/2-3-stable/CHANGELOG.md)
+[2-5-stable branch](https://github.com/codevise/pageflow-chart/blob/2-5-stable/CHANGELOG.md)
 for previous changes.

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in chart.gemspec
 gemspec
+
+if ENV['PAGEFLOW_DEPENDENCIES'] == 'experimental'
+  git 'https://github.com/codevise/pageflow', branch: 'edge', glob: '**/*.gemspec' do
+    gem 'pageflow'
+    gem 'pageflow-support'
+  end
+end

data/README.md

@@ -1,7 +1,7 @@
 # Pageflow Chart
 
 [![Gem Version](https://badge.fury.io/rb/pageflow-chart.svg)](http://badge.fury.io/rb/pageflow-chart)
-[![Build Status](https://travis-ci.org/codevise/pageflow-chart.svg?branch=master)](https://travis-ci.org/codevise/pageflow-chart)
+[![Build Status](https://github.com/codevise/pageflow-chart/workflows/tests/badge.svg)](https://github.com/codevise/pageflow-chart/actions)
 
 Page type showing scraped svg diagramms from Datawrapper.
 

data/chart.gemspec

@@ -16,17 +16,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.1'
+  spec.required_ruby_version = '>= 2.1'
 
-  spec.add_runtime_dependency 'pageflow', '~> 15.7.x'
+  spec.add_runtime_dependency 'pageflow', ['>= 15.7', '< 18']
   spec.add_runtime_dependency 'nokogiri', '~> 1.0'
   spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
 
-  spec.add_development_dependency 'pageflow-support', '~> 15.x'
   spec.add_development_dependency 'bundler', ['>= 1.0', '< 3']
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec-rails', '~> 3.0'
   spec.add_development_dependency 'factory_bot_rails', '~> 4.8'
+  spec.add_development_dependency 'pageflow-support', ['>= 15.0', '< 18']
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec-rails', '~> 6.0'
   spec.add_development_dependency 'webmock', '~> 3.0'
 
   # Semantic versioning rake tasks

data/lib/pageflow/chart/downloader.rb

@@ -13,7 +13,7 @@ module Pageflow
       end
 
       def load(url, raise_on_http_error: false)
-        file = open(make_absolute(url))
+        file = make_absolute(url).open
         yield(file)
       rescue OpenURI::HTTPError => exception
         Rails.logger.error "Exception loading url #{url}: #{exception.message}"

data/lib/pageflow/chart/engine.rb

@@ -1,11 +1,28 @@
 require 'pageflow-public-i18n'
+require 'sprockets/rails'
 
 module Pageflow
   module Chart
     class Engine < Rails::Engine
       isolate_namespace Pageflow::Chart
 
-      config.paths.add('lib', eager_load: true)
+      if Rails.respond_to?(:autoloaders)
+        lib = root.join('lib')
+
+        config.autoload_paths << lib
+        config.eager_load_paths << lib
+
+        initializer 'pageflow_chart.autoloading' do
+          Rails.autoloaders.main.ignore(
+            lib.join('generators'),
+            lib.join('pageflow/chart/configuration.rb'),
+            lib.join('pageflow/chart/version.rb')
+          )
+        end
+      else
+        config.autoload_paths << File.join(config.root, 'lib')
+      end
+
       config.assets.precompile += ['pageflow/chart/custom.css', 'pageflow/chart/transparent_background.css']
       config.i18n.load_path += Dir[config.root.join('config', 'locales', '**', '*.yml').to_s]
 

data/lib/pageflow/chart/page_type.rb

@@ -8,7 +8,7 @@ module Pageflow
       end
 
       def json_seed_template
-        'pageflow/chart/page_type.json.jbuilder'
+        'pageflow/chart/page_type'
       end
 
       def file_types

data/lib/pageflow/chart/refresh_tag_following_downloader.rb

@@ -10,7 +10,7 @@ module Pageflow
       class NoUrlInRefreshMetaTag < StandardError; end
 
       def load_following_refresh_tags(url, options = {}, redirect_count = 0, &block)
-        load(url, options) do |file|
+        load(url, **options) do |file|
           if (redirect_url = find_refresh_meta_tag_url(file.read))
             if redirect_count >= MAX_REDIRECT_COUNT
               raise TooManyRedirects, 'Too many redirects via refresh meta tags.'

data/lib/pageflow/chart/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module Chart
-    VERSION = '2.4.0'.freeze
+    VERSION = '2.6.0'.freeze
   end
 end

data/lib/pageflow/chart.rb

@@ -1,4 +1,6 @@
 require 'pageflow/chart/engine'
+require 'pageflow/chart/configuration'
+require 'pageflow/chart/version'
 
 module Pageflow
   module Chart

data/spec/pageflow/chart/refresh_tag_following_downloader_spec.rb

@@ -17,7 +17,7 @@ module Pageflow
           result = ''
 
           allow(downloader).to receive(:load)
-            .with(original_url, {})
+            .with(original_url, any_args)
             .and_yield(StringIO.new(chart_html))
 
           refresh_tag_following_downloader.load_following_refresh_tags(original_url) do |file|
@@ -57,11 +57,11 @@ module Pageflow
           result = ''
 
           allow(downloader).to receive(:load)
-            .with(original_url, {})
+            .with(original_url, any_args)
             .and_yield(StringIO.new(redirect_html))
 
           allow(downloader).to receive(:load)
-            .with(target_url, {})
+            .with(target_url, any_args)
             .and_yield(StringIO.new(chart_html))
 
           refresh_tag_following_downloader.load_following_refresh_tags(original_url) do |file|
@@ -88,11 +88,11 @@ module Pageflow
           result = ''
 
           allow(downloader).to receive(:load)
-            .with(original_url, {})
+            .with(original_url, any_args)
             .and_yield(StringIO.new(redirect_html))
 
           allow(downloader).to receive(:load)
-            .with(target_url, {})
+            .with(target_url, any_args)
             .and_yield(StringIO.new(chart_html))
 
           refresh_tag_following_downloader.load_following_refresh_tags(original_url) do |file|
@@ -119,11 +119,11 @@ module Pageflow
           result = ''
 
           allow(downloader).to receive(:load)
-            .with(original_url, {})
+            .with(original_url, any_args)
             .and_yield(StringIO.new(redirect_html))
 
           allow(downloader).to receive(:load)
-            .with(target_url, {})
+            .with(target_url, any_args)
             .and_yield(StringIO.new(chart_html))
 
           refresh_tag_following_downloader.load_following_refresh_tags(original_url) do |file|
@@ -143,7 +143,7 @@ module Pageflow
             <html><head><meta http-equiv="REFRESH" content="0; url=#{original_url}"></head></html>
           HTML
 
-          allow(downloader).to receive(:load).with(original_url, {}) do |&block|
+          allow(downloader).to receive(:load).with(original_url, any_args) do |&block|
             block.call(StringIO.new(redirect_html))
           end
 
@@ -162,7 +162,7 @@ module Pageflow
             <html><head><meta http-equiv="REFRESH" content="something strange"></head></html>
           HTML
 
-          allow(downloader).to receive(:load).with(original_url, {}).and_yield(StringIO.new(redirect_html))
+          allow(downloader).to receive(:load).with(original_url, any_args).and_yield(StringIO.new(redirect_html))
 
           expect {
             refresh_tag_following_downloader.load_following_refresh_tags(original_url)
@@ -179,7 +179,7 @@ module Pageflow
             <html><head><meta http-equiv="REFRESH"></head></html>
           HTML
 
-          allow(downloader).to receive(:load).with(original_url, {}).and_yield(StringIO.new(redirect_html))
+          allow(downloader).to receive(:load).with(original_url, any_args).and_yield(StringIO.new(redirect_html))
 
           expect {
             refresh_tag_following_downloader.load_following_refresh_tags(original_url)

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-chart
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '15.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 15.7.x
+        version: '18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '15.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 15.7.x
+        version: '18'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: pageflow-support
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 15.x
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 15.x
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,47 +79,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: pageflow-support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '15.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '15.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '18'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -163,9 +175,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".jshintrc"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -253,7 +265,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -262,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Pagetype for Embedded Datawrapper Charts

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-rvm: 2.3
-
-# User container based travis infrastructure which allows caching
-# features for open source projects.
-sudo: false
-cache: bundler
-
-services:
-  - redis-server
-  - mysql
-
-script:
-  - bin/rspec