active_smsgate 0.0.3 → 0.0.4

data/README.rdoc

@@ -3,7 +3,7 @@
 Description goes here.
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -12,6 +12,4 @@ Description goes here.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-== Copyright
 
-Copyright (c) 2010 Pechnikov Maxim. See LICENSE for details.

data/lib/active_smsgate/gateways/amegainform.rb

@@ -42,9 +42,8 @@ module ActiveSmsgate #:nodoc:
       #              в течение которого было установлено соединение для отправки сообщения.
       # SMS_DTMF_DIGITS - Что пользователь нажимал в сеансе разговора (для SENDVOICE (в разработке))
       # SMS_CLOSE_TIME - Время завершения работы по сообщению.
-
-
 =end
+
     class Amegainform < Gateway
 
       CLASS_ID = 'amegainform'
@@ -56,7 +55,6 @@ module ActiveSmsgate #:nodoc:
       base_uri 'http://service.amega-inform.ru'
 
       # Адреса резервных серверов: service-r1.amegainform.ru и service-r2.amegainform.ru
-
       # Создание нового шлюза  AmegaInformGateway
       # * <tt>:login</tt> -- REQUIRED
       # * <tt>:password</tt> -- REQUIRED
@@ -111,9 +109,6 @@ module ActiveSmsgate #:nodoc:
         xml = Zlib::GzipReader.new( StringIO.new( response ) ).read
         if response.code == 200
           parse(xml)
-          @sms.map{|x| x.merge({ :sms_group_id => x[:sms_group_id],
-                                 :sms_id => x[:id], :phone => x[:phone], :sms_count => x[:sms_res_count] })}
-
         else
           raise
         end
@@ -143,13 +138,6 @@ module ActiveSmsgate #:nodoc:
         xml = Zlib::GzipReader.new( StringIO.new( response ) ).read
         if response.code == 200
           parse(xml)
-          if sms_type == :sms
-            @messages.map{ |msg| msg.merge({ :sms_id => msg[:sms_id],:sms_count => msg[:sms_res_count],
-                                             :phone => msg[:sms_target] }) }.find{ |x| x[:sms_id] ==  sms_id.to_s }
-          else
-            @messages.map{ |msg| msg.merge({ :sms_id => msg[:sms_id],
-                                             :sms_count => msg[:sms_res_count], :phone => msg[:sms_target] }) }
-          end
         else
           raise
         end
@@ -159,27 +147,6 @@ module ActiveSmsgate #:nodoc:
         false
       end
 
-      # Выполнение отправки смс завершено
-      def complete_sms(sms_id)
-        @message ||= reply_sms(sms_id)
-        true if @message[:sms_closed].to_i == 1
-      end
-      alias :complete_sms? :complete_sms
-
-      # Смс досталена
-      def success_sms(sms_id)
-        @message ||= reply_sms(sms_id)
-        true if @message[:sms_sent].to_i == 1
-      end
-      alias :success_sms? :success_sms
-
-      # Смс не доставлена
-      def failure_sms(sms_id)
-        @message ||= reply_sms(sms_id)
-        true if @message[:sms_sent].to_i != 1
-      end
-      alias :failure_sms? :failure_sms
-
       private
 
       # Возвращает параметры для авторизации
@@ -189,23 +156,24 @@ module ActiveSmsgate #:nodoc:
       def parse(xml)
         doc = Nokogiri::XML(xml)
         @sms, @messages, @errors = nil, nil, nil
+
         # Ответ от отправка смс
         @sms = doc.at("//output//result") && doc.at("//output//result").
           children.search("//sms").map {|x|
-          _x ={}
-          doc.at("//output//result").each { |v,l| _x[v.downcase.to_sym] = l }
-          x.each { |v,l| _x[v.downcase.to_sym] = l }
-          _x[:text] = x.inner_html
-          _x
+          hash = { }
+          doc.at("//output//result").each { |v,l| hash[v.downcase.to_sym] = l }
+          x.each { |v,l| hash[v.downcase.to_sym] = l }
+          hash[:text] = x.inner_html
+          ::ResultSms::Result.new(hash.merge({ :sms_id => hash[:id], :sms_count => x[:sms_res_count]}))
         }
 
         # Сообщения о доставках смс
         @messages = doc.at("//output//MESSAGES") && doc.at("//output//MESSAGES").
           children.search("//MESSAGE").map { |x|
-          _x = { }
-          x.each { |v,l| _x[v.downcase.to_sym] = l }
-          x.children.each {|n| _x[n.name.downcase.to_sym] = n.inner_html unless n.blank? }
-          _x
+          hash = { }
+          x.each { |v,l| hash[v.downcase.to_sym] = l }
+          x.children.each {|n| hash[n.name.downcase.to_sym] = n.inner_html unless n.blank? }
+          ::ResultSms::Message.new(hash.merge({ :phone => hash[:sms_target], :sms_count => hash[:sms_res_count] }))
         }
 
         # Сообщения об ошибках
@@ -214,6 +182,26 @@ module ActiveSmsgate #:nodoc:
 
         { :sms => @sms, :messages => @messages, :errors => @errors}
       end
+
+      module ResultSms
+        class Message < OpenStruct
+          def complete; true if sms_closed.to_i == 1; end
+          alias :complete? :complete
+
+          def success; true if sms_sent.to_i == 1; end
+          alias :success? :success
+
+          def failure; true unless success?;  end
+          alias :failure? :failure
+          define_method(:id){ @table[:id] || object_id}
+        end
+        class Result  < OpenStruct;
+          define_method(:id){ @table[:id] || object_id}
+        end
+      end
+
     end
   end
 end
+
+

data/lib/active_smsgate.rb

@@ -7,6 +7,7 @@ require 'nokogiri'
 require 'digest'
 require "zlib"
 require 'active_resource'
+require 'ostruct'
 
 require "active_smsgate/gateway"
 Dir[File.join(File.dirname(__FILE__), 'active_smsgate','gateways','**','*.rb')].each { |gw| require gw }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Pechnikov Maxim
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 +06:00
+date: 2010-05-14 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,13 +78,11 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
 files: 
 - lib/active_smsgate.rb
 - lib/active_smsgate/gateway.rb
 - lib/active_smsgate/gateways/amegainform.rb
-- LICENSE
 - README.rdoc
 has_rdoc: true
 homepage: http://github.com/pronix/active_smsgate

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Pechnikov Maxim
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.