contentful-importer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b4cb5b28ec76176d942746f1e3d0c1062acbb39
-  data.tar.gz: e214eff208d733e53483a1397d5f12cbadbdb5a9
+  metadata.gz: b73728474014c30ccd464ed1d5cf924709ab305c
+  data.tar.gz: 09ce5c3def7d50dd13817c754f0e5e8819ca10a5
 SHA512:
-  metadata.gz: c045429597f9113ee8dc58678b8d8fdea072fe9f17447d2d49ef28c1ead138c2f393294d542874dd80e418f764b40a0c419ebeae2729c11f09daea19aecfef79
-  data.tar.gz: 8f889a25905fa8e8903aad4961793e1f16ae17de1f82f028ed70bd8042d0b0f6d811e5fc3f694ad6da95b2d4a232e1d15e8bed7d2d96bfdc7c1a55232f5b6bd7
+  metadata.gz: 1c863bfd32bec39e6c64b437bf84053fa0bd6505e20f42d39a7777a997a7ac575c6ebccf3b7988da8b2b58d692cb4b770af3346c822bdb4222cae2183c9ffed2
+  data.tar.gz: a76e0c297f18bd96796e859470412a08dbd041f006725c7da4146ceee43cb89d0023c09ac36a109d5d31e6d240b5f9c9937b99249d2b123b1b977ef9e127c135

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 # Change Log
+
+## 0.0.2
+### Added
+* Read contentType and description from asset JSON files, falling back to contentType inference from the asset URL.
+
 ## 0.0.1
 ### Other
 * Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    contentful-importer (0.0.1)
+    contentful-importer (0.0.2)
       activesupport (~> 4.1)
       api_cache (~> 0.3.0)
       contentful-management (~> 0.5.0)
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.0)
+    activesupport (4.2.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -31,10 +31,10 @@ GEM
     docile (1.1.5)
     escort (0.4.0)
       nesty
-    form_data (0.1.0)
-    http (0.7.1)
-      form_data (~> 0.1.0)
+    http (0.7.3)
+      http-form_data (~> 1.0.0)
       http_parser.rb (~> 0.6.0)
+    http-form_data (1.0.0)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
     json (1.8.2)
@@ -65,7 +65,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     vcr (2.9.3)

data/README.md

@@ -9,9 +9,9 @@ You can use one of the following tools to extract your content and make it ready
 
 #### Available exporters
 
- - [Database](https://github.com/contentful/database-adapter)
- - [Wordpress](https://github.com/contentful/wordpress-adapter)
- - [Drupal](https://github.com/contentful/drupal-adapter)
+ - [Database](https://github.com/contentful/database-exporter.rb)
+ - [Wordpress](https://github.com/contentful/wordpress-exporter.rb)
+ - [Drupal](https://github.com/contentful/drupal-exporter.rb)
 
 
 ## Installation

data/lib/importer/parallel_importer.rb

@@ -85,9 +85,10 @@ module Contentful
     def import_asset(asset_attributes)
       logger.info "Import asset - #{asset_attributes['id']} "
       asset_title = asset_attributes['name'].present? ? asset_attributes['name'] : asset_attributes['id']
+      asset_description = asset_attributes['description'].present? ? asset_attributes['description'] : ''
       asset_file = create_asset_file(asset_title, asset_attributes)
       space = Contentful::Management::Space.find(config.config['space_id'])
-      asset = space.assets.create(id: "#{asset_attributes['id']}", title: "#{asset_title}", description: '', file: asset_file)
+      asset = space.assets.create(id: "#{asset_attributes['id']}", title: "#{asset_title}", description: asset_description, file: asset_file)
       asset_status(asset, asset_attributes)
     end
 
@@ -376,7 +377,7 @@ module Contentful
     end
 
     def file_content_type(params)
-      MimeContentType::EXTENSION_LIST[File.extname(params['url'])]
+      params['contentType'].present? ? params['contentType'] : MimeContentType::EXTENSION_LIST[File.extname(params['url'])]
     end
 
     def format_json(item)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Version
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/lib/importer/parallel_importer_spec.rb

@@ -22,6 +22,16 @@ module Contentful
       expect(file).to be_a Contentful::Management::File
     end
 
+    it 'gets asset content type from params' do
+      file = @importer.create_asset_file('title', {'url' => 'www.example.com/image.jpg?withoutextension', 'contentType' => 'image/jpeg'})
+      expect(file.properties[:contentType]).to eq'image/jpeg'
+    end
+
+    it 'gets asset content type from params' do
+      file = @importer.create_asset_file('title', {'url' => 'www.example.com/image.jpg'})
+      expect(file.properties[:contentType]).to eq'image/jpeg'
+    end
+
     it 'get_id' do
       id = @importer.send(:get_id, {'id' => 'name.png'})
       expect(id).to eq 'name.png'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful-importer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Contentful GmbH (Andreas Tiefenthaler)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http