mfms 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6275368229d65373594802e1ea72a218dfde252b
-  data.tar.gz: 6f8c06258ad905b2904ca677a3b6b0d3628e0524
+  metadata.gz: 6ae64ec8c94b3342a9233737e7950969e1fbccbe
+  data.tar.gz: d83570485e8c366af7da09ca5e34d67c5a21dd47
 SHA512:
-  metadata.gz: a90c7ac25217b7810c0646db83bd8eb9aaed73f5c3518c9634c99313ac145e29ae5cdc8c878b7d19fa72fed1496aec83e365d07ca5a226f546bac61a707cca07
-  data.tar.gz: 9c90c71176091a054a52db407a36b6c1f040c5b1064e84cbbcd03142a972a97897589306ddabdf2330e4226de89cc12049d68cc1a9f6122770bfd76b493499f9
+  metadata.gz: d1de22bb5cd0072f3113f96cd71c10d300db23f74834ba392983934a9dcab5c171be09c2a7cc4039810b8b7385dd7eafef210d35927bfd85193a260419f3fd27
+  data.tar.gz: 36fce255803d1c5ea964553fa8fdee16ddccfcf0063fba9ee32fff2f7202a5fa32bad54f76033b68dde408dacdfc38b257edcc7fbc445b470558728b903948ce

data/lib/mfms/sms.rb

@@ -24,9 +24,8 @@ module Mfms
       @@server = settings[:server]
       @@port = settings[:port]
       @@ssl_port = settings[:ssl_port]
-      @@cert_store = OpenSSL::X509::Store.new
-      @@cert_store.add_cert OpenSSL::X509::Certificate.new File.read(settings[:cert])
-      @@ssl = settings[:ssl] & true # connect using ssl by default
+      @@cert_store = init_cert_store settings[:cert]
+      @@ssl = !settings[:ssl].nil? ? settings[:ssl] : true # connect using ssl by default
 
       validate_settings!
     end
@@ -105,9 +104,28 @@ module Mfms
       end
 
       def validate!
+        raise ArgumentError, "Phone should be assigned to #{self.class}." if @phone.nil?
+        raise ArgumentError, "Phone number should contain only numbers. Minimum length is 10. #{@phone.inspect} is given." unless @phone =~ /^[0-9]{10,}$/
+        raise ArgumentError, "Subject should be assigned to #{self.class}." if @subject.nil?
+        raise ArgumentError, "Message should be assigned to #{self.class}." if @message.nil?
+      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 send_url

data/lib/mfms/version.rb

@@ -2,7 +2,7 @@ module Mfms
   class Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
 
     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.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Fokin Eugene
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies: []
 description: This library helps to send sms via mfms service
 email: