valdemaximus-conduit 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/valdemaximus-conduit.rb

@@ -19,17 +19,45 @@ module ValdeMaximus
       send('/phone_numbers', 'phone_number[]' => phone_numbers, :lazy => lazy.to_s)
     end
     
+    def status_of_phone_numbers(phone_numbers, date=nil)
+      get('/phone_numbers', {'phone_number[]' => phone_numbers, :date => date})
+    end
+    
     private
+      def get(path, params={})        
+        @http = Net::HTTP.new(@domain, @port)
+        @http.use_ssl = false
+        
+        data = convert_hash_to_data(params)
+        
+        @headers = {
+          'Content-Type' => ValdeMaximus::UriUtil::CONTENT_TYPE
+        }
+        
+        resp, data = @http.get2(path+"#{@format}?#{data}", @headers)
+        if @format == '.yml'
+          [resp, YAML::load(data)]
+        else
+          [resp, data]
+        end
+      end
+      
       def send(path, params={})
         @http ||= Net::HTTP.new(@domain, @port)
         @http.use_ssl = false
     
-        data = ValdeMaximus::UriUtil.to_url_param({:user_credentials => @creds}.merge(params))
+        data = convert_hash_to_data(params)
+        
         @headers = {
           'Content-Type' => ValdeMaximus::UriUtil::CONTENT_TYPE
         }
 
         resp, data = @http.post2(path + @format, data, @headers)
+        if @format == '.yml'
+          [resp, YAML::load(data)]
+        else
+          [resp, data]
+        end
       end
     
       def assign_properties(p)
@@ -38,14 +66,22 @@ module ValdeMaximus
         @creds = p[:creds] unless p[:creds].nil?
         @format = ".#{p[:format].nil? ? "yml" : p[:format]}"
       end
+      
+      
+      def convert_hash_to_data(params)
+        params = {:user_credentials => @creds}.merge(params)
+        params.delete_if{|key, value| value.nil?}
+        data = ValdeMaximus::UriUtil.to_url_param(params)
+      end
   end
 end
 
 if __FILE__ == $0
   c = ValdeMaximus::Conduit.new(:format => 'yml', :domain => 'localhost', :port => 3000, :creds => 'f_Le6kzsCJi5tNP7rFpQ')
-  res = c.send_message('hello world 12',
-                       ['8016946634, Tom Johnson',
-                        '8016946632, Little T Johnson',
-                        '8016946633, Big T Johnson'])
-  puts res
+  c.status_of_phone_numbers(['8016946632', '8016025388'])
+  # res = c.send_message('hello world 12',
+  #                      ['8016946634, Tom Johnson',
+  #                       '8016946632, Little T Johnson',
+  #                       '8016946633, Big T Johnson'])
+  # puts res
 end

data/test/tc_conduit.rb

@@ -4,16 +4,37 @@ require 'valdemaximus-conduit'
 
 class TestValdeMaximusConduit < Test::Unit::TestCase
   def test_message_with_phone_numbers
-    c = ValdeMaximus::Conduit.new(:format => 'plain', :domain => 'localhost', :port => 3000, :creds => 'rQMX3kaae9CBtdNWp7U9')
-    res = c.send_message('hello world 2',
-                         ['8016946632'])
-    assert_equal('SUCCESS', res[1])
+    c = ValdeMaximus::Conduit.new(:format => 'yml', :domain => 'localhost', :port => 3000, :creds => 'rQMX3kaae9CBtdNWp7U9')
+    res, data = c.send_message('hello world 2', ['8016946632'])
+    assert_equal(200, data[:code])
+    assert_equal('SUCCESS', data[:message])
+    
+    res, data = c.send_message('hello world 3', ['18016946632'])
+    assert_equal(200, data[:code])
+    assert_equal('SUCCESS', data[:message])
+    
+    res, data = c.send_message('hello world 4', ['80169466323'])
+    assert_equal(400, data[:code])
+    assert_equal('FAILURE', data[:message])
+    
+    res, data = c.send_message('hello world 5', ['180169466323'])
+    assert_equal(400, data[:code])
+    assert_equal('FAILURE', data[:message])
   end
   
   def test_create_phone_numbers
-    c = ValdeMaximus::Conduit.new(:format => 'plain', :domain => 'localhost', :port => 3000, :creds => 'rQMX3kaae9CBtdNWp7U9')
-    res = c.add_phone_numbers(['8016946632', '8016025388'])
-    assert_equal('SUCCESS', res[1])
+    c = ValdeMaximus::Conduit.new(:format => 'yml', :domain => 'localhost', :port => 3000, :creds => 'rQMX3kaae9CBtdNWp7U9')
+    
+    res, data = c.add_phone_numbers(['8016946632', '8016025388'])
+    assert_equal(202, data[:code])
+    assert_equal('ACCEPTED', data[:message])
+    
+    res, data = c.add_phone_numbers(['8016946632', '18016025388'])
+    assert_equal(400, data[:code])
+    assert_equal('FAILURE', data[:message])
+    
+    res, data = c.add_phone_numbers(['18016946632', '8016025388'])
+    assert_equal('FAILURE', data[:message])
   end
   
   # def test_message_with_node_id
@@ -30,4 +51,32 @@ class TestValdeMaximusConduit < Test::Unit::TestCase
   #                         '8016946633, Michael'], 1000000)
   #   assert_equal('FAILURE', res[1])
   # end
+  
+  def test_status_of_phone_numbers
+    c = ValdeMaximus::Conduit.new(:format => 'yml', :domain => 'localhost', :port => 3000, :creds => 'rQMX3kaae9CBtdNWp7U9')
+    
+    res, data = c.status_of_phone_numbers(['6669990003', '6669990002'])
+    assert_equal(409, data[:code])
+    assert_equal('CONFLICT', data[:message])
+    
+    res, data = c.add_phone_numbers(['6669990001'])
+    
+    res, data = c.status_of_phone_numbers(['6669990001', '6669990003'])
+    assert_equal(409, data[:code])
+    assert_equal('CONFLICT', data[:message])
+    
+    res, data = c.status_of_phone_numbers(['66699900011', '6669990002'])
+    assert_equal(400, data[:code])
+    assert_equal('FAILURE', data[:message])
+    
+    res, data = c.add_phone_numbers(['6669990001', '6669990002'])
+    
+    res, data = c.status_of_phone_numbers(['6669990001', '6669990002'])
+    assert_equal(206, data[:code])
+    assert_equal('PARTIAL', data[:message])
+    
+    res, data = c.status_of_phone_numbers(['8016946632', '8016025388'])
+    assert_equal(200, data[:code])
+    assert_equal('SUCCESS', data[:message])
+  end
 end

data/valdemaximus-conduit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{valdemaximus-conduit}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Johnson"]
-  s.date = %q{2010-01-23}
+  s.date = %q{2010-02-03}
   s.description = %q{A Library to programmatically interface with portal}
   s.email = %q{valde.maximus@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: valdemaximus-conduit
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Tom Johnson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 -07:00
+date: 2010-02-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency