trails 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.4 / 2010-03-06
+
+* Clean up logging a bit
+
 === 1.0.3 / 2010-03-06
 
 * Fix Manifest so all required files get added (!)

data/lib/trails.rb

@@ -1,5 +1,5 @@
 module Trails
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end
 begin
   TwilioRest

data/lib/trails/test_helper.rb

@@ -113,11 +113,11 @@ end # module Trails
 
 # open up the TwilioRest::Account class so that we can keep track of faked requests
 class TwilioRest::Account
+  @@fake_requests ||= []
   def self.faked_requests
     return @@fake_requests
   end
   def request_with_fake( url, method, params )
-    @@fake_requests ||= []
     @@fake_requests.push( OpenStruct.new( :url => url, :method => method, :params => params ) )
     fake_response = OpenStruct.new
     fake_response.body = 'Fake Body'

data/lib/trails/twilio/account.rb

@@ -3,14 +3,16 @@ module Trails
     class Account
       attr_reader :config
       def initialize( opts = {} )
-        if( opts.blank? ) 
-          STDERR.puts "no opts specified. trying to pull opts from #{self.class.config.inspect}"
+        _logger = opts[:logger] || ActiveRecord::Base.logger rescue Logger.new( STDERR )
+        if( !opts.blank? ) 
+          _logger.warn "overriding default opts #{self.class.config.inspect} with #{opts.inspect}"
+        else
           opts = self.class.config[self.class.config.keys.first]
         end
         @config = opts.dup
         @sid = @config[:sid] || raise( "no sid specified on #{self}" )
         @token = @config[:token]
-        @logger = @config[:logger]
+        @logger = _logger
       end
 
       def self.sid_from_request( request )
@@ -29,8 +31,14 @@ module Trails
       end
 
       def verify_caller( request )
-        # TODO: check caller credentials here. :)
-        return true
+        # TODO: fix testing stuff so that it includes the right signature.
+        base_string = request.url
+        base_string += request.post_parameters.
+          sort{ |a,b| a.first.to_s <=> b.first.to_s }.
+          flatten.join if( :post == request.method.to_sym )
+
+        digest = OpenSSL::Digest::Digest.new('sha1')
+        expected = Base64.encode64( OpenSSL::HMAC.digest(digest, @sid, base_string) ).strip
       end
 
       # Make outgoing calls.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trails
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Hemant Bhanoo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -08:00
+date: 2010-03-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency