contentful_middleman 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1307e1d94d361acbb2e3dff98d646982d7b437e8d0998c18ce8b4c8d69ae1e66
-  data.tar.gz: f56e068dd9463f21a02a587f2c69a9e105dc3194c3db267953a2f51f2676c3ae
+  metadata.gz: 867e24853effdac2308b2bae362ec4f1da52763bd0468b777c3ad4520239c87a
+  data.tar.gz: 720213486daf6a332cf24f42c1448a25d15e32b8fb72f39c16c1b93688a1a683
 SHA512:
-  metadata.gz: 4f02722dce5f2e2be856200bc0162af50f873927432e53f82b45887d1c20f80209659f85b73113480f15bdf434d86c620c0886c8d5e8cbe75a613da709507b00
-  data.tar.gz: bd9b842b364b540c4ef7da32dbb22038c2f01ce887c084f43bd892ddc6224b49623851528bf22a945f1cc32e974fc2ec3de504a675ac1e83cdbcb9cf412425e8
+  metadata.gz: 3a60eac2b8439a95db2563bde3b85076c8cd5039b4a64cf0b4b336f016b3aed61826bc86d3a2bed9750c3a49abf65a20d7e957702f289c1a9a8d1d54794ac82d
+  data.tar.gz: 5748ce48dcb6b199cdf7538bfcdfa43dcc4c942f90469388124e7e054d7e08e7fb405f5277405cc09da8d42533e484ef6014c966803f73b489d9d0db8ad97e5b

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 ## Unreleased
 
+## 4.2.0
+### Added
+* Added `base_path` and `destination` configuration options to manipulate the path to which the data files are saved to. [#89](https://github.com/contentful/contentful_middleman/issues/89)
+
 ## 4.1.0
 ### Added
 * *This feature is currently in BETA state, changes may occur as patch fixes* Added support for RichText and added the `rich_text` view helper.

data/README.md

@@ -64,7 +64,9 @@ all_entries_page_size    | Integer amount of items per page for `:all_entries` r
 rebuild_on_webhook       | Boolean to toggle Webhook server. Server will run in port 5678, and will be expecting to receive Contentful Webhook calls on `/receive`.
 webhook_timeout          | Integer (in seconds) for wait time after Webhook received for rebuilding. Only used if `:rebuild_on_webhook` is true. Defaults to 300 seconds.
 webhook_controller       | Class for handling Webhook response, defaults to `::ContentfulMiddleman::WebhookHandler`.
-rich_text_mappings | Hash with `'nodeTyoe' => RendererClass` pairs determining overrides for the [`RichTextRenderer` library](https://github.com/contentful/rich-text-renderer.rb) configuration.
+rich_text_mappings       | Hash with `'nodeType' => RendererClass` pairs determining overrides for the [`RichTextRenderer` library](https://github.com/contentful/rich-text-renderer.rb) configuration.
+base_path                | String with path to your Middleman Application, defaults to current directory. Path is relative to your current location.
+destination              | String with path within your base path under which to store the output yaml files. Defaults to `data`.
 
 You can activate the extension multiple times to import entries from different spaces.
 

data/lib/contentful_middleman/commands/contentful.rb

@@ -15,9 +15,6 @@ module Middleman
     class Contentful < Thor::Group
       include Thor::Actions
 
-      # Path where Middleman expects the local data to be stored
-      MIDDLEMAN_LOCAL_DATA_FOLDER = 'data'
-
       check_unknown_options!
 
       class_option "rebuild",
@@ -34,23 +31,24 @@ module Middleman
       end
 
       def contentful
-        if contentful_instances.size > 0
-          ContentfulMiddleman::VersionHash.source_root    = self.class.source_root
-          ContentfulMiddleman::LocalData::Store.base_path = MIDDLEMAN_LOCAL_DATA_FOLDER
-          ContentfulMiddleman::LocalData::File.thor       = self
-
-          hash_local_data_changed = contentful_instances.reduce(false) do |changes, instance|
-            import_task = create_import_task(instance)
-            import_task.run
-
-            changes || import_task.changed_local_data?
-          end
-
-          Middleman::Cli::Build.new.build if hash_local_data_changed && options[:rebuild]
-          logger.info 'Contentful Import: Done!'
-        else
-          raise Thor::Error.new "You need to activate the contentful extension in config.rb before you can import data from Contentful"
+        raise Thor::Error.new "You need to activate the contentful extension in config.rb before you can import data from Contentful" if contentful_instances.empty?
+
+        ContentfulMiddleman::VersionHash.source_root    = self.class.source_root
+        ContentfulMiddleman::LocalData::File.thor       = self
+
+        hash_local_data_changed = contentful_instances.reduce(false) do |changes, instance|
+          ContentfulMiddleman::LocalData::Store.base_path = File.join(
+            instance.options.base_path,
+            instance.options.destination
+          )
+          import_task = create_import_task(instance)
+          import_task.run
+
+          changes || import_task.changed_local_data?
         end
+
+        Middleman::Cli::Build.new.build if hash_local_data_changed && options[:rebuild]
+        logger.info 'Contentful Import: Done!'
       end
 
       private

data/lib/contentful_middleman/core.rb

@@ -55,6 +55,11 @@ module ContentfulMiddleman
     option :rich_text_mappings, {},
       "Custom renderers for the RichTextRenderer library"
 
+    option :base_path, Dir.pwd,
+      "String with path to your Middleman Application. Path is relative to your current location."
+
+    option :destination, 'data',
+      "String with path within your base path under which to store the output yaml files."
 
     helpers ContentfulMiddleman::Helpers
     include ContentfulMiddleman::Helpers

data/lib/contentful_middleman/version.rb

@@ -1,3 +1,3 @@
 module ContentfulMiddleman
-  VERSION = "4.1.0"
+  VERSION = "4.2.0"
 end

data/spec/contentful_middleman/core_spec.rb

@@ -22,6 +22,8 @@ describe ContentfulMiddleman::Core do
       expect(options.rebuild_on_webhook).to eq(false)
       expect(options.webhook_timeout).to eq(300)
       expect(options.default_locale).to eq('en-US')
+      expect(options.base_path).to eq Dir.pwd
+      expect(options.destination).to eq 'data'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_middleman
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Sascha Konietzke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core