contentful_middleman 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cfeacffa7586cbc65d3822d9b4b02484b7c8ca6
-  data.tar.gz: 03d6f48d7678eaa561ce7b1c68df617038e303f7
+  metadata.gz: e9139679962d383306d6e3bc2ac41003499bad3c
+  data.tar.gz: 7775dbb392e95e021cf9fa8adfb9a97a5e722ad2
 SHA512:
-  metadata.gz: d99a7a9e1f17201f4a0e6fb2e0e4c29c0e60a35700057161917695dc6228c71a7eb360051ec73b173a2c215736e2b7fc02037cdeacd0d8f9e96f85bd596bc158
-  data.tar.gz: 522fda1018a1713ccdfd20d7ce77b40c2cfe6b2fa0826da8658d48100c6faf90584d9c106e4f8c55d5c71fc4c6d64ef5a185a42c59ce682fa28bdb8575c2fa0d
+  metadata.gz: f89ab95709e0510226915f0e3991d4561c193b80cb419a2f830206725c1a71c038852eb81d3e56bded678913e99f820b306700e4ddcd842c7ac7e57ff8e5b8fd
+  data.tar.gz: 118262ec63062c0962fce52c1ff643a40376c95668bf7fa219cc5ec8b8aee37313549e66d4cb3e9f4530f667facc2bcce7e041e11ac6d70bc18c12f54523277e

data/CHANGELOG.md

@@ -1,9 +1,16 @@
 # Change Log
 
-## Upcoming
+## 1.0.4
+### Fixed
+* Typo in the require statements
+* The importing of entries with fields containing a list of elements other that links to entries now works
+* Handle non included links i.e. when the `include` query parameter is not present or its value doesn't cover a link
+
+## 1.0.3
 ## Fixed
 * The importing of entries including `Contentful::Location` fields now works
 
+
 ## 1.0.2
 ### Fixed
 * Include `middleman-blog` as dependency of the gem.

data/README.md

@@ -48,7 +48,7 @@ Parameter     | Description
 ----------    |------------
 space         | Hash with an user choosen name for the space as key and the space id as value
 access_token  | Contentful Delivery API access token
-cda_query     | Hash describing query configuration. See [contentful.rb](https://github.com/contentful/contentful.rb) for more info
+cda_query     | Hash describing query configuration. See [contentful.rb](https://github.com/contentful/contentful.rb) for more info (look for filter options there)
 content_types | Hash describing the mapping applied to entries of the imported content types
 
 You can activate the extension multiple times to import entries from different spaces.

data/lib/contentful_middleman/commands/contentful.rb

@@ -5,7 +5,7 @@ require 'digest'
 require 'contentful_middleman/commands/context'
 require 'contentful_middleman/tools/backup'
 require 'contentful_middleman/version_hash'
-require 'Contentful_middleman/import_task'
+require 'contentful_middleman/import_task'
 require 'contentful_middleman/local_data/store'
 require 'contentful_middleman/local_data/file'
 

data/lib/contentful_middleman/commands/context.rb

@@ -1,14 +1,13 @@
 module ContentfulMiddleman
   class Context < BasicObject
     def initialize
-      @variables       = {}
-      @nexted_contexts = []
+      @variables = {}
     end
 
     def method_missing(symbol, *args, &block)
       if symbol =~ /\A.+=\z/
-        variable_name              = symbol.to_s.gsub('=','')
-        variable_value             = args.first
+        variable_name  = symbol.to_s.gsub('=','')
+        variable_value = args.first
 
         set variable_name, variable_value
       else
@@ -16,25 +15,6 @@ module ContentfulMiddleman
       end
     end
 
-    def nest(field_name)
-      @nexted_contexts << field_name
-      new_context = Context.new
-      yield new_context
-
-      set field_name, new_context
-    end
-
-    def map(field_name, elements)
-      @nexted_contexts << field_name
-      new_contexts = elements.map do |element|
-        new_context = Context.new
-        yield element, new_context
-        new_context
-      end
-
-      set field_name, new_contexts
-    end
-
     def set(name, value)
       @variables[name.to_sym] = value
     end
@@ -47,30 +27,27 @@ module ContentfulMiddleman
       Context == klass
     end
 
-    def to_hash
-      @variables
+    def to_yaml
+      hashize.to_yaml
     end
 
-    def to_yaml
+    def hashize
       variables = @variables.dup
       variables.update(variables) do |variable_name, variable_value|
-        if @nexted_contexts.include? variable_name
-          hashize_nested_context(variable_value)
-        else
-          variable_value
-        end
+        ensure_primitive_data_types(variable_value)
       end
-
-      variables.to_yaml
     end
 
-    def hashize_nested_context(nested_context)
-      case nested_context
+    def ensure_primitive_data_types(value)
+      case value
+      when Context
+        value.hashize
       when ::Array
-        nested_context.map {|e| e.to_hash}
+        value.map {|element| ensure_primitive_data_types(element)}
       else
-        nested_context.to_hash
+        value
       end
     end
+
   end
 end

data/lib/contentful_middleman/mappers/base.rb

@@ -1,44 +1,66 @@
+require_relative '../commands/context'
+
 module ContentfulMiddleman
   module Mapper
     class Base
       def map(context, entry)
-        map_entry(context, entry)
-      end
-
-      private
-      def map_entry(context, entry)
         context.id = entry.id
         entry.fields.each {|k, v| map_field context, k, v}
       end
 
+      private
+
       def map_field(context, field_name, field_value)
-        case field_value
+        value_mapping = map_value(field_value)
+        context.set(field_name, value_mapping)
+      end
+
+      def map_value(value)
+        case value
         when Contentful::Asset
-          map_asset(context, field_name, field_value)
+          map_asset(value)
         when Contentful::Location
-          map_location(context, field_name, field_value)
+          map_location(value)
+        when Contentful::Link
+          map_link(value)
+        when Contentful::DynamicEntry
+          map_entry(value)
         when Array
-          map_array(context, field_name, field_value)
+          map_array(value)
         else
-          context.set(field_name, field_value)
+          value
         end
       end
 
-      def map_asset(context, field_name, field_value)
-        context.nest(field_name) do |nested_context|
-          nested_context.title = field_value.title
-          nested_context.url   = field_value.file.url
-        end
+      def map_asset(asset)
+        context       = Context.new
+        context.title = asset.title
+        context.url   = asset.file.url
+
+        context
       end
 
-      def map_array(context, field_name, field_value)
-          context.map(field_name, field_value) do |element, new_context|
-            map_entry(new_context, element)
-          end
+      def map_entry(entry)
+        context    = Context.new
+        context.id = entry.id
+        entry.fields.each {|k, v| map_field context, k, v}
+
+        context
+      end
+
+      def map_location(location)
+        location.properties
+      end
+
+      def map_link(link)
+        context    = Context.new
+        context.id = link.id
+
+        context
       end
 
-      def map_location(context, field_name, field_value)
-        context.set(field_name, field_value.properties)
+      def map_array(array)
+        array.map {|element| map_value(element)}
       end
     end
   end

data/lib/contentful_middleman/version.rb

@@ -1,3 +1,3 @@
 module ContentfulMiddleman
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_middleman
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Sascha Konietzke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core