fuelsdk 0.1.4 → 0.1.5

data/ChangeLog.md

@@ -1,9 +1,11 @@
 FuelSDK-Ruby
 ============
 
-2013-09-19: Version 0.1.4
+2013-10-17: Version 0.1.5
 ```
   moved dataextension property munging into client so not required to instantiate those objects.
+
+  convert properties to array at last minute. fixes #14
 ```
 
 2013-09-18: Version 0.1.3

data/lib/fuelsdk.rb

@@ -33,3 +33,6 @@ ET_UnsubEvent = FuelSDK::UnsubEvent
 ET_TriggeredSend = FuelSDK::TriggeredSend
 ET_Campaign = FuelSDK::Campaign
 ET_Get = FuelSDK::Get
+ET_Post = FuelSDK::Post
+ET_Delete = FuelSDK::Delete
+ET_Patch = FuelSDK::Patch

data/lib/fuelsdk/objects.rb

@@ -4,7 +4,7 @@ module FuelSDK
       module Read
         attr_accessor :filter
         def get _id=nil
-          client.soap_get _id||id, properties, filter
+          client.soap_get _id||id, Array.wrap(properties), filter
         end
 
         def info
@@ -14,15 +14,15 @@ module FuelSDK
 
       module CUD #create, update, delete
         def post
-          client.soap_post id, properties
+          client.soap_post id, Array.wrap(properties)
         end
 
         def patch
-          client.soap_patch id, properties
+          client.soap_patch id, Array.wrap(properties)
         end
 
         def delete
-          client.soap_delete id, properties
+          client.soap_delete id, Array.wrap(properties)
         end
       end
     end
@@ -30,21 +30,21 @@ module FuelSDK
     module Rest
       module Read
         def get
-          client.rest_get id, properties
+          client.rest_get id, Array.wrap(properties)
         end
       end
 
       module CUD
         def post
-          client.rest_post id, properties
+          client.rest_post id, Array.wrap(properties)
         end
 
         def patch
-          client.rest_patch id, properties
+          client.rest_patch id, Array.wrap(properties)
         end
 
         def delete
-          client.rest_delete id, properties
+          client.rest_delete id, Array.wrap(properties)
         end
       end
     end
@@ -56,11 +56,6 @@ module FuelSDK
       alias props= properties= # backward compatibility
       alias authStub= client= # backward compatibility
 
-      def properties
-        @properties = [@properties].compact unless @properties.kind_of? Array
-        @properties
-      end
-
       def id
         self.class.id
       end
@@ -167,10 +162,6 @@ module FuelSDK
         'DataExtensionField'
       end
       def get
-        if filter and filter.kind_of? Hash and \
-          filter.include? 'Property' and filter['Property'] == 'CustomerKey'
-          filter['Property'] = 'DataExtension.CustomerKey'
-        end
         super
       end
     end
@@ -264,7 +255,7 @@ module FuelSDK
           raise 'Unable to handle muliple DataExtension definitions and a field definition'
         end
 
-        d.each do |de|
+        Array.wrap(d).each do |de|
 
           if (explicit_fields(de) and (de['columns'] || de['fields'] || has_fields)) or
             (de['columns'] and (de['fields'] || has_fields)) or
@@ -345,4 +336,74 @@ module FuelSDK
       end
     end
   end
+
+  class Post < Objects::Base
+    include Objects::Soap::CUD
+    attr_accessor :id
+
+    def initialize client, id, properties
+      self.properties = properties
+      self.client = client
+      self.id = id
+    end
+
+    def post
+      super
+    end
+
+    class << self
+      def new client, id, properties=nil
+        o = self.allocate
+        o.send :initialize, client, id, properties
+        return o.post
+      end
+    end
+  end
+
+  class Delete < Objects::Base
+    include Objects::Soap::CUD
+    attr_accessor :id
+
+    def initialize client, id, properties
+      self.properties = properties
+      self.client = client
+      self.id = id
+    end
+
+    def delete
+      super
+    end
+
+    class << self
+      def new client, id, properties=nil
+        o = self.allocate
+        o.send :initialize, client, id, properties
+        return o.delete
+      end
+    end
+  end
+
+  class Patch < Objects::Base
+      include Objects::Soap::CUD
+      attr_accessor :id
+
+      def initialize client, id, properties
+        self.properties = properties
+        self.client = client
+        self.id = id
+      end
+
+      def patch
+        super
+      end
+
+      class << self
+        def new client, id, properties=nil
+          o = self.allocate
+          o.send :initialize, client, id, properties
+          return o.patch
+        end
+      end
+  end
+
 end

data/lib/fuelsdk/soap.rb

@@ -247,8 +247,19 @@ module FuelSDK
       }
     end
 
-    def normalize_filter filter
+    def normalize_customer_key filter, object_type
+      filter.tap do |f|
+        if is_a_dataextension? object_type
+          if filter['Property'] == 'CustomerKey'
+            f['Property'] = 'DataExtension.CustomerKey'
+          end
+        end
+      end
+    end
+
+    def normalize_filter filter, object_type=''
       if filter and filter.kind_of? Hash
+        normalize_customer_key filter, object_type
         if filter.has_key?('LogicalOperator')
           add_complex_filter_part filter
         else
@@ -338,7 +349,7 @@ module FuelSDK
     end
 
     def is_a_dataextension? object_type
-      object_type == 'DataExtensionObject'
+      object_type.start_with? 'DataExtension'
     end
 
     def format_object_cud_properties object_type, properties

data/lib/fuelsdk/version.rb

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

data/spec/objects_spec.rb

@@ -6,13 +6,13 @@ describe FuelSDK::Objects::Base do
   subject{ object }
 
   describe '#properties' do
-    it 'is empty by default' do
-      expect(object.properties).to be_empty
+    it 'is nil by default' do
+      expect(object.properties).to be_nil
     end
 
-    it 'returns item in array when item is not an array' do
+    it 'returns property' do
       object.properties = {'name' => 'value'}
-      expect(object.properties).to eq([{'name' => 'value'}])
+      expect(object.properties).to eq({'name' => 'value'})
     end
 
     it 'returns array when assigned array' do

data/spec/soap/get_spec.rb

@@ -254,4 +254,16 @@ describe FuelSDK::Soap do
     end
   end
 
+  describe '#normalize_customer_key' do
+    it 'changes CustomerKey to DataExtension.CustomerKey' do
+      expect(client.normalize_customer_key({'Property' => 'CustomerKey'}, 'DataExtensionField'))
+        .to eq({'Property' => 'DataExtension.CustomerKey'})
+    end
+
+    it 'nothing changes if object is not a DataExtension' do
+      expect(client.normalize_customer_key({'Property' => 'CustomerKey'}, 'SomethingObject'))
+        .to eq({'Property' => 'CustomerKey'})
+    end
+  end
+
 end

metadata

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