twilio_resource 0.1.1 → 0.2.0

data/lib/twilio_resource.rb

@@ -1,10 +1,17 @@
 require 'logger'
-require 'activeresource'
+require 'reactive_resource'
 
 require 'twilio_resource/twilio_format'
 require 'twilio_resource/exceptions'
 
 module TwilioResource
+
+  autoload :Base, 'twilio_resource/base'
+  autoload :Account, 'twilio_resource/account'
+  autoload :Call, 'twilio_resource/call'
+  autoload :IncomingPhoneNumber, 'twilio_resource/incoming_phone_number'
+  autoload :LocalIncomingPhoneNumber, 'twilio_resource/local_incoming_phone_number'
+  autoload :TollFreeIncomingPhoneNumber, 'twilio_resource/toll_free_incoming_phone_number'
   
   class << self
     attr_accessor :logger
@@ -18,10 +25,3 @@ module TwilioResource
     TwilioResource::Base.token = token
   end
 end
-
-require 'twilio_resource/base'
-require 'twilio_resource/account'
-require 'twilio_resource/call'
-require 'twilio_resource/incoming_phone_number'
-require 'twilio_resource/local_incoming_phone_number'
-require 'twilio_resource/toll_free_incoming_phone_number'

data/lib/twilio_resource/base.rb

@@ -1,3 +1,5 @@
+require 'reactive_resource'
+
 # Encapsulates the changes that need to be made to active_resource's
 # defaults in order to communicate with Twilio. There are a few main
 # issues with ActiveResource's defaults:
@@ -15,7 +17,7 @@
 #    ActiveResource::Formats::TwilioFormat.
 # 
 # All of the Twilio ActiveResource classes inherit from this class.
-class TwilioResource::Base < ActiveResource::Base
+class TwilioResource::Base < ReactiveResource::Base
 
   class << self
     attr_accessor :sid
@@ -27,29 +29,23 @@ class TwilioResource::Base < ActiveResource::Base
     alias_method :password=, :token=
   end
   
-  # Have to override this to make empty extensions work (without the dot)
+  # Add logging to these requests
   def self.element_path(id, prefix_options = {}, query_options = nil)
-    prefix_options, query_options = split_options(prefix_options) if query_options.nil?
-    extension = format.extension.blank? ? "" : ".#{format.extension}"
-    path = "#{prefix(prefix_options)}#{collection_name}/#{id}#{extension}#{query_string(query_options)}"
+    path = super(id, prefix_options, query_options)
     TwilioResource.logger.info("Request: #{path}")
     path
   end
 
-  # Have to override this to make empty extensions work (without the dot)
+  # Add logging to these requests
   def self.collection_path(prefix_options = {}, query_options = nil)
-    prefix_options, query_options = split_options(prefix_options) if query_options.nil?
-    extension = format.extension.blank? ? "" : ".#{format.extension}"
-    path = "#{prefix(prefix_options)}#{collection_name}#{extension}#{query_string(query_options)}"
+    path = super(prefix_options, query_options)
     TwilioResource.logger.info("Request: #{path}")
     path
   end
 
-  # Have to override this to make empty extensions work (without the dot)
+  # Add logging to these requests
   def self.custom_method_collection_url(method_name, options = {})
-    prefix_options, query_options = split_options(options)
-    extension = format.extension.blank? ? "" : ".#{format.extension}"
-    path = "#{prefix(prefix_options)}#{collection_name}/#{method_name}#{extension}#{query_string(query_options)}"
+    path = super(method_name, options)
     TwilioResource.logger.info("Request: #{path}")
     path
   end
@@ -73,7 +69,6 @@ class TwilioResource::Base < ActiveResource::Base
     rescue => e
       raise TwilioResource::Exception.find_exception(e)
     end
-
   end
 
 

data/lib/twilio_resource/call.rb

@@ -3,7 +3,7 @@
 # - http://www.twilio.com/docs/api/2008-08-01/rest/call
 # - http://www.twilio.com/docs/api/2008-08-01/rest/making_calls
 class TwilioResource::Call < TwilioResource::Base
-  self.prefix = superclass.prefix_source + 'Accounts/:account_id/'
+  belongs_to :account
 
   NOT_DIALED = 0
   IN_PROGRESS = 1

data/lib/twilio_resource/incoming_phone_number.rb

@@ -2,5 +2,5 @@
 # incoming phone calls. Documentation is at
 # http://www.twilio.com/docs/api/2008-08-01/rest/incoming-phone-numbers
 class TwilioResource::IncomingPhoneNumber < TwilioResource::Base
-  self.prefix = superclass.prefix_source + 'Accounts/:account_id/'
+  belongs_to :account
 end

data/lib/twilio_resource/local_incoming_phone_number.rb

@@ -5,10 +5,12 @@
 # http://www.twilio.com/docs/api/2008-08-01/rest/incoming-phone-numbers
 class TwilioResource::LocalIncomingPhoneNumber < TwilioResource::IncomingPhoneNumber
   
-  self.prefix = superclass.prefix_source + 'IncomingPhoneNumbers/'
-
   def self.collection_name
     'Local'
   end
 
+  def self.association_prefix(options)
+    super(options) + superclass.collection_name + "/"
+  end
+
 end

data/lib/twilio_resource/toll_free_incoming_phone_number.rb

@@ -5,10 +5,12 @@
 # http://www.twilio.com/docs/api/2008-08-01/rest/incoming-phone-numbers
 class TwilioResource::TollFreeIncomingPhoneNumber < TwilioResource::IncomingPhoneNumber
   
-  self.prefix = superclass.prefix_source + 'IncomingPhoneNumbers/'
-
   def self.collection_name
     'TollFree'
   end
 
+  def self.association_prefix(options)
+    super(options) + superclass.collection_name + "/"
+  end
+
 end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'rubygems'
-require 'activeresource'
+require 'reactive_resource'
 require 'twilio_resource'
 
 TwilioResource.setup('1', '1')

data/test/twilio_mock.rb

@@ -22,10 +22,18 @@ class TwilioMock
 
   end
 
+  def self.build_header(method)
+    if ActiveResource::VERSION::MAJOR == 3
+      TwilioResource::Account.connection.send(:build_request_headers, {}, method, '')
+    else
+      TwilioResource::Account.connection.send(:build_request_headers, {})
+    end
+  end
+  
   def self.auth_delete(account_id)
     old_account_id = TwilioResource::Base.user
     TwilioResource::Base.user = account_id
-    auth = TwilioResource::Account.connection.send(:build_request_headers, {}, :delete)
+    auth = build_header(:delete)
     TwilioResource::Base.user = old_account_id
     auth
   end
@@ -33,7 +41,7 @@ class TwilioMock
   def self.auth_post(account_id)
     old_account_id = TwilioResource::Base.user
     TwilioResource::Base.user = account_id
-    auth = TwilioResource::Account.connection.send(:build_request_headers, {}, :post)
+    auth = build_header(:post)
     TwilioResource::Base.user = old_account_id
     auth
   end
@@ -41,7 +49,7 @@ class TwilioMock
   def self.auth_get(account_id)
     old_account_id = TwilioResource::Base.user
     TwilioResource::Base.user = account_id
-    auth = TwilioResource::Account.connection.send(:build_request_headers, {}, :get)
+    auth = build_header(:get)
     TwilioResource::Base.user = old_account_id
     auth
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: twilio_resource
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Justin Weiss
@@ -15,23 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -07:00
+date: 2011-02-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activeresource
+  name: reactive_resource
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
-        - 2
-        - 3
-        - 2
-        version: 2.3.2
+        - 0
+        - 5
+        - 1
+        version: 0.5.1
   type: :runtime
   version_requirements: *id001
 description: 
@@ -74,7 +72,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -83,7 +80,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"