bronto 0.0.8 → 0.0.9

data/lib/bronto.rb

@@ -14,6 +14,23 @@ require "core_ext/object"
 require "core_ext/string"
 
 module Bronto
+  class Error < StandardError
+    attr_accessor :code, :message
+
+    def initialize(code, message)
+      self.code = code
+      self.message = message
+    end
+
+    def code=(new_code)
+      @code = new_code.to_i
+    end
+
+    def to_s
+      "#{code}: #{message}"
+    end
+  end
+
   class Errors
     attr_accessor :messages
 

data/lib/bronto/base.rb

@@ -106,10 +106,10 @@ module Bronto
       objs.each { |o| o.errors.clear }
 
       Array.wrap(resp[:return][:results]).each_with_index do |result, i|
-        if result[:is_new] and !result[:is_error]
-          objs[i].id = result[:id]
-        elsif result[:is_error]
+        if result[:is_error]
           objs[i].errors.add(result[:error_code], result[:error_string])
+        else
+          objs[i].id = result[:id]
         end
       end
 

data/lib/bronto/contact.rb

@@ -1,6 +1,6 @@
 module Bronto
   class Contact < Base
-    attr_accessor :email, :fields, :lists
+    attr_accessor :email, :fields, :list_ids
 
     # Finds contacts based on the `filter` (Bronto::Filter object).
     # * `page_number` is the page of contacts to request. Bronto doesn't specify how many contacts are returned per page,
@@ -9,6 +9,7 @@ module Bronto
     # * `include_lists` determines whether to include the list IDs each contact belongs to.
     def self.find(filter = Bronto::Filter.new, page_number = 1, fields = nil, include_lists = false, api_key = nil)
       body = { filter: filter.to_hash, page_number: page_number }
+      api_key = api_key || self.api_key
 
       body[:fields] = Array.wrap(fields).map { |f| f.is_a?(Bronto::Field) ? f.id : f } if Array(fields).length > 0
       body[:include_lists] = include_lists
@@ -33,10 +34,10 @@ module Bronto
       objs.each { |o| o.errors.clear }
 
       Array.wrap(resp[:return][:results]).each_with_index do |result, i|
-        if result[:is_new] and !result[:is_error]
-          objs[i].id = result[:id]
-        elsif result[:is_error]
+        if result[:is_error]
           objs[i].errors.add(result[:error_code], result[:error_string])
+        else
+          objs[i].id = result[:id]
         end
       end
 
@@ -51,6 +52,25 @@ module Bronto
       super(options)
     end
 
+    def reload
+      return false if self.email.blank?
+
+      filter = Bronto::Filter.new
+      filter.add_filter("email", "EqualTo", self.email)
+
+      new_contact = self.class.find(filter, 1, self.fields, true, self.api_key).first
+
+      self.id = new_contact.id
+      self.fields = new_contact.fields
+      self.list_ids = new_contact.list_ids
+
+      true
+    end
+
+    def save
+      self.class.save(self)
+    end
+
     def to_hash
       if id.present?
         { id: id, email: email, fields: fields.values.map(&:to_hash) }

data/lib/bronto/delivery.rb

@@ -11,6 +11,7 @@ module Bronto
     def self.find(filter = Bronto::Filter.new, page_number = 1, include_recipients = false, include_content = false, api_key = nil)
       body = { filter: filter.to_hash, page_number: page_number, include_recipients: include_recipients,
           include_content: include_content }
+      api_key = api_key || self.class.api_key
 
       resp = request(:read, api_key) do
         soap.body = body

data/lib/bronto/list.rb

@@ -23,8 +23,16 @@ module Bronto
       self.active_count ||= 0
     end
 
-    # Adds the given contacts to this list.
     def add_to_list(*contacts)
+      begin
+        add_to_list!(contacts)
+      rescue Bronto::Error => e
+        false
+      end
+    end
+
+    # Adds the given contacts to this list.
+    def add_to_list!(*contacts)
       return false if !self.id.present?
       contacts = contacts.flatten
 
@@ -38,7 +46,12 @@ module Bronto
         }
       end
 
-      Array.wrap(resp[:return][:results]).select { |r| r[:is_error] }.count == 0
+      errors = Array.wrap(resp[:return][:results]).select { |r| r[:is_error] }
+      errors.each do |error|
+        raise Bronto::Error.new(error[:error_code], error[:error_string])
+      end
+
+      true
     end
 
     # Removes the given contacts from this list.

data/lib/bronto/version.rb

@@ -1,3 +1,3 @@
 module Bronto
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bronto
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: