pageflow-panorama 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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +10 -16
  3. data/app/assets/javascripts/pageflow/panorama/page_type.js +2 -5
  4. data/app/assets/stylesheets/pageflow/panorama.scss +1 -1
  5. data/app/views/pageflow/panorama/page.html.erb +5 -15
  6. data/db/migrate/20190307093122_copy_panorama_package_attributes_of_failed_uploads.rb +21 -0
  7. data/lib/pageflow/panorama/version.rb +1 -1
  8. data/pageflow-panorama.gemspec +3 -3
  9. data/spec/integration/page_type_spec.rb +4 -0
  10. metadata +17 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 500c7e9bed41c89b126e3793d0f958fa472a7749ebd31c02045f44840fcf5d8c
4
- data.tar.gz: 3a6f4ab360d1e5d0c16dc58a903b4d5e356c14360350aa04432dea0d0ebd0f28
3
+ metadata.gz: c457397c261ea9a1ade84a3bb97a17f20fa7268bbb3c9d23a0e46e96e7b240f3
4
+ data.tar.gz: a1bcf318d142760ec391a51b2237fa5d76595653f9a104ea3e45624c6859b000
5
5
  SHA512:
6
- metadata.gz: 3945f9b655595abb18f7fab80f73d71b69a5ab580f750190883043ccbaa30756c4cafb195c448aa8dbc51924cecfa25b9d32ac1d5c62f604aded5224fff941b5
7
- data.tar.gz: fd41e73d383a9f316f48ba6f45116484849e0faf5e1645bf4d398865d35a1e78434898c0af50fd829eb46b0ceebe78f63aea549158947601ea355f50c1785e2a
6
+ metadata.gz: e3e8c34ed50b57fc2d8127d811b795b7199180037a6171c38d48016472f705fd223476c1dcde4510d8bc1bf7f4a3d004f9a5ef5868f2f4848e5a1311b3860a52
7
+ data.tar.gz: 12792526b512f691eafca8bb58cda0b4f5e228c9747d4e57677a3fc1444486ffbc30478f999ff0568736f20c81e997d26e8e77bdeae7cde15d083703ef069a1d
data/CHANGELOG.md CHANGED
@@ -1,24 +1,18 @@
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-panorama/compare/1-x-stable...v2.0.0)
7
+ [Compare changes](https://github.com/codevise/pageflow-panorama/compare/2-0-stable...v2.1.0)
8
8
 
9
- - Migrate to Pageflow 13
10
- ([#22](https://github.com/codevise/pageflow-panorama/pull/22))
11
- - Set package attachment in specs
12
- ([#27](https://github.com/codevise/pageflow-panorama/pull/27))
13
- - Replace hostedfile.columns in migration
14
- ([#26](https://github.com/codevise/pageflow-panorama/pull/26))
15
- - Migrate unpacking to aws-sdk-s3 api
16
- ([#25](https://github.com/codevise/pageflow-panorama/pull/25))
17
- - Turn lib into eager load path
18
- ([#24](https://github.com/codevise/pageflow-panorama/pull/24))
19
- - Add options parameter to io adapter initializer
20
- ([#23](https://github.com/codevise/pageflow-panorama/pull/23))
9
+ - Adapt page dom for pageflow 14
10
+ ([#31](https://github.com/codevise/pageflow-panorama/pull/31))
11
+ - Setup page type lint specs
12
+ ([#30](https://github.com/codevise/pageflow-panorama/pull/30))
13
+ - Allow bundler 2 in development dependencies
14
+ ([#29](https://github.com/codevise/pageflow-panorama/pull/29))
21
15
 
22
16
  See
23
- [1-x-stable branch](https://github.com/codevise/pageflow-panorama/blob/1-x-stable/CHANGELOG.md)
17
+ [2-0-stable branch](https://github.com/codevise/pageflow-panorama/blob/2-0-stable/CHANGELOG.md)
24
18
  for previous changes.
data/app/assets/javascripts/pageflow/panorama/page_type.js CHANGED
@@ -48,10 +48,7 @@ pageflow.pageType.register('panorama', _.extend({
48
48
  deactivated: function(pageElement, configuration) {},
49
49
 
50
50
  update: function(pageElement, configuration) {
51
- pageElement.find('h2 .tagline').text(configuration.get('tagline') || '');
52
- pageElement.find('h2 .title').text(configuration.get('title') || '');
53
- pageElement.find('h2 .subtitle').text(configuration.get('subtitle') || '');
54
- pageElement.find('p').html(configuration.get('text') || '');
51
+ this.updateDefaultPageContent(pageElement, configuration);
55
52
 
56
53
  this.updateInfoBox(pageElement, configuration);
57
54
  this.updateCommonPageCssClasses(pageElement, configuration);
@@ -102,4 +99,4 @@ pageflow.pageType.register('panorama', _.extend({
102
99
  }
103
100
  };
104
101
  }
105
- }, pageflow.commonPageCssClasses, pageflow.infoBox));
102
+ }, pageflow.commonPageCssClasses, pageflow.infoBox, pageflow.defaultPageContent));
data/app/assets/stylesheets/pageflow/panorama.scss CHANGED
@@ -3,7 +3,7 @@
3
3
  .js .panorama_page {
4
4
  overflow: hidden;
5
5
 
6
- .contentText {
6
+ .page_text {
7
7
  margin-bottom: 200px;
8
8
 
9
9
  @include phone {
data/app/views/pageflow/panorama/page.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div class="blackLayer"></div>
1
+ <div class="black_layer"></div>
2
2
  <div class="content_and_background panorama_page">
3
3
  <div class="close_button text_hidden_only" tabindex="4" title="<%= t('pageflow.public.panorama.close') %>">
4
4
  <div class="label">
@@ -6,9 +6,9 @@
6
6
  </div>
7
7
  </div>
8
8
 
9
- <div class="backgroundArea page_background page_background-for_page_with_player_controls">
9
+ <div class="page_background page_background-for_page_with_player_controls">
10
10
  <%= background_image_div(configuration, 'fallback_image') %>
11
- <%= content_tag(:div, class: 'videoWrapper iframeWrapper', data: {panorama_url: panorama_url(configuration) }) do %>
11
+ <%= content_tag(:div, class: 'uncropped_media_wrapper iframeWrapper', data: {panorama_url: panorama_url(configuration) }) do %>
12
12
  <% end %>
13
13
  <%= shadow_div :opacity => configuration['gradient_opacity'] %>
14
14
  </div>
@@ -29,18 +29,8 @@
29
29
 
30
30
  <div class="scroller">
31
31
  <div>
32
- <div class="contentWrapper">
33
- <div class="page_header">
34
- <h2>
35
- <span class="tagline"><%= configuration['tagline'] %></span>
36
- <span class="title"><%= configuration['title'] %></span>
37
- <span class="subtitle"><%= configuration['subtitle'] %></span>
38
- <%= background_image_tag(configuration['fallback_image_id'], {"class" => "print_image"}) %>
39
- </h2>
40
- </div>
41
- <div class="contentText">
42
- <p><%= raw configuration['text'] %></p>
43
- </div>
32
+ <div class="content_wrapper">
33
+ <%= page_default_content(page) %>
44
34
  </div>
45
35
  </div>
46
36
  </div>
data/db/migrate/20190307093122_copy_panorama_package_attributes_of_failed_uploads.rb ADDED
@@ -0,0 +1,21 @@
1
+ class CopyPanoramaPackageAttributesOfFailedUploads < ActiveRecord::Migration[5.2]
2
+ def up
3
+ execute("UPDATE pageflow_panorama_packages pp
4
+ SET pp.attachment_on_s3_file_name = pp.attachment_on_filesystem_file_name,
5
+ pp.attachment_on_s3_content_type = pp.attachment_on_filesystem_content_type,
6
+ pp.attachment_on_s3_file_size = pp.attachment_on_filesystem_file_size,
7
+ pp.attachment_on_s3_updated_at = pp.attachment_on_filesystem_updated_at,
8
+ pp.state = 'uploading_failed'
9
+ WHERE pp.state = 'uploading_to_s3_failed';")
10
+ end
11
+
12
+ def down
13
+ execute("UPDATE pageflow_panorama_packages pp
14
+ SET pp.attachment_on_s3_file_name = NULL,
15
+ pp.attachment_on_s3_content_type = NULL,
16
+ pp.attachment_on_s3_file_size = NULL,
17
+ pp.attachment_on_s3_updated_at = NULL,
18
+ pp.state = 'uploading_to_s3_failed'
19
+ WHERE pp.state = 'uploading_failed';")
20
+ end
21
+ end
data/lib/pageflow/panorama/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Pageflow
2
2
  module Panorama
3
- VERSION = '2.0.0'.freeze
3
+ VERSION = '2.1.0'.freeze
4
4
  end
5
5
  end
data/pageflow-panorama.gemspec CHANGED
@@ -18,13 +18,13 @@ 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 'rubyzip', '~> 1.1'
23
23
  spec.add_runtime_dependency 'aws-sdk-s3', '~> 1.17'
24
24
  spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
25
25
 
26
- spec.add_development_dependency 'pageflow-support', '~> 13.x'
27
- spec.add_development_dependency 'bundler', '~> 1.0'
26
+ spec.add_development_dependency 'pageflow-support', '~> 14.x'
27
+ spec.add_development_dependency 'bundler', ['>= 1.0', '< 3']
28
28
  spec.add_development_dependency 'rake', '~> 12.0'
29
29
  spec.add_development_dependency 'rspec-rails', '~> 3.7'
30
30
  spec.add_development_dependency 'factory_bot_rails', '~> 4.8'
data/spec/integration/page_type_spec.rb ADDED
@@ -0,0 +1,4 @@
1
+ require 'spec_helper'
2
+ require 'pageflow/lint'
3
+
4
+ Pageflow::Lint.page_type(Pageflow::Panorama.page_type)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pageflow-panorama
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
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: rubyzip
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,34 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 13.x
75
+ version: 14.x
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 13.x
82
+ version: 14.x
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bundler
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: '1.0'
90
+ - - "<"
91
+ - !ruby/object:Gem::Version
92
+ version: '3'
90
93
  type: :development
91
94
  prerelease: false
92
95
  version_requirements: !ruby/object:Gem::Requirement
93
96
  requirements:
94
- - - "~>"
97
+ - - ">="
95
98
  - !ruby/object:Gem::Version
96
99
  version: '1.0'
100
+ - - "<"
101
+ - !ruby/object:Gem::Version
102
+ version: '3'
97
103
  - !ruby/object:Gem::Dependency
98
104
  name: rake
99
105
  requirement: !ruby/object:Gem::Requirement
@@ -193,6 +199,7 @@ files:
193
199
  - config/pageflow_panorama.rb.example
194
200
  - db/migrate/20140915133249_create_packages.rb
195
201
  - db/migrate/20160824115300_add_parent_file_to_packages.rb
202
+ - db/migrate/20190307093122_copy_panorama_package_attributes_of_failed_uploads.rb
196
203
  - lib/generators/pageflow_panorama/install/install_generator.rb
197
204
  - lib/pageflow-panorama.rb
198
205
  - lib/pageflow/panorama/archive.rb
@@ -213,6 +220,7 @@ files:
213
220
  - spec/fixtures/krpano.zip
214
221
  - spec/fixtures/krpano_with_unprocessable_thumbnail.zip
215
222
  - spec/fixtures/some.txt.zip
223
+ - spec/integration/page_type_spec.rb
216
224
  - spec/models/pageflow/panorama/package_spec.rb
217
225
  - spec/pageflow/panorama/job_status_attributes_spec.rb
218
226
  - spec/pageflow/panorama/unpack_to_s3_spec.rb
@@ -250,6 +258,7 @@ test_files:
250
258
  - spec/fixtures/krpano.zip
251
259
  - spec/fixtures/krpano_with_unprocessable_thumbnail.zip
252
260
  - spec/fixtures/some.txt.zip
261
+ - spec/integration/page_type_spec.rb
253
262
  - spec/models/pageflow/panorama/package_spec.rb
254
263
  - spec/pageflow/panorama/job_status_attributes_spec.rb
255
264
  - spec/pageflow/panorama/unpack_to_s3_spec.rb