mfms 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68b6c8c740eba9f28d326f0c7d92a01724941a6c
-  data.tar.gz: 736b36e41793fdb54ff6682ff3ff454a57bc3d7a
+  metadata.gz: 0acdb437e94f51421bee45daf2934fd5807ed705
+  data.tar.gz: e946b964e1ac23c05aeb1c116a2e15652443ed78
 SHA512:
-  metadata.gz: c64acbf8a7746ed55f88dc4aec903025073096b82baf7336b0aa9138599be100ecd05b7acd7df70952e15742add66eb3bcb53ce57dd7b5177c82a349cc1828e7
-  data.tar.gz: 16bbc5a7c37ceb3bc08b0132730df9c2f31fc26ccd3d31e5a92475e1c1ed0008482c8fe3b22961a69992a367de99ba0dadb424b04ea89bf23b8c4ba6b45519ba
+  metadata.gz: 49b8f66c083ac2854601cb85458fc8d154e8aee5b91cc5c145e08dc26c525a6bcdf5cc00bffeae3d64f56d006bb226551d2e8a802c4ffde1189c866e41b74481
+  data.tar.gz: 41d5ab08dafb976b623cf73d3d5dce55698037d9826e8158abf59aaa411339c42993a89d9325affe75bb4d65cefb98907eebfc6dea2248e330799ff38d50eea3

data/lib/mfms/sms.rb

@@ -7,37 +7,42 @@ require 'russian'
 module Mfms
   class SMS
 
-    attr_accessor :phone, :subject, :message
+    attr_accessor :phone, :subject, :message, :account, :login, :password, :server, :cert, :port, :ssl_port, :ssl
     attr_reader :id, :status
 
-    def initialize(phone, subject, message, translit = nil)
+    def initialize(phone, subject, message, translit = nil, account = nil)
       @phone = phone
       @subject = subject
       @message = message
       @status = 'not-sent'
-      @translit = translit.nil? ? @@translit : translit
-
+      account = "@@#{account}".to_sym
+      account_variable = if account.present? && self.class.class_variables.include?(account)
+                           account
+                         else
+                           self.class.class_variables.select{|sym| sym.to_s.include?('revoup0')}.first
+                         end
+      account_settings = Mfms::SMS.class_variable_get(account_variable)
+      @login = account_settings[:login]
+      @password = account_settings[:password]
+      @ssl = account_settings[:ssl]
+      @ssl_port = account_settings[:ssl_port]
+      @port = account_settings[:port]
+      @cert = account_settings[:cert]
+      @server = account_settings[:server]
+      @translit = translit.nil? ? account_settings[:translit] : translit
       validate!
     end
 
-    def self.settings=(settings={})
-      @@login = settings[:login]
-      @@password = settings[:password]
-      @@server = settings[:server]
-      @@port = settings[:port]
-      @@ssl_port = settings[:ssl_port]
-      @@cert_store = init_cert_store settings[:cert]
-      @@ssl = !settings[:ssl].nil? ? settings[:ssl] : true # connect using ssl by default
-      @@translit = !settings[:translit].nil? ? settings[:translit] : false # use translit or not
-      validate_settings!
-    end
-
-    def self.ssl=(flag)
-      @@ssl = flag
-    end
-
-    def self.ssl
-      @@ssl
+    def self.settings=(settings=[])
+      settings.each do |setting|
+        account = setting.keys.first
+        account_settings = setting[account]
+        account_settings[:cert] = init_cert_store(account_settings[:cert])
+        account_settings[:ssl] = account_settings[:ssl].presence || true
+        account_settings[:translit] = account_settings[:translit].presence || false
+        class_variable_set("@@#{account}", account_settings)
+        validate_settings!(account_settings)
+      end
     end
 
     # => SMS send status codes:
@@ -50,7 +55,7 @@ module Mfms
 
     def send
       #return stubbed_send if (defined?(Rails) && !Rails.env.production?)
-      self.class.establish_connection.start do |http|
+      establish_connection.start do |http|
         request = Net::HTTP::Get.new(send_url)
         response = http.request(request)
         body = response.body.split(';')
@@ -99,42 +104,42 @@ module Mfms
 
     private
 
-      def self.establish_connection
-        port = @@ssl ? @@ssl_port : @@port
-        http = Net::HTTP.new(@@server, port)
-        http.use_ssl = @@ssl
-        http.cert_store = @@cert_store
-        http
-      end
+    def establish_connection
+      port = @ssl ? @ssl_port : @port
+      http = Net::HTTP.new(@server, port)
+      http.use_ssl = @ssl
+      http.cert_store = @cert
+      http
+    end
 
-      def self.init_cert_store cert
-        raise ArgumentError, "Path to certificate should be defined for #{self}." if cert.nil?
-        raise ArgumentError, "Certificate file '#{File.expand_path(cert)}' does not exist." unless File.exist?(cert)
-        cert_store = OpenSSL::X509::Store.new
-        cert_store.add_cert OpenSSL::X509::Certificate.new File.read(cert)
-        cert_store
-      end
+    def self.init_cert_store(cert)
+      raise ArgumentError, "Path to certificate should be defined for #{self}." if cert.nil?
+      raise ArgumentError, "Certificate file '#{File.expand_path(cert)}' does not exist." unless File.exist?(cert)
+      cert_store = OpenSSL::X509::Store.new
+      cert_store.add_cert OpenSSL::X509::Certificate.new File.read(cert)
+      cert_store
+    end
 
-      def self.validate_settings!
-        raise ArgumentError, "Login should be defined for #{self}." if @@login.nil?
-        raise ArgumentError, "Password should be defined for #{self}." if @@password.nil?
-        raise ArgumentError, "Server should be defined for #{self}." if @@server.nil?
-        raise ArgumentError, "Port should be defined for #{self}." if @@port.nil?
-        raise ArgumentError, "Port for ssl should be defined for #{self}." if @@ssl_port.nil?
-        raise ArgumentError, "Port should contain only numbers. #{@@port.inspect} is given." unless @@port.instance_of?(Fixnum)
-        raise ArgumentError, "Port for ssl should contain only numbers. #{@@ssl_port.inspect} is given." unless @@ssl_port.instance_of?(Fixnum)
-      end
+    def self.validate_settings!(settings)
+      raise ArgumentError, "Login should be defined for #{self}." if settings[:login].nil?
+      raise ArgumentError, "Password should be defined for #{self}." if settings[:password].nil?
+      raise ArgumentError, "Server should be defined for #{self}." if settings[:server].nil?
+      raise ArgumentError, "Port should be defined for #{self}." if settings[:port].nil?
+      raise ArgumentError, "Port for ssl should be defined for #{self}." if settings[:ssl_port].nil?
+      raise ArgumentError, "Port should contain only numbers. #{settings[:port].inspect} is given." unless settings[:port].instance_of?(Fixnum)
+      raise ArgumentError, "Port for ssl should contain only numbers. #{settings[:ssl_port].inspect} is given." unless settings[:ssl_port].instance_of?(Fixnum)
+    end
 
-      def send_url
-        message = @translit ? Russian.translit(@message) : @message
-        "/revoup/connector0/send?login=#{@@login}&password=#{@@password}&" +
-        "subject[0]=#{@subject}&address[0]=#{@phone}&text[0]=#{URI.encode(message)}"
-      end
+    def send_url
+      message = @translit ? Russian.translit(@message) : @message
+      "/revoup/connector0/send?login=#{@login}&password=#{@password}&" +
+          "subject[0]=#{@subject}&address[0]=#{@phone}&text[0]=#{URI.encode(message)}"
+    end
 
-      def self.status_url msg_id
-        "/revoup/connector0/status?login=#{@@login}&password=#{@@password}&" +
-        "providerId[0]=#{msg_id}"
-      end
+    def self.status_url(msg_id)
+      "/revoup/connector0/status?login=#{@login}&password=#{@password}&" +
+          "providerId[0]=#{msg_id}"
+    end
 
   end
 end

data/lib/mfms/version.rb

@@ -1,8 +1,8 @@
 module Mfms
   class Version
     MAJOR = 0
-    MINOR = 5
-    PATCH = 1
+    MINOR = 6
+    PATCH = 0
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mfms
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Fokin Eugene
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: russian
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Send sms via mfms service