pageflow-chart 2.0.0 → 2.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +8 -11
  3. data/app/assets/javascripts/pageflow/chart/page_type.js +3 -6
  4. data/app/views/pageflow/chart/page.html.erb +5 -15
  5. data/chart.gemspec +3 -3
  6. data/lib/pageflow/chart/version.rb +1 -1
  7. data/spec/integration/page_type_spec.rb +8 -0
  8. metadata +16 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2b1435f809acae371c8763fae0b78649d2f7963827319aeb4c1c5dba27a4bd2a
4
- data.tar.gz: 4c2316ed5fb81c380e4d0edf2d223e3fc8d14197e87159f137801162fb736371
3
+ metadata.gz: 69e58dc4cf527ebcc87f4fb761209cbc4c943f851dbbf317c34b1dc386b98b30
4
+ data.tar.gz: d7e671cc45b645abe390dc01ba7db1a59b117dffc9ff873284d5864a9ec2cad7
5
5
  SHA512:
6
- metadata.gz: 2b7f42f5daae277098f64d5fdcd131170dae0fe606a460ee233be7766258e0df47062406c6c077bcd43dd6eb9d30f0e4b2d6f2e5aee3642b17c351296723f056
7
- data.tar.gz: f57e84c97e1db0ef06e6db4a3c93a175cf389dc6e84aaacbc4f135ac70447d5d9a9e60081b793bdfc8ded31e94086a9f838956c113fb0477212888befb9a2ddc
6
+ metadata.gz: fe79c1727ae70e0184a93c568fc042edcbaddf86ab5d51fda3040dec8a037a57493233271cae64208735c9b3bbc9ece1d72dc5fe07a9e0feddf1d63dd421347d
7
+ data.tar.gz: 29f7ecd19a0dbd9ed7c0f21db3be6bd1cb7a47d71282ea74e6b7077ce7fe28b16fc1453af7a6af3bb7dc78c53aa77c2cfc8be1c2b024b96eac9f94fc79403e68
data/CHANGELOG.md CHANGED
@@ -1,19 +1,16 @@
1
1
  # CHANGELOG
2
2
 
3
- ### Version 2.0.0
3
+ ### Version 2.1.0
4
4
 
5
- 2018-12-10
5
+ 2019-04-08
6
6
 
7
- [Compare changes](https://github.com/codevise/pageflow-chart/compare/1-x-stable...v2.0.0)
7
+ [Compare changes](https://github.com/codevise/pageflow-chart/compare/2-0-stable...v2.1.0)
8
8
 
9
- - Update to Pageflow 13
10
- ([#45](https://github.com/codevise/pageflow-chart/pull/45),
11
- [#47](https://github.com/codevise/pageflow-chart/pull/47),
12
- [#48](https://github.com/codevise/pageflow-chart/pull/48),
13
- [#46](https://github.com/codevise/pageflow-chart/pull/46))
14
- - Fix page template extension
15
- ([#49](https://github.com/codevise/pageflow-chart/pull/49))
9
+ - Adapt page dom for pageflow 14
10
+ ([#51](https://github.com/codevise/pageflow-chart/pull/51))
11
+ - Setup page type lint specs
12
+ ([#50](https://github.com/codevise/pageflow-chart/pull/50))
16
13
 
17
14
  See
18
- [1-x-stable branch](https://github.com/codevise/pageflow-chart/blob/1-x-stable/CHANGELOG.md)
15
+ [2-0-stable branch](https://github.com/codevise/pageflow-chart/blob/2-0-stable/CHANGELOG.md)
19
16
  for previous changes.
data/app/assets/javascripts/pageflow/chart/page_type.js CHANGED
@@ -1,4 +1,4 @@
1
- pageflow.react.registerPageTypeWithDefaultBackground('chart', {
1
+ pageflow.react.registerPageTypeWithDefaultBackground('chart', _.extend({
2
2
 
3
3
  prepareNextPageTimeout: 0,
4
4
 
@@ -143,10 +143,7 @@ pageflow.react.registerPageTypeWithDefaultBackground('chart', {
143
143
  deactivated: function(pageElement, configuration) {},
144
144
 
145
145
  update: function(pageElement, configuration) {
146
- pageElement.find('h2 .tagline').text(configuration.get('tagline') || '');
147
- pageElement.find('h2 .title').text(configuration.get('title') || '');
148
- pageElement.find('h2 .subtitle').text(configuration.get('subtitle') || '');
149
- pageElement.find('p').html(configuration.get('text') || '');
146
+ this.updateDefaultPageContent(pageElement, configuration);
150
147
 
151
148
  pageElement.find('.shadow').css({
152
149
  opacity: configuration.get('gradient_opacity') / 100
@@ -177,4 +174,4 @@ pageflow.react.registerPageTypeWithDefaultBackground('chart', {
177
174
  }
178
175
  });
179
176
  }
180
- });
177
+ }, pageflow.defaultPageContent));
data/app/views/pageflow/chart/page.html.erb CHANGED
@@ -1,7 +1,7 @@
1
- <div class="blackLayer"></div>
1
+ <div class="black_layer"></div>
2
2
  <div class="content_and_background chart_page">
3
- <div class="backgroundArea">
4
- <%= page_background_asset(configuration) %>
3
+ <div class="page_background">
4
+ <%= page_background_asset(page) %>
5
5
  <%= shadow_div :opacity => configuration['gradient_opacity'] %>
6
6
  </div>
7
7
 
@@ -13,18 +13,8 @@
13
13
  </div>
14
14
  <div class="scroller">
15
15
  <div>
16
- <div class="contentWrapper">
17
- <div class="page_header">
18
- <h2>
19
- <span class="tagline"><%= configuration['tagline'] %></span>
20
- <span class="title"><%= configuration['title'] %></span>
21
- <span class="subtitle"><%= configuration['subtitle'] %></span>
22
- </h2>
23
- <%= background_image_tag(configuration['background_image_id'], {"class" => "print_image"}) %>
24
- </div>
25
- <div class="contentText">
26
- <p><%= raw configuration['text'] %></p>
27
- </div>
16
+ <div class="content_wrapper">
17
+ <%= page_default_content(page) %>
28
18
  </div>
29
19
  </div>
30
20
  </div>
data/chart.gemspec CHANGED
@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
18
18
 
19
19
  spec.required_ruby_version = '~> 2.1'
20
20
 
21
- spec.add_runtime_dependency 'pageflow', '~> 13.x'
21
+ spec.add_runtime_dependency 'pageflow', '~> 14.x'
22
22
  spec.add_runtime_dependency 'nokogiri', '~> 1.0'
23
23
  spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
24
24
 
25
- spec.add_development_dependency 'pageflow-support', '~> 13.x'
26
- spec.add_development_dependency 'bundler', '~> 1.0'
25
+ spec.add_development_dependency 'pageflow-support', '~> 14.x'
26
+ spec.add_development_dependency 'bundler', ['>= 1.0', '< 3']
27
27
  spec.add_development_dependency 'rake', '~> 12.0'
28
28
  spec.add_development_dependency 'rspec-rails', '~> 3.0'
29
29
  spec.add_development_dependency 'factory_bot_rails', '~> 4.8'
data/lib/pageflow/chart/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Pageflow
2
2
  module Chart
3
- VERSION = '2.0.0'.freeze
3
+ VERSION = '2.1.0'.freeze
4
4
  end
5
5
  end
data/spec/integration/page_type_spec.rb ADDED
@@ -0,0 +1,8 @@
1
+ require 'spec_helper'
2
+ require 'pageflow/lint'
3
+
4
+ module Pageflow
5
+ module Chart
6
+ Pageflow::Lint.page_type(Chart.page_type)
7
+ end
8
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pageflow-chart
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Codevise Solutions Ltd
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-12-10 00:00:00.000000000 Z
11
+ date: 2019-04-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pageflow
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 13.x
19
+ version: 14.x
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: 13.x
26
+ version: 14.x
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: nokogiri
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,34 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 13.x
61
+ version: 14.x
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 13.x
68
+ version: 14.x
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bundler
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '1.0'
76
+ - - "<"
77
+ - !ruby/object:Gem::Version
78
+ version: '3'
76
79
  type: :development
77
80
  prerelease: false
78
81
  version_requirements: !ruby/object:Gem::Requirement
79
82
  requirements:
80
- - - "~>"
83
+ - - ">="
81
84
  - !ruby/object:Gem::Version
82
85
  version: '1.0'
86
+ - - "<"
87
+ - !ruby/object:Gem::Version
88
+ version: '3'
83
89
  - !ruby/object:Gem::Dependency
84
90
  name: rake
85
91
  requirement: !ruby/object:Gem::Requirement
@@ -219,6 +225,7 @@ files:
219
225
  - spec/controllers/pageflow/chart/scraped_sites_controller_spec.rb
220
226
  - spec/factories/scraped_sites.rb
221
227
  - spec/fixtures/datawrapper.html
228
+ - spec/integration/page_type_spec.rb
222
229
  - spec/jobs/pageflow/chart/scrape_site_job_spec.rb
223
230
  - spec/models/pageflow/chart/scraped_site_spec.rb
224
231
  - spec/pageflow/chart/configuration_spec.rb
@@ -260,6 +267,7 @@ test_files:
260
267
  - spec/controllers/pageflow/chart/scraped_sites_controller_spec.rb
261
268
  - spec/factories/scraped_sites.rb
262
269
  - spec/fixtures/datawrapper.html
270
+ - spec/integration/page_type_spec.rb
263
271
  - spec/jobs/pageflow/chart/scrape_site_job_spec.rb
264
272
  - spec/models/pageflow/chart/scraped_site_spec.rb
265
273
  - spec/pageflow/chart/configuration_spec.rb