lib/fuelsdk/objects.rb in fuelsdk-0.0.3 vs lib/fuelsdk/objects.rb in fuelsdk-0.0.4

@@ -1,146 +1,158 @@
 module FuelSDK
-  module ET_SoapGet
-    def get
-      client.soap_get id, properties, filter
-    end
+  module Objects
+    module SoapRead
+      def get
+        client.soap_get id, properties, filter
+      end
 
-    def info
-      client.soap_describe id
+      def info
+        client.soap_describe id
+      end
     end
-  end
 
-  module ET_SoapCUD #create, update, delete
-    def post
-      client.soap_post id, properties
-    end
+    module SoapCUD #create, update, delete
+      def post
+        client.soap_post id, properties
+      end
 
-    def patch
-      client.soap_patch id, properties
-    end
+      def patch
+        client.soap_patch id, properties
+      end
 
-    def delete
-      client.soap_delete id, properties
+      def delete
+        client.soap_delete id, properties
+      end
     end
-  end
 
-  module ET_RestGet
-    def get
-      client.rest_get id, properties
+    module RestRead
+      def get
+        client.rest_get id, properties
+      end
     end
-  end
 
-  module ET_RestCUD
-    def post
-      client.rest_post id, properties
-    end
+    module RestCUD
+      def post
+        client.rest_post id, properties
+      end
 
-    def patch
-      client.rest_patch id, properties
-    end
+      def patch
+        client.rest_patch id, properties
+      end
 
-    def delete
-      client.rest_delete id, properties
+      def delete
+        client.rest_delete id, properties
+      end
     end
-  end
 
-  class ET_Base
-    attr_accessor :filter, :properties, :client
-    attr_reader :id
+    class Base
+      attr_accessor :filter, :properties, :client
+      attr_reader :id
 
-    alias props= properties= # backward compatibility
-    alias authStub= client= # backward compatibility
+      alias props= properties= # backward compatibility
+      alias authStub= client= # backward compatibility
 
-    def id
-      self.class.name.split('::').pop.split('_').pop
+      def id
+        self.class.id
+      end
+
+      class << self
+        def id
+          self.name.split('::').pop
+        end
+      end
     end
   end
 
-  class ET_BounceEvent < ET_Base
-    include ET_SoapGet
+  class BounceEvent < Objects::Base
+    include Objects::SoapRead
   end
 
-  class ET_ClickEvent < ET_Base
-    include ET_SoapGet
+  class ClickEvent < Objects::Base
+    include Objects::SoapRead
   end
 
-  class ET_ContentArea < ET_Base
-    include ET_SoapGet
-    include ET_SoapCUD
+  class ContentArea < Objects::Base
+    include Objects::SoapRead
+    include Objects::SoapCUD
   end
 
-  class ET_Folder < ET_Base
-    include ET_SoapGet
-    include ET_SoapCUD
-    def id
-      'DataFolder'
+  class DataFolder < Objects::Base
+    include Objects::SoapRead
+    include Objects::SoapCUD
+  end
+
+  class Folder < DataFolder
+    class << self
+      def id
+        DataFolder.id
+      end
     end
   end
 
-  class ET_Email < ET_Base
-    include ET_SoapGet
-    include ET_SoapCUD
+  class Email < Objects::Base
+    include Objects::SoapRead
+    include Objects::SoapCUD
   end
 
-  class ET_List < ET_Base
-    include ET_SoapGet
-    include ET_SoapCUD
+  class List < Objects::Base
+    include Objects::SoapRead
+    include Objects::SoapCUD
 
-    class Subscriber < ET_Base
-      include ET_SoapGet
+    class Subscriber < Objects::Base
+      include Objects::SoapRead
       def id
         'ListSubscriber'
       end
     end
   end
 
-  class ET_OpenEvent < ET_Base
-    include ET_SoapGet
+  class OpenEvent < Objects::Base
+    include Objects::SoapRead
   end
 
-  class ET_SentEvent < ET_Base
-    include ET_SoapGet
+  class SentEvent < Objects::Base
+    include Objects::SoapRead
   end
 
-  class ET_Subscriber < ET_Base
-    include ET_SoapGet
-    include ET_SoapCUD
+  class Subscriber < Objects::Base
+    include Objects::SoapRead
+    include Objects::SoapCUD
   end
 
-  class ET_UnsubEvent < ET_Base
-    include ET_SoapGet
+  class UnsubEvent < Objects::Base
+    include Objects::SoapRead
   end
 
-  class ET_TriggeredSend < ET_Base
+  class TriggeredSend < Objects::Base
     attr_accessor :subscribers
-    include ET_SoapGet
-    include ET_SoapCUD
+    include Objects::SoapRead
+    include Objects::SoapCUD
     def id
       'TriggeredSendDefinition'
     end
     def send
       client.soap_post 'TriggeredSend', 'TriggeredSendDefinition' => properties, 'Subscribers' => subscribers
     end
   end
 
-  class ET_Campaign < ET_Base
-    include ET_RestGet
-    include ET_RestCUD
+  class Campaign < Objects::Base
+    include Objects::RestRead
+    include Objects::RestCUD
 
-
     def properties
       @properties ||= {}
       @properties.merge! 'id' => '' unless @properties.include? 'id'
       @properties
     end
 
     def id
       "https://www.exacttargetapis.com/hub/v1/campaigns/%{id}"
     end
 
-    class Asset < ET_Base
-      include ET_RestGet
-      include ET_RestCUD
+    class Asset < Objects::Base
+      include Objects::RestRead
+      include Objects::RestCUD
 
       def properties
         @properties ||= {}
         @properties.merge! 'assetId' => '' unless @properties.include? 'assetId'
         @properties