pageflow-chart 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cc1d7a83608fe48cb16cefb854b05e4f203d6145
-  data.tar.gz: d2f8e9ee2f7f55133b32cc5f319a21eed791e215
+SHA256:
+  metadata.gz: 468db56cbd4ad18e357d70438b2b0fef4f4dcf78ff3bce4b8a3b807db2823392
+  data.tar.gz: 5052ee6ccb0760023ec96bb39db2d54f0e62e1897ac976a61afa298680897670
 SHA512:
-  metadata.gz: aedbaab6f9ca7e42272ff0188cf6cb7261d1ea4bcf7e6b12bdcc77a902626ba0974d7a8ea8fbc08596258b9b9bc72a585c9cbb3ca075683a8e61db9e040af1ea
-  data.tar.gz: 96d7cd899d64010e611b4f01a82830c12e0f7974f274f630af1519c1f0198cada990ba09bce1acb0430bd13e9ce998842ce7ddd8d4c38aa030414f364628f92d
+  metadata.gz: c1ffd7a740081216f29f415f8b1945b1ef6ecccc5049e9711dd701c0bbe646fae153937248eb5051b5406be4730233fba09edcba622cc3a5577b9ca0938a3ddb
+  data.tar.gz: 08ece544c861bbb9c4b3dc0d0fa4cb2cb9fcff824feb96ffee9541a98fb63d2c45199a7fd677c6428164ad89b07f19ceed2981e25980ea7de8bdf3c47b68b91c

data/CHANGELOG.md

@@ -1,28 +1,18 @@
 # CHANGELOG
 
-### Version 1.0.1
+### Version 1.1.0
 
-2017-08-17
+2017-11-08
 
-[Compare changes](https://github.com/codevise/pageflow-chart/compare/v1.0.0...v1.0.1)
+[Compare changes](https://github.com/codevise/pageflow-chart/compare/1-0-stable...v1.1.0)
 
-- Try to minimize changes in script tag order
-  ([#39](https://github.com/codevise/pageflow-chart/pull/39))
-
-### Version 1.0.0
-
-2017-08-11
-
-[Compare changes](https://github.com/codevise/pageflow-chart/compare/0-2-stable...v1.0.0)
-
-- Allow to use background video
-  ([#29](https://github.com/codevise/pageflow-chart/pull/29),
-   [#30](https://github.com/codevise/pageflow-chart/pull/30))
-- Drop the superfluous .css extension
-  ([#34](https://github.com/codevise/pageflow-chart/pull/34))
-- Improve gemspec
-  ([#38](https://github.com/codevise/pageflow-chart/pull/38))
+- Require pageflow 12.1 for split layout handling and make split
+  layout compatible with adjustable title max-widths
+  ([#31](https://github.com/codevise/pageflow-chart/pull/31),
+   [#41](https://github.com/codevise/pageflow-chart/pull/41))
+- Ignore Openuri::HttpError when downloading
+  ([#40](https://github.com/codevise/pageflow-chart/pull/40))
 
 See
-[0-2-stable branch](https://github.com/codevise/pageflow-chart/blob/0-2-stable/CHANGELOG.md)
+[1-0-stable branch](https://github.com/codevise/pageflow-chart/blob/1-0-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -52,15 +52,16 @@ Create a proxy (via Apache, Nginx, ...) from your domain to your configured
 `S3_HOST_ALIAS` to circumvent the same-domain policy. Configure this
 in your Pageflow Chart initializer `config/initializers/pageflow_chart.rb`.
 
-Example conf snippet for Nginx:
+Example conf snippet for Nginx. Add this `location` block inside every `server` that's being used by Ruby/Rails.
 
     location /datawrapper/ {
       proxy_pass http://bucketname.s3-website-eu-west-1.amazonaws.com/;
       proxy_redirect http://bucketname.s3-website-eu-west-1.amazonaws.com/ $scheme://$host/datawrapper/;
     }
 
-This is needed so the charts can be servered from the same origin as
-the entry.
+Normally you will do in two servers: the one that has `listen 80` in it
+and the other one which has `listen 443' in it (for https). This is needed
+so the charts can be servered from the same origin a the entry.
 
 ## Configuration
 

data/app/assets/javascripts/pageflow/chart/page_type.js

@@ -17,19 +17,19 @@ pageflow.react.registerPageTypeWithDefaultBackground('chart', {
   },
 
   resize: function(pageElement, configuration) {
-    var iframeWrapper = pageElement.find('.iframeWrapper'),
-        pageHeader = pageElement.find('.page_header'),
-        scroller = pageElement.find('.scroller'),
-        fullWidth = configuration.full_width,
-        widescreened = pageElement.width() > 1430;
-
-    if (fullWidth) {
-      widescreened = false;
-    }
+    var iframeWrapper = pageElement.find('.iframeWrapper');
+    var pageHeader = pageElement.find('.page_header');
+    var pageTitle = pageHeader.find('.title');
+    var scroller = pageElement.find('.scroller');
+    var fullWidth = configuration.full_width;
+
+    pageElement.toggleClass('page-with_split_layout', !fullWidth);
 
-    iframeWrapper.toggleClass('widescreened', widescreened);
+    var splitLayout = this.wideEnoughForSplitLayout(pageElement) && !fullWidth;
 
-    if (widescreened) {
+    iframeWrapper.toggleClass('widescreened', splitLayout);
+
+    if (splitLayout) {
       iframeWrapper.insertAfter(scroller);
     }
     else {
@@ -37,6 +37,21 @@ pageflow.react.registerPageTypeWithDefaultBackground('chart', {
     }
   },
 
+  wideEnoughForSplitLayout: function(pageElement) {
+    var pageTitle = pageElement.find('.page_header .title');
+
+    var pageTitleClientRect = pageTitle[0].getBoundingClientRect();
+    var pageClientRect = pageElement[0].getBoundingClientRect();
+
+    var spaceRightFromTitle = pageClientRect.right - pageTitleClientRect.right;
+    var spaceLeftFromTitle = pageTitleClientRect.left - pageClientRect.left;
+    var leftPositionedEmbedWidth = pageClientRect.width * 0.51;
+    var rightPositionedEmbedWidth = pageClientRect.width * 0.55;
+
+    return (spaceRightFromTitle >= rightPositionedEmbedWidth ||
+            spaceLeftFromTitle >= leftPositionedEmbedWidth);
+  },
+
   customizeLayout: function(pageElement, configuration) {
     var that = this;
     var iframe = pageElement.find('iframe');

data/chart.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.1'
 
-  spec.add_runtime_dependency 'pageflow', '~> 12.x'
+  spec.add_runtime_dependency 'pageflow', '~> 12.1'
   spec.add_runtime_dependency 'nokogiri', '~> 1.0'
   spec.add_runtime_dependency 'paperclip', '~> 4.2'
   spec.add_runtime_dependency 'state_machine', '~> 1.2'

data/lib/pageflow/chart/downloader.rb

@@ -12,12 +12,11 @@ module Pageflow
 
       def load(url)
         file = open(make_absolute(url))
-
-        begin
-          yield(file)
-        ensure
-          file.close
-        end
+        yield(file)
+      rescue OpenURI::HTTPError => exception
+        Rails.logger.error "Exception loading url #{url}: #{exception.message}"
+      ensure
+        file.close if file
       end
 
       def load_all(urls, options = {})

data/lib/pageflow/chart/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module Chart
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/spec/pageflow/chart/downloader_spec.rb

@@ -17,6 +17,19 @@ module Pageflow
           expect(result).to eq("aaa")
         end
 
+        it 'ignores HTTP response 404' do
+          downloader = Downloader.new
+          result = ''
+
+          stub_request(:get, "http://example.com/a").to_return(status: 404, body: 'aaa')
+
+          downloader.load('http://example.com/a') do |io|
+            result = io.read
+          end
+
+          expect(result).to eq("")
+        end
+
         it 'derives protocol from base_url' do
           downloader = Downloader.new(base_url: 'http://someother.com')
           result = ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-chart
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.x
+        version: '12.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.x
+        version: '12.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: Pagetype for Embedded Datawrapper Charts