smsified 0.1.6 → 0.1.7

data/examples/sending_and_subscribing.rb

@@ -30,7 +30,7 @@ puts result.data.inspect
 puts result.http.inspect
 
 # Get some of your sent SMS details
-result = smsified.search_sms 'startDate=2011-02-14&endDate=2011-02-15'
+result = smsified.search_sms 'start=2011-02-14&end=2011-02-15'
 puts result.data.inspect
 puts result.data.inspect
 

data/lib/smsified/oneapi.rb

@@ -1,6 +1,6 @@
 module Smsified
   SMSIFIED_ONEAPI_PUBLIC_URI = 'https://api.smsified.com/v1'
-  SMSIFIED_HTTP_HEADERS      = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+  SMSIFIED_HTTP_HEADERS      = { 'Content-Type' => 'application/x-www-form-urlencoded','Accept'=>'application/json' }
   
   class OneAPI
     include Helpers

data/lib/smsified/reporting.rb

@@ -44,7 +44,7 @@ module Smsified
       
       options[:sender_address] = options[:sender_address] || @sender_address
 
-      Response.new self.class.get("/smsmessaging/outbound/#{options[:sender_address]}/requests/#{options[:request_id]}/deliveryInfos", :basic_auth => @auth)
+      Response.new self.class.get("/smsmessaging/outbound/#{options[:sender_address]}/requests/#{options[:request_id]}/deliveryInfos", :basic_auth => @auth, :headers    => SMSIFIED_HTTP_HEADERS)
     end
     
     ##
@@ -55,7 +55,7 @@ module Smsified
     # @example
     #   reporting.retrieve_sms '74ae6147f915eabf87b35b9ea30c5916'
     def retrieve_sms(message_id)
-      Response.new self.class.get("/messages/#{message_id}", :basic_auth => @auth)
+      Response.new self.class.get("/messages/#{message_id}", :basic_auth => @auth, :headers    => SMSIFIED_HTTP_HEADERS)
     end
     
     ##
@@ -64,9 +64,9 @@ module Smsified
     # @param [required, String] query_string to search SMS messages for
     # @return [Object] A Response Object with http and data instance methods
     # @example
-    #   reporting.search_sms 'startDate=2011-02-14&endDate=2011-02-15'
+    #   reporting.search_sms 'start=2011-02-14&end=2011-02-15'
     def search_sms(query_string)
-      Response.new self.class.get("/messages?#{query_string}", :basic_auth => @auth)
+      Response.new self.class.get("/messages?#{query_string}", :basic_auth => @auth, :headers    => SMSIFIED_HTTP_HEADERS)
     end
   end
 end

data/lib/smsified/subscriptions.rb

@@ -48,7 +48,10 @@ module Smsified
       
       Response.new self.class.post("/smsmessaging/inbound/subscriptions", 
                                    :basic_auth => @auth,
-                                   :body       => camelcase_keys(query))
+                                   :body       => camelcase_keys(query),
+                                   :headers    => SMSIFIED_HTTP_HEADERS
+                                   )
+
     end
     
     ##
@@ -64,7 +67,9 @@ module Smsified
     def create_outbound_subscription(sender_address, options)
       Response.new self.class.post("/smsmessaging/outbound/#{sender_address}/subscriptions", 
                                    :basic_auth => @auth,
-                                   :body       => build_query_string(options))
+                                   :body       => build_query_string(options),
+                                   :headers    => SMSIFIED_HTTP_HEADERS
+                                   )
     end
     
     ##
@@ -75,7 +80,7 @@ module Smsified
     # @example
     #   subscriptions.delete_inbound_subscription('89edd71c1c7f3d349f9a3a4d5d2d410c')
     def delete_inbound_subscription(subscription_id)
-      Response.new self.class.delete("/smsmessaging/inbound/subscriptions/#{subscription_id}", :basic_auth => @auth)
+      Response.new self.class.delete("/smsmessaging/inbound/subscriptions/#{subscription_id}", :basic_auth => @auth, :headers    => SMSIFIED_HTTP_HEADERS)
     end
     
     ##
@@ -86,7 +91,7 @@ module Smsified
     # @example
     #   subscriptions.delete_outbound_subscription('89edd71c1c7f3d349f9a3a4d5d2d410c')
     def delete_outbound_subscription(sender_address)
-      Response.new self.class.delete("/smsmessaging/outbound/subscriptions/#{sender_address}", :basic_auth => @auth)
+      Response.new self.class.delete("/smsmessaging/outbound/subscriptions/#{sender_address}", :basic_auth => @auth, :headers    => SMSIFIED_HTTP_HEADERS)
     end
     
     ##
@@ -97,7 +102,7 @@ module Smsified
     # @example
     #   subscriptions.inbound_subscriptions('tel:+14155551212')
     def inbound_subscriptions(destination_address)
-      Response.new self.class.get("/smsmessaging/inbound/subscriptions?destinationAddress=#{destination_address}", :basic_auth => @auth)
+      Response.new self.class.get("/smsmessaging/inbound/subscriptions?destinationAddress=#{destination_address}", :basic_auth => @auth, :headers    => SMSIFIED_HTTP_HEADERS)
     end
 
     ##
@@ -108,7 +113,7 @@ module Smsified
     # @example
     #   subscriptions.outbound_subscriptions('tel:+14155551212')
     def outbound_subscriptions(sender_address)
-      Response.new self.class.get("/smsmessaging/outbound/subscriptions?senderAddress=#{sender_address}", :basic_auth => @auth)
+      Response.new self.class.get("/smsmessaging/outbound/subscriptions?senderAddress=#{sender_address}", :basic_auth => @auth, :headers    => SMSIFIED_HTTP_HEADERS)
     end
     
     ##
@@ -125,7 +130,9 @@ module Smsified
     def update_inbound_subscription(subscription_id, options)
       Response.new self.class.post("/smsmessaging/inbound/subscriptions/#{subscription_id}", 
                                    :basic_auth => @auth,
-                                   :body       => build_query_string(options))
+                                   :body       => build_query_string(options),
+                                   :headers    => SMSIFIED_HTTP_HEADERS
+                                   )
     end
     
     ##
@@ -142,7 +149,9 @@ module Smsified
     def update_outbound_subscription(sender_address, options)
       Response.new self.class.post("/smsmessaging/outbound/#{sender_address}/subscriptions", 
                                    :basic_auth => @auth,
-                                   :body       => build_query_string(options))
+                                   :body       => build_query_string(options),
+                                   :headers    => SMSIFIED_HTTP_HEADERS
+                                   )
     end
   end
 end

data/spec/smsified_spec.rb

@@ -118,7 +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"
+      FakeWeb.last_request.body.should eql "address=14155551212&message=Hola+from+RSpec%21"
     end
     
     it "Should send an SMS to multiple destinations" do
@@ -126,7 +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"
+      FakeWeb.last_request.body.should eql "address=14155551212&address=13035551212&message=Hola+from+RSpec%21"
     end
     
     it "Should raise an error if you pass an unknown method name" do
@@ -403,8 +403,9 @@ describe "Smsified" do
                            :body   => @message.to_json)
       
       FakeWeb.register_uri(:get, 
-                           "https://#{@username}:#{@password}@api.smsified.com/v1/messages?startDate=2011-05-12&endDate=2011-05-12",
+                           "https://#{@username}:#{@password}@api.smsified.com/v1/messages?start=2011-05-12&end=2011-05-12",
                            :status => ["200", "OK"],
+                           :content_type=>"application/json",
                            :body   => @message_range.to_json)
       
       FakeWeb.register_uri(:get, 
@@ -438,6 +439,11 @@ describe "Smsified" do
       end
     end
     
+    it "should get json by default" do
+      response = @reporting.search_sms 'start=2011-05-12&end=2011-05-12'
+      response.http.content_type.should eql "application/json"
+    end
+    
     it "Should raise an error if no :sender_address specified" do
       begin
         @reporting.delivery_status('foobar')
@@ -464,7 +470,7 @@ describe "Smsified" do
     end
     
     it "Should retrieve SMS messages based on a query string" do
-      response = @reporting.search_sms 'startDate=2011-05-12&endDate=2011-05-12'
+      response = @reporting.search_sms 'start=2011-05-12&end=2011-05-12'
       response.data.should eql @message_range
     end
     

metadata

@@ -1,167 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: smsified
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.1.7
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
 platform: ruby
-authors: 
+authors:
 - Jason Goecke
+- John Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-05 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-08-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70254480066540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  version_requirements: *id001
-  name: rspec
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70254480066540
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70254480066020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  version_requirements: *id002
-  name: yard
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70254480066020
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70254480065540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  version_requirements: *id003
-  name: bundler
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70254480065540
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70254480065060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
-  version_requirements: *id004
-  name: jeweler
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
-  name: rcov
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70254480065060
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70254480064560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
-  name: fakeweb
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id007
-  name: awesome_print
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *70254480064560
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70254480064080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70254480064080
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: &70254480063600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id008
-  name: json
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70254480063600
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70254480063100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id009
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70254480063100
+- !ruby/object:Gem::Dependency
   name: httparty
+  requirement: &70254480062560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70254480062560
 description: Gem for consuming the SMSified OneAPI
-email: jsgoecke@voxeo.com
+email:
+- jsgoecke@voxeo.com
+- jdyer@voxeo.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - README.md
 - lib/smsified.rb
 - lib/smsified/helpers.rb
@@ -174,41 +133,35 @@ files:
 - examples/sending_and_subscribing.rb
 - spec/smsified_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/tropo/smsified-oneapi
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3692374572593381168
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Gem for consuming the SMSified OneAPI
-test_files: 
+test_files:
 - examples/sending_and_subscribing.rb
 - spec/smsified_spec.rb
 - spec/spec_helper.rb