pageflow-chart 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmViYWVjOGM0OGIwOTFkODk3MzA1NjBiOWQxMDBiMjQ3NDNkNzFjZA==
+    NzRhZTQ1NzAzMGRmYjQwN2ExODk5ZWFjZmYzNzJkNDA1NjBjZTJmYw==
   data.tar.gz: !binary |-
-    ZTBhODQ0ZTE2ZGNiYzI4NDQ0YTRhYmFlN2Y1NjZiZTg1NjllODNlMA==
+    ZDNhYTYzOThiOTk1Njg3ODRiNzM3ZjIzMmI1NGRjNmNjYzEwM2JkMA==
 SHA512:
   metadata.gz: !binary |-
-    ZTQzNzQxZjczZDBiZDkyY2VmMTg2ZjQ2NGY1ZDAwY2RiZDdmOGRjZGMyYWQx
-    NTYyMDU0YWUyNzYzMDllODQxNTA4NmYyYjc2NTVmNmIyMzVlMDc3NDJiNWY2
-    ODk1Y2M5NDVjNDAwY2IyZWM1ZTljNGMzODIzMjM2YWM0MWMxMTU=
+    NWQyMTEzYzhkMzkxZjgxNTdjY2Q4MWYwN2I3ODI4NmMxNjkzNzY3NGZiY2Vk
+    MzNhYmY2ZmQ4ZjcxYWMzZWRmODZmNDJiZjdiM2YxOTRmYjc0NmYyYmNmNTFl
+    OTliYTNiMTIxOGMzMWYyZmQ5N2E4NzkxZDgzN2EzZjc3ODRhYWE=
   data.tar.gz: !binary |-
-    NDk1NDY1YTkzNWQ0ODRiMWZlNjhjZDM2ZDM3ZTNhOTNiYTQ4YWI1MzUzMWQw
-    ZGNkZWRkM2ZiMjcxNjMxMTJmYTc0MmVlYjU3YzcwNDY1OWM5Mjc1NmQ5MWE4
-    MWQwZjIyYTlkMDk2MmFlOWYyYWIzYzk5ZmU2ZDNlM2M1NDE1Y2U=
+    YzA5MzExNmQ4ZGQ1MTI0M2NmOWMyYWY4ZWUxOGJiMWFkZjMzNmZiMGVmN2Ni
+    ZTE3NjAxYTM2NzFmN2MxY2VlMDliZGU2YzNhNTc1Y2UwZDEwODg2ZDZkY2I1
+    NzM1ZTgyZDRhYTk4NWM5Mzk3MmUwZDdmMmVhOGJiNjg5OTUzNmE=

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+### Version 0.1.1
+
+[Compare changes](https://github.com/codevise/pageflow-chart/compare/v0.1.0...v0.1.1)
+
+- Bug fix: Support new datawrapper host name.
+  ([#9](https://github.com/codevise/pageflow-chart/pull/9),
+   [#10](https://github.com/codevise/pageflow-chart/pull/10))
+- Bug fix: Save correct content types for scraped files with
+  Paperclip 4.x.
+  ([#7](https://github.com/codevise/pageflow-chart/pull/7))
+- Bug fix: Explicitly disable Paperclip attachment validation.
+  ([#5](https://github.com/codevise/pageflow-chart/pull/5))
+- Bug fix: Do not report binstubs as executables in gemspec.
+  ([#6](https://github.com/codevise/pageflow-chart/pull/6))
+
 ### Version 0.1.0
 
 2015-02-03

data/Gemfile

@@ -7,4 +7,4 @@ gem 'activeadmin', :git => 'https://github.com/codevise/active_admin.git', :bran
 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'

data/README.md

@@ -1,5 +1,7 @@
 # Pageflow Chart
 
+[![Gem Version](https://badge.fury.io/rb/pageflow-chart.svg)](http://badge.fury.io/rb/pageflow-chart)
+
 Page type showing scraped svg diagramms from Datawrapper.
 
 ## Installation
@@ -7,7 +9,7 @@ Page type showing scraped svg diagramms from Datawrapper.
 Add this line to your application's Gemfile:
 
     # Gemfile
-    gem 'pagflow-chart'
+    gem 'pageflow-chart'
 
 Mount the engine:
 
@@ -27,18 +29,18 @@ Include javascript/stylesheets:
     # app/assets/javascripts/pageflow/editor.js
     //= require pageflow/chart/editor
 
-    # app/assets/stylesheets/pageflow/application.scss.css;
+    # app/assets/stylesheets/pageflow/application.css.scss;
     @import "pageflow/chart";
 
 
-    # app/assets/stylesheets/pageflow/editor.scss.css;
+    # app/assets/stylesheets/pageflow/editor.css.scss;
     @import "pageflow/chart/editor";
 
     # Adding basic style to your theme
     # app/assets/stylesheets/pageflow/themes/default.css.scss
     @import "pageflow/chart/themes/default";
 
-Install and run migrations:
+Execute `bundle install`. Then Install and run migrations:
 
     rake pageflow_chart:install:migrations
     rake db:migrate SCOPE=pageflow_chart
@@ -68,11 +70,12 @@ Example:
 
     Pageflow::Chart.configure do |config|
       config.scraped_sites_root_url = '/datawrapper'
+      
+      # Allow scraping charts from custom account URLs
+      config.supported_hosts << 'http://mycustom.datawrapper.de'
     end
 
-Please see `lib/pageflow/chart/configuration.rb` for the possible options.
-
-TODO: Document config options here
+Also see `lib/pageflow/chart/configuration.rb` for the additional options.
 
 ## Troubleshooting
 

data/app/models/pageflow/chart/scraped_site.rb

@@ -6,6 +6,11 @@ module Pageflow
       has_attached_file :html_file, Chart.config.paperclip_options(extension: 'html')
       has_attached_file :csv_file, Chart.config.paperclip_options(basename: 'data', extension: 'csv')
 
+      do_not_validate_attachment_file_type(:javascript_file)
+      do_not_validate_attachment_file_type(:stylesheet_file)
+      do_not_validate_attachment_file_type(:html_file)
+      do_not_validate_attachment_file_type(:csv_file)
+
       state_machine initial: 'unprocessed' do
         extend StateMachineJob::Macro
 

data/app/views/pageflow/chart/page_type.json.jbuilder

@@ -1,2 +1,2 @@
 json.key_format! camelize: :lower
-json.supported_hosts Pageflow::Chart.config.supported_hosts
+json.supported_hosts Pageflow::Chart.config.supported_hosts.uniq

data/chart.gemspec

@@ -2,21 +2,20 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "pageflow-chart"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["Tim Fischbach"]
   spec.email         = ["tfischbach@codevise.de"]
   spec.summary       = "Pagetype for Embedded Datawrapper Charts"
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/codevise/pageflow-chart"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "pageflow", "~> 0.7"
   spec.add_runtime_dependency "nokogiri"
-  spec.add_runtime_dependency "paperclip"
+  spec.add_runtime_dependency "paperclip", "~> 4.2"
   spec.add_runtime_dependency "state_machine"
   spec.add_runtime_dependency "state_machine_job"
   spec.add_runtime_dependency 'i18n-js'

data/lib/pageflow/chart/configuration.rb

@@ -41,7 +41,7 @@ module Pageflow
         @paperclip_s3_default_options = {}
         @paperclip_base_path = ':host'
         @scraped_sites_root_url = nil
-        @supported_hosts = ['http://cf.datawrapper.de']
+        @supported_hosts = ['http://cf.datawrapper.de', 'http://datawrapper.dwcdn.de']
       end
 
       # @api private
@@ -55,9 +55,23 @@ module Pageflow
 
       def default_paperclip_path_options(options)
         {
-          path: File.join(paperclip_base_path, ":class/:id_partition/#{options.fetch(:basename, 'all')}.#{options.fetch(:extension)}")
+          path: File.join(paperclip_base_path, ":class/:id_partition/#{options.fetch(:basename, 'all')}.#{options.fetch(:extension)}"),
+          s3_headers: paperclip_s3_headers(options)
         }
       end
+
+      def paperclip_s3_headers(options)
+        {
+          'Content-Type' => CONTENT_TYPE_MAPPING[options.fetch(:extension)]
+        }
+      end
+
+      CONTENT_TYPE_MAPPING = {
+        'css' => 'text/css',
+        'js' => 'application/javascript',
+        'html' => 'text/html',
+        'csv' => 'text/plain'
+      }
     end
   end
 end

data/spec/pageflow/chart/configuration_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+module Pageflow
+  module Chart
+    describe Configuration do
+      describe 'paperclip_options' do
+        it 'returns hash with path option for file with given extension' do
+          configuration = Configuration.new
+
+          result = configuration.paperclip_options(extension: 'js')
+
+          expect(result[:path]).to eq(':host/:class/:id_partition/all.js')
+        end
+
+        it 'allows to override basename of path option' do
+          configuration = Configuration.new
+
+          result = configuration.paperclip_options(basename: 'some', extension: 'js')
+
+          expect(result[:path]).to eq(':host/:class/:id_partition/some.js')
+        end
+
+        it 'uses paperclip_base_path as prefix' do
+          configuration = Configuration.new
+          configuration.paperclip_base_path = 'main'
+
+          result = configuration.paperclip_options(basename: 'some', extension: 'js')
+
+          expect(result[:path]).to eq('main/:class/:id_partition/some.js')
+        end
+
+        it 'returns hash with s3_headers option with matching content type for js' do
+          configuration = Configuration.new
+
+          result = configuration.paperclip_options(extension: 'js')
+
+          expect(result[:s3_headers]['Content-Type']).to eq('application/javascript')
+        end
+
+        it 'returns hash with s3_headers option with matching content type for css' do
+          configuration = Configuration.new
+
+          result = configuration.paperclip_options(extension: 'css')
+
+          expect(result[:s3_headers]['Content-Type']).to eq('text/css')
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-chart
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tim Fischbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -42,16 +42,16 @@ dependencies:
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -181,8 +181,7 @@ dependencies:
 description: 
 email:
 - tfischbach@codevise.de
-executables:
-- rails
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -275,6 +274,7 @@ files:
 - spec/fixtures/datawrapper.html
 - spec/jobs/pageflow/chart/scrape_site_job_spec.rb
 - spec/models/pageflow/chart/scraped_site_spec.rb
+- spec/pageflow/chart/configuration_spec.rb
 - spec/pageflow/chart/downloader_spec.rb
 - spec/pageflow/chart/scraper_spec.rb
 - spec/requests/scraping_site_spec.rb
@@ -284,7 +284,7 @@ files:
 - spec/support/paperclip.rb
 - spec/support/resque.rb
 - spec/support/webmock.rb
-homepage: ''
+homepage: https://github.com/codevise/pageflow-chart
 licenses:
 - MIT
 metadata: {}
@@ -352,6 +352,7 @@ test_files:
 - spec/fixtures/datawrapper.html
 - spec/jobs/pageflow/chart/scrape_site_job_spec.rb
 - spec/models/pageflow/chart/scraped_site_spec.rb
+- spec/pageflow/chart/configuration_spec.rb
 - spec/pageflow/chart/downloader_spec.rb
 - spec/pageflow/chart/scraper_spec.rb
 - spec/requests/scraping_site_spec.rb