moonshado-sms 0.5.0 → 1.0.0

data/README.rdoc

@@ -17,4 +17,4 @@ Production environment config:
 
 == Copyright
 
-Copyright (c) 2010 Kevin Patel. See LICENSE for details.
+Copyright (c) 2010 Moonshado, Inc. See LICENSE for details.

data/Rakefile

@@ -11,8 +11,8 @@ begin
     gem.authors = ["Kevin Patel"]
     gem.add_development_dependency "shoulda", ">= 0"
     gem.add_development_dependency "webmock", ">= 0"
-    gem.add_runtime_dependency "rest-client", '1.5.1'
-    gem.add_runtime_dependency "yajl-ruby", '0.7.6'
+    gem.add_runtime_dependency "rest-client", '1.6.0'
+    gem.add_runtime_dependency "yajl-ruby", '0.7.7'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :patch: 0
 :build: 
-:major: 0
-:minor: 5
+:major: 1
+:minor: 0

data/lib/moonshado/configuration.rb

@@ -23,8 +23,8 @@ module Moonshado
     def initialize
       @secure                   = false
       @host                     = 'heroku.moonshado.com'
-      @http_open_timeout        = 2
-      @http_read_timeout        = 5
+      @http_open_timeout        = 10
+      @http_read_timeout        = 10
       @production_environment   = true
       @sms_uri                  = '/sms'
       @keywords_uri             = '/keywords'

data/lib/moonshado/sms.rb

@@ -22,7 +22,7 @@ module Moonshado
       def find(id)
         response = sender.get(configuration.sms_uri + "/#{id}")
 
-        Yajl::Parser.new.parse(response.body)
+        parse(response.to_s)
       end
     end
 
@@ -46,7 +46,11 @@ module Moonshado
       data = {:sms => {:device_address => format_number(@number), :message => @message}}
 
       if production_environment?
-        response = sender.send_to_moonshado(data, configuration.sms_uri)
+        begin
+          response = sender.send_to_moonshado(data, configuration.sms_uri)
+        rescue Exception => e
+          response = RestClient::Response.create("{\"stat\":\"fail\",\"error\":\"#{e.message}\"}", "", {})
+        end
       else
         response = RestClient::Response.create('{"stat":"ok","id":"sms_id_mock"}', "", {})
       end
@@ -85,7 +89,11 @@ module Moonshado
       end
 
       def parse(json)
-        parser = Yajl::Parser.new.parse(json)
+        begin
+          parser = Yajl::Parser.new.parse(json)
+        rescue Exception => e
+          {"stat"=>"fail", "error"=>"json parser error", "response"=>json.to_s}
+        end
       end
   end
-end
+end

data/moonshado-sms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{moonshado-sms}
-  s.version = "0.5.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Patel"]
-  s.date = %q{2010-08-06}
+  s.date = %q{2010-08-26}
   s.email = %q{tech@moonshado.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -53,19 +53,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, ["= 1.5.1"])
-      s.add_runtime_dependency(%q<yajl-ruby>, ["= 0.7.6"])
+      s.add_runtime_dependency(%q<rest-client>, ["= 1.6.0"])
+      s.add_runtime_dependency(%q<yajl-ruby>, ["= 0.7.7"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
-      s.add_dependency(%q<rest-client>, ["= 1.5.1"])
-      s.add_dependency(%q<yajl-ruby>, ["= 0.7.6"])
+      s.add_dependency(%q<rest-client>, ["= 1.6.0"])
+      s.add_dependency(%q<yajl-ruby>, ["= 0.7.7"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
-    s.add_dependency(%q<rest-client>, ["= 1.5.1"])
-    s.add_dependency(%q<yajl-ruby>, ["= 0.7.6"])
+    s.add_dependency(%q<rest-client>, ["= 1.6.0"])
+    s.add_dependency(%q<yajl-ruby>, ["= 0.7.7"])
   end
 end
 

data/test/sms_test.rb

@@ -44,5 +44,25 @@ class Moonshado::SmsTest < Test::Unit::TestCase
 
       assert_equal(sms.deliver_sms, {"id"=>"sms_id_mock", "stat"=>"ok"})
     end
+
+    should "handle bad response" do
+      sms = Moonshado::Sms.new
+      assert_equal(sms.send(:parse, "test")["stat"], 'fail')
+      assert_equal(sms.send(:parse, "test")["error"], 'json parser error')
+    end
+  end
+
+  context Moonshado::Sms do
+    setup do
+      Moonshado::Sms.configure do |config|
+        config.api_key = '20lsdjf2'
+        config.host = 'notreal.moonshado.com'
+        config.production_environment = true
+      end
+    end
+
+    should "return DNS error" do
+      assert_equal(Moonshado::Sms.new("1(555)555-6471", "test").deliver_sms["stat"], "fail")
+    end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: moonshado-sms
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 5
   - 0
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Kevin Patel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -04:00
+date: 2010-08-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,12 +54,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 1
-        - 5
-        - 1
-        version: 1.5.1
+        - 6
+        - 0
+        version: 1.6.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -70,12 +70,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 0
         - 7
-        - 6
-        version: 0.7.6
+        - 7
+        version: 0.7.7
   type: :runtime
   version_requirements: *id004
 description: