tropo_message 0.0.5 → 0.1.0

data/.gitignore

@@ -1,21 +1,3 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
+pkg/*
+*.gem
+.bundle

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in tropo_message.gemspec
+gemspec

data/Rakefile

@@ -1,53 +1,2 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "tropo_message"
-    gem.summary = "A tiny wrapper for creating a Tropo message"
-    gem.description = "A tiny wrapper for creating a Tropo message"
-    gem.email = "dwilkie@gmail.com"
-    gem.homepage = "http://github.com/dwilkie/tropo_message"
-    gem.authors = ["David Wilkie"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "tropo_message #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/lib/tropo_message.rb

@@ -47,7 +47,7 @@ module Tropo
     #   #   <token>1234512345</token>
     #   #   <var name="to" value="44122782474"/>
     #   #   <var name="text" value="Hi+John%2C+how+r+u+today%3F"/>
-    #   #  </sessions>"
+    #   # </sessions>"
     #
     def request_xml
       request_params = @params.dup
@@ -109,19 +109,19 @@ module Tropo
 
     # Getter/Setter methods
     def action
-      params["action"] || tropo_parameters["action"]
+      params["action"] || unescape(tropo_parameters["action"])
     end
 
     def answer_on_media
-      params["answer_on_media"] || tropo_parameters["answer_on_media"]
+      params["answer_on_media"] || unescape(tropo_parameters["answer_on_media"])
     end
 
     def channel
-      params["channel"] || tropo_parameters["channel"] || "TEXT"
+      params["channel"] || unescape(tropo_parameters["channel"]) || "TEXT"
     end
 
     def from
-      params["from"] || tropo_parameters["from"]
+      params["from"] || unescape(tropo_parameters["from"])
     end
 
     def from=(value)
@@ -129,19 +129,19 @@ module Tropo
     end
 
     def headers
-      params["headers"] || tropo_parameters["headers"]
+      params["headers"] || unescape(tropo_parameters["headers"])
     end
 
     def network
-      params["network"] || tropo_parameters["network"] || "SMS"
+      params["network"] || unescape(tropo_parameters["network"]) || "SMS"
     end
 
     def recording
-      params["recording"] || tropo_parameters["recording"]
+      params["recording"] || unescape(tropo_parameters["recording"])
     end
 
     def text
-      params["text"] || tropo_parameters["text"]
+      params["text"] || unescape(tropo_parameters["text"])
     end
 
     def text=(value)
@@ -149,11 +149,11 @@ module Tropo
     end
 
     def timeout
-      params["timeout"] || tropo_parameters["timeout"]
+      params["timeout"] || unescape(tropo_parameters["timeout"])
     end
 
     def to
-      params["to"] || tropo_parameters["to"]
+      params["to"] || unescape(tropo_parameters["to"])
     end
 
     def to=(value)
@@ -184,6 +184,13 @@ module Tropo
         }.tr(' ', '+')
       end
 
+     # Unescapes a URI escaped string. (Stolen from Camping).
+      def unescape(s)
+        s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
+          [$1.delete('%')].pack('H*')
+        } if s
+      end
+
       # Return the bytesize of String; uses String#length under Ruby 1.8 and
       # String#bytesize under 1.9.
       if ''.respond_to?(:bytesize)

data/lib/tropo_message/version.rb

@@ -0,0 +1,4 @@
+module TropoMessage
+  VERSION = "0.1.0"
+end
+

data/spec/tropo_messsage_spec.rb

@@ -13,16 +13,16 @@ describe Tropo::Message do
         "call_id"=>nil,
         "parameters"=>{
           "token" => "123451234512345123451234512345123451234512345",
-          "text"=>"Hi%2C+how+r+u+today+%3A+my+friend+%3Cyour+name",
-          "to"=>"612382211234",
-          "from" => "661213433198",
-          "channel" => "SomeChannel",
-          "network" => "SomeNetwork",
-          "action" => "SomeAction",
-          "timeout" => "SomeTimeout",
-          "answer_on_media" => "Phone",
-          "headers" => "MyCustomHeaders",
-          "recording" => "MyRecording"
+          "text"=>"Hi%2C+how+r+u+today+%3A+my+friend+%3Cyour+name%3E",
+          "to"=>"%2B612382211234",
+          "from" => "%2B661213433198",
+          "channel" => "Some%2BChannel",
+          "network" => "Some%2BNetwork",
+          "action" => "Some%2BAction",
+          "timeout" => "Some%2BTimeout",
+          "answer_on_media" => "The%2BPhone",
+          "headers" => "My%2BCustom%2BHeaders",
+          "recording" => "My%2BRecording"
         }
       }
     }
@@ -84,14 +84,14 @@ describe Tropo::Message do
       it "should include all the required and optional parameters" do
         tropo_message.parse(tropo_session)
         tropo_message.response_params.should == {
-          "to" => "612382211234",
-          "channel" => "SomeChannel",
-          "network" => "SomeNetwork",
-          "from" => "661213433198",
-          "timeout" => "SomeTimeout",
-          "answer_on_media" => "Phone",
-          "headers" => "MyCustomHeaders",
-          "recording" => "MyRecording"
+          "to" => "+612382211234",
+          "channel" => "Some+Channel",
+          "network" => "Some+Network",
+          "from" => "+661213433198",
+          "timeout" => "Some+Timeout",
+          "answer_on_media" => "The+Phone",
+          "headers" => "My+Custom+Headers",
+          "recording" => "My+Recording"
         }
       end
     end
@@ -103,7 +103,7 @@ describe Tropo::Message do
       it "should include all the required parameters" do
         tropo_message.parse(tropo_session)
         tropo_message.response_params.should == {
-          "to" => "612382211234",
+          "to" => "+612382211234",
           "channel" => "TEXT",
           "network" => "SMS",
         }
@@ -136,9 +136,9 @@ describe Tropo::Message do
       end
     end
     context "responding to tropo" do
-      it "should return the receiver from the session parameters" do
+      it "should return the receiver (unescapted) from the session parameters" do
         tropo_message.parse(tropo_session)
-        tropo_message.to.should == "612382211234"
+        tropo_message.to.should == "+612382211234"
       end
     end
   end
@@ -153,7 +153,7 @@ describe Tropo::Message do
     context "responding to tropo" do
       it "should return the sender from the session parameters" do
         tropo_message.parse(tropo_session)
-        tropo_message.from.should == "661213433198"
+        tropo_message.from.should == "+661213433198"
       end
     end
   end
@@ -168,7 +168,7 @@ describe Tropo::Message do
     context "responding to tropo" do
       it "should return the text from the session parameters" do
         tropo_message.parse(tropo_session)
-        tropo_message.text.should == "Hi%2C+how+r+u+today+%3A+my+friend+%3Cyour+name"
+        tropo_message.text.should == "Hi, how r u today : my friend <your name>"
       end
     end
   end
@@ -186,7 +186,7 @@ describe Tropo::Message do
       context "'channel' is in the session parameters" do
         it "should return the channel from the session parameters" do
           tropo_message.parse(tropo_session)
-          tropo_message.channel.should == "SomeChannel"
+          tropo_message.channel.should == "Some+Channel"
         end
       end
       context "'channel' is not in the session parameters" do
@@ -212,7 +212,7 @@ describe Tropo::Message do
       context "'network' is in the session parameters" do
         it "should return the network from the session parameters" do
           tropo_message.parse(tropo_session)
-          tropo_message.network.should == "SomeNetwork"
+          tropo_message.network.should == "Some+Network"
         end
       end
       context "'network' is not in the session parameters" do
@@ -239,7 +239,7 @@ describe Tropo::Message do
       context "'action' is in the session parameters" do
         it "should return the action from the session parameters" do
           tropo_message.parse(tropo_session)
-          tropo_message.action.should == "SomeAction"
+          tropo_message.action.should == "Some+Action"
         end
       end
       context "'action' is not in the session parameters" do
@@ -265,7 +265,7 @@ describe Tropo::Message do
       context "'timeout' is in the session parameters" do
         it "should return the timeout from the session parameters" do
           tropo_message.parse(tropo_session)
-          tropo_message.timeout.should == "SomeTimeout"
+          tropo_message.timeout.should == "Some+Timeout"
         end
       end
       context "'timeout' is not in the session parameters" do
@@ -291,7 +291,7 @@ describe Tropo::Message do
       context "'answer_on_media' is in the session parameters" do
         it "should return 'answer_on_media' from the session parameters" do
           tropo_message.parse(tropo_session)
-          tropo_message.answer_on_media.should == "Phone"
+          tropo_message.answer_on_media.should == "The+Phone"
         end
       end
       context "'answer_on_media' is not in the session parameters" do
@@ -317,7 +317,7 @@ describe Tropo::Message do
       context "'headers' is in the session parameters" do
         it "should return the headers from the session parameters" do
           tropo_message.parse(tropo_session)
-          tropo_message.headers.should == "MyCustomHeaders"
+          tropo_message.headers.should == "My+Custom+Headers"
         end
       end
       context "'headers' is not in the session parameters" do
@@ -343,7 +343,7 @@ describe Tropo::Message do
       context "'recording' is in the session parameters" do
         it "should return the recording from the session parameters" do
           tropo_message.parse(tropo_session)
-          tropo_message.recording.should == "MyRecording"
+          tropo_message.recording.should == "My+Recording"
         end
       end
       context "'recording' is not in the session parameters" do

data/tropo_message.gemspec

@@ -1,51 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "tropo_message/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{tropo_message}
-  s.version = "0.0.5"
+  s.name        = "tropo_message"
+  s.version     = TropoMessage::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["David Wilkie"]
+  s.email       = ["dwilkie@gmail.com"]
+  s.homepage    = "https://github.com/dwilkie/tropo_message"
+  s.summary     = %q{Simplifies sending messages with Tropo}
+  s.description = %q{Makes it easier to send a message using Tropo}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["David Wilkie"]
-  s.date = %q{2010-10-15}
-  s.description = %q{A tiny wrapper for creating a Tropo message}
-  s.email = %q{dwilkie@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.markdown"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "lib/tropo_message.rb",
-     "spec/spec_helper.rb",
-     "spec/tropo_messsage_spec.rb",
-     "tropo_message.gemspec"
-  ]
-  s.homepage = %q{http://github.com/dwilkie/tropo_message}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A tiny wrapper for creating a Tropo message}
-  s.test_files = [
-    "spec/tropo_messsage_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "tropo_message"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 5
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - David Wilkie
@@ -14,37 +14,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +07:00
+date: 2010-11-15 00:00:00 +07:00
 default_executable: 
 dependencies: []
 
-description: A tiny wrapper for creating a Tropo message
-email: dwilkie@gmail.com
+description: Makes it easier to send a message using Tropo
+email: 
+- dwilkie@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
-- VERSION
 - lib/tropo_message.rb
+- lib/tropo_message/version.rb
 - spec/spec_helper.rb
 - spec/tropo_messsage_spec.rb
 - tropo_message.gemspec
 has_rdoc: true
-homepage: http://github.com/dwilkie/tropo_message
+homepage: https://github.com/dwilkie/tropo_message
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -65,11 +66,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: tropo_message
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A tiny wrapper for creating a Tropo message
-test_files: 
-- spec/tropo_messsage_spec.rb
-- spec/spec_helper.rb
+summary: Simplifies sending messages with Tropo
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-0.0.5