fuelsdk 0.1.3 → 0.1.4

data/ChangeLog.md

@@ -1,6 +1,11 @@
 FuelSDK-Ruby
 ============
 
+2013-09-19: Version 0.1.4
+```
+  moved dataextension property munging into client so not required to instantiate those objects.
+```
+
 2013-09-18: Version 0.1.3
 ```
   augment soap_cud to handle dataextensions better

data/lib/fuelsdk/objects.rb

@@ -208,71 +208,28 @@ module FuelSDK
       end
 
       def post
-        munge_properties self.properties
+        add_customer_key self.properties
         super
       end
 
       def patch
-        munge_properties self.properties
+        add_customer_key self.properties
         super
       end
 
       def delete
-        munge_keys self.properties
+        add_customer_key self.properties
         super
       end
 
       private
-        #::TODO::
-        # opportunity for meta programming here... but need to get this out the door
-        def munge_keys d
-          d.each do |o|
-
-            next if explicit_keys(o) && explicit_customer_key(o)
-
-            formatted = []
-            o['CustomerKey'] = customer_key unless explicit_customer_key o
-            unless explicit_properties(o)
-              o.each do |k, v|
-                next if k == 'CustomerKey'
-                formatted.concat FuelSDK.format_name_value_pairs k => v
-                o.delete k
-              end
-              o['Keys'] = {'Key' => formatted }
-            end
+        def add_customer_key data
+          data.each do |d|
+            next if d.include? 'CustomerKey'
+            d['CustomerKey'] = customer_key
           end
         end
 
-        def explicit_keys h
-          h['Keys'] and h['Keys']['Key']
-        end
-
-        def munge_properties d
-          d.each do |o|
-
-            next if explicit_properties(o) && explicit_customer_key(o)
-
-            formatted = []
-            o['CustomerKey'] = customer_key unless explicit_customer_key o
-            unless explicit_properties(o)
-              o.each do |k, v|
-                next if k == 'CustomerKey'
-                formatted.concat FuelSDK.format_name_value_pairs k => v
-                o.delete k
-              end
-              o['Properties'] = {'Property' => formatted }
-            end
-          end
-        end
-
-        def explicit_properties h
-          h['Properties'] and h['Properties']['Property']
-        end
-
-        def explicit_customer_key h
-          h['CustomerKey']
-        end
-
         def retrieve_required
           # have to use instance variables so we don't recursivelly retrieve_required
           if !@name && !@customer_key

data/lib/fuelsdk/version.rb

@@ -1,3 +1,3 @@
 module FuelSDK
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/fuelsdk.rb

@@ -4,18 +4,7 @@ require 'rubygems'
 require 'date'
 require 'jwt'
 require 'active_support/inflector'
-
-class Array
-  class << self
-    def wrap subject
-      if subject.kind_of? Array
-        subject
-      else
-        [subject]
-      end
-    end
-  end
-end
+require "active_support/core_ext/array/wrap"
 
 module FuelSDK
   require 'fuelsdk/utils'

data/spec/objects_spec.rb

@@ -461,11 +461,9 @@ describe FuelSDK::DataExtension::Row do
 
       subject.properties = [{'Name' => 'Justin'}]
 
-      expect(subject.post).to eq([
-        'DataExtensionObject', [{
-          'CustomerKey' => 'Subscribers',
-          'Properties' => {'Property' => [{'Name' => 'Name', 'Value' => 'Justin'}]}}]
-      ])
+      expect(subject.post).to eq(
+        ["DataExtensionObject", [{"Name"=>"Justin", "CustomerKey"=>"Subscribers"}]]
+      )
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuelsdk
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler