streamsend-ruby 0.0.2.pre1 → 0.0.2.pre2

data/Gemfile

@@ -1,8 +1,9 @@
 source :rubygems
 
 gem 'httparty'
+gem 'xml-simple'
 
 group :development, :test do
   gem 'webmock'
   gem 'rspec', "< 2.0"
-end
+end

data/lib/spec/version.rb

@@ -4,7 +4,7 @@ module Spec # :nodoc:
       MAJOR = 0
       MINOR = 0
       TINY  = 2
-      PRE   = "pre1" # VALID VALUES: nil, "pre1", "pre2", ...
+      PRE   = "pre2" # VALID VALUES: nil, "pre1", "pre2", ...
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 

data/lib/streamsend.rb

@@ -1,13 +1,14 @@
 require 'rubygems'
 require 'httparty'
+require "xmlsimple"
 
 module StreamSend
   include HTTParty
   format :xml
 
   def self.configure(username, password, host = "app.streamsend.com")
-    base_uri host
-    basic_auth username, password
+    base_uri(host)
+    basic_auth(username, password)
   end
 
   class Resource
@@ -20,10 +21,6 @@ module StreamSend
       @new_record
     end
 
-    def saved!
-      @new_record = false
-    end
-
     def method_missing(method, *args, &block)
       if method.to_s.match(/^(.*)=$/)
         @data[$1] = *args
@@ -34,6 +31,14 @@ module StreamSend
       end
     end
 
+    def errors=(vals = [])
+      @errors = vals
+    end
+
+    def errors
+      @errors
+    end
+
     def attributes
       @data
     end
@@ -42,6 +47,14 @@ module StreamSend
       @data["id"]
     end
 
+    def to_xml
+      XmlSimple.xml_out({:person => self.attributes.reject { |_,v| v.nil? || v.blank? }}, :keep_root => true)
+    end
+
+    def self.to_xml(input_hash=self.attributes)
+      XmlSimple.xml_out({:person => input_hash.reject { |_,v| v.nil? || v.blank? }}, :keep_root => true)
+    end
+
     def self.find(options={})
       response = StreamSend.get(resource_path(options))
       case response.code
@@ -62,18 +75,15 @@ module StreamSend
 
     def save
       if self.new_record?
-        attributes = StreamSend.post(self.class.resource_path("audience_id" => self.audience_id),
-                                                   self.attributes)
+        response = StreamSend.post(self.class.resource_path("audience_id" => self.audience_id),
+                                                   :body => self.to_xml, :headers => { "Content-Type" => "application/xml" })
         self.id = attributes["id"]
-        self.created_at = Time.now
-        self.saved!
       else
-        attributes = StreamSend.put(self.class.resource_path({ "id" => self.id,
+        response = StreamSend.put(self.class.resource_path({ "id" => self.id,
                                                     "audience_id" => self.audience_id,
-                                                  }.merge( self.attributes)))
-        self.updated_at = TIme.now
-        self.saved!
+                                                  }), :body => self.to_xml, :headers => { "Content-Type" => "application/xml" })
       end
+      handle_response(response)
     end
 
     def self.resource_name
@@ -84,6 +94,27 @@ module StreamSend
     def self.resource_path(options={})
       ""
     end
+
+    private
+    def saved!
+      if @new_record
+        self.created_at = Time.now
+      else
+        self.updated_at = Time.now
+      end
+      @new_record = false
+    end
+
+    def handle_response(response)
+      case response.code.to_i
+      when 200, 201
+         saved!
+         true
+      else
+        self.errors = response.parsed_response["errors"].values unless response.parsed_response.empty?
+        false
+      end
+    end
   end
 
   class Audience < Resource
@@ -111,18 +142,16 @@ module StreamSend
 
       case response.code
       when 200
-        response["people"].collect { |data| new(data, true) }
+        response["people"].collect { |data| new(data, true)}
       else
         raise "Could not find any subscribers. Make sure your audience ID is correct. (#{response.code})"
       end
     end
 
-    def self.create(audience_id, subscriber_hash)
-      if attributes = StreamSend.post(resource_path("audience_id" => audience_id), subscriber_hash)
-        new(attributes, true)
-      else
-        raise("Could not create the subscriber.")
-      end
+    def self.create(subscriber_hash)
+      resource = new(subscriber_hash)
+      resource.save
+      resource
     end
 
     def self.find_by_email_address(email_address, options={})

data/spec/streamsend_spec.rb

@@ -24,13 +24,13 @@ describe "StreamSend" do
       end
     end
 
-    describe "#id" do
+    describe ".id" do
       it "should return id" do
         StreamSend::Resource.new({"id" => 99}).id.should == 99
       end
     end
 
-    describe "#attributes" do
+    describe ".attributes" do
       before do
         @attributes = { "id" => 99, "email_address" => "foo@example.org" }
       end
@@ -38,6 +38,42 @@ describe "StreamSend" do
         StreamSend::Resource.new(@attributes).attributes.should == @attributes
       end
     end
+
+    describe ".to_xml" do
+      before do
+        @resource = StreamSend::Resource.new("audience_id" => 2, "email_address" => "foo@example.com", "unsubscribed_at" => nil)
+        @xml = "<person audience_id=\"2\" email_address=\"foo@example.com\" />\n"
+      end
+
+      it "should convert our object to xml" do
+        @resource.to_xml.should == @xml
+      end
+
+      it "should not raise an error if there are nil values in the attributes" do
+        lambda { @resource.to_xml}.should_not raise_error
+      end
+
+      describe "#to_xml" do
+        it "should return xml" do
+          StreamSend::Resource.to_xml("audience_id" => 2, "email_address" => "foo@example.com").should == @xml
+        end
+      end
+    end
+
+    describe "#errors" do
+      before do
+        @resource = StreamSend::Resource.new({})
+        @resource.errors = ["You did it wrong!"]
+      end
+
+      it "should populate the errors" do
+        @resource.errors.should include("You did it wrong!")
+      end
+
+      it "should not set errors on our attributes" do
+        @resource.attributes.has_key?("errors").should_not be_true, "errors should not be an attribute of Resource"
+      end
+    end
   end
 
   describe "Audience" do
@@ -74,10 +110,22 @@ describe "StreamSend" do
         audience.id.should == @audience.id
         audience.created_at.should == Time.parse("2009-07-23T18:07:46Z")
       end
+
+      describe ".resource_path" do
+        it "should return a valid path to the resource" do
+          StreamSend::Audience.resource_path("id" => 1).should == "/audiences/1.xml"
+        end
+      end
     end
   end
 
   describe "Subscriber" do
+    describe ".resource_path" do
+      it "should return a valid path to the resource" do
+        StreamSend::Subscriber.resource_path("id" => 12, "audience_id" => 1).should == "/audiences/1/people/12.xml"
+      end
+    end
+
     describe ".all" do
       describe "with subscribers" do
         before(:each) do
@@ -95,7 +143,7 @@ describe "StreamSend" do
           stub_http_request(:get, "http://#{@username}:#{@password}@#{@host}/audiences/1/people.xml").to_return(:body => xml)
         end
 
-        it "should return array of one subscriber object" do
+        it "should return an array of one subscriber object" do
           subscribers = StreamSend::Subscriber.all(1)
           subscribers.size.should == 1
 
@@ -176,57 +224,21 @@ describe "StreamSend" do
       end
     end
 
-=begin
-    describe "#show" do
-      describe "with valid subscriber instance" do
-        before(:each) do
-          xml = <<-"XML".gsub(/^\s+/,'')
-            <?xml version="1.0" encoding="UTF-8"?>
-            <person>
-              <id type="integer">2</id>
-              <email-address>scott@gmail.com</email-address>
-              <created-at type="datetime">2009-09-18T01:27:05Z</created-at>
-              <first-name>Scott</first-name>
-              <last-name>Albertson</last-name>
-            </person>
-          XML
-
-          stub_http_request(:get, "http://#{@username}:#{@password}@#{@host}/audiences/1/people/2.xml").to_return(:body => xml)
-        end
-
-        it "should return subscriber" do
-          subscriber = StreamSend::Subscriber.new({"id" => 2}).show(1)
-
-          subscriber.should be_instance_of(StreamSend::Subscriber)
-          subscriber.id.should == 2
-          subscriber.email_address.should == "scott@gmail.com"
-          subscriber.created_at.should == Time.parse("2009-09-18T01:27:05Z")
-          subscriber.first_name.should == "Scott"
-          subscriber.last_name.should == "Albertson"
-        end
-      end
-
-      describe "with invalid subscriber instance" do
-        it "should return nil" do
-          lambda { StreamSend::Subscriber.new({:id => 99}).show(1) }.should raise_error
-        end
-      end
-
-      describe "with invalid audience" do
-        it "should raise exception" do
-          lambda { StreamSend::Subscriber.new({:id => 2}).show(99) }.should raise_error
-        end
-      end
-    end
-=end
-
     describe "#create" do
       before(:each) do
-        @subscriber = StreamSend::Subscriber.new(:email_address =>"scott@example.com")
-        stub_http_request(:post, "http://#{@username}:#{@password}@#{@host}/audiences/1/people.xml").with(:body => @subscriber).to_return({ :response => true })
+        @subscriber = StreamSend::Subscriber.new(:email_address =>"scott@example.com", "audience_id" => 1)
+        stub_request(:post, "http://#{@username}:#{@password}@#{@host}/audiences/1/people.xml?").
+          with(:body => "<person audience_id=\"1\" email_address=\"scott@example.com\" />\n",
+               :headers => {'Content-Type'=>'application/xml'}).
+          to_return(:status => 201, :body => "", :headers => {})
+
+        @bad_subscriber = {:email_address =>"scott@example", "audience_id" => 1}
+
+        stub_request(:post, "http://#{@username}:#{@password}@#{@host}/audiences/1/people.xml?").
+        with(:body => "<person audience_id=\"1\" email_address=\"scott@example\" />\n",
+            :headers => {'Content-Type'=>'application/xml'}).
+        to_return(:status => 422, :body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>\n  <error>Email address does not appear to be valid</error>\n</errors>\n", :headers => {})
 
-        @bad_subscriber = StreamSend::Subscriber.new(:email_address =>"scott@example")
-        stub_http_request(:post, "http://#{@username}:#{@password}@#{@host}/audiences/1/people.xml").with(:body => @bad_subscriber).to_return({ :response => Exception })
       end
 
       describe "with valid subscriber instance" do
@@ -240,8 +252,16 @@ describe "StreamSend" do
       end
 
       describe "with an invalid email address" do
-        it "should raise exception" do
-          StreamSend::Subscriber.create(1, @bad_subscriber.attributes).should raise_error
+        before do
+          @subscriber = StreamSend::Subscriber.create(@bad_subscriber)
+        end
+
+        it "should not save and be a new record" do
+          @subscriber.should be_new_record
+        end
+
+        it "should set errors on the unsaved record" do
+          @subscriber.errors.should include("Email address does not appear to be valid")
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: streamsend-ruby
 version: !ruby/object:Gem::Version 
-  hash: 270495464
+  hash: -1876988183
   prerelease: true
   segments: 
   - 0
   - 0
   - 2
-  - pre1
-  version: 0.0.2.pre1
+  - pre2
+  version: 0.0.2.pre2
 platform: ruby
 authors: 
 - Gaslight Software
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-04 00:00:00 -04:00
+date: 2011-08-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,6 +116,6 @@ rubyforge_project: streamsend-ruby
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: streamsend-ruby 0.0.2.pre1
+summary: streamsend-ruby 0.0.2.pre2
 test_files: 
 - spec/streamsend_spec.rb