pageflow-text-page 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1511040950d640f49334cdbcc067f51e67111815c4955777069aeff50cf507f9
-  data.tar.gz: 29b24c40f2e5885fbd686567ab3b35bca32b76bf13ff8868f412ba29b72bcf44
+  metadata.gz: 62541c66c7a4e7cf14968341cdb71305e72edfdc3c482d8c3624f22e0a1e656d
+  data.tar.gz: b352873cacf1aaf22c559adbf439f754204ed9f5bef50b916a434de7ebc9f89c
 SHA512:
-  metadata.gz: 8973f983f3a8de2e8ad9d2167d0021f88b5ae104387e47aa22b1eacb20dc67929d489ebd6fe2efdbc2ab87928abbb49538369a565afe9e10d4f94bf989e99169
-  data.tar.gz: ffd2957abc5e79faf5c27f1e13dce27f7eb6e881346951ad2e4efe63e4416ec9fc97712b6778eedefc87c132f35265ce08e0a474777c07b47c9f834c0b63bf60
+  metadata.gz: 25aa572040dd199bd7b527d6d21ead5acb8a336ca4c3ee6355447f244ecf78b9ebf0631374ecc6bc56a311f3d3c67877eb5f52160d534d58955403c29e5aafa7
+  data.tar.gz: 590d46fa27064db4371829e8b7f3bc65c69933ed1a0fb23710358ab08dde0a097c0f6e2189cff25e47ea4ee7b8d24749e8b7b4cb4f1b0e357bddec2ef584799e

data/.travis.yml

@@ -1,4 +1,3 @@
-dist: trusty
 language: ruby
 rvm: 2.5
 
@@ -9,3 +8,6 @@ cache: bundler
 
 script:
   - bin/rspec
+
+services:
+  - mysql

data/CHANGELOG.md

@@ -1,14 +1,18 @@
 # CHANGELOG
 
-### Version 1.5.0
+### Version 1.6.0
 
-2019-11-04
+2019-11-21
 
-[Compare changes](https://github.com/codevise/pageflow-text-page/compare/1-4-stable...v1.5.0)
+[Compare changes](https://github.com/codevise/pageflow-text-page/compare/1-5-stable...v1.6.0)
 
-- Extend pageflow version requirement to < 16
-  ([#28](https://github.com/codevise/pageflow-text-page/pull/28))
+- Restrict theme-induced text max-width to left text layout
+  ([#31](https://github.com/codevise/pageflow-text-page/pull/31))
+- Change file lookup to perma_id
+  ([#30](https://github.com/codevise/pageflow-text-page/pull/30))
+- Fix Travis CI
+  ([#29](https://github.com/codevise/pageflow-text-page/pull/29))
 
 See
-[1-4-stable branch](https://github.com/codevise/pageflow-text-page/blob/1-4-stable/CHANGELOG.md)
+[1-5-stable branch](https://github.com/codevise/pageflow-text-page/blob/1-5-stable/CHANGELOG.md)
 for previous changes.

data/app/assets/stylesheets/pageflow/text_page/themes/default.scss

@@ -29,14 +29,18 @@ $text-page-anchor-inverted-color: $page-anchor-color !default;
 @include pageflow-page-type-pictograms("text_page");
 
 .page .text_page {
+  .inline_text_position_left {
+    .page_text {
+      @include wide_desktop {
+        max-width: $text-page-page-text-wide-desktop-max-width;
+      }
+    }
+  }
+
   .page_text {
     font-size: $text-page-content-text-base-font-size;
     max-width: 500px;
 
-    @include wide_desktop {
-      max-width: $text-page-page-text-wide-desktop-max-width;
-    }
-
     @include phone {
       font-size: $text-page-content-text-phone-base-font-size;
       max-width: 84%;

data/app/helper/pageflow/text_page/image_helper.rb

@@ -1,28 +1,28 @@
 module Pageflow
   module TextPage
     module ImageHelper
-      def content_image(id, alt, format = :medium)
-        image = Pageflow::ImageFile.find_by_id(id)
+      def content_image(perma_id, alt, format = :medium)
+        image = find_file_in_entry(ImageFile, perma_id)
         if image
-          image_tag(image.attachment.url(:medium))
+          image_tag(image.attachment.url(format), alt: alt)
         else
           ''
         end
       end
 
-      def content_image_large(id, alt, format = :large)
-        image = Pageflow::ImageFile.find_by_id(id)
+      def content_image_large(perma_id, alt, format = :large)
+        image = find_file_in_entry(ImageFile, perma_id)
         if image
-          image_tag(image.attachment.url(:large))
+          image_tag(image.attachment.url(format), alt: alt)
         else
           ''
         end
       end
 
-      def fullscreen_image_url(id, format = :large)
-        image = Pageflow::ImageFile.find_by_id(id)
+      def fullscreen_image_url(perma_id, format = :large)
+        image = find_file_in_entry(ImageFile, perma_id)
         if image
-          return image.attachment.url(:large)
+          return image.attachment.url(format)
         else
           '#'
         end
@@ -31,9 +31,9 @@ module Pageflow
       def background_asset_present_css_class(configuration)
         file =
           if configuration['background_type'] == 'video'
-            Pageflow::VideoFile.find_by_id(configuration['video_file_id'])
+            find_file_in_entry(VideoFile, configuration['video_file_id'])
           else
-            Pageflow::ImageFile.find_by_id(configuration['background_image_id'])
+            find_file_in_entry(ImageFile, configuration['background_image_id'])
           end
 
         file ? '' : 'no_background_asset'

data/lib/pageflow/text_page/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module TextPage
-    VERSION = '1.5.0'.freeze
+    VERSION = '1.6.0'.freeze
   end
 end

data/pageflow-text-page.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.1'
 
-  spec.add_runtime_dependency 'pageflow', ['>= 14', '< 16']
+  spec.add_runtime_dependency 'pageflow', ['>= 15', '< 16']
   spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
 
   spec.add_development_dependency 'bundler', ['>= 1.0', '< 3']
-  spec.add_development_dependency 'pageflow-support', ['>= 14', '< 16']
+  spec.add_development_dependency 'pageflow-support', ['>= 15', '< 16']
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-text-page
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '15'
     - - "<"
       - !ruby/object:Gem::Version
         version: '16'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '15'
     - - "<"
       - !ruby/object:Gem::Version
         version: '16'
@@ -70,7 +70,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '15'
     - - "<"
       - !ruby/object:Gem::Version
         version: '16'
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '15'
     - - "<"
       - !ruby/object:Gem::Version
         version: '16'
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Pageflow Page Type text pages