pageflow-linkmap-page 0.2.0 → 1.0.0

data/spec/controllers/pageflow/linkmap_page/mask_sprites_controller_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+module Pageflow
+  module LinkmapPage
+    describe MaskSpritesController do
+      DATA_URL = 'data:image/png;base64,iVBORw0KGgoAAA' \
+        'ANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAAGXRFWHRTb2Z' \
+        '0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAENJREFU' \
+        'eNpiYICABCDeAcRfoXQCA5LEDyD+j4R/wBTsQJOAYZA42' \
+        'Chskl+ZgMRhBuzgMEhyBRD/RJP4CRXH7VqAAAMA2qweFJ' \
+        'llSygAAAAASUVORK5CYII='.freeze
+
+      describe '#create' do
+        routes { Pageflow::LinkmapPage::Engine.routes }
+
+        it 'responds with success for member' do
+          user = create(:user)
+          entry = create(:entry, with_member: user)
+          image_file = create(:image_file, used_in: entry.draft)
+
+          sign_in(user)
+          post(:create,
+               image_file_id: image_file.id,
+               mask_sprite: {attachment: DATA_URL},
+               format: 'json')
+
+          expect(response.status).to eq(201)
+        end
+
+        it 'includes id of created mask sprite in response' do
+          user = create(:user)
+          entry = create(:entry, with_member: user)
+          image_file = create(:image_file, used_in: entry.draft)
+
+          sign_in(user)
+          post(:create,
+               image_file_id: image_file.id,
+               mask_sprite: {attachment: DATA_URL},
+               format: 'json')
+
+          json = JSON.parse(response.body)
+
+          expect(json['id']).to eq(MaskSprite.last.id)
+        end
+
+        it 'creates mask sprite for image' do
+          user = create(:user)
+          entry = create(:entry, with_member: user)
+          image_file = create(:image_file, used_in: entry.draft)
+
+          sign_in(user)
+          post(:create,
+               image_file_id: image_file.id,
+               mask_sprite: {attachment: DATA_URL},
+               format: 'json')
+          mask_sprite = MaskSprite.where(image_file: image_file).first
+
+          expect(mask_sprite).to be_present
+          expect(mask_sprite.attachment).to be_present
+        end
+
+        it 'does not recreate mask sprite if it already exists' do
+          user = create(:user)
+          entry = create(:entry, with_member: user)
+          image_file = create(:image_file, used_in: entry.draft)
+
+          sign_in(user)
+          post(:create,
+               image_file_id: image_file.id,
+               mask_sprite: {attachment: DATA_URL},
+               format: 'json')
+
+          expect {
+            post(:create,
+                 image_file_id: image_file.id,
+                 mask_sprite: {attachment: DATA_URL},
+                 format: 'json')
+          }.not_to change { MaskSprite.count }
+        end
+
+        it 'requires user to have permissions for entry' do
+          user = create(:user)
+          entry = create(:entry)
+          image_file = create(:image_file, used_in: entry.draft)
+
+          sign_in(user)
+          post(:create,
+               image_file_id: image_file.id,
+               mask_sprite: {attachment: DATA_URL},
+               format: 'json')
+
+          expect(response.status).to eq(403)
+        end
+
+        it 'requires user to be signed in' do
+          image_file = create(:image_file)
+
+          post(:create,
+               image_file_id: image_file.id,
+               mask_sprite: {attachment: DATA_URL},
+               format: 'json')
+
+          expect(response.status).to eq(401)
+        end
+      end
+    end
+  end
+end

data/spec/helpers/pageflow/linkmap_page/areas_helper_spec.rb

@@ -22,13 +22,34 @@ module Pageflow
           expect(html).to have_selector('div a[href]')
         end
 
-        it 'renders hover image inside linkmap areas' do
+        it 'renders hover image canvas inside linkmap areas' do
           entry = create(:entry)
           configuration = {'linkmap_areas' => [{}], 'hover_image_id' => 5}
 
           html = helper.linkmap_areas_div(entry, configuration)
 
-          expect(html).to have_selector('a div[class~="image_panorama_5"]')
+          expect(html).to have_selector('a canvas.hover_image')
+        end
+
+        it 'sets data-mask-id attribute if area has mask_perma_id' do
+          entry = create(:entry)
+          configuration = {'linkmap_areas' => [{'mask_perma_id' => '1:2'}]}
+
+          html = helper.linkmap_areas_div(entry, configuration)
+
+          expect(html).to have_selector('a[data-mask-id="1:2"]')
+        end
+
+        it 'does not set data-mask-id attribute if background type is hover_video' do
+          entry = create(:entry)
+          configuration = {
+            'linkmap_areas' => [{'mask_perma_id' => '1:2'}],
+            'background_type' => 'hover_video'
+          }
+
+          html = helper.linkmap_areas_div(entry, configuration)
+
+          expect(html).not_to have_selector('a[data-mask-id]')
         end
       end
 

metadata

@@ -1,85 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-linkmap-page
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: pageflow-external-links
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: i18n-js
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !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
@@ -98,58 +96,58 @@ dependencies:
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: semmy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '1.0'
 description: 
 email:
 - info@codevise.de
@@ -180,27 +178,44 @@ files:
 - app/assets/javascript/pageflow/linkmap_page/editor/models/area_file_selection_handler.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/audio_file_area_type.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/external_link_area_type.js
+- app/assets/javascript/pageflow/linkmap_page/editor/models/masks_delegator.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/new_area_file_selection_handler.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/page_configuration_mixin.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/page_link_area_type.js
+- app/assets/javascript/pageflow/linkmap_page/editor/models/stored_mask_sprite.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/text_only_area_type.js
 - app/assets/javascript/pageflow/linkmap_page/editor/routers/side_bar_router.js
 - app/assets/javascript/pageflow/linkmap_page/editor/templates/edit_area.jst.ejs
 - app/assets/javascript/pageflow/linkmap_page/editor/templates/embedded/area_item.jst.ejs
+- app/assets/javascript/pageflow/linkmap_page/editor/templates/embedded/area_masks_preview.jst.ejs
+- app/assets/javascript/pageflow/linkmap_page/editor/templates/embedded/area_outlines.jst.ejs
 - app/assets/javascript/pageflow/linkmap_page/editor/templates/scaled_on_phone_hint.jst.ejs
+- app/assets/javascript/pageflow/linkmap_page/editor/templates/select_area_position_hint.jst.ejs
 - app/assets/javascript/pageflow/linkmap_page/editor/views/areas_list_view.js
 - app/assets/javascript/pageflow/linkmap_page/editor/views/configuration_editor_view.js
 - app/assets/javascript/pageflow/linkmap_page/editor/views/edit_area_view.js
 - app/assets/javascript/pageflow/linkmap_page/editor/views/editable_areas_mode_view.js
 - app/assets/javascript/pageflow/linkmap_page/editor/views/embedded/area_item_embedded_view.js
+- app/assets/javascript/pageflow/linkmap_page/editor/views/embedded/area_masks_preview_embedded_view.js
+- app/assets/javascript/pageflow/linkmap_page/editor/views/embedded/area_outlines_embedded_view.js
 - app/assets/javascript/pageflow/linkmap_page/editor/views/embedded/areas_embedded_view.js
 - app/assets/javascript/pageflow/linkmap_page/editor/views/embedded/panorama_embedded_view.js
+- app/assets/javascript/pageflow/linkmap_page/editor/views/inputs/area_mask_input_view.js
 - app/assets/javascript/pageflow/linkmap_page/editor/views/scaled_on_phone_hint_view.js
+- app/assets/javascript/pageflow/linkmap_page/editor/views/select_area_position_hint_view.js
 - app/assets/javascript/pageflow/linkmap_page/features.js
 - app/assets/javascript/pageflow/linkmap_page/page_type.js
 - app/assets/javascript/pageflow/linkmap_page/vendor/gyro.js
 - app/assets/javascript/pageflow/linkmap_page/widgets/hover_video.js
 - app/assets/javascript/pageflow/linkmap_page/widgets/linkmap.js
+- app/assets/javascript/pageflow/linkmap_page/widgets/linkmap/area_contains.js
+- app/assets/javascript/pageflow/linkmap_page/widgets/linkmap/area_redraw.js
+- app/assets/javascript/pageflow/linkmap_page/widgets/linkmap/color_map.js
+- app/assets/javascript/pageflow/linkmap_page/widgets/linkmap/image_data.js
+- app/assets/javascript/pageflow/linkmap_page/widgets/linkmap/mask.js
+- app/assets/javascript/pageflow/linkmap_page/widgets/linkmap/mask_sprite.js
+- app/assets/javascript/pageflow/linkmap_page/widgets/linkmap/masks.js
+- app/assets/javascript/pageflow/linkmap_page/widgets/linkmap/remote_image.js
 - app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_audio_player_controls.js
 - app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_audio_players_controller.js
 - app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_lookaround.js
@@ -208,33 +223,32 @@ files:
 - app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_panorama.js
 - app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_panorama/get_panorama_size.js
 - app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_scroll_indicators.js
-- app/assets/stylesheets/pageflow/linkmap_page.css.scss
-- app/assets/stylesheets/pageflow/linkmap_page/animations/rotate.css.scss
+- app/assets/stylesheets/pageflow/linkmap_page.scss
+- app/assets/stylesheets/pageflow/linkmap_page/animations/rotate.scss
 - app/assets/stylesheets/pageflow/linkmap_page/audio_player_controls.scss
-- app/assets/stylesheets/pageflow/linkmap_page/editor.css.scss
+- app/assets/stylesheets/pageflow/linkmap_page/editor.scss
+- app/assets/stylesheets/pageflow/linkmap_page/editor/action_buttons.scss
+- app/assets/stylesheets/pageflow/linkmap_page/editor/area_outlines.scss
 - app/assets/stylesheets/pageflow/linkmap_page/editor/areas_list.scss
-- app/assets/stylesheets/pageflow/linkmap_page/editor/file_areas.css.scss
-- app/assets/stylesheets/pageflow/linkmap_page/editor/resizable.css.scss
-- app/assets/stylesheets/pageflow/linkmap_page/themes/default.css.scss
+- app/assets/stylesheets/pageflow/linkmap_page/editor/file_areas.scss
+- app/assets/stylesheets/pageflow/linkmap_page/editor/inputs/area_mask.scss
+- app/assets/stylesheets/pageflow/linkmap_page/editor/masks_preview.scss
+- app/assets/stylesheets/pageflow/linkmap_page/editor/resizable.scss
+- app/assets/stylesheets/pageflow/linkmap_page/editor/select_area_position_hint.scss
+- app/assets/stylesheets/pageflow/linkmap_page/themes/default.scss
 - app/assets/stylesheets/pageflow/linkmap_page/themes/default/scroll_indicators.scss
+- app/controllers/pageflow/linkmap_page/mask_sprites_controller.rb
 - app/helpers/pageflow/linkmap_page/areas_helper.rb
+- app/models/pageflow/linkmap_page/mask_sprite.rb
 - app/views/pageflow/linkmap_page/areas/_div.html.erb
 - app/views/pageflow/linkmap_page/page.html.erb
 - bin/rspec
 - bin/spring
 - config/locales/de.yml
 - config/locales/en.yml
-- config/locales/new/inverted.de.yml
-- config/locales/new/inverted.en.yml
-- config/locales/new/scaled_on_phone_hint.de.yml
-- config/locales/new/scaled_on_phone_hint.en.yml
-- config/locales/new/scroll_indicators_v.de.yml
-- config/locales/new/scroll_indicators_v.en.yml
-- config/locales/new/text_only_area_type.de.yml
-- config/locales/new/text_only_area_type.en.yml
-- config/locales/new/typo.en.yml
 - config/routes.rb
 - config/spring.rb
+- db/migrate/20170330201200_create_mask_sprites.rb
 - lib/generators/pageflow_linkmap_page/install/install_generator.rb
 - lib/pageflow-linkmap-page.rb
 - lib/pageflow/linkmap_page/engine.rb
@@ -242,11 +256,12 @@ files:
 - lib/pageflow/linkmap_page/plugin.rb
 - lib/pageflow/linkmap_page/version.rb
 - pageflow-linkmap-page.gemspec
+- spec/controllers/pageflow/linkmap_page/mask_sprites_controller_spec.rb
 - spec/helpers/pageflow/linkmap_page/areas_helper_spec.rb
 - spec/spec_helper.rb
 - spec/support/config/devise.rb
 - spec/support/config/factory_girl.rb
-homepage: http://github.com/codevise/pageflow-linkmap-page
+homepage: https://github.com/codevise/pageflow-linkmap-page
 licenses:
 - MIT
 metadata: {}
@@ -256,9 +271,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -271,6 +286,7 @@ signing_key:
 specification_version: 4
 summary: Pageflow page type for a page that contains customizable link areas
 test_files:
+- spec/controllers/pageflow/linkmap_page/mask_sprites_controller_spec.rb
 - spec/helpers/pageflow/linkmap_page/areas_helper_spec.rb
 - spec/spec_helper.rb
 - spec/support/config/devise.rb

data/config/locales/new/inverted.de.yml

@@ -1,10 +0,0 @@
-de:
-  activerecord:
-    attributes:
-      pageflow/linkmap_page/area:
-        inverted: "Invertieren"
-  pageflow:
-    ui:
-      inline_help:
-        pageflow/linkmap_page/area:
-          inverted: "Dunkle Piktogramme für die Verwendung auf hellen Hintergründen anzeigen."

data/config/locales/new/inverted.en.yml

@@ -1,10 +0,0 @@
-en:
-  activerecord:
-    attributes:
-      pageflow/linkmap_page/area:
-        inverted: "Invert"
-  pageflow:
-    ui:
-      inline_help:
-        pageflow/linkmap_page/area:
-          inverted: "Display dark pictograms to improve visibility on light backgrounds."

data/config/locales/new/scaled_on_phone_hint.de.yml

@@ -1,11 +0,0 @@
-de:
-  pageflow:
-    linkmap_page:
-      editor:
-        views:
-          scaled_on_phone_hint:
-            text: "Das Panorama wird im %{orientation} skaliert, um eine Mindestgröße der Hotspots für die Touch-Eingabe zu gewährleisten. Hotspots vergrößern, um Skalierung zu vermeiden."
-            orientations:
-              both: "Phone Layout"
-              landscape: "Landscape Phone Layout"
-              portrait: "Portrait Phone Layout"

data/config/locales/new/scaled_on_phone_hint.en.yml

@@ -1,11 +0,0 @@
-en:
-  pageflow:
-    linkmap_page:
-      editor:
-        views:
-          scaled_on_phone_hint:
-            text: "The panorama will be scaled on %{orientation} to ensure minimum hotspot size for touch interaction. Increase hotspot size to prevent scaling."
-            orientations:
-              both: "phones"
-              landscape: "phones in landscape orientation"
-              portrait: "phones in portrait orientation"

data/config/locales/new/scroll_indicators_v.de.yml

@@ -1,6 +0,0 @@
-de:
-  pageflow:
-    linkmap_page:
-      page:
-        scroll_up: Nach oben scrollen
-        scroll_down: Nach unten scrollen

data/config/locales/new/scroll_indicators_v.en.yml

@@ -1,6 +0,0 @@
-en:
-  pageflow:
-    linkmap_page:
-      page:
-        scroll_up: Scroll up
-        scroll_down: Scroll down

data/config/locales/new/text_only_area_type.de.yml

@@ -1,11 +0,0 @@
-de:
-  pageflow:
-    linkmap_page:
-      editor:
-        area_types:
-          text_only: "Nur Text"
-  activerecord:
-    values:
-      pageflow/linkmap_page/area:
-        target_type:
-          text_only: Nur Text

data/config/locales/new/text_only_area_type.en.yml

@@ -1,11 +0,0 @@
-en:
-  pageflow:
-    linkmap_page:
-      editor:
-        area_types:
-          text_only: "Text only"
-  activerecord:
-    values:
-      pageflow/linkmap_page/area:
-        target_type:
-          text_only: Text only

data/config/locales/new/typo.en.yml

@@ -1,6 +0,0 @@
-en:
-  pageflow:
-    linkmap_page:
-      page_attributes:
-        limit_scrolling:
-          label: Restrict to hotspot areas