pageflow-panorama 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1dd8882acc8a93ab6dc8a02b67f151d2c3ed5afc
-  data.tar.gz: 104f93596ecaadcfad90f8be78c85900a2a6b0d7
+SHA256:
+  metadata.gz: 500c7e9bed41c89b126e3793d0f958fa472a7749ebd31c02045f44840fcf5d8c
+  data.tar.gz: 3a6f4ab360d1e5d0c16dc58a903b4d5e356c14360350aa04432dea0d0ebd0f28
 SHA512:
-  metadata.gz: e1f75d47dbca60c4a4ed35e1650eeb6502af56ae253c7bf2cf1d03059b8cf0610b5bce364d2bf97cee92b948b07244129d08dcab5344df19a51f86fda1a4df46
-  data.tar.gz: b6368917787af55b1ca3cc0df19731806dde3669b2faec32451841aad817e2ee026c1ff83d30daf82bbd4760d65511a9b90ee4578c49c14fcec5811b20f4c1e2
+  metadata.gz: 3945f9b655595abb18f7fab80f73d71b69a5ab580f750190883043ccbaa30756c4cafb195c448aa8dbc51924cecfa25b9d32ac1d5c62f604aded5224fff941b5
+  data.tar.gz: fd41e73d383a9f316f48ba6f45116484849e0faf5e1645bf4d398865d35a1e78434898c0af50fd829eb46b0ceebe78f63aea549158947601ea355f50c1785e2a

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.1
+rvm: 2.3
 
 # User container based travis infrastructure which allows caching
 # features for open source projects.

data/CHANGELOG.md

@@ -1,43 +1,24 @@
 # CHANGELOG
 
-### Version 1.0.1
+### Version 2.0.0
 
-2017-08-10
+2018-12-10
 
-[Compare changes](https://github.com/codevise/pageflow-panorama/compare/v1.0.0...v1.0.1)
+[Compare changes](https://github.com/codevise/pageflow-panorama/compare/1-x-stable...v2.0.0)
 
-- Rename .css.scss files to just .css and update readme
-  ([#20](https://github.com/codevise/pageflow-panorama/pull/20))
-
-### Version 1.0.0
-
-2017-08-10
-
-[Compare changes](https://github.com/codevise/pageflow-panorama/compare/0-3-stable...v1.0.0)
-
-- Improve thumbnail processing
-  ([#19](https://github.com/codevise/pageflow-panorama/pull/19))
-- Load subdirectories of `config/locales`.
-  ([#18](https://github.com/codevise/pageflow-panorama/pull/18))
-- Fix unpacking progress and improve retry
-  ([#17](https://github.com/codevise/pageflow-panorama/pull/17))
-- Prevent leaving invalid packages on the file system
-  ([#16](https://github.com/codevise/pageflow-panorama/pull/16))
-- Update semmy
-  ([#15](https://github.com/codevise/pageflow-panorama/pull/15))
-- Setup travis
-  ([#14](https://github.com/codevise/pageflow-panorama/pull/14))
-- Migration added index for video files instead of packages
-  ([#13](https://github.com/codevise/pageflow-panorama/pull/13))
-- Allow different thumbnail names
-  ([#12](https://github.com/codevise/pageflow-panorama/pull/12))
-- Support pageflow 12
-  ([#11](https://github.com/codevise/pageflow-panorama/pull/11))
-- Add css class to background for slim controls shadow
-  ([#10](https://github.com/codevise/pageflow-panorama/pull/10))
-- Add nested files support
-  ([#9](https://github.com/codevise/pageflow-panorama/pull/9))
+- Migrate to Pageflow 13
+  ([#22](https://github.com/codevise/pageflow-panorama/pull/22))
+- Set package attachment in specs
+  ([#27](https://github.com/codevise/pageflow-panorama/pull/27))
+- Replace hostedfile.columns in migration
+  ([#26](https://github.com/codevise/pageflow-panorama/pull/26))
+- Migrate unpacking to aws-sdk-s3 api
+  ([#25](https://github.com/codevise/pageflow-panorama/pull/25))
+- Turn lib into eager load path
+  ([#24](https://github.com/codevise/pageflow-panorama/pull/24))
+- Add options parameter to io adapter initializer
+  ([#23](https://github.com/codevise/pageflow-panorama/pull/23))
 
 See
-[0-3-stable branch](https://github.com/codevise/pageflow-panorama/blob/0-3-stable/CHANGELOG.md)
+[1-x-stable branch](https://github.com/codevise/pageflow-panorama/blob/1-x-stable/CHANGELOG.md)
 for previous changes.

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in panorama.gemspec
 gemspec
-
-gem 'state_machine', git: 'https://github.com/codevise/state_machine.git'

data/app/jobs/pageflow/panorama/unpack_package_job.rb

@@ -2,12 +2,12 @@ require 'pageflow/panorama/validation'
 
 module Pageflow
   module Panorama
-    class UnpackPackageJob
-      @queue = :slow
+    class UnpackPackageJob < ActiveJob::Base
+      queue_as :slow
 
-      extend StateMachineJob
+      include StateMachineJob
 
-      def self.perform_with_result(package, _options)
+      def perform_with_result(package, _options)
         JobStatusAttributes.handle(package, stage: :unpacking) do |&progress|
           Archive.for(package) do |archive|
             parse(package, archive)
@@ -22,7 +22,7 @@ module Pageflow
 
       private_class_method
 
-      def self.unpack_to_s3(package, archive, &progress)
+      def unpack_to_s3(package, archive, &progress)
         bucket = Panorama.bucket_factory.from_attachment(package.attachment_on_s3)
 
         UnpackToS3
@@ -33,14 +33,14 @@ module Pageflow
           .upload(&progress)
       end
 
-      def self.parse(package, archive)
+      def parse(package, archive)
         result = Validation.parse(archive)
 
         package.index_document = result.index_document
         process_thumbnail(package, archive.find_entry(result.thumbnail))
       end
 
-      def self.process_thumbnail(package, thumbnail_file)
+      def process_thumbnail(package, thumbnail_file)
         package.thumbnail = thumbnail_file
         package.valid?
 

data/db/migrate/20140915133249_create_packages.rb

@@ -1,7 +1,23 @@
-class CreatePackages < ActiveRecord::Migration
+class CreatePackages < ActiveRecord::Migration[4.2]
   def change
     create_table :pageflow_panorama_packages do |t|
-      Pageflow::HostedFile.columns(t)
+      t.belongs_to(:entry, index: true)
+      t.belongs_to(:uploader, index: true)
+
+      t.string(:state)
+      t.string(:rights)
+
+      t.string(:attachment_on_filesystem_file_name)
+      t.string(:attachment_on_filesystem_content_type)
+      t.integer(:attachment_on_filesystem_file_size, limit: 8)
+      t.datetime(:attachment_on_filesystem_updated_at)
+
+      t.string(:attachment_on_s3_file_name)
+      t.string(:attachment_on_s3_content_type)
+      t.integer(:attachment_on_s3_file_size, limit: 8)
+      t.datetime(:attachment_on_s3_updated_at)
+
+      t.timestamps
 
       t.integer(:unpacking_progress)
       t.string(:unpacking_error_message)

data/db/migrate/20160824115300_add_parent_file_to_packages.rb

@@ -1,4 +1,4 @@
-class AddParentFileToPackages < ActiveRecord::Migration
+class AddParentFileToPackages < ActiveRecord::Migration[4.2]
   def change
     add_column :pageflow_panorama_packages, :parent_file_id, :integer
     add_column :pageflow_panorama_packages, :parent_file_model_type, :string

data/lib/pageflow/panorama/engine.rb

@@ -6,7 +6,7 @@ module Pageflow
     class Engine < Rails::Engine
       isolate_namespace Pageflow::Panorama
 
-      config.autoload_paths << File.join(config.root, 'lib')
+      config.paths.add('lib', eager_load: true)
       config.i18n.load_path += Dir[config.root.join('config', 'locales', '**', '*.yml').to_s]
     end
   end

data/lib/pageflow/panorama/s3_bucket.rb

@@ -8,11 +8,21 @@ module Pageflow
       end
 
       def write(name:, input_stream:, content_length:, content_type:)
-        object = bucket.objects[name]
-        object.write(input_stream,
-                     acl: :public_read,
-                     content_type: content_type,
-                     content_length: content_length)
+        object = bucket.object(name)
+
+        object.put(body: StreamWithSize.new(input_stream, content_length),
+                   acl: 'public-read',
+                   content_type: content_type,
+                   content_length: content_length)
+      end
+
+      class StreamWithSize < SimpleDelegator
+        attr_reader :size
+
+        def initialize(stream, size)
+          super(stream)
+          @size = size
+        end
       end
 
       class Factory

data/lib/pageflow/panorama/unpack_to_s3.rb

@@ -46,7 +46,7 @@ module Pageflow
 
         begin
           yield
-        rescue AWS::S3::Errors::SlowDown
+        rescue Aws::S3::Errors::SlowDown
           retries += 1
 
           raise if retries > 5

data/lib/pageflow/panorama/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module Panorama
-    VERSION = '1.0.1'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

data/lib/pageflow/panorama/zip_entry_paperclip_io_adapter.rb

@@ -9,7 +9,7 @@ module Pageflow
         attr_writer(:original_filename)
       end
 
-      def initialize(entry)
+      def initialize(entry, options = {})
         @entry = entry
         cache_current_values
       end

data/pageflow-panorama.gemspec

@@ -4,31 +4,30 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pageflow/panorama/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "pageflow-panorama"
+  spec.name          = 'pageflow-panorama'
   spec.version       = Pageflow::Panorama::VERSION
-  spec.authors       = ["Codevise Solutions"]
-  spec.email         = ["info@codevise.de"]
-  spec.summary       = "Pagetype for iframe embedded 360° panoramas"
-  spec.homepage      = "https://github.com/codevise/pageflow-panorama"
-  spec.license       = "MIT"
+  spec.authors       = ['Codevise Solutions']
+  spec.email         = ['info@codevise.de']
+  spec.summary       = 'Pagetype for iframe embedded 360° panoramas'
+  spec.homepage      = 'https://github.com/codevise/pageflow-panorama'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.required_ruby_version = '~> 2.1'
 
-  spec.add_runtime_dependency "pageflow", [">= 0.11", "< 13"]
-  spec.add_runtime_dependency 'state_machine_job', ['>= 0.2', '< 2']
-  spec.add_runtime_dependency "rubyzip", "~> 1.1"
+  spec.add_runtime_dependency 'pageflow', '~> 13.x'
+  spec.add_runtime_dependency 'rubyzip', '~> 1.1'
+  spec.add_runtime_dependency 'aws-sdk-s3', '~> 1.17'
   spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
 
-  spec.add_development_dependency 'pageflow-support', '>= 0.11.4'
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails", "~> 3.0"
-  spec.add_development_dependency 'factory_girl_rails'
-  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency 'pageflow-support', '~> 13.x'
+  spec.add_development_dependency 'bundler', '~> 1.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec-rails', '~> 3.7'
+  spec.add_development_dependency 'factory_bot_rails', '~> 4.8'
 
   # Semantic versioning rake tasks
   spec.add_development_dependency 'semmy', '~> 1.0'

data/spec/models/pageflow/panorama/package_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Pageflow
   module Panorama
     describe Package do
-      describe '#process', inline_resque: true do
+      describe '#process', perform_jobs: true do
         it 'parses thumbnail and index document' do
           zip_file = File.open(Engine.root.join('spec', 'fixtures', 'krpano.zip'))
           package = Package.create!(attachment: zip_file)
@@ -72,7 +72,7 @@ module Pageflow
         end
       end
 
-      describe '#retry', stub_resque: true do
+      describe '#retry' do
         it 'resets unpacking progress and error_message' do
           zip_file = File.open(Engine.root.join('spec', 'fixtures', 'krpano.zip'))
           package = Package.create!(attachment: zip_file,

data/spec/pageflow/panorama/job_status_attributes_spec.rb

@@ -5,7 +5,7 @@ module Pageflow
     describe JobStatusAttributes do
       describe '#handle' do
         it 'updates phase progress attribute when passed block is called' do
-          record = Package.create!(unpacking_progress: 0)
+          record = Package.create!(attachment: zip_file, unpacking_progress: 0)
 
           JobStatusAttributes.handle(record, stage: :unpacking) do |&progress|
             progress.call(20)
@@ -15,7 +15,7 @@ module Pageflow
         end
 
         it 'sets phase error message if error with message_i18n_key is raised' do
-          record = Package.create!(unpacking_progress: 0)
+          record = Package.create!(attachment: zip_file, unpacking_progress: 0)
           error_with_message_i18n_key = Class.new(RuntimeError) do
             def message_i18n_key
               :i18n_key
@@ -35,7 +35,8 @@ module Pageflow
 
       describe '#reset' do
         it 'resets progress and error message attrbute' do
-          record = Package.create!(unpacking_progress: 20,
+          record = Package.create!(attachment: zip_file,
+                                   unpacking_progress: 20,
                                    unpacking_error_message: 'fail')
 
           JobStatusAttributes.reset(record, stage: :unpacking)
@@ -44,6 +45,10 @@ module Pageflow
           expect(record.unpacking_error_message).to eq(nil)
         end
       end
+
+      def zip_file
+        File.open(Engine.root.join('spec', 'fixtures', 'krpano.zip'))
+      end
     end
   end
 end

data/spec/pageflow/panorama/unpack_to_s3_spec.rb

@@ -45,7 +45,7 @@ module Pageflow
 
         it 'retries when write fails' do
           archive = Zip::File.open(Engine.root.join('spec', 'fixtures', 'some.txt.zip'))
-          bucket = Doubles.bucket_raising_once(AWS::S3::Errors::SlowDown)
+          bucket = Doubles.bucket_raising_once(Aws::S3::Errors::SlowDown.new(nil, 'message'))
           unpack_to_s3 = UnpackToS3.new(archive: archive,
                                         destination_bucket: bucket,
                                         destination_base_path: 'base')
@@ -58,7 +58,7 @@ module Pageflow
 
         it 're-raises exception when write fails too often' do
           archive = Zip::File.open(Engine.root.join('spec', 'fixtures', 'some.txt.zip'))
-          bucket = Doubles.bucket_raising(AWS::S3::Errors::SlowDown)
+          bucket = Doubles.bucket_raising(Aws::S3::Errors::SlowDown.new(nil, 'message'))
           unpack_to_s3 = UnpackToS3.new(archive: archive,
                                         destination_bucket: bucket,
                                         destination_base_path: 'base')
@@ -67,7 +67,7 @@ module Pageflow
 
           expect {
             unpack_to_s3.upload
-          }.to raise_error(AWS::S3::Errors::SlowDown)
+          }.to raise_error(Aws::S3::Errors::SlowDown)
         end
       end
     end

data/spec/support/config/active_job.rb

@@ -0,0 +1,7 @@
+RSpec.configure do |config|
+  config.before(:each) do |example|
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs =
+      example.metadata[:perform_jobs]
+  end
+end

metadata

@@ -1,69 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-panorama
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Codevise Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.11'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: 13.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.11'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: 13.x
 - !ruby/object:Gem::Dependency
-  name: state_machine_job
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: pageflow-public-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -82,86 +70,72 @@ dependencies:
   name: pageflow-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 13.x
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 13.x
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: semmy
   requirement: !ruby/object:Gem::Requirement
@@ -244,8 +218,8 @@ files:
 - spec/pageflow/panorama/unpack_to_s3_spec.rb
 - spec/pageflow/panorama/validation/kr_pano_spec.rb
 - spec/spec_helper.rb
+- spec/support/config/active_job.rb
 - spec/support/config/pageflow_panorama.rb
-- spec/support/config/resque.rb
 - spec/support/helpers/doubles.rb
 homepage: https://github.com/codevise/pageflow-panorama
 licenses:
@@ -267,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Pagetype for iframe embedded 360° panoramas
@@ -281,6 +255,6 @@ test_files:
 - spec/pageflow/panorama/unpack_to_s3_spec.rb
 - spec/pageflow/panorama/validation/kr_pano_spec.rb
 - spec/spec_helper.rb
+- spec/support/config/active_job.rb
 - spec/support/config/pageflow_panorama.rb
-- spec/support/config/resque.rb
 - spec/support/helpers/doubles.rb

data/spec/support/config/resque.rb

@@ -1,13 +0,0 @@
-RSpec.configure do |config|
-  config.before(:each, inline_resque: true) do
-    Resque.inline = true
-  end
-
-  config.after(:each, inline_resque: true) do
-    Resque.inline = false
-  end
-
-  config.before(:each, stub_resque: true) do
-    allow(Resque).to receive(:enqueue)
-  end
-end