exacttarget 0.0.1 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/exacttarget.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exacttarget}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Simpson"]

data/lib/exacttarget/client.rb

@@ -33,7 +33,7 @@ module ExactTarget
           }
         ).body
       rescue SocketError
-        puts '[ExactTarget] Error: API request failed (SocketError).'
+        raise '[ExactTarget] Error: API request failed (SocketError).'
       end
     end
     

data/lib/exacttarget/email.rb

@@ -3,68 +3,88 @@ module ExactTarget
   
     public
     
-    def email_find_all
-      email_search
+    def email_find_by_id(id, options = {})
+      email_find({
+        :id => id,
+        :body => true
+      }.merge(options))
     end
     
-    def email_find_by_id(id)
-      email_search :id, id, true
+    def email_find_by_name(name, options = {})
+      email_find({
+        :name => name,
+      }.merge(options))
     end
     
-    def email_find_by_name(name, get_body = false)
-      email_search :name, name, get_body
+    def email_find_by_subject(subject, options = {})
+      email_find({
+        :subject => subject,
+      }.merge(options))
     end
     
-    def email_find_by_subject(subject, get_body = false)
-      email_search :subject, subject, get_body
-    end
-    
-    private
-    
-    def email_search(filter = :all, value = '', get_body = false)
-      # ExactTarget does not return more than one email
-      # for any search besides all. So we must grab the
-      # entire list and search here (slow, but necessary).
-      
-      @action = 'retrieve'
+    def email_find(options = {})
+      @action     = 'retrieve'
       @sub_action = 'all'
-      @type = ''
-      @value = ''
+      @type       = ''
+      @value      = ''
+      
+      id          = options[:id]      || false
+      name        = options[:name]    || false
+      subject     = options[:subject] || false
+      start_date  = options[:start]   || false
+      end_date    = options[:end]     || false
+      get_body    = options[:body]    || false
+      list        = []
+      
+      format = Proc.new { |date|
+        begin
+          date if date.instance_of? Date
+          Date.strptime(date, '%m/%d/%Y')
+        rescue
+          raise '[ExactTarget] Error: Invalid date.'
+        end
+      }
       
-      list = []
       Nokogiri::Slop(send(render(:email)))
         .exacttarget
         .system
         .email
         .emaillist.each do |email|
-          case filter
-            when :id
-              next if !email.emailid.content == value.to_s
-            when :name, :subject
-              next if !email.send('email' + filter.to_s).content.include? value.to_s
-          end
+          (next if email.emailid.content != id.to_s) if id
+          (next if !email.emailname.content.include? name.to_s) if name
+          (next if !email.emailsubject.content.include? subject.to_s) if subject
+          
+          date = format.call(email.emailcreateddate.content)
           
-          body = (email_get_body(email.emailid.content) if get_body) || nil
+          (next if date < format.call(start_date)) if start_date
+          (next if date > format.call(end_date)) if end_date
+          
+          body = email_get_body(email.emailid.content) if get_body
           
           email.instance_eval do
-            list << {
+            new = {
               :id           => emailid.content,
               :name         => emailname.content,
               :subject      => emailsubject.content,
-              :category_id  => categoryid.content,
-              :body         => body
+              :date         => email.emailcreateddate.content,
+              :category_id  => categoryid.content
             }
+            
+            new[:body] = body if get_body
+            list << new
           end
       end
       
       list
     end
     
+    private
+    
     def email_get_body(id)
-      @action = 'retrieve'
+      @action     = 'retrieve'
       @sub_action = 'htmlemail'
-      @type = 'emailid'
-      @value = id.to_s
+      @type       = 'emailid'
+      @value      = id.to_s
       
       begin
         Nokogiri::XML(send(render(:email)))
@@ -75,5 +95,4 @@ module ExactTarget
     end
     
   end
-
 end

data/lib/exacttarget/templates/email.xml.erb

@@ -1,22 +1,20 @@
 <system>
+
   <system_name>email</system_name>
   <action><%= @action %></action>
   <sub_action><%= @sub_action %></sub_action>
+  
   <% if @action == 'retrieve' %>
     <search_type><%= @type %></search_type>
     <search_value><%= @value %></search_value>
     <search_value2></search_value2>
     <% if @sub_action == 'all' %>
-      <daterange>
-        <% if @type == 'daterange' || @type == 'emailnameanddaterange' %>
-          <startdate><%= @start_date %></startdate>
-          <enddate><%= @end_date %></enddate>
-        <% end %>
-      </daterange>
+      <daterange></daterange>
     <% else %>
       <search_value3></search_value3>
     <% end %>
   <% end %>
+  
   <% if @action == 'add' %>
     <% if @sub_action == 'HTMLPaste' %>
       <category></category>
@@ -32,4 +30,5 @@
       <email_body><![ CDATA[<%= @body %>]]></email_body>
     <% end %>
   <% end %>
+  
 </system>

data/lib/exacttarget.rb

@@ -2,7 +2,7 @@
 begin
   require 'nokogiri'
 rescue LoadError
-  puts '[ExactTarget] Error: Nokogiri is missing, run "bundle install".'
+  raise '[ExactTarget] Error: Nokogiri is missing, run "bundle install".'
 end
 
 # Standard:

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Matthew Simpson
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2723099065645774218
+      hash: -1942609719604810864
       segments: 
       - 0
       version: "0"