pageflow-chart 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b8214ac8aa74aef666927a7e0885bf08cd11dfb
-  data.tar.gz: f8742d5353918f09393681e95a80b5ab07f60cd4
+  metadata.gz: 11c6001c705a34c2d17a065441d9686e344d7599
+  data.tar.gz: 46f602eb70655ddd464c18eda8de6d609361d6b3
 SHA512:
-  metadata.gz: 55d71e4e9ecd1b741a289c1a5ab0e76527928c69beaf6bbe72b0148ed66633ceb0589f1f21fe55f358aee76d3a9e40b005cd7b57c8d6c5727f2f8fd489852c13
-  data.tar.gz: 6d834f287f3db679deff54c09575b18b4db50a3e4f7dfa1930cde69ca4f0217542b69f3e3c040d0dcdbfbca8b4b90241270ef4b6b9aa6747374816cfc186d8a0
+  metadata.gz: 4bd30df75eb0b9604b04f4d7a7a4aabd713b622a171453f58107318acb2dc4fe1a86421c6ccabe958f4d9b04531c262e0a3839975934d43a98823ac4d904aba6
+  data.tar.gz: ae52e80fa81f6cbd3e94102874c6902a151b6c77b4b55bd0422db8c0b7595e91b993ad18b5164c467e3c5b455d2c3d722c27635c113535bd5db1d03a18ff6b1e

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+### Version 0.2.1
+
+2017-07-12
+
+[Compare changes](https://github.com/codevise/pageflow-chart/compare/v0.2.0...v0.2.1)
+
+- Update datawrapper scraping
+  ([#36](https://github.com/codevise/pageflow-chart/pull/36))
+- Ensure custom theme attribute is evaluated correctly
+  ([#28](https://github.com/codevise/pageflow-chart/pull/28))
+- Fix test suite
+  ([#27](https://github.com/codevise/pageflow-chart/pull/27))
+
 ### Version 0.2.0
 
 2016-06-09

data/Gemfile

@@ -3,10 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in chart.gemspec
 gemspec
 
-gem 'activeadmin', :git => 'https://github.com/codevise/active_admin.git', :branch => 'rails4'
-gem 'ransack'
-gem 'inherited_resources', '1.4.1'
-gem 'formtastic', '2.3.0.rc2'
 gem 'state_machine', git: 'https://github.com/codevise/state_machine.git'
 
-gem 'pageflow', git: 'https://github.com/codevise/pageflow'
+gem 'pageflow', git: 'https://github.com/codevise/pageflow', branch: '0-11-stable'

data/app/assets/javascripts/pageflow/chart/editor/views/embedded/iframe_embedded_view.js

@@ -39,7 +39,13 @@ pageflow.chart.IframeEmbeddedView = Backbone.Marionette.View.extend({
 
     if (scrapedSite && scrapedSite.isProcessed()) {
       this.$el.attr('src', scrapedSite.get('html_file_url'));
-      this.$el.attr('data-use-custom-theme', scrapedSite.get('use_custom_theme'));
+
+      if (scrapedSite.get('use_custom_theme')) {
+        this.$el.attr('data-use-custom-theme', 'true');
+      }
+      else {
+        this.$el.removeAttr('data-use-custom-theme');
+      }
     }
     else {
       this.$el.attr('src', '');

data/app/assets/stylesheets/pageflow/chart/transparent_background.css.erb

@@ -5,3 +5,7 @@
 %> {
   background-color: rgba(0, 0, 0, 0) !important;
 }
+
+a.logo img {
+  display: none;
+}

data/app/helpers/pageflow/chart/scraped_sites_helper.rb

@@ -17,9 +17,12 @@ module Pageflow
 
         if scraped_site
           data_attributes = {
-            src: scraped_site.html_file_url,
-            use_custom_theme: scraped_site.use_custom_theme
+            src: scraped_site.html_file_url
           }
+
+          if scraped_site.use_custom_theme
+            data_attributes[:use_custom_theme] = true
+          end
         end
 
         content_tag(:iframe, '', IFRAME_ATTRIBUTES.merge(data: data_attributes))

data/config/locales/de.yml

@@ -7,34 +7,35 @@ de:
     chart:
       editor:
         templates:
+          datawrapper_ad:
+            create_chart: Neues Datawrapper Diagramm erstellen
           scraped_site_status:
             failed: Beim Herunterladen des Diagramms ist ein Fehler aufgetreten.
             pending: Diagramm wird heruntergeladen...
       help_entries:
         page_type:
           menu_item: Diagramm
-          text: ! '# Diagramm
-
+          text: |-
+            # Diagramm
 
             Einbindung von Datawrapper-Diagrammen
 
-
             Hier kannst Du Deinen Pageflow um animierte Infografiken ergänzen. Eingebettet ist das
-
             Diagramm in ein Hintergrund-Bild und Text. Die Infografik lässt sich durch Klicken
-
             vergrössern.
 
-
             Dein Diagramm musst Du allerdings zuvor extern erstellen und einen entsprechenden Link generieren. Unter www.datawrapper.de findest Du Beispiele und die Konditionen, um
-
             diesen Dienst in Anspruch zu nehmen.
 
-
             Beachte, dass Datawrapper ein spezielles Design für Diagramme bietet, die in Pageflow eingebettet werden sollen. Klicke dazu im "Visualisieren" Schritt des Diagramm Assistenten auf das Tab "Design" und wähle "Pageflow" aus. Das Farbschema des Diagramms ist dann für die Verwendung in Pageflow optimiert.
 
-
-            Typische Anwendungsbeispiele: Statistiken, Diagramme, Zahlen&Fakten'
+            Typische Anwendungsbeispiele: Statistiken, Diagramme, Zahlen&Fakten
+      page_attributes:
+        full_width:
+          inline_help: Verbreitert das Diagramm, so dass es die maximal verfügbare Breite nutzt.
+          label: Gesamte Breite nutzen
+        scraped_site_id:
+          inline_help: 'URL zu einem bei Datawrapper publiziertem Diagramm. Datawrapper bietet in den Diagramm Optionen ein spezielles ''Pageflow'' Design für eine optimale Darstellung innerhalb des Beitrags. '
       page_type_category_name: Daten und Diagramme
       page_type_description: Einbindung von Diagrammen, die mit Datawrapper erstellt wurden
       page_type_name: Diagramm

data/config/locales/en.yml

@@ -7,13 +7,21 @@ en:
     chart:
       editor:
         templates:
+          datawrapper_ad:
+            create_chart: Create new Datawrapper chart
           scraped_site_status:
             failed: Chart download failed.
             pending: Downloading chart...
       help_entries:
         page_type:
           menu_item: Chart
-          text: ! "# Chart\n\nIntegration of a Datawrapper-Diagram\n\nHere you can add animated infographics to your Pageflow. The diagram is embedded into a background-picture and text. To enlarge the graphic you simply have to click on it. \n\nBut first of all you have to create your graphic externally and generate a link. You can find examples and requirements for this under www.datawrapper.de.\n\nNote that Datawrapper offers a special layout option for charts that shall be embedded into a Pageflow: In the \"Visualize\" step of the chart creation wizard, click the \"Design\" tab and select the \"Pageflow\" layout. That way a color scheme is used which complements Pageflow's look.\n\nExamples of application: statistics, diagrams, numbers & facts"
+          text: "# Chart\n\nIntegration of a Datawrapper-Diagram\n\nHere you can add animated infographics to your Pageflow. The diagram is embedded into a background-picture and text. To enlarge the graphic you simply have to click on it. \n\nBut first of all you have to create your graphic externally and generate a link. You can find examples and requirements for this under www.datawrapper.de.\n\nNote that Datawrapper offers a special layout option for charts that shall be embedded into a Pageflow: In the \"Visualize\" step of the chart creation wizard, click the \"Design\" tab and select the \"Pageflow\" layout. That way a color scheme is used which complements Pageflow's look.\n\nExamples of application: statistics, diagrams, numbers & facts"
+      page_attributes:
+        full_width:
+          inline_help: Extends the chart to use the maximum width available.
+          label: Use full width
+        scraped_site_id:
+          inline_help: URL of a chart published via Datawrapper. Datawrapper offers a special 'Pageflow' layout selectable on the 'Design' tab for optimal display inside Pageflow.
       page_type_category_name: Data and Charts
       page_type_description: Embedded Datawrapper chart
       page_type_name: Chart

data/lib/pageflow/chart/scraper.rb

@@ -67,12 +67,13 @@ module Pageflow
       end
 
       def combine_script_tags_in_head
-        script_tags_in_head.each(&:remove)
+        script_src_tags_in_head.each(&:remove)
 
-        all_script_tag = Nokogiri::XML::Node.new('script', document)
-        all_script_tag[:src] = 'all.js'
-        all_script_tag[:type] = 'text/javascript'
-        document.at_css('head') << all_script_tag
+        all_script_src_tag = Nokogiri::XML::Node.new('script', document)
+        all_script_src_tag[:src] = 'all.js'
+        all_script_src_tag[:type] = 'text/javascript'
+        document.at_css('head').children.first
+                .add_previous_sibling(all_script_src_tag)
       end
 
       def combine_css_link_tags
@@ -86,14 +87,14 @@ module Pageflow
       end
 
       def filtered_script_tags_in_head
-        script_tags_in_head.reject do |tag|
+        script_src_tags_in_head.reject do |tag|
           options.fetch(:head_script_blacklist, []).any? do |regexp|
             tag[:src] =~ regexp
           end
         end
       end
 
-      def script_tags_in_head
+      def script_src_tags_in_head
         document.css('head script[src]')
       end
 

data/lib/pageflow/chart/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module Chart
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

data/spec/pageflow/chart/scraper_spec.rb

@@ -8,7 +8,9 @@ module Pageflow
           html = <<-HTML
             <!DOCTYPE html>
             <html>
-              <head></head>
+              <head>
+                <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+              </head>
               <body>contents</body>
             </html>
           HTML
@@ -57,7 +59,9 @@ module Pageflow
           html = <<-HTML
             <!DOCTYPE html>
             <html>
-              <head></head>
+              <head>
+                <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+              </head>
               <body>
                 <script id="good">window.ok = true;</script>
                 <script id="bad">alert();</script>
@@ -74,7 +78,9 @@ module Pageflow
           html = <<-HTML
             <!DOCTYPE html>
             <html>
-              <head></head>
+              <head>
+                <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+              </head>
               <body>
                 <div id="bad" class="noscript"></div>
                 <div id="good"></div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-chart
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tim Fischbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -260,10 +260,6 @@ files:
 - chart.gemspec
 - config/locales/de.yml
 - config/locales/en.yml
-- config/locales/new/datawrapper_ad.de.yml
-- config/locales/new/datawrapper_ad.en.yml
-- config/locales/new/full_width.de.yml
-- config/locales/new/full_width.en.yml
 - config/routes.rb
 - db/migrate/20140417112724_create_pageflow_chart_scraped_sites.rb
 - db/migrate/20160211085234_add_use_custom_theme_to_scraped_sites.rb
@@ -348,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Pagetype for Embedded Datawrapper Charts

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

@@ -1,10 +0,0 @@
-de:
-  pageflow:
-    chart:
-      editor:
-        templates:
-          datawrapper_ad:
-            create_chart: "Neues Datawrapper Diagramm erstellen"
-      page_attributes:
-        scraped_site_id:
-          inline_help: "URL zu einem bei Datawrapper publiziertem Diagramm. Datawrapper bietet in den Diagramm Optionen ein spezielles 'Pageflow' Design für eine optimale Darstellung innerhalb des Beitrags. "

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

@@ -1,10 +0,0 @@
-en:
-  pageflow:
-    chart:
-      editor:
-        templates:
-          datawrapper_ad:
-            create_chart: "Create new Datawrapper chart"
-      page_attributes:
-        scraped_site_id:
-          inline_help: "URL of a chart published via Datawrapper. Datawrapper offers a special 'Pageflow' layout selectable on the 'Design' tab for optimal display inside Pageflow."

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

@@ -1,7 +0,0 @@
-de:
-  pageflow:
-    chart:
-      page_attributes:
-        full_width:
-          inline_help: Verbreitert das Diagramm, so dass es die maximal verfügbare Breite nutzt.
-          label: Gesamte Breite nutzen

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

@@ -1,7 +0,0 @@
-en:
-  pageflow:
-    chart:
-      page_attributes:
-        full_width:
-          inline_help: Extends the chart to use the maximum width available.
-          label: Use full width