aproxacs-sms_client 0.1.1 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.4

data/lib/sms_client/client/joyzen_client.rb

@@ -14,9 +14,7 @@ module SMS
       page = @agent.get("http://www.joyzen.co.kr/community/message/pop_message.html")
       page = @agent.get("http://www.joyzen.co.kr/community/message/pop_message.html")
       @remains = page.search("tr td font strong").first.content.to_i
-
-      SMS.log.info "[Joyzen] Remains : #{remains} times" if SMS.log
-      available?
+      super
     rescue Exception => e
       SMS.log.debug e if SMS.log
       false
@@ -31,8 +29,6 @@ module SMS
         form.phone = from
         form.group_name1 = to
       end.submit
-      
-      true
     end
   end
 end

data/lib/sms_client/client/lgt_client.rb

@@ -19,8 +19,7 @@ module SMS
       page = page.forms.first.submit
       page = @agent.get("http://cworld.ez-i.co.kr/mylgt2007/web2phone.asp")
       @remains = page.search(".mysms2_1 .accent").first.content.to_i
-      SMS.log.info "[LG Telecom] Remains : #{remains} times" if SMS.log
-      available?
+      super
     rescue Exception => e
       SMS.log.debug e if SMS.log
       false

data/lib/sms_client/client/paran_client.rb

@@ -2,7 +2,7 @@ module SMS
   class ParanClient
     include ClientMethods
     
-    def login(id, password)
+    def login(id, password)      
       id, domain = id.split("@")
       page = @agent.get("http://www.paran.com")
       page = page.form_with(:name => "fmLogin") do |form|
@@ -16,9 +16,7 @@ module SMS
       if page.search("#smsinfo a").first.content =~ /(\d+).*/
         @remains = $1.to_i
       end
-      
-      SMS.log.info "[Paran] Remains : #{remains} times" if SMS.log
-      available?
+      super
     rescue Exception => e
       SMS.log.debug e if SMS.log
       false

data/lib/sms_client/client/xpeed_client.rb

@@ -15,9 +15,7 @@ module SMS
       page.form_with(:name => "phone_form") do |form|
         @remains = form.remainFreeStr.split(":").last.to_i
       end
-
-      SMS.log.info "[Xpeed] Remains : #{remains} times" if SMS.log
-      available?
+      super
     rescue Exception => e
       SMS.log.debug e if SMS.log
       false

data/lib/sms_client/client_methods.rb

@@ -1,7 +1,5 @@
 module SMS
   module ClientMethods
-    attr_accessor :priority
-    
     def initialize
       @agent = WWW::Mechanize.new do |agent|
         agent.user_agent_alias = 'Windows IE 7'
@@ -24,6 +22,14 @@ module SMS
       end
     end
 
+    def login(id, password)
+      @id = id
+      @password = password
+      SMS.log.info "[Paran] Remains : #{remains} times" if SMS.log
+      available?
+      true
+    end
+
     def deliver(to, msg)
       return false unless available?
       return false unless valid_number?(to)
@@ -36,7 +42,7 @@ module SMS
     end
 
     def to_s
-      "#{self.class} : avaliable=#{available?}, from=#{from}, remains=#{remains}, priority=#{priority}"
+      "#{self.class} : avaliable=#{available?}, from=#{from}, remains=#{remains}"
     end
 
     protected

data/lib/sms_client/client_pool.rb

@@ -8,62 +8,43 @@ module SMS
     #  ...
     # }
     #
-    def initialize(config)
-      add(config)
-    end
-
-    def clients
-      @clients ||= []
+    def initialize(config = {})
+      @config = config.to_a
+      sort
     end
+    attr_accessor :from
 
     def size
-      clients.size
+      @config.size
     end
 
     def add(cli)
-      if cli.is_a? SMS::Client
-        clients << cli
-      else cli.is_a? Hash
-        cli.each do |key, val|
-          val.symbolize_keys!
-          client = SMS::Client.new(key) do |c|
-            c.priority = val[:priority] || 10
-            c.login(val[:id], val[:password])
-          end
-          clients << client if client.available?
-        end
-      end
-
+      @config.concat cli.to_a
       sort
     end
 
-    def remove(cli)
-      clients.delete(cli)
+    def remove(key)
+      @config.delete(key)
     end
 
     def first
-      clients.each do |cli|
-        next unless cli.available?
-        return cli
-      end
-    end
-
-    def from=(num)
-      clients.each do |c|
-        c.from = num
+      @config.each do |cf|
+        cli = Client.new(cf[0]) do |cli|
+          cli.from = from if from
+          cli.login(cf[1]["id"], cf[1]["password"])
+        end
+        return cli if cli.available?
       end
     end
 
     def to_s
-      clients.inject(["#{self.class} : "]) do |ret, cli|
-        ret << "  (#{cli.to_s})"
-      end.join("\n")
+      @config.to_s
     end
 
     private
     def sort
-      clients.sort! do |a, b|
-        a.priority <=> b.priority
+      @config.sort! do |a,b|
+        a[1]["priority"] <=> b[1]["priority"]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aproxacs-sms_client
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors: 
 - aproxacs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: send_text
 dependencies: 
 - !ruby/object:Gem::Dependency