twilio-rb 2.2.1 → 2.2.2

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/stevegraham/twilio-rb.png)](https://travis-ci.org/stevegraham/twilio-rb)
+
 # Twilio.rb
 
 Interact with the Twilio API in a nice Ruby way.
@@ -396,3 +398,4 @@ A recording resource instance has an extra instance method: `#mp3` this returns
 * Aaron Lerch
 * Joël Franusic
 * Mark Burns
+* Alex Sharp

data/lib/twilio-rb.rb

@@ -6,16 +6,6 @@ module Twilio
   APIError            = Class.new StandardError
   ConfigurationError  = Class.new StandardError
   InvalidStateError   = Class.new StandardError
-
-  class << self
-    def const_missing(const_name)
-      if [:ACCOUNT_SID, :AUTH_TOKEN].include? const_name
-        raise Twilio::ConfigurationError.new "Cannot complete request. Please set #{const_name.to_s.downcase} with Twilio::Config.setup first!"
-      else
-        super
-      end
-    end
-  end
 end
 
 Dir[File.join(File.dirname(__FILE__), 'twilio', '*.rb')].each { |lib| require lib }

data/lib/twilio/available_phone_number.rb

@@ -10,7 +10,7 @@ module Twilio
         number_type              = opts.delete('TollFree') ? 'TollFree' : 'Local'
         params                   = { :query => opts } if opts.any?
 
-        handle_response get "/Accounts/#{Twilio::ACCOUNT_SID}/AvailablePhoneNumbers/#{country_code}/#{number_type}.json", params 
+        handle_response get "/Accounts/#{Twilio::Config.account_sid}/AvailablePhoneNumbers/#{country_code}/#{number_type}.json", params 
       end
 
       private :new

data/lib/twilio/capability.rb

@@ -17,7 +17,7 @@ module Twilio
       if opts['account_sid'] && opts['auth_token']
         [opts.delete('account_sid'), opts.delete('auth_token')]
       else
-        [Twilio::ACCOUNT_SID, Twilio::AUTH_TOKEN]
+        [Twilio::Config.account_sid, Twilio::Config.auth_token]
       end
     end
 

data/lib/twilio/config.rb

@@ -1,13 +1,34 @@
-module Twilio
+
+
+  module Twilio
   module Config
+    attr_writer :account_sid, :auth_token
+
+    def account_sid
+      if @account_sid
+        @account_sid
+      else
+        raise Twilio::ConfigurationError.new \
+          "Cannot complete request. Please set account_sid with Twilio::Config.setup first!"
+      end
+    end
+
+    def auth_token
+      if @auth_token
+        @auth_token
+      else
+        raise Twilio::ConfigurationError.new \
+          "Cannot complete request. Please set auth_token with Twilio::Config.setup first!"
+      end
+    end
+
     def setup(opts={}, &blk)
       if block_given?
         instance_eval &blk
         warn 'The block syntax for configuration is deprecated. Use an options hash instead, e.g. Twilio::Config.setup account_sid: "AC00000000000000000000000", auth_token: "xxxxxxxxxxxxxxxxxxx"'
       else
         opts.map do |k,v|
-          const = k.to_s.upcase
-          Twilio.const_set(const, v) unless Twilio.const_defined? const
+          send("#{k}=", v)
         end
       end
 

data/lib/twilio/finder.rb

@@ -3,7 +3,7 @@ module Twilio
     def find(id, opts={})
       opts        = opts.with_indifferent_access
       # Support subaccounts by optionally passing in an account_sid or account object
-      account_sid = opts.delete('account_sid') || opts.delete('account').try(:sid) || Twilio::ACCOUNT_SID
+      account_sid = opts.delete('account_sid') || opts.delete('account').try(:sid) || Twilio::Config.account_sid
       connect     = opts.delete 'connect'
 
       res  = get "#{resource_path(account_sid)}/#{id}.json", :account_sid => (connect && account_sid)
@@ -17,7 +17,7 @@ module Twilio
     def count(opts={})
       opts        = opts.with_indifferent_access
       # Support subaccounts by optionally passing in an account_sid or account object
-      account_sid = opts.delete('account_sid') || opts.delete('account').try(:sid) || Twilio::ACCOUNT_SID
+      account_sid = opts.delete('account_sid') || opts.delete('account').try(:sid) || Twilio::Config.account_sid
       connect     = opts.delete 'connect'
 
       params      = prepare_params opts if opts.any?
@@ -27,7 +27,7 @@ module Twilio
     def all(opts={})
       opts        = opts.with_indifferent_access
       # Support subaccounts by optionally passing in an account_sid or account object
-      account_sid = opts.delete('account_sid') || opts.delete('account').try(:sid) || Twilio::ACCOUNT_SID
+      account_sid = opts.delete('account_sid') || opts.delete('account').try(:sid) || Twilio::Config.account_sid
       connect     = opts.delete 'connect'
 
       params      = prepare_params opts if opts.any?

data/lib/twilio/persistable.rb

@@ -6,7 +6,7 @@ module Twilio
         def create(attrs={})
           attrs        = attrs.with_indifferent_access
           # Support subaccounts by optionally passing in an account_sid or account object
-          account_sid  = attrs.delete('account_sid') || attrs.delete('account').try(:sid) || Twilio::ACCOUNT_SID
+          account_sid  = attrs.delete('account_sid') || attrs.delete('account').try(:sid) || Twilio::Config.account_sid
           connect      = attrs.delete 'connect'
           request_opts = { :body => Hash[attrs.map { |k,v| [k.to_s.camelize, v]}] }
 

data/lib/twilio/request_filter.rb

@@ -15,7 +15,7 @@ module Twilio
     def expected_signature_for(request)
       string_to_sign = request.url + request.request_parameters.sort.join
       digest         = OpenSSL::Digest::Digest.new('sha1')
-      hash           = OpenSSL::HMAC.digest(digest, Twilio::AUTH_TOKEN, string_to_sign)
+      hash           = OpenSSL::HMAC.digest(digest, Twilio::Config.auth_token, string_to_sign)
 
       Base64.encode64(hash).strip
     end

data/lib/twilio/resource.rb

@@ -111,8 +111,9 @@ module Twilio
           define_method(meth) do |*args| # splatted args necessary hack since <= 1.8.7 does not support optional block args
             opts        = args.extract_options!
             account_sid = opts.delete :account_sid
+
             # if account sid is passed in as an option use it for basic auth (twilio connect)
-            super args.first, opts.merge(:headers => { 'User-Agent' => 'twilio-rb/2.1.1' }, :basic_auth => { :username => account_sid || Twilio::ACCOUNT_SID, :password => Twilio::AUTH_TOKEN })
+            super args.first, opts.merge(:headers => { 'User-Agent' => 'twilio-rb/2.1.1' }, :basic_auth => { :username => account_sid || Twilio::Config.account_sid, :password => Twilio::Config.auth_token })
           end
         end
 

data/lib/twilio/sandbox.rb

@@ -19,7 +19,7 @@ module Twilio
 
     private
     def path
-      "/Accounts/#{Twilio::ACCOUNT_SID}/Sandbox.json"
+      "/Accounts/#{Twilio::Config.account_sid}/Sandbox.json"
     end
     extend self
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twilio-rb
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70246567007180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70246567007180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70246567006680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70246567006680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70246567006200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70246567006200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &70246567005740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70246567005740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70246567005280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70246567005280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: jwt
-  requirement: &70246567004800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70246567004800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70246567004340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: 1.6.1
   type: :development
   prerelease: false
-  version_requirements: *70246567004340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70246567003860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70246567003860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70246567003400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *70246567003400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70246567002940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70246567002940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70246567002480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +181,12 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70246567002480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 description: A nice Ruby wrapper for the Twilio REST API
 email: sjtgraham@mac.com
 executables: []
@@ -188,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Interact with the Twilio API in a nice Ruby way.