twilio-rb 1.0beta → 1.0beta2

data/README.md

@@ -9,9 +9,11 @@ It offers an ActiveRecord style API, i.e. one that most Ruby developers are fami
 
 ## Installation
 
-The library has been packaged as a gem and is available from rubygems.org
+The library has been packaged as a gem and is available from rubygems.org. The version that this readme pertains to is 1.0beta. To install use the `--pre` flag
 
-<pre>gem install twilio-rb</pre>
+<pre>gem install twilio-rb --pre</pre>
+
+Please use the Github issue tracker to report any issues or bugs you uncover.
 
 ## Usage
 
@@ -21,7 +23,7 @@ Require the library in your script as
 
 or using bundler:
 
-<pre>gem 'twilio-rb', '1.0pre', :require => 'twilio'</pre>
+<pre>gem 'twilio-rb', '1.0beta', :require => 'twilio'</pre>
 
 ## Configuration
 

data/lib/railtie.rb

@@ -5,10 +5,14 @@ module Twilio
         class Template
           module Handlers
             class TwiML < ::ActionView::Template::Handler
+              self.default_format = 'text/xml'
               include ::ActionView::Template::Handlers::Compilable
 
               def compile(template)
-                %<Twilio::TwiML.build { |res| #{template.source} }>
+                <<-EOS
+                controller.content_type = 'text/xml'
+                Twilio::TwiML.build {|res| #{template.source} }
+                EOS
               end
             end
           end
@@ -19,4 +23,4 @@ module Twilio
       ::Mime::Type.register_alias 'text/xml', :voice
     end
   end
-end
+end

data/lib/twilio/call.rb

@@ -15,18 +15,19 @@ module Twilio
       end
 
       private
-      def prepare_dates(opts)
-        opts.map do |k,v|
+      def prepare_params(opts) # :nodoc:
+        pairs = opts.map do |k,v|
           if [:started_before, :started_after, :ended_before, :ended_after].include? k
             k = k.to_s
             # Fancy schmancy-ness to handle Twilio <= URI operator for dates
             comparator = k =~ /before$/ ? '<=' : '>='
             delineator = k =~ /started/ ? 'Start' : 'End' 
-            delineator << "Time" << comparator << v.to_s
+            CGI.escape(delineator << "Time" << comparator << v.to_s)
           else
-            "#{k.to_s.camelize}=#{v}"
+            "#{k.to_s.camelize}=#{CGI.escape v.to_s}"
           end
         end
+        "?#{pairs.join('&')}"
       end
     end
 

data/lib/twilio/finder.rb

@@ -5,21 +5,17 @@ module Twilio
       hash = res.parsed_response
       if (200..299).include? res.code
         hash['api_version'] = hash['api_version'].to_s # api_version parsed as a date by http_party
-        new hash 
+        new hash
       end
     end
 
     def count(opts={})
-      opts   = prepare_dates opts
-      params = "?#{URI.encode(opts.join '&')}" unless opts.empty?
-
+      params = prepare_params opts if opts.any?
       get("/Accounts/#{Twilio::ACCOUNT_SID}/#{resource_fragment}.json#{params}").parsed_response['total']
     end
 
     def all(opts={})
-      opts   = prepare_dates opts
-      params = "?#{URI.encode(opts.join '&')}" unless opts.empty?
-      
+      params = prepare_params opts if opts.any?
       handle_response get "/Accounts/#{Twilio::ACCOUNT_SID}/#{resource_fragment}.json#{params}"
     end
 
@@ -31,17 +27,18 @@ module Twilio
       resource   = klass_name == 'SMS' ? "#{klass_name}/Messages" : klass_name.pluralize
     end
 
-    def prepare_dates(opts) # :nodoc:
-      opts.map do |k,v|
+    def prepare_params(opts) # :nodoc:
+      pairs = opts.map do |k,v|
         if [:updated_before, :created_before, :updated_after, :created_after].include? k
           k = k.to_s
           # Fancy schmancy-ness to handle Twilio <= URI operator for dates
           comparator = k =~ /before$/ ? '<=' : '>='
-          "Date" << k.gsub(/\_\w+$/, '').capitalize << comparator << v.to_s
+          CGI.escape("Date" << k.gsub(/\_\w+$/, '').capitalize << comparator << v.to_s)
         else
-          "#{k.to_s.camelize}=#{v}"
+          "#{k.to_s.camelize}=#{CGI.escape v.to_s}"
         end
       end
+      "?#{pairs.join('&')}"
     end
 
     def handle_response(res) # :nodoc:

data/lib/twilio/notification.rb

@@ -6,17 +6,18 @@ module Twilio
 
     class << self
       private
-      def prepare_dates(opts)
-        opts.map do |k,v|
+      def prepare_params(opts) # :nodoc:
+        pairs = opts.map do |k,v|
           if [:created_before, :created_after].include? k
             k = k.to_s
             # Fancy schmancy-ness to handle Twilio <= URI operator for dates
             comparator = k =~ /before$/ ? '<=' : '>='
-            "MessageDate" << comparator << v.to_s
+            CGI.escape("MessageDate" << comparator << v.to_s)
           else
-            "#{k.to_s.camelize}=#{v}"
+            "#{k.to_s.camelize}=#{CGI.escape v.to_s}"
           end
         end
+        "?#{pairs.join('&')}"
       end
     end
   end

data/lib/twilio/sms.rb

@@ -6,17 +6,18 @@ module Twilio
 
     class << self
       private
-      def prepare_dates(opts)
-        opts.map do |k,v|
+      def prepare_params(opts) # :nodoc:
+        pairs = opts.map do |k,v|
           if [:created_before, :created_after, :sent_before, :sent_after].include? k
             k = k.to_s
             # Fancy schmancy-ness to handle Twilio <= URI operator for dates
-            comparator = k =~ /before$/ ? '<=' : '>=' 
-            "DateSent" << comparator << v.to_s
+            comparator = k =~ /before$/ ? '<=' : '>='
+            URI.encode("DateSent" << comparator << v.to_s)
           else
-            "#{k.to_s.camelize}=#{v}"
+            "#{k.to_s.camelize}=#{CGI.escape v.to_s}"
           end
         end
+        "?#{pairs.join('&')}"
       end
     end
   end

data/lib/twilio.rb

@@ -1,4 +1,4 @@
-%w<rubygems active_support cgi yajl yajl/json_gem httparty builder>.each  { |lib| require lib }
+%w<rubygems active_support active_support/inflector cgi yajl yajl/json_gem httparty builder>.each  { |lib| require lib }
 %w<resource finder persistable deletable>.each { |lib| require File.join(File.dirname(__FILE__), 'twilio', "#{lib}.rb") }
 
 module Twilio

metadata

@@ -1,11 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: twilio-rb
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 1
-  - 0beta
-  version: 1.0beta
+  prerelease: 3
+  version: 1.0beta2
 platform: ruby
 authors: 
 - Stevie Graham
@@ -13,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-26 00:00:00 +00:00
+date: 2011-06-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,103 +21,86 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: i18n
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 7
         version: 0.7.7
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 1
         version: 0.6.1
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 2
         version: 2.1.2
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
         version: 1.6.1
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 0
         version: 2.2.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 10
         version: 0.9.10
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: A nice Ruby wrapper for the Twilio REST API
 email: sjtgraham@mac.com
 executables: []
@@ -151,7 +131,7 @@ files:
 - lib/twilio/transcription.rb
 - lib/twilio/twiml.rb
 - lib/twilio.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/stevegraham/twilio-rb
 licenses: []
 
@@ -165,25 +145,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Interact with the Twilio API in a nice Ruby way.