lib/gooddata/models/to_wire.rb in gooddata-0.6.16 vs lib/gooddata/models/to_wire.rb in gooddata-0.6.17

@@ -16,11 +16,12 @@
           attribute_to_wire(dataset, DatasetBlueprint.anchor(dataset))
         else
           {
             attribute: {
               identifier: GoodData::Model.identifier_for(dataset, type: :anchor_no_label),
-              title: "Records of #{ GoodData::Model.title(dataset) }"
+              title: "Records of #{ GoodData::Model.title(dataset) }",
+              folder: dataset[:folder] || GoodData::Model.title(dataset)
             }
           }
         end
       end
 
@@ -41,14 +42,15 @@
       # @param attribute [Hash] Attribute
       # @return [Hash] Manifest for a particular reference
       def self.attribute_to_wire(dataset, attribute)
         default_label = DatasetBlueprint.default_label_for_attribute(dataset, attribute)
         label = default_label[:type].to_sym == :label ? default_label : default_label.merge(type: :primary_label)
-        {
+        payload = {
           attribute: {
             identifier: GoodData::Model.identifier_for(dataset, attribute),
             title: GoodData::Model.title(attribute),
+            folder: attribute[:folder] || dataset[:folder] || GoodData::Model.title(dataset),
             labels: ([attribute.merge(type: :primary_label)] + DatasetBlueprint.labels_for_attribute(dataset, attribute)).map do |l|
               {
                 label: {
                   identifier: GoodData::Model.identifier_for(dataset, l, attribute),
                   title: GoodData::Model.title(l),
@@ -58,10 +60,13 @@
               }
             end,
             defaultLabel: GoodData::Model.identifier_for(dataset, label, attribute)
           }
         }
+        payload.tap do |p|
+          p[:attribute][:description] = GoodData::Model.description(attribute) if GoodData::Model.description(attribute)
+        end
       end
 
       # Converts dataset to wire format.
       #
       # @param project [Hash] Project blueprint hash represenation
@@ -98,16 +103,20 @@
       #
       # @param dataset [Hash] Dataset blueprint hash represenation
       # @param fact [Hash] Fact blueprint
       # @return [Hash] Manifest for a particular reference
       def self.fact_to_wire(dataset, fact)
-        {
+        payload = {
           fact: {
             identifier: GoodData::Model.identifier_for(dataset, fact),
             title: GoodData::Model.title(fact),
+            folder: fact[:folder] || dataset[:folder] || GoodData::Model.title(dataset),
             dataType: fact[:gd_data_type] || DEFAULT_FACT_DATATYPE
           }
         }
+        payload.tap do |p|
+          p[:fact][:description] = GoodData::Model.description(fact) if GoodData::Model.description(fact)
+        end
       end
 
       # Converts references to wire format.
       #
       # @param fact [Hash] Project blueprint hash represenation