pageflow-panorama 2.1.0 → 2.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/tests.yml +6 -0
- data/CHANGELOG.md +6 -10
- data/Gemfile +3 -0
- data/README.md +1 -1
- data/app/assets/javascripts/pageflow/panorama/editor/models/package.js +1 -1
- data/app/assets/stylesheets/pageflow/panorama/editor.scss +1 -1
- data/app/helpers/pageflow/panorama/packages_helper.rb +3 -1
- data/app/models/pageflow/panorama/package.rb +12 -3
- data/lib/pageflow/panorama/page_type.rb +15 -7
- data/lib/pageflow/panorama/version.rb +1 -1
- data/pageflow-panorama.gemspec +2 -2
- data/spec/factories/panorama_package.rb +11 -0
- data/spec/helpers/pageflow/panorama/packages_helper_spec.rb +44 -0
- data/spec/integration/file_type_spec.rb +10 -0
- data/spec/support/config/factory_bot.rb +14 -0
- metadata +32 -13
- data/.travis.yml +0 -10
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 14a1c0d1d6a8183d7b0cdaf7924d391da6fc5cd5807afc2afb967dfc8f848244
|
|
4
|
+
data.tar.gz: 0dee2b56cf1e39485032be7d3a2c1f362382684b84cc1178aefe6a2432887fd6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 78c38565277d6fa7b787c8e6b95d61cac83234d3bd2af3a7d69d3c2cfa8a38d1cd27def67099ef1ab526ba3f093118a94d1b6d0647649a25143c05bf517b2068
|
|
7
|
+
data.tar.gz: 21d734ba5fe809872778169584fec2558ef569c30f2fa107e99af572d8733679e8b4505bc2b5b5e23d7ef3af27bcfaa36d87f9fa2a6d619331cf882488c8580e
|
data/CHANGELOG.md
CHANGED
|
@@ -1,18 +1,14 @@
|
|
|
1
1
|
# CHANGELOG
|
|
2
2
|
|
|
3
|
-
### Version 2.
|
|
3
|
+
### Version 2.3.0
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
2022-12-28
|
|
6
6
|
|
|
7
|
-
[Compare changes](https://github.com/codevise/pageflow-panorama/compare/2-
|
|
7
|
+
[Compare changes](https://github.com/codevise/pageflow-panorama/compare/2-2-stable...v2.3.0)
|
|
8
8
|
|
|
9
|
-
-
|
|
10
|
-
([#
|
|
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))
|
|
9
|
+
- Add support for Pageflow 16
|
|
10
|
+
([#36](https://github.com/codevise/pageflow-panorama/pull/36))
|
|
15
11
|
|
|
16
12
|
See
|
|
17
|
-
[2-
|
|
13
|
+
[2-2-stable branch](https://github.com/codevise/pageflow-panorama/blob/2-2-stable/CHANGELOG.md)
|
|
18
14
|
for previous changes.
|
data/Gemfile
CHANGED
data/README.md
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# Pageflow Panorama
|
|
2
2
|
|
|
3
3
|
[](http://badge.fury.io/rb/pageflow-panorama)
|
|
4
|
-
[](https://github.com/codevise/pageflow-panorama/actions)
|
|
5
5
|
|
|
6
6
|
Page type showing 360° panoramas in embedded iframes. Currently
|
|
7
7
|
supported are panoramas by palmsfilm.com, panogate.com and KRPano via
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
module Pageflow
|
|
2
2
|
module Panorama
|
|
3
3
|
module PackagesHelper
|
|
4
|
+
include RevisionFileHelper
|
|
5
|
+
|
|
4
6
|
def panorama_url(configuration)
|
|
5
7
|
if configuration['panorama_source'] == 'url'
|
|
6
8
|
configuration['panorama_url']
|
|
7
9
|
else
|
|
8
|
-
package = Package
|
|
10
|
+
package = find_file_in_entry(Package, configuration['panorama_package_id'])
|
|
9
11
|
package ? package.index_document_path : nil
|
|
10
12
|
end
|
|
11
13
|
end
|
|
@@ -3,7 +3,7 @@ require 'zip'
|
|
|
3
3
|
module Pageflow
|
|
4
4
|
module Panorama
|
|
5
5
|
class Package < ActiveRecord::Base
|
|
6
|
-
include
|
|
6
|
+
include UploadableFile
|
|
7
7
|
|
|
8
8
|
processing_state_machine do
|
|
9
9
|
state 'unpacking'
|
|
@@ -14,11 +14,11 @@ module Pageflow
|
|
|
14
14
|
transition any => 'unpacking'
|
|
15
15
|
end
|
|
16
16
|
|
|
17
|
-
event :
|
|
17
|
+
event :retry_unpacking do
|
|
18
18
|
transition 'unpacking_failed' => 'unpacking'
|
|
19
19
|
end
|
|
20
20
|
|
|
21
|
-
before_transition on: :
|
|
21
|
+
before_transition on: :retry_unpacking do |package|
|
|
22
22
|
JobStatusAttributes.reset(package, stage: :unpacking)
|
|
23
23
|
end
|
|
24
24
|
|
|
@@ -47,6 +47,15 @@ module Pageflow
|
|
|
47
47
|
def unpack_base_path
|
|
48
48
|
attachment_on_s3.present? ? File.dirname(attachment_on_s3.path(:unpacked)) : nil
|
|
49
49
|
end
|
|
50
|
+
|
|
51
|
+
# UploadableFile-overrides
|
|
52
|
+
def retry!
|
|
53
|
+
retry_unpacking!
|
|
54
|
+
end
|
|
55
|
+
|
|
56
|
+
def ready?
|
|
57
|
+
unpacked?
|
|
58
|
+
end
|
|
50
59
|
end
|
|
51
60
|
end
|
|
52
61
|
end
|
|
@@ -10,11 +10,7 @@ module Pageflow
|
|
|
10
10
|
end
|
|
11
11
|
|
|
12
12
|
def file_types
|
|
13
|
-
[
|
|
14
|
-
FileType.new(model: Package,
|
|
15
|
-
editor_partial: 'pageflow/panorama/editor/packages/package',
|
|
16
|
-
top_level_type: true)
|
|
17
|
-
]
|
|
13
|
+
[Panorama.package_file_type]
|
|
18
14
|
end
|
|
19
15
|
|
|
20
16
|
def json_seed_template
|
|
@@ -23,10 +19,22 @@ module Pageflow
|
|
|
23
19
|
|
|
24
20
|
def thumbnail_candidates
|
|
25
21
|
[
|
|
26
|
-
{
|
|
27
|
-
|
|
22
|
+
{
|
|
23
|
+
attribute: 'thumbnail_image_id',
|
|
24
|
+
file_collection: 'image_files'
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
attribute: 'panorama_package_id',
|
|
28
|
+
file_collection: 'pageflow_panorama_packages'
|
|
29
|
+
}
|
|
28
30
|
]
|
|
29
31
|
end
|
|
30
32
|
end
|
|
33
|
+
|
|
34
|
+
def self.package_file_type
|
|
35
|
+
FileType.new(model: Package,
|
|
36
|
+
editor_partial: 'pageflow/panorama/editor/packages/package',
|
|
37
|
+
top_level_type: true)
|
|
38
|
+
end
|
|
31
39
|
end
|
|
32
40
|
end
|
data/pageflow-panorama.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', '
|
|
21
|
+
spec.add_runtime_dependency 'pageflow', ['>= 15.0', '< 17']
|
|
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', '
|
|
26
|
+
spec.add_development_dependency 'pageflow-support', ['>= 15.0', '< 17']
|
|
27
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'
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
require 'spec_helper'
|
|
2
|
+
require 'pageflow/used_file_test_helper'
|
|
3
|
+
|
|
4
|
+
module Pageflow
|
|
5
|
+
module Panorama
|
|
6
|
+
describe PackagesHelper do
|
|
7
|
+
include UsedFileTestHelper
|
|
8
|
+
|
|
9
|
+
describe '#panorama_url' do
|
|
10
|
+
context 'URL panorama source' do
|
|
11
|
+
it 'should return specified panorama url when panorama source is URL' do
|
|
12
|
+
@entry = PublishedEntry.new(create(:entry, :published))
|
|
13
|
+
configuration = {
|
|
14
|
+
'panorama_source' => 'url',
|
|
15
|
+
'panorama_url' => 'S3-url'
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
url = helper.panorama_url(configuration)
|
|
19
|
+
expect(url).to eq('S3-url')
|
|
20
|
+
end
|
|
21
|
+
end
|
|
22
|
+
|
|
23
|
+
it 'should return nil if no package can be found' do
|
|
24
|
+
@entry = PublishedEntry.new(create(:entry, :published))
|
|
25
|
+
configuration = {
|
|
26
|
+
'panorama_package_id' => 500
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
expect(helper.panorama_url(configuration)).to be_nil
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
it 'should return the packages index document path' do
|
|
33
|
+
panorama_package_file = create_used_file(:package)
|
|
34
|
+
configuration = {
|
|
35
|
+
'panorama_package_id' => panorama_package_file.perma_id
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
url = helper.panorama_url(configuration)
|
|
39
|
+
expect(url).to match(/#{panorama_package_file.id}\/unpacked\/#{panorama_package_file.perma_id}/)
|
|
40
|
+
end
|
|
41
|
+
end
|
|
42
|
+
end
|
|
43
|
+
end
|
|
44
|
+
end
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
require 'factory_bot_rails'
|
|
2
|
+
|
|
3
|
+
RSpec.configure do |config|
|
|
4
|
+
# Allow to use build and create methods without FactoryBot prefix.
|
|
5
|
+
config.include FactoryBot::Syntax::Methods
|
|
6
|
+
|
|
7
|
+
# Make sure factories are up to date when using spring. Skip in CI
|
|
8
|
+
# since reloading causes factories to be excluded in test coverage.
|
|
9
|
+
unless ENV['CI']
|
|
10
|
+
config.before(:all) do
|
|
11
|
+
FactoryBot.reload
|
|
12
|
+
end
|
|
13
|
+
end
|
|
14
|
+
end
|
metadata
CHANGED
|
@@ -1,29 +1,35 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: pageflow-panorama
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.3.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:
|
|
11
|
+
date: 2022-12-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: pageflow
|
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
|
16
16
|
requirements:
|
|
17
|
-
- - "
|
|
17
|
+
- - ">="
|
|
18
|
+
- !ruby/object:Gem::Version
|
|
19
|
+
version: '15.0'
|
|
20
|
+
- - "<"
|
|
18
21
|
- !ruby/object:Gem::Version
|
|
19
|
-
version:
|
|
22
|
+
version: '17'
|
|
20
23
|
type: :runtime
|
|
21
24
|
prerelease: false
|
|
22
25
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
26
|
requirements:
|
|
24
|
-
- - "
|
|
27
|
+
- - ">="
|
|
28
|
+
- !ruby/object:Gem::Version
|
|
29
|
+
version: '15.0'
|
|
30
|
+
- - "<"
|
|
25
31
|
- !ruby/object:Gem::Version
|
|
26
|
-
version:
|
|
32
|
+
version: '17'
|
|
27
33
|
- !ruby/object:Gem::Dependency
|
|
28
34
|
name: rubyzip
|
|
29
35
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -70,16 +76,22 @@ dependencies:
|
|
|
70
76
|
name: pageflow-support
|
|
71
77
|
requirement: !ruby/object:Gem::Requirement
|
|
72
78
|
requirements:
|
|
73
|
-
- - "
|
|
79
|
+
- - ">="
|
|
80
|
+
- !ruby/object:Gem::Version
|
|
81
|
+
version: '15.0'
|
|
82
|
+
- - "<"
|
|
74
83
|
- !ruby/object:Gem::Version
|
|
75
|
-
version:
|
|
84
|
+
version: '17'
|
|
76
85
|
type: :development
|
|
77
86
|
prerelease: false
|
|
78
87
|
version_requirements: !ruby/object:Gem::Requirement
|
|
79
88
|
requirements:
|
|
80
|
-
- - "
|
|
89
|
+
- - ">="
|
|
90
|
+
- !ruby/object:Gem::Version
|
|
91
|
+
version: '15.0'
|
|
92
|
+
- - "<"
|
|
81
93
|
- !ruby/object:Gem::Version
|
|
82
|
-
version:
|
|
94
|
+
version: '17'
|
|
83
95
|
- !ruby/object:Gem::Dependency
|
|
84
96
|
name: bundler
|
|
85
97
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -163,8 +175,8 @@ executables: []
|
|
|
163
175
|
extensions: []
|
|
164
176
|
extra_rdoc_files: []
|
|
165
177
|
files:
|
|
178
|
+
- ".github/workflows/tests.yml"
|
|
166
179
|
- ".gitignore"
|
|
167
|
-
- ".travis.yml"
|
|
168
180
|
- CHANGELOG.md
|
|
169
181
|
- Gemfile
|
|
170
182
|
- README.md
|
|
@@ -216,10 +228,13 @@ files:
|
|
|
216
228
|
- lib/pageflow/panorama/version.rb
|
|
217
229
|
- lib/pageflow/panorama/zip_entry_paperclip_io_adapter.rb
|
|
218
230
|
- pageflow-panorama.gemspec
|
|
231
|
+
- spec/factories/panorama_package.rb
|
|
219
232
|
- spec/fixtures/dir_some.txt.zip
|
|
220
233
|
- spec/fixtures/krpano.zip
|
|
221
234
|
- spec/fixtures/krpano_with_unprocessable_thumbnail.zip
|
|
222
235
|
- spec/fixtures/some.txt.zip
|
|
236
|
+
- spec/helpers/pageflow/panorama/packages_helper_spec.rb
|
|
237
|
+
- spec/integration/file_type_spec.rb
|
|
223
238
|
- spec/integration/page_type_spec.rb
|
|
224
239
|
- spec/models/pageflow/panorama/package_spec.rb
|
|
225
240
|
- spec/pageflow/panorama/job_status_attributes_spec.rb
|
|
@@ -227,6 +242,7 @@ files:
|
|
|
227
242
|
- spec/pageflow/panorama/validation/kr_pano_spec.rb
|
|
228
243
|
- spec/spec_helper.rb
|
|
229
244
|
- spec/support/config/active_job.rb
|
|
245
|
+
- spec/support/config/factory_bot.rb
|
|
230
246
|
- spec/support/config/pageflow_panorama.rb
|
|
231
247
|
- spec/support/helpers/doubles.rb
|
|
232
248
|
homepage: https://github.com/codevise/pageflow-panorama
|
|
@@ -248,16 +264,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
248
264
|
- !ruby/object:Gem::Version
|
|
249
265
|
version: '0'
|
|
250
266
|
requirements: []
|
|
251
|
-
|
|
252
|
-
rubygems_version: 2.7.5
|
|
267
|
+
rubygems_version: 3.0.8
|
|
253
268
|
signing_key:
|
|
254
269
|
specification_version: 4
|
|
255
270
|
summary: Pagetype for iframe embedded 360° panoramas
|
|
256
271
|
test_files:
|
|
272
|
+
- spec/factories/panorama_package.rb
|
|
257
273
|
- spec/fixtures/dir_some.txt.zip
|
|
258
274
|
- spec/fixtures/krpano.zip
|
|
259
275
|
- spec/fixtures/krpano_with_unprocessable_thumbnail.zip
|
|
260
276
|
- spec/fixtures/some.txt.zip
|
|
277
|
+
- spec/helpers/pageflow/panorama/packages_helper_spec.rb
|
|
278
|
+
- spec/integration/file_type_spec.rb
|
|
261
279
|
- spec/integration/page_type_spec.rb
|
|
262
280
|
- spec/models/pageflow/panorama/package_spec.rb
|
|
263
281
|
- spec/pageflow/panorama/job_status_attributes_spec.rb
|
|
@@ -265,5 +283,6 @@ test_files:
|
|
|
265
283
|
- spec/pageflow/panorama/validation/kr_pano_spec.rb
|
|
266
284
|
- spec/spec_helper.rb
|
|
267
285
|
- spec/support/config/active_job.rb
|
|
286
|
+
- spec/support/config/factory_bot.rb
|
|
268
287
|
- spec/support/config/pageflow_panorama.rb
|
|
269
288
|
- spec/support/helpers/doubles.rb
|