textmagic 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c810998c9e416e69841a07869dc802818d1a4a65
-  data.tar.gz: 3c5c28da54b76a1d939b15ae2edecec92c313a42
+  metadata.gz: 0465c4db491828640efa4ca882e0ab95884e4cde
+  data.tar.gz: 96c9846d3a600b35896843d67f778a60f2f97c3c
 SHA512:
-  metadata.gz: 4041fbd28087e80983118b69ab1e5abae41ba8ea9a846844df83d81696f20c8765ecf18ef48e634a821ff8e4006214583b9c8c4bea27e33712ddf3f30abcb9c5
-  data.tar.gz: 40968523dc18f0c1c6816d8eb64c4713291e5f52bcef386ebc87189868377c878302f36ed24b716fb374e22a942c8ac2cd42886737eb5bf92a259bd39dc5ea69
+  metadata.gz: 6de90d2f47bab95032839e143a2ea945f7786a99afb34f51d07a76b63cf5008186a6488d4c49a5427a86ab9a9f7aa3f3a090ef6327e3b84efb112a6f3b8f8b9e
+  data.tar.gz: e6b8a540489968dc9c6c7e8b018a333d9fac8fde9b7335741d1630fb449d0ffecf2201dd660cf3f3910eabcf573dc6e02609ecec5bc7b339481ad030a4dd9cc8

data/.gitignore

@@ -1,17 +1,2 @@
 *.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+gems.locked

data/.rubocop.yml

@@ -0,0 +1,102 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.0
+
+Documentation:
+  Enabled: false
+
+Lint/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Lint/LiteralInInterpolation:
+  Enabled: true
+
+Metrics/AbcSize:
+  Exclude:
+    - test/**/*
+
+Metrics/ClassLength:
+  Exclude:
+    - test/**/*
+
+Metrics/LineLength:
+  Max: 120
+  Exclude:
+    - test/**/*
+
+Metrics/MethodLength:
+  Exclude:
+    - test/**/*
+
+Layout/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+Layout/EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines
+
+Layout/EmptyLinesAroundModuleBody:
+  EnforcedStyle: empty_lines
+
+Layout/FirstParameterIndentation:
+  EnforcedStyle: special_for_inner_method_call
+
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+  IndentationWidth: 2
+
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+  IndentationWidth: 2
+
+Style/AutoResourceCleanup:
+  Enabled: true
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/MethodCalledOnDoEndBlock:
+  Enabled: true
+
+Style/MethodCalledOnDoEndBlock:
+  Exclude:
+    - test/**/*
+
+Style/Send:
+  Enabled: true
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+Style/StringMethods:
+  Enabled: true
+
+Style/SymbolArray:
+  Enabled: true
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma

data/.rubocop_todo.yml

@@ -0,0 +1,38 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-10-02 15:24:21 +0000 using RuboCop version 0.50.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 4
+Metrics/AbcSize:
+  Max: 35
+
+# Offense count: 16
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 265
+
+# Offense count: 2
+Metrics/CyclomaticComplexity:
+  Max: 13
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 17
+
+# Offense count: 2
+Metrics/PerceivedComplexity:
+  Max: 11
+
+# Offense count: 27
+Style/Send:
+  Exclude:
+    - 'bin/tm'
+    - 'lib/textmagic/api.rb'
+    - 'lib/textmagic/response.rb'
+    - 'test/test_api.rb'
+    - 'test/test_response.rb'

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.4.1

data/Rakefile

@@ -6,4 +6,4 @@ Rake::TestTask.new(:test) do |test|
   test.pattern = "test/**/test_*.rb"
   test.verbose = true
 end
-task :default => :test
+task default: :test

data/bin/tm

@@ -1,44 +1,44 @@
 #!/usr/bin/env ruby
-require 'optparse'
+require "optparse"
 
-lib = File.join(File.dirname(__FILE__), '..', 'lib', 'textmagic')
+lib = File.join(File.dirname(__FILE__), "..", "lib", "textmagic")
 
 if File.exist?("#{lib}.rb")
   require lib
 else
-  require 'rubygems'
-  require 'textmagic'
+  require "rubygems"
+  require "textmagic"
 end
 
-filename = File.join(ENV['HOME'], '.textmagic')
+filename = File.join(ENV["HOME"], ".textmagic")
 options = YAML.load_file(filename) if File.exist?(filename)
 options ||= {}
 
 parser = OptionParser.new do |opts|
-  opts.banner = 'Usage:'
+  opts.banner = "Usage:"
   opts.separator " "
   opts.separator [
     "tm account",
-    'tm send PHONE[,PHONE2[,PHONE3 ...]] MESSAGE',
-    'tm status MESSAGE_ID',
-    'tm receive [LAST_RETREIVED_ID]',
-    'tm delete MESSAGE_ID [MESSAGE_ID2 [MESSAGE_ID3 ...]]'
+    "tm send PHONE[,PHONE2[,PHONE3 ...]] MESSAGE",
+    "tm status MESSAGE_ID",
+    "tm receive [LAST_RETREIVED_ID]",
+    "tm delete MESSAGE_ID [MESSAGE_ID2 [MESSAGE_ID3 ...]]",
   ]
 
   opts.separator " "
   opts.separator "Specific options:"
 
-  opts.on('-u', '--username USERNAME',
+  opts.on("-u", "--username USERNAME",
     "Specify your TextMagic API username (overrides ~/.textmagic setting)") do |username|
-    options['username'] = username
+    options["username"] = username
   end
 
-  opts.on('-p', '--password PASSWORD',
+  opts.on("-p", "--password PASSWORD",
     "Specify your TextMagic API password (overrides ~/.textmagic setting)") do |password|
-    options['password'] = password
+    options["password"] = password
   end
 
-  opts.on_tail('-h', '--help', "Show this message") do
+  opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
   end
@@ -53,38 +53,38 @@ end
 
 command = ARGV.shift
 
-unless options['username']
+unless options["username"]
   puts "Username not specified. Use --help option to find out details"
   exit 1
 end
 
-unless options['password']
+unless options["password"]
   puts "Password not specified. Use --help option to find out details"
   exit 1
 end
 
-api = TextMagic::API.new(options['username'], options['password'])
+api = TextMagic::API.new(options["username"], options["password"])
 
 begin
   case command
-  when 'account'
+  when "account"
     puts "Your account's balance: #{api.account.balance} credits"
-  when 'send'
-    unless phones = ARGV.shift
+  when "send"
+    unless (phones = ARGV.shift)
       puts "Phone number(s) and message not specified. Use --help option to find out details"
       exit 1
     end
-    if (text = ARGV.join(' ')).empty?
+    if (text = ARGV.join(" ")).empty?
       puts "Message not specified. Use --help option to find out details"
       exit 1
     end
-    response = api.send(text, phones.split(','))
+    response = api.send(text, phones.split(","))
     puts "Sent text: #{response.sent_text}"
     puts "Parts: #{response.parts_count}"
     response.each do |phone, message_id|
       puts "Message id (#{phone}): #{message_id}"
     end
-  when   'status'
+  when "status"
     if ARGV.empty?
       puts "Message id(s) not specified. Use --help option to find out details"
       exit 1
@@ -92,15 +92,15 @@ begin
     api.status(ARGV).each do |message_id, status|
       puts "Status (#{message_id}): #{status}"
     end
-  when   'receive'
+  when "receive"
     response = api.receive(ARGV.first)
     response.each do |message|
       puts "#{message} [#{message.message_id}, #{message.timestamp}]"
     end
-    puts 'No new messages' if response.empty?
-  when   'delete'
+    puts "No new messages" if response.empty?
+  when "delete"
     api.delete(ARGV)
-    puts 'Message(s) deleted'
+    puts "Message(s) deleted"
   else
     puts "Unknown command #{command}. Use --help option to find out details"
     exit 1

data/gems.rb

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gemspec
+
+gem "minitest", require: "minitest/autorun"
+gem "mocha", require: "mocha/mini_test"
+gem "rubocop"
+gem "webmock"

data/lib/textmagic.rb

@@ -1,5 +1,3 @@
-require "httparty"
-
 %w[charset validation api response executor error version].each do |lib|
   require File.join(File.dirname(__FILE__), "textmagic", lib)
 end

data/lib/textmagic/api.rb

@@ -88,13 +88,13 @@ module TextMagic
       when nil then unicode ? 1 : 0
       else raise Error.new(10, "Wrong parameter value #{options[:unicode]} for parameter unicode")
       end
-      raise Error.new(6, "Message contains invalid characters") if unicode && options[:unicode] == 0
+      raise Error.new(6, "Message contains invalid characters") if unicode && options[:unicode].zero?
       raise Error.new(7, "Message too long") unless API.validate_text_length(text, unicode)
       single = args.size == 1 && args.first.is_a?(String)
       phones = args.flatten
       raise Error.new(9, "Invalid phone number format") unless API.validate_phones(phones)
       options[:send_time] = options[:send_time].to_i if options[:send_time]
-      hash = Executor.execute("send", @username, @password, options.merge(:text => text, :phone => phones.join(",")))
+      hash = Executor.execute("send", @username, @password, options.merge(text: text, phone: phones.join(",")))
       TextMagic::API::Response.send(hash, single)
     end
 
@@ -141,10 +141,10 @@ module TextMagic
       single = ids.size == 1 && ids.first.is_a?(String)
       ids.flatten!
       raise TextMagic::API::Error.new(4, "Insufficient parameters") if ids.empty?
-      hash = Executor.execute("message_status", @username, @password, :ids => ids.join(","))
+      hash = Executor.execute("message_status", @username, @password, ids: ids.join(","))
       TextMagic::API::Response.message_status(hash, single)
     end
-    alias :status :message_status
+    alias status message_status
 
     # Executes a receive command by sending a request to the TextMagic's
     # SMS gateway.
@@ -175,7 +175,7 @@ module TextMagic
     # <b>It is strongly encouraged to setup callbacks to receive replies instead of
     # using this method.</b>
     def receive(last_retrieved_id = nil)
-      hash = Executor.execute("receive", @username, @password, :last_retrieved_id => last_retrieved_id)
+      hash = Executor.execute("receive", @username, @password, last_retrieved_id: last_retrieved_id)
       TextMagic::API::Response.receive(hash)
     end
 
@@ -192,13 +192,12 @@ module TextMagic
     #  api.delete_reply("173205", "223606")
     #  api.delete_reply(["244948", "264575"])
     def delete_reply(*ids)
-      single = ids.size == 1 && ids.first.is_a?(String)
       ids.flatten!
       raise TextMagic::API::Error.new(4, "Insufficient parameters") if ids.empty?
-      Executor.execute("delete_reply", @username, @password, :ids => ids.join(","))
+      Executor.execute("delete_reply", @username, @password, ids: ids.join(","))
       true
     end
-    alias :delete :delete_reply
+    alias delete delete_reply
 
     # Executes a check_number command by sending a request to the TextMagic's
     # SMS gateway.
@@ -239,9 +238,11 @@ module TextMagic
       single = phones.size == 1 && phones.first.is_a?(String)
       phones.flatten!
       raise TextMagic::API::Error.new(4, "Insufficient parameters") if phones.empty?
-      hash = Executor.execute("check_number", @username, @password, :phone => phones.join(","))
+      hash = Executor.execute("check_number", @username, @password, phone: phones.join(","))
       TextMagic::API::Response.check_number(hash, single)
     end
-    alias :check :check_number
+    alias check check_number
+
   end
+
 end

data/lib/textmagic/charset.rb

@@ -1,30 +1,35 @@
-# encoding: utf-8
-
 module TextMagic
 
   class API
 
     module Charset
 
-      GSM_CHARSET = "@£$¥èéùìòÇ\nØø\rÅåΔ_ΦΓΛΩΠΨΣΘΞ\e\f^{}\\[~]|€ÆæßÉ !\"#¤%&'()*+,-./0123456789:;<=>?¡ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÑܧ¿abcdefghijklmnopqrstuvwxyzäöñüà".scan(/./u)
-      ESCAPED_CHARS = "{}\\~[]|€"
+      GSM_CHARSET =
+        "@£$¥èéùìòÇ\nØø\rÅåΔ_ΦΓΛΩΠΨΣΘΞ\e\f^{}\\[~]|€ÆæßÉ !\"#¤%&'()*+,-./0123456789:;<=>?¡"\
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÑܧ¿abcdefghijklmnopqrstuvwxyzäöñüà".scan(/./u).freeze
+      ESCAPED_CHARS = "{}\\~[]|€".freeze
 
       # Returns +true+ if the supplied text contains only characters from
       # GSM 03.38 charset, otherwise it returns +false+.
-      def is_gsm(text)
+      def gsm?(text)
         text.scan(/./u).each { |c| return false unless GSM_CHARSET.include?(c) }
         true
       end
+      alias is_gsm gsm?
 
       # Returns +true+ if the supplied text contains characters outside of
       # GSM 03.38 charset, otherwise it returns +false+.
-      def is_unicode(text)
+      def unicode?(text)
         !is_gsm(text)
       end
+      alias is_unicode unicode?
 
       def real_length(text, unicode)
         text.size + (unicode ? 0 : text.scan(/[\{\}\\~\[\]\|€]/).size)
       end
+
     end
+
   end
+
 end

data/lib/textmagic/error.rb

@@ -13,7 +13,8 @@ module TextMagic
       #  TextMagic::API::Error.new("error_code" => code, "error_message" => message)
       def initialize(*args)
         if args.first.is_a?(Hash)
-          @code, @message = args.first["error_code"], args.first["error_message"]
+          @code = args.first["error_code"]
+          @message = args.first["error_message"]
         else
           @code, @message = args
         end
@@ -22,6 +23,9 @@ module TextMagic
       def to_s
         "#{@message} (#{@code})"
       end
+
     end
+
   end
+
 end

data/lib/textmagic/executor.rb

@@ -1,10 +1,12 @@
+require "net/http"
+
 module TextMagic
+
   class API
 
-    class Executor
+    module Executor
 
-      include HTTParty
-      base_uri "https://www.textmagic.com/app"
+      module_function
 
       # Executes a command by sending a request to the TextMagic's Bulk
       # SMS gateway. This is a low-level generic method used by methods
@@ -18,15 +20,20 @@ module TextMagic
       # Returns a hash with values parsed from the server"s response if
       # the command was successfully executed. In case the server replies
       # with error, this method raises a TextMagic::API::Error.
-      def self.execute(command, username, password, options = {})
+      def execute(command, username, password, options = {})
         raise TextMagic::API::Error.new(3, "Command is undefined") unless command
         raise TextMagic::API::Error.new(5, "Invalid username & password combination") unless username && password
-        options.merge!(:username => username, :password => password, :cmd => command)
+        options.merge!(username: username, password: password, cmd: command)
         options.delete_if { |key, value| !key || !value }
-        response = self.post("/api", :body => options, :format => :json)
-        raise Error.new(response) if response && response["error_code"]
-        response
+        uri = URI("https://www.textmagic.com/app/api")
+        response = Net::HTTP.post_form(uri, options)
+        result = JSON.parse(response.body) if response.body
+        raise Error, response.body if result && result["error_code"]
+        result
       end
+
     end
+
   end
+
 end

data/lib/textmagic/response.rb

@@ -4,21 +4,22 @@ module TextMagic
 
   class API
 
-    class Response
+    module Response
 
-      def self.account(hash)
+      module_function
+
+      def account(hash)
         response = OpenStruct.new(hash)
         response.balance = response.balance.to_f
-        response.balance = response.balance.to_i if response.balance % 1 == 0
+        response.balance = response.balance.to_i if (response.balance % 1).zero?
         response
       end
 
-      def self.send(hash, single)
-        response = nil
-        if single
-          response = hash["message_id"].keys.first.dup
+      def send(hash, single)
+        response = if single
+          hash["message_id"].keys.first.dup
         else
-          response = hash["message_id"].invert
+          hash["message_id"].invert
         end
         metaclass = class << response; self; end
         metaclass.send :attr_accessor, :sent_text, :parts_count, :message_id
@@ -28,7 +29,7 @@ module TextMagic
         response
       end
 
-      def self.message_status(hash, single)
+      def message_status(hash, single)
         response = {}
         hash.each do |message_id, message_hash|
           status = message_hash["status"].dup
@@ -45,7 +46,7 @@ module TextMagic
         single ? response.values.first : response
       end
 
-      def self.receive(hash)
+      def receive(hash)
         response = hash["messages"].collect do |message_hash|
           message = "#{message_hash["from"]}: #{message_hash["text"]}"
           metaclass = class << message; self; end
@@ -62,13 +63,16 @@ module TextMagic
         response
       end
 
-      def self.check_number(hash, single)
+      def check_number(hash, single)
         response = {}
         hash.each do |phone, check_hash|
           response[phone] = OpenStruct.new(check_hash)
         end
         single ? response.values.first : response
       end
+
     end
+
   end
+
 end

data/lib/textmagic/validation.rb

@@ -4,8 +4,8 @@ module TextMagic
 
     module Validation
 
-      MAX_LENGTH_GSM = [160, 306, 459]
-      MAX_LENGTH_UNICODE = [70, 134, 201]
+      MAX_LENGTH_GSM = [160, 306, 459].freeze
+      MAX_LENGTH_UNICODE = [70, 134, 201].freeze
 
       # Validates message text length. Returns +true+ if the text length is
       # within the limits for the unicode/parts combination, otherwise it
@@ -29,6 +29,9 @@ module TextMagic
         phones.each { |phone| return false unless phone =~ /^\d{1,15}$/ }
         true
       end
+
     end
+
   end
+
 end

data/lib/textmagic/version.rb

@@ -1,3 +1,5 @@
 module Textmagic
-  VERSION = "0.6.0"
+
+  VERSION = "0.7.0".freeze
+
 end

data/test/test_api.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require "test_helper"
 
 describe "API" do
@@ -17,7 +15,8 @@ describe "API" do
   describe "Account command" do
 
     before do
-      @username, @password = random_string, random_string
+      @username = random_string
+      @password = random_string
       @api = TextMagic::API.new(@username, @password)
       @response = random_string
       @processed_response = random_string
@@ -40,8 +39,10 @@ describe "API" do
   describe "Send command" do
 
     before do
-      @username, @password = random_string, random_string
-      @text, @phone = random_string, random_phone
+      @username = random_string
+      @password = random_string
+      @text = random_string
+      @phone = random_phone
       @api = TextMagic::API.new(@username, @password)
       @response = random_string
       @processed_response = random_string
@@ -50,46 +51,46 @@ describe "API" do
     end
 
     it "should call Executor execute with correct arguments" do
-      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, :text => @text, :phone => @phone, :unicode => 0).returns(@response)
+      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, text: @text, phone: @phone, unicode: 0).returns(@response)
       @api.send(@text, @phone)
     end
 
     it "should join multiple phone numbers supplied as an array" do
       phones = Array.new(3) { random_phone }
-      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, :text => @text, :phone => phones.join(","), :unicode => 0).returns(@response)
+      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, text: @text, phone: phones.join(","), unicode: 0).returns(@response)
       @api.send(@text, phones)
     end
 
     it "should join multiple phone numbers supplied as arguments" do
       phones = Array.new(3) { random_phone }
-      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, :text => @text, :phone => phones.join(","), :unicode => 0).returns(@response)
+      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, text: @text, phone: phones.join(","), unicode: 0).returns(@response)
       @api.send(@text, *phones)
     end
 
     it "should replace true with 1 for unicode" do
-      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, :text => @text, :phone => @phone, :unicode => 1).returns(@response)
-      @api.send(@text, @phone, :unicode => true)
+      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, text: @text, phone: @phone, unicode: 1).returns(@response)
+      @api.send(@text, @phone, unicode: true)
     end
 
     it "should set unicode value to 0 if it is not set to by user and text contains only characters from GSM 03.38 charset" do
-      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, :text => @text, :phone => @phone, :unicode => 0).returns(@response).times(2)
+      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, text: @text, phone: @phone, unicode: 0).returns(@response).times(2)
       @api.send(@text, @phone)
-      @api.send(@text, @phone, :unicode => false)
+      @api.send(@text, @phone, unicode: false)
     end
 
     it "should raise an error if unicode is set to 0 and text contains characters outside of GSM 03.38 charset" do
       text = "Вильма Привет"
       assert_raises TextMagic::API::Error do
-        @api.send(text, @phone, :unicode => false)
+        @api.send(text, @phone, unicode: false)
       end
     end
 
     it "should raise an error if unicode value is not valid" do
       assert_raises TextMagic::API::Error do
-        @api.send(@text, @phone, :unicode => 2 + rand(10))
+        @api.send(@text, @phone, unicode: 2 + rand(10))
       end
       assert_raises TextMagic::API::Error do
-        @api.send(@text, @phone, :unicode => random_string)
+        @api.send(@text, @phone, unicode: random_string)
       end
     end
 
@@ -124,14 +125,14 @@ describe "API" do
 
     it "should support send_time option" do
       time = Time.now + rand
-      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, :text => @text, :phone => @phone, :unicode => 0, :send_time => time.to_i).returns(@response)
-      @api.send(@text, @phone, :send_time => time.to_i)
+      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, text: @text, phone: @phone, unicode: 0, send_time: time.to_i).returns(@response)
+      @api.send(@text, @phone, send_time: time.to_i)
     end
 
     it "should convert send_time to Fixnum" do
       time = Time.now + rand
-      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, :text => @text, :phone => @phone, :unicode => 0, :send_time => time.to_i).returns(@response)
-      @api.send(@text, @phone, :send_time => time)
+      TextMagic::API::Executor.expects(:execute).with("send", @username, @password, text: @text, phone: @phone, unicode: 0, send_time: time.to_i).returns(@response)
+      @api.send(@text, @phone, send_time: time)
     end
 
     it "should call Response.send method to process the response hash (single phone)" do
@@ -151,7 +152,8 @@ describe "API" do
   describe "Message status command" do
 
     before do
-      @username, @password = random_string, random_string
+      @username = random_string
+      @password = random_string
       @api = TextMagic::API.new(@username, @password)
       @response = random_string
       @processed_response = random_string
@@ -161,19 +163,19 @@ describe "API" do
 
     it "should call Executor execute with correct arguments" do
       id = random_string
-      TextMagic::API::Executor.expects(:execute).with("message_status", @username, @password, :ids => id).returns(@response)
+      TextMagic::API::Executor.expects(:execute).with("message_status", @username, @password, ids: id).returns(@response)
       @api.message_status(id)
     end
 
     it "should join ids supplied as array" do
       ids = Array.new(3) { random_string }
-      TextMagic::API::Executor.expects(:execute).with("message_status", @username, @password, :ids => ids.join(","))
+      TextMagic::API::Executor.expects(:execute).with("message_status", @username, @password, ids: ids.join(","))
       @api.message_status(ids)
     end
 
     it "should join ids supplied as arguments" do
       ids = Array.new(3) { random_string }
-      TextMagic::API::Executor.expects(:execute).with("message_status", @username, @password, :ids => ids.join(","))
+      TextMagic::API::Executor.expects(:execute).with("message_status", @username, @password, ids: ids.join(","))
       @api.message_status(*ids)
     end
 
@@ -199,7 +201,8 @@ describe "API" do
   describe "Receive command" do
 
     before do
-      @username, @password = random_string, random_string
+      @username = random_string
+      @password = random_string
       @api = TextMagic::API.new(@username, @password)
       @response = random_string
       @processed_response = random_string
@@ -208,13 +211,13 @@ describe "API" do
     end
 
     it "should call Executor execute with correct arguments" do
-      TextMagic::API::Executor.expects(:execute).with("receive", @username, @password, :last_retrieved_id => nil)
+      TextMagic::API::Executor.expects(:execute).with("receive", @username, @password, last_retrieved_id: nil)
       @api.receive
     end
 
     it "should accept last_retrieved_id optional value" do
       last_retrieved_id = rand(1e10)
-      TextMagic::API::Executor.expects(:execute).with("receive", @username, @password, :last_retrieved_id => last_retrieved_id)
+      TextMagic::API::Executor.expects(:execute).with("receive", @username, @password, last_retrieved_id: last_retrieved_id)
       @api.receive(last_retrieved_id)
     end
 
@@ -227,7 +230,8 @@ describe "API" do
   describe "Delete reply command" do
 
     before do
-      @username, @password = random_string, random_string
+      @username = random_string
+      @password = random_string
       @api = TextMagic::API.new(@username, @password)
       @response = random_string
       @processed_response = random_string
@@ -237,19 +241,19 @@ describe "API" do
 
     it "should call Executor execute with correct arguments" do
       id = random_string
-      TextMagic::API::Executor.expects(:execute).with("delete_reply", @username, @password, :ids => id)
+      TextMagic::API::Executor.expects(:execute).with("delete_reply", @username, @password, ids: id)
       @api.delete_reply(id)
     end
 
     it "should join ids supplied as array" do
       ids = Array.new(3) { random_string }
-      TextMagic::API::Executor.expects(:execute).with("delete_reply", @username, @password, :ids => ids.join(","))
+      TextMagic::API::Executor.expects(:execute).with("delete_reply", @username, @password, ids: ids.join(","))
       @api.delete_reply(ids)
     end
 
     it "should join ids supplied as arguments" do
       ids = Array.new(3) { random_string }
-      TextMagic::API::Executor.expects(:execute).with("delete_reply", @username, @password, :ids => ids.join(","))
+      TextMagic::API::Executor.expects(:execute).with("delete_reply", @username, @password, ids: ids.join(","))
       @api.delete_reply(*ids)
     end
 
@@ -268,7 +272,8 @@ describe "API" do
   describe "Check number command" do
 
     before do
-      @username, @password = random_string, random_string
+      @username = random_string
+      @password = random_string
       @api = TextMagic::API.new(@username, @password)
       @response = random_string
       @processed_response = random_string
@@ -278,19 +283,19 @@ describe "API" do
 
     it "should call Executor execute with correct arguments" do
       phone = random_phone
-      TextMagic::API::Executor.expects(:execute).with("check_number", @username, @password, :phone => phone)
+      TextMagic::API::Executor.expects(:execute).with("check_number", @username, @password, phone: phone)
       @api.check_number(phone)
     end
 
     it "should join phones supplied as array" do
       phones = Array.new(3) { random_phone }
-      TextMagic::API::Executor.expects(:execute).with("check_number", @username, @password, :phone => phones.join(","))
+      TextMagic::API::Executor.expects(:execute).with("check_number", @username, @password, phone: phones.join(","))
       @api.check_number(phones)
     end
 
     it "should join phones supplied as arguments" do
       phones = Array.new(3) { random_phone }
-      TextMagic::API::Executor.expects(:execute).with("check_number", @username, @password, :phone => phones.join(","))
+      TextMagic::API::Executor.expects(:execute).with("check_number", @username, @password, phone: phones.join(","))
       @api.check_number(*phones)
     end
 

data/test/test_charset.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require "test_helper"
 
 describe "Charset" do

data/test/test_executor.rb

@@ -5,10 +5,10 @@ describe "Executor" do
   describe "execute method" do
 
     before do
-      FakeWeb.allow_net_connect = false
-
-      @username, @password = random_string, random_string
-      @command, @options = random_string, random_hash
+      @username = random_string
+      @password = random_string
+      @command = random_string
+      @options = random_hash
       @uri = "https://www.textmagic.com/app/api"
     end
 
@@ -31,28 +31,33 @@ describe "Executor" do
     end
 
     it "should send a POST request to proper uri" do
-      response = "{}"
-      FakeWeb.register_uri(:post, @uri, :body => response)
+      WebMock.stub_request(:post, @uri).to_return(status: 200, body: "{}")
       TextMagic::API::Executor.execute(@command, @username, @password, @options)
     end
 
     it "should not send parameters with nil keys" do
       options_with_empty_values = @options.merge(nil => random_string)
-      @options.merge!(:username => @username, :password => @password, :cmd => @command)
-      TextMagic::API::Executor.expects(:post).with("/api", :body => @options, :format => :json)
+      @options.merge!(username: @username, password: @password, cmd: @command)
+      WebMock.
+        stub_request(:post, @uri).
+        with(body: @options).
+        to_return(status: 200, body: "", headers: {})
       TextMagic::API::Executor.execute(@command, @username, @password, options_with_empty_values)
     end
 
     it "should not send parameters with nil values" do
       options_with_empty_values = @options.merge(random_string => nil)
-      @options.merge!(:username => @username, :password => @password, :cmd => @command)
-      TextMagic::API::Executor.expects(:post).with("/api", :body => @options, :format => :json)
+      @options.merge!(username: @username, password: @password, cmd: @command)
+      WebMock.
+        stub_request(:post, @uri).
+        with(body: @options).
+        to_return(status: 200, body: "", headers: {})
       TextMagic::API::Executor.execute(@command, @username, @password, options_with_empty_values)
     end
 
     it "should raise an error if the response contains error_code" do
       response = "{\"error_code\":#{1 + rand(10)}}"
-      FakeWeb.register_uri(:post, @uri, :body => response)
+      WebMock.stub_request(:post, @uri).to_return(status: 200, body: response)
       assert_raises TextMagic::API::Error do
         TextMagic::API::Executor.execute(@command, @username, @password, @options)
       end
@@ -60,9 +65,12 @@ describe "Executor" do
 
     it "should return a hash with values from the response" do
       hash = { "this" => "is", "just" => "a", "random" => "hash" }
-      FakeWeb.register_uri(:post, @uri, :body => '{"this":"is","just":"a","random":"hash"}')
+      response = '{"this":"is","just":"a","random":"hash"}'
+      WebMock.stub_request(:post, @uri).to_return(status: 200, body: response)
       response = TextMagic::API::Executor.execute(@command, @username, @password, @options)
       assert_equal hash, response.to_hash
     end
+
   end
+
 end

data/test/test_helper.rb

@@ -6,7 +6,7 @@ def random_string(legth = 5 + rand(10))
 end
 
 def random_phone
-  rand(10 ** 12).to_s
+  rand(10**12).to_s
 end
 
 def random_hash
@@ -15,10 +15,18 @@ def random_hash
   hash
 end
 
-class Minitest::Test
+module Minitest
+
+  class Test
+
+    def self.it(name, &block)
+      test_name = "test_#{name.gsub(/\s+/, "_")}".to_sym
+      define_method(test_name, &block)
+    end
 
-  def self.it(name, &block)
-    test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
-    define_method(test_name, &block)
   end
+
 end
+
+require "webmock/minitest"
+WebMock.disable_net_connect!

data/test/test_response.rb

@@ -22,7 +22,8 @@ describe "Response" do
   describe "Response to send command with single phone number" do
 
     before do
-      @message_id, @phone = random_string, random_phone
+      @message_id = random_string
+      @phone = random_phone
       @text = random_string
       @parts_count = 1 + rand(3)
       @hash = { "message_id" => { @message_id => @phone }, "sent_text" => @text, "parts_count" => @parts_count }
@@ -45,8 +46,10 @@ describe "Response" do
   describe "Response to send command with multiple phone numbers" do
 
     before do
-      @message_id1, @phone1 = random_string, random_phone
-      @message_id2, @phone2 = random_string, random_phone
+      @message_id1 = random_string
+      @phone1 = random_phone
+      @message_id2 = random_string
+      @phone2 = random_phone
       @text = random_string
       @parts_count = 1 + rand(3)
       @hash = { "message_id" => { @message_id1 => @phone1, @message_id2 => @phone2 }, "sent_text" => @text, "parts_count" => @parts_count }
@@ -91,8 +94,8 @@ describe "Response" do
           "created_time" => @created_time.to_s,
           "reply_number" => @reply_number,
           "completed_time" => @completed_time.to_s,
-          "credits_cost" => @credits_cost
-        }
+          "credits_cost" => @credits_cost,
+        },
       }
       @response = TextMagic::API::Response.message_status(@hash, true)
     end
@@ -142,8 +145,8 @@ describe "Response" do
           "created_time" => @created_time,
           "reply_number" => @reply_number,
           "completed_time" => @completed_time,
-          "credits_cost" => @credits_cost
-        }
+          "credits_cost" => @credits_cost,
+        },
       }
       @response = TextMagic::API::Response.message_status(@hash, false)
     end
@@ -189,12 +192,14 @@ describe "Response" do
 
     before do
       @timestamp = (Time.now - 30).to_i
-      @text, @phone, @message_id = random_string, random_phone, random_string
+      @text = random_string
+      @phone = random_phone
+      @message_id = random_string
       @message = {
         "timestamp" => @timestamp,
         "from" => @phone,
         "text" => @text,
-        "message_id" => @message_id
+        "message_id" => @message_id,
       }
       @unread = rand(1e4)
       @hash = { "unread" => @unread, "messages" => [@message] }
@@ -239,8 +244,8 @@ describe "Response" do
       @hash = {
         @phone => {
           "price" => @price,
-          "country" => @country
-        }
+          "country" => @country,
+        },
       }
       @response = TextMagic::API::Response.check_number(@hash, true)
     end
@@ -267,8 +272,8 @@ describe "Response" do
       @hash = {
         @phone => {
           "price" => @price,
-          "country" => @country
-        }
+          "country" => @country,
+        },
       }
       @response = TextMagic::API::Response.check_number(@hash, false)
     end

data/test/test_validation.rb

@@ -75,11 +75,11 @@ describe "Validation" do
   describe "validate_phones method" do
 
     it "should return true if phone number consists of up to 15 digits" do
-      assert_equal true, TextMagic::API.validate_phones(rand(10 ** 15).to_s)
+      assert_equal true, TextMagic::API.validate_phones(rand(10**15).to_s)
     end
 
     it "should return false if phone number is longer than 15 digits" do
-      assert_equal false, TextMagic::API.validate_phones((10 ** 16 + rand(10 ** 15)).to_s)
+      assert_equal false, TextMagic::API.validate_phones((10**16 + rand(10**15)).to_s)
     end
 
     it "should return false if phone number contains non-digits" do
@@ -91,7 +91,8 @@ describe "Validation" do
     end
 
     it "should return true if all phone numbers in a list are valid" do
-      phone1, phone2 = rand(10 ** 15).to_s, rand(10 ** 15).to_s
+      phone1 = rand(10**15).to_s
+      phone2 = rand(10**15).to_s
       assert_equal true, TextMagic::API.validate_phones(phone1, phone2)
       assert_equal true, TextMagic::API.validate_phones([phone1, phone2])
     end
@@ -101,7 +102,7 @@ describe "Validation" do
     end
 
     it "should return false if format of any of phone numbers in a list is invalid" do
-      phone1 = rand(10 ** 15).to_s, rand(10 ** 15).to_s
+      phone1 = rand(10**15).to_s, rand(10**15).to_s
       phone2 = random_string
       assert_equal false, TextMagic::API.validate_phones(phone1, phone2)
       assert_equal false, TextMagic::API.validate_phones([phone1, phone2])

data/textmagic.gemspec

@@ -1,24 +1,23 @@
-# -*- encoding: utf-8 -*-
+
 require File.expand_path("../lib/textmagic/version", __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Vladimir Bobes Tuzinsky"]
+  gem.authors       = ["Vladimír Bobeš Tužinský"]
   gem.email         = ["vladimir@tuzinsky.com"]
-  gem.summary       = %q{Ruby interface to the TextMagic's Bulk SMS Gateway}
-  gem.description   = %q{
+  gem.summary       = "Ruby interface to the TextMagic's Bulk SMS Gateway"
+  gem.description   = "
     textmagic is a Ruby interface to the TextMagic's Bulk SMS Gateway.
     It can be used to easily integrate SMS features into your application.
     It supports sending messages, receiving replies and more.
     You need to have a valid TextMagic account to use this gem. You can get one at http://www.textmagic.com.
-  }
-  gem.homepage      = ""
+  "
+  gem.homepage      = "https://github.com/bobes/textmagic"
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "textmagic"
+  gem.licenses      = ["MIT"]
   gem.require_paths = ["lib"]
   gem.version       = Textmagic::VERSION
-
-  gem.add_runtime_dependency "httparty", "~> 0.5"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: textmagic
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
-- Vladimir Bobes Tuzinsky
+- Vladimír Bobeš Tužinský
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
+date: 2017-10-02 00:00:00.000000000 Z
+dependencies: []
 description: "\n    textmagic is a Ruby interface to the TextMagic's Bulk SMS Gateway.\n
   \   It can be used to easily integrate SMS features into your application.\n    It
   supports sending messages, receiving replies and more.\n    You need to have a valid
@@ -38,14 +24,16 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".gitignore"
-- Gemfile
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".ruby-version"
 - History.txt
 - LICENSE
 - README.md
 - Rakefile
 - bin/tm
+- gems.rb
 - lib/textmagic.rb
-- lib/textmagic/.rb
 - lib/textmagic/api.rb
 - lib/textmagic/charset.rb
 - lib/textmagic/error.rb
@@ -61,8 +49,9 @@ files:
 - test/test_response.rb
 - test/test_validation.rb
 - textmagic.gemspec
-homepage: ''
-licenses: []
+homepage: https://github.com/bobes/textmagic
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -80,15 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby interface to the TextMagic's Bulk SMS Gateway
-test_files:
-- test/test_api.rb
-- test/test_charset.rb
-- test/test_error.rb
-- test/test_executor.rb
-- test/test_helper.rb
-- test/test_response.rb
-- test/test_validation.rb
+test_files: []

data/Gemfile

@@ -1,9 +0,0 @@
-source "http://rubygems.org"
-
-gemspec
-
-gem "minitest", :require => "minitest/autorun"
-gem "mocha", :require => "mocha/mini_test"
-gem "fakeweb"
-gem "mcmire-matchy"
-gem "rake"

data/lib/textmagic/.rb

@@ -1,5 +0,0 @@
-require "textmagic//version"
-
-module Textmagic/
-  # Your code goes here...
-end