smsified 0.1.5 → 0.1.6

data/lib/smsified/helpers.rb

@@ -29,5 +29,31 @@ module Smsified
       
       options
     end
+    
+    ##
+    # Builds the necessary query string
+    def build_query_string(options)
+      options = camelcase_keys(options)
+      
+      query = ''
+
+      options.each do |k,v|
+        if k == :address
+          if RUBY_VERSION.to_f == 1.9
+            if v.instance_of?(String)
+              v.each_line { |address| query += "#{ '&' if query != '' }address=#{CGI.escape address}" }
+            else
+              v.each { |address| query += "#{ '&' if query != '' }address=#{CGI.escape address}" }
+            end
+          else
+            v.each { |address| query += "#{ '&' if query != '' }address=#{CGI.escape address}" }
+          end
+        else
+          query += "#{ '&' if query != '' }#{k.to_s}=#{CGI.escape v}"
+        end
+      end
+
+      query
+    end
   end
 end

data/lib/smsified/oneapi.rb

@@ -87,31 +87,5 @@ module Smsified
         end
       end
     end
-    
-    private
-    
-    ##
-    # Builds the necessary query string
-    def build_query_string(options)
-      query = ''
-
-      options.each do |k,v|
-        if k == :address
-          if RUBY_VERSION.to_f == 1.9
-            if v.instance_of?(String)
-              v.each_line { |address| query += "#{ '&' if query != '' }address=#{CGI.escape address}" }
-            else
-              v.each { |address| query += "#{ '&' if query != '' }address=#{CGI.escape address}" }
-            end
-          else
-            v.each { |address| query += "#{ '&' if query != '' }address=#{CGI.escape address}" }
-          end
-        else
-          query += "#{ '&' if query != '' }#{k.to_s}=#{CGI.escape v}"
-        end
-      end
-      
-      query
-    end
   end
 end

data/lib/smsified/subscriptions.rb

@@ -64,7 +64,7 @@ module Smsified
     def create_outbound_subscription(sender_address, options)
       Response.new self.class.post("/smsmessaging/outbound/#{sender_address}/subscriptions", 
                                    :basic_auth => @auth,
-                                   :body       => camelcase_keys(options))
+                                   :body       => build_query_string(options))
     end
     
     ##
@@ -125,7 +125,7 @@ module Smsified
     def update_inbound_subscription(subscription_id, options)
       Response.new self.class.post("/smsmessaging/inbound/subscriptions/#{subscription_id}", 
                                    :basic_auth => @auth,
-                                   :body       => camelcase_keys(options))
+                                   :body       => build_query_string(options))
     end
     
     ##
@@ -142,7 +142,7 @@ module Smsified
     def update_outbound_subscription(sender_address, options)
       Response.new self.class.post("/smsmessaging/outbound/#{sender_address}/subscriptions", 
                                    :basic_auth => @auth,
-                                   :body       => camelcase_keys(options))
+                                   :body       => build_query_string(options))
     end
   end
 end

data/spec/smsified_spec.rb

@@ -12,27 +12,36 @@ describe "Smsified" do
   end
   
   describe "Helpers" do
-    it 'Should camelcase the appropriate keys' do
+    before(:all) do
       class Foo
         include Smsified::Helpers
         
-        attr_reader :keys 
+        attr_reader :keys, :query_string 
         
         def initialize(hash)
           @keys = camelcase_keys(hash)
+          @query_string = build_query_string(hash)
         end
       end
       
-      camelcased_keys = Foo.new({ :destination_address => 'foo',
-                                  :notify_url          => 'bar',
-                                  :client_correlator   => 'baz',
-                                  :callback_data       => 'donkey' }).keys
+      @foo = Foo.new({ :destination_address => 'foo',
+                       :notify_url          => 'bar',
+                       :client_correlator   => 'baz',
+                       :callback_data       => 'donkey' })
+    end
+    
+    it 'Should camelcase the appropriate keys' do                                  
+      camelcased_keys = @foo.keys
                                   
       camelcased_keys[:destinationAddress].should eql 'foo'
       camelcased_keys[:notifyURL].should eql 'bar'
       camelcased_keys[:clientCorrelator].should eql 'baz'
       camelcased_keys[:callbackData].should eql 'donkey'
     end
+    
+    it 'Should build a proper query string' do
+      @foo.query_string.should eql "destinationAddress=foo&notifyURL=bar&clientCorrelator=baz&callbackData=donkey"
+    end
   end
   
   describe "OneAPI" do
@@ -109,6 +118,7 @@ describe "Smsified" do
     it "Should send an SMS" do
       response = @one_api.send_sms(:address => @address, :message => 'Hola from RSpec!', :sender_address => @sender_address)
       response.data.should eql @message_sent
+      FakeWeb.last_request.body.should eql "message=Hola+from+RSpec%21&address=14155551212"
     end
     
     it "Should send an SMS to multiple destinations" do
@@ -116,6 +126,7 @@ describe "Smsified" do
                                    :message        => 'Hola from RSpec!', 
                                    :sender_address => @sender_address)
       response.data.should eql @message_sent
+      FakeWeb.last_request.body.should eql "message=Hola+from+RSpec%21&address=14155551212&address=13035551212"
     end
     
     it "Should raise an error if you pass an unknown method name" do
@@ -267,12 +278,14 @@ describe "Smsified" do
         result = @subscriptions.create_inbound_subscription('17177455076', :notify_url => 'http://foobar.com')
         result.http.code.should eql '200'
         result.data.should eql @inbound_subscription
+        FakeWeb.last_request.body.should eql "destinationAddress=17177455076&notifyURL=http%3A%2F%2Ffoobar.com"
       end
     
       it 'Should create an outbound subscription' do
         result = @subscriptions.create_outbound_subscription('17177455076', :notify_url => 'http://foobar.com')
         result.http.code.should eql '200'
         result.data.should eql @outbound_subscription
+        FakeWeb.last_request.body.should eql "notifyURL=http%3A%2F%2Ffoobar.com"
       end
     end
     
@@ -292,12 +305,14 @@ describe "Smsified" do
 
         result.http.code.should eql '200'
         result.data.should eql @inbound_subscription
+        FakeWeb.last_request.body.should eql "notifyURL=http%3A%2F%2Ffoobar1.com"
       end
       
       it 'Should update an outbound subscription' do
         result = @subscriptions.update_outbound_subscription(@sender_address, :notify_url => 'http://foobar.com')
         result.http.code.should eql '200'
         result.data.should eql @outbound_subscription
+        FakeWeb.last_request.body.should eql "notifyURL=http%3A%2F%2Ffoobar.com"
       end
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smsified
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jason Goecke