textmagic 0.3.0 → 0.3.1

data/.gitignore

@@ -3,3 +3,5 @@
 coverage
 rdoc
 pkg
+_layouts
+_site

data/History.txt

@@ -0,0 +1,8 @@
+== 0.3.1 2009-05-30
+
+* Sending POST requests instead of GET.
+
+== 0.3.0 2009-05-28
+
+* The first official release.
+* Support for account, send, receive, message_status and delete_reply API commands.

data/README.rdoc

@@ -11,11 +11,11 @@ SMS Gateway, visit the official {API documentation}[http://api.textmagic.com]
 or {Google group}[http://groups.google.com/group/textmagic-api].
 
 Links:
-Code[http://github.com/bobes/textmagic/tree/master]
+Doc[http://tuzinsky.com/textmagic/rdoc]
 |
-Doc[http://bobes.github.com/textmagic/rdoc]
+Code[http://github.com/bobes/textmagic/tree/master]
 |
-Blame[http://bobes.github.com]
+Blame[http://tuzinsky.com]
 
 
 == Installation

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 0
+:patch: 1

data/lib/executor.rb

@@ -7,13 +7,14 @@ module TextMagic
       include HTTParty
       base_uri "http://www.textmagic.com/app"
 
-      # Executes a command by sending a request to the TextMagic's HTTP
-      # gateway. This is a low-level generic method used by methods in
-      # TextMagic::API class. You should never need to use this method
+      # Executes a command by sending a request to the TextMagic's Bulk
+      # SMS gateway. This is a low-level generic method used by methods
+      # in TextMagic::API class. You should never need to use this method
       # directly.
       #
       # Parameters specified in the +options+ hash will be added to the
-      # HTTP request's URI.
+      # HTTP POST request's body together with command, username and
+      # password.
       #
       # Returns a hash with values parsed from the server's response if
       # the command was successfully executed. In case the server replies
@@ -25,7 +26,7 @@ module TextMagic
         end
         options.merge!(:username => username, :password => password, :cmd => command)
         options.delete_if { |key, value| key.nil? || key.to_s.blank? || value.nil? || value.to_s.blank? }
-        response = self.get('/api', :query => options, :format => :json)
+        response = self.post('/api', :body => options, :format => :json)
         raise Error.new(response) if response && response['error_code']
         response
       end

data/test/test_executor.rb

@@ -10,51 +10,53 @@ class ExecutorTest < Test::Unit::TestCase
 
       @username, @password = random_string, random_string
       @command, @options = random_string, random_hash
-      @uri = build_uri(@command, @username, @password, @options)
+      @uri = "http://www.textmagic.com/app/api"
     end
 
     should 'not send HTTP request without command' do
-      TextMagic::API::Executor.expects(:get).never
+      TextMagic::API::Executor.expects(:post).never
       lambda {
         TextMagic::API::Executor.execute(nil, @username, @password, @options)
       }.should raise_error(TextMagic::API::Error)
     end
 
     should 'not send HTTP request without username' do
-      TextMagic::API::Executor.expects(:get).never
+      TextMagic::API::Executor.expects(:post).never
       lambda {
         TextMagic::API::Executor.execute(@command, nil, @password, @options)
       }.should raise_error(TextMagic::API::Error)
     end
 
     should 'not send HTTP request without password' do
-      TextMagic::API::Executor.expects(:get).never
+      TextMagic::API::Executor.expects(:post).never
       lambda {
         TextMagic::API::Executor.execute(@command, @username, nil, @options)
       }.should raise_error(TextMagic::API::Error)
     end
 
-    should 'send a GET request to proper uri' do
+    should 'send a POST request to proper uri' do
       response = random_string
-      FakeWeb.register_uri(:get, @uri, :string => response)
+      FakeWeb.register_uri(:post, @uri, :string => response)
       TextMagic::API::Executor.execute(@command, @username, @password, @options)
     end
 
     should 'not send parameters with empty keys' do
       options_with_empty_values = @options.merge(nil => random_string, '' => random_string)
-      TextMagic::API::Executor.expects(:get).with('/api', :query => @options, :format => :json)
+      @options.merge!(:username => @username, :password => @password, :cmd => @command)
+      TextMagic::API::Executor.expects(:post).with('/api', :body => @options, :format => :json)
       TextMagic::API::Executor.execute(@command, @username, @password, options_with_empty_values)
     end
 
     should 'not send parameters with empty values' do
       options_with_empty_values = @options.merge(random_string => nil, random_string => '')
-      TextMagic::API::Executor.expects(:get).with('/api', :query => @options, :format => :json)
+      @options.merge!(:username => @username, :password => @password, :cmd => @command)
+      TextMagic::API::Executor.expects(:post).with('/api', :body => @options, :format => :json)
       TextMagic::API::Executor.execute(@command, @username, @password, options_with_empty_values)
     end
 
     should 'raise an error if the response contains error_code' do
       response = "{error_code:#{1 + rand(10)}}"
-      FakeWeb.register_uri(:get, @uri, :string => response)
+      FakeWeb.register_uri(:post, @uri, :string => response)
       lambda {
         TextMagic::API::Executor.execute(@command, @username, @password, @options)
       }.should raise_error(TextMagic::API::Error)
@@ -62,7 +64,7 @@ class ExecutorTest < Test::Unit::TestCase
 
     should 'return a hash with values from the response' do
       hash = random_hash
-      FakeWeb.register_uri(:get, @uri, :string => hash.to_json)
+      FakeWeb.register_uri(:post, @uri, :string => hash.to_json)
       response = TextMagic::API::Executor.execute(@command, @username, @password, @options)
       response.should == hash
     end

data/test/test_helper.rb

@@ -27,12 +27,6 @@ def random_hash
   hash
 end
 
-def build_uri(command, username, password, options = {})
-  options.merge!(:cmd => command, :username => username, :password => password)
-  uri = "http://www.textmagic.com/app/api?"
-  uri << options.collect { |key, value| "#{key}=#{value}"}.join('&')
-end
-
 def load_response(filename)
   File.read(File.join(File.dirname(__FILE__), 'fixtures', filename) + '.json')
 end

data/textmagic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{textmagic}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Bobes Tuzinsky"]
-  s.date = %q{2009-05-28}
+  s.date = %q{2009-05-30}
   s.email = %q{vladimir.tuzinsky@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "History.txt",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: textmagic
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Vladimir Bobes Tuzinsky
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-28 00:00:00 +02:00
+date: 2009-05-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- History.txt
 - LICENSE
 - README.rdoc
 - Rakefile