streamsend 1.0.0.rc5 → 1.0.0.rc6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2EyMzFiNThlZWQ1YjRjNDQxMjE3YWNmOTIxZGEyMmY1M2E1ZGYxNw==
+    OGViNzRmM2I3M2NjODk3NTlkZDgzMTc3MTljMTkxMGRhY2YxODZkYg==
   data.tar.gz: !binary |-
-    MGI4ODQ4NTkyNjc2MWMyZGNlNjdjYWQ5OTEzZmY4ZGFkYmM5OTdkNQ==
+    MDQ3NjJmYzVhNWQ3ZGI5OWFkN2ZjN2Q4YjlmMTAxZmRiM2VmOTBmZg==
 SHA512:
   metadata.gz: !binary |-
-    YzU2ZDM1Zjk4NDI5YjM2YTUwYWQyOWRiMWFiY2M5YmQ0ZTY3YjQyZmM5Zjk3
-    NjY0OTg1NGI0N2Q4MjRiNjhjZWI3OTc2MGFkNTMwZTljNTc3MmM0YWU4NzY2
-    NTRmNjk5OGU4ODlhMDEwMDA2OTU3ZmFkZTVjMzY3NzVkN2FkOGY=
+    NjFmZmIzNTE2MmYyMWI0MGYyYzZiMDgxOGFhN2I3YjYyOWYwZjZiOTdjMjA4
+    YWE3ZWUxY2Y0YWNlNTdmM2I0YzdjYzkyYTY5ZTIwMzQ3NjMwMTg3ZmQ0OWUx
+    ZTM4ZmFkODE3MDMzZTQyY2M4ZjE4MDY3NzY3NjcwYzkzNWI1OTc=
   data.tar.gz: !binary |-
-    MzEzYWVlYmZhNWJiZTgxMmRlNjNhYWVjNDYyYzEwZjA0ODhiNzdkZmUzNmY5
-    MTRjNzEzYjJiM2M1NGYzYjNkOTg0MjYxODUxNTdlNmJlYTZkY2Y0ZGE5NDJl
-    NDNiNDU1ZTUxNjI1NTlmZTNmYmYyZmJjYWM4ZjZjMTY4MTIzMzE=
+    ODYyYjNhMzlhMWU5MzlkOWZkY2E0ZDc1NDAyNzQyODlkOTE3MzhlZjZmNmMz
+    ZmYwOTk3YzhkMDAxNDk0ZTM1MzYwNDc1ODNlZmJjYmUzODE0ODFlNGM4ZDY5
+    NmJkYWJhOWU3MTY1OTkzOWIwZjgyOWNhOGNhOTRmMjU0ZDJiZGI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    streamsend (1.0.0.rc4)
+    streamsend (1.0.0.rc6)
       activesupport (~> 3.2)
       builder
       httmultiparty

data/lib/streamsend/api/base/base_call.rb

@@ -58,14 +58,13 @@ module StreamSend
         private
 
         def get_error_from response
-          message = "Unprocessable Entity"
-          if response.parsed_response["request"]
-            message = response.parsed_response["request"]["errors"]
-          elsif response.parsed_response["errors"]
-            message = response.parsed_response["errors"]["error"]
-          elsif response["errors"]
-            message = response["errors"]
+          return response.parsed_response["request"]["errors"] if response.parsed_response["request"]
+          if response.parsed_response["errors"]
+            return response.parsed_response["errors"] if response.parsed_response["errors"].is_a?(Array)
+            return response.parsed_response["errors"]["error"] if response.parsed_response["errors"].is_a?(Hash)
           end
+          return response["errors"] if response["errors"]
+          return "Unprocessable Entity"
         end
       end
     end

data/lib/streamsend/version.rb

@@ -1,3 +1,3 @@
 module StreamSend
-  VERSION = "1.0.0.rc5"
+  VERSION = "1.0.0.rc6"
 end

data/spec/lib/streamsend/api/integration/from_email_address_spec.rb

@@ -7,6 +7,7 @@ module StreamSend
         let(:session){ StreamSend::Api::Session.new() }
         let(:randomish){ DateTime.now.to_i.to_s }
         let(:email_hash){ { :from_email_address => { :email_address => "testing+#{randomish}@badd.address" } } }
+        let(:address_id) { Create.new(session).execute(email_hash) }
 
         before do
           WebMock.disable!
@@ -25,8 +26,6 @@ module StreamSend
 
         describe Show do
           it "shows a from email address by id" do
-            creator = Create.new(session)
-            address_id = creator.execute(email_hash)
             shower = Show.new(session)
             address = shower.execute(address_id)
             expect(address.email_address).to eq(email_hash[:from_email_address][:email_address])
@@ -35,8 +34,6 @@ module StreamSend
 
         describe ResendActivationEmail do
           it "resends the actiation email" do
-            creator = Create.new(session)
-            address_id = creator.execute(email_hash)
             response = ResendActivationEmail.new(session).execute(address_id)
             expect(response.code).to eq(200)
           end

data/spec/lib/streamsend/api/integration/person_spec.rb

@@ -148,16 +148,25 @@ module StreamSend
             id = creator.execute(person_hash)
 
             person = shower.execute(id)
-            person.email_address = "me+#{randomish}@you.too"
+            new_email_address = "me+#{randomish}@you.too"
+            person.email_address = new_email_address
             updater = Update.new(session)
             updater.execute(id, :person => person.marshal_dump)
             person_updated = shower.execute(id)
-            expect(person_updated.email_address).to eq(person_hash[:person][:email_address])
+            expect(person_updated.email_address).to eq(new_email_address)
             expect(person_updated.id).to eq(id)
 
             destroyer = Destroy.new(session)
             destroyer.execute(id)
           end
+
+          it "handles 422 errors properly" do
+            invalid_person_id = -3
+            update_request = Update.new(session)
+            expect do
+              update_request.execute(invalid_person_id, {})
+            end.to raise_error(StreamSend::Api::SemanticException, /Invalid person ID/)
+          end
         end
 
         describe Destroy do

data/spec/lib/streamsend/api/unit/base/update_spec.rb

@@ -30,11 +30,9 @@ module StreamSend
           let(:non_existent_person_id) { 42 }
           let(:error_response) do
             response_xml = <<-XML
-            <request>
               <errors type='array'>
-                <message>Invalid Owner ID</message>
+                <error>Invalid Owner ID</error>
               </errors>
-            </request>
             XML
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: streamsend
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc5
+  version: 1.0.0.rc6
 platform: ruby
 authors:
 - Bob Yeo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httmultiparty