twilio_resource 0.1.0 → 0.1.1

data/README.md

@@ -8,7 +8,7 @@ as if they're local ActiveRecord models:
     phone = TwilioResource::LocalIncomingPhoneNumber.new(:url => 'http://www.example.com',
                                                          :area_code => '206',
                                                          :method => 'GET',
-                                                         :friendly_name =g> "My First Phone Number",
+                                                         :friendly_name => "My First Phone Number",
                                                          :account_id => Twilio::Base.user)
     phone.save
 
@@ -17,6 +17,7 @@ The wrapper doesn't support the entire Twilio API, but it should be
 simple enough to add new functionality as needed by following the 
 models that are already built.
 
+
 Supported Functionality
 =======================
 - Requesting, listing, and deleting new local and toll-free numbers
@@ -75,4 +76,4 @@ Placing a call:
       :account_id => Twilio::Base.user, 
       :caller => '2065551111',
       :called => '2065551212',
-      :url => 'http://example.com/call.xml'})
+      :url => 'http://example.com/call.xml'})

data/lib/twilio_resource/exceptions.rb

@@ -10,12 +10,9 @@ class TwilioResource::Exception < StandardError
   # exception if it is mapped, or the xml response otherwise.
   def self.find_exception(e)
     new_exception = if e.respond_to?(:response)
-      exception_data = Hash.from_xml(e.response.body)
+      exception_data = ActiveResource::Formats::TwilioFormat.decode(e.response.body)
 
-      
-      code = exception_data['twilio_response'] && 
-          exception_data['twilio_response']['rest_exception'] && 
-          exception_data['twilio_response']['rest_exception']['code']
+      code = exception_data['code']
       exception_klass = twilio_exceptions[code.to_i] if code
       exception_klass.nil? ? e : exception_klass.new
     else

data/lib/twilio_resource/twilio_format.rb

@@ -31,6 +31,12 @@ module ActiveResource
       # Manipulate from_xml Hash, because twilio doesn't format their
       # xml in the way active_resource expects it.
       def from_xml_data(data)
+
+        # HACK to underscore hash keys like Rails did in 2.3.2 (e.g. "CallSegmentSid" => "call_segment_sid")
+        # Hash#from_xml stopped doing this in Rails 2.3.4, and it's unclear if it should or not.
+        # See: https://rails.lighthouseapp.com/projects/8994/tickets/3377-hashfrom_xml-converted-camelcase-to-underscore-in-232-doesnt-in-234
+        data = deep_underscore_hash_keys(data)
+
         if data.is_a?(Hash) && data['twilio_response']
           from_xml_data(data['twilio_response'])
         else
@@ -40,7 +46,7 @@ module ActiveResource
             # it's the empty set, initialize it to an array so
             # active_resource doesn't throw a fit.
             if v["page"]
-              array_data = v[k.singularize] 
+              array_data = v[k.singularize]
               data[k] = [array_data].flatten.compact
             elsif v.blank?
               data[k] = []
@@ -51,6 +57,24 @@ module ActiveResource
           data.values.first
         end
       end
+      
+      
+      def deep_underscore_hash_keys(hash)
+        hash.keys.each do |key|
+          hash[key.underscore] = hash.delete(key)
+        end
+
+        hash.values.each do |value|
+          if value.is_a?(Hash)
+            deep_underscore_hash_keys(value)
+          elsif value.is_a?(Array)
+            value.each {|v| deep_underscore_hash_keys(v)}
+          end
+        end
+        
+        hash
+      end
+      
     end
   end
 end

data/test/call_test.rb

@@ -11,6 +11,12 @@ class TwilioResource::CallTest < Test::Unit::TestCase
   def test_find_all
     calls = TwilioResource::Call.find(:all, :params => {:account_id => 1})
     assert_equal 2, calls.length
+    
+    # check attributes were assigned correctly
+    call = calls.first
+    assert_equal('4159633717', call.called)
+    assert_equal('4156767925', call.caller)
+    assert(call.call_segment_sid.blank?)
   end
 
   # what the hell, twilio? who uses capitalization to distinguish

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twilio_resource
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Justin Weiss
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 -07:00
+date: 2010-10-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activeresource
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 3
@@ -67,23 +70,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An ActiveResource API wrapper for Twilio