smslist 0.0.1 → 0.0.1.1

data/README.md

@@ -1,10 +1,12 @@
 # Smslist
 
+[![Gem Version](https://badge.fury.io/rb/smslist.png)][gem]
 [![Build Status](https://secure.travis-ci.org/lebedev-yury/smslist.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/lebedev-yury/smslist.png?travis)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/lebedev-yury/smslist.png)][codeclimate]
 [![Coverage Status](https://coveralls.io/repos/lebedev-yury/smslist/badge.png?branch=master)][coveralls]
 
+[gem]: https://rubygems.org/gems/smslist
 [travis]: http://travis-ci.org/lebedev-yury/smslist
 [gemnasium]: https://gemnasium.com/lebedev-yury/smslist
 [codeclimate]: https://codeclimate.com/github/lebedev-yury/smslist
@@ -91,7 +93,6 @@ You will get a hash for id, with state and datetime, or error message.
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
-* Ruby 1.8.7
 * Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0

data/Rakefile

@@ -4,8 +4,8 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :test => :spec
-task :default => :spec
+task test: :spec
+task default: :spec
 
 namespace :doc do
   require 'yard'

data/lib/smslist/authentication.rb

@@ -2,9 +2,9 @@ module Smslist
   module Authentication
     def authentication
       if token
-        {:token => token}
+        {token: token}
       elsif login && password
-        {:login => login, :password => password}
+        {login: login, password: password}
       else
         raise Smslist::UnauthorizedError.new('Access token, or login '\
           'and password are not initialized')

data/lib/smslist/client/sms.rb

@@ -18,11 +18,11 @@ module Smslist
         end
 
         body = build_xml_body do |xml|
-          xml.message(type: "#{ 'flash' if options[:flash] }sms") {
+          xml.message(type:"#{ 'flash' if options[:flash] }sms") {
             xml.sender sms_sender
-            xml.text_ text.encode(:xml => :text)
+            xml.text_ text.encode(xml: :text)
             recipients.each_with_index do |recipient, index|
-              xml.abonent :phone => recipient, :number_sms => index + 1
+              xml.abonent phone: recipient, number_sms: index + 1
             end
           }
         end
@@ -38,10 +38,10 @@ module Smslist
           if node.text == 'send'
             [
               recipients[node[:number_sms].to_i - 1],
-              {:status => :ok, :id => node['id_sms'].to_i, :parts => node['parts'].to_i }
+              {status: :ok, id: node['id_sms'].to_i, parts: node['parts'].to_i }
             ]
           else
-            [recipients[node[:number_sms].to_i - 1], { :error => node.text }]
+            [recipients[node[:number_sms].to_i - 1], { error: node.text }]
           end
         end
 

data/lib/smslist/client/state.rb

@@ -47,13 +47,13 @@ module Smslist
             [
               node['id_sms'],
               {
-                :state => node.text,
-                :datetime => DateTime.strptime(node['time'], '%Y-%m-%d %H:%M:%S')
+                state: node.text,
+                datetime: (DateTime.strptime(node['time'], '%Y-%m-%d %H:%M:%S') rescue nil)
               }
             ]
           else
-            [node['id_sms'], { :state => node.text,
-              :error => STATE_ERRORS[node['err'].to_i] }]
+            [node['id_sms'], { state: node.text,
+              error: STATE_ERRORS[node['err'].to_i] }]
           end
         end
 

data/lib/smslist/request.rb

@@ -3,14 +3,14 @@ require 'httparty'
 module Smslist
   module Request
     def post(xml, method = nil)
-      HTTParty.post request_uri(method), :body => xml, :headers => headers
+      HTTParty.post request_uri(method), body: xml, headers: headers
     end
 
     def build_xml_body(&block)
-      Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
+      Nokogiri::XML::Builder.new(encoding: 'utf-8') do |xml|
         xml.request {
           xml.security {
-            authentication.each { |k, v| xml.send(k, :value => v) }
+            authentication.each { |k, v| xml.send(k, value: v) }
           }
           xml.instance_eval(&block) if block_given?
         }

data/lib/smslist/version.rb

@@ -1,3 +1,3 @@
 module Smslist
-  VERSION = '0.0.1'
+  VERSION = '0.0.1.1'
 end

data/spec/fixtures/state.xml

@@ -4,4 +4,5 @@
     <state id_sms="1002" time="2011-01-01 12:57:46" err="0">deliver</state>
     <state id_sms="1003" time="2011-01-01 12:57:46" err="0">expired</state>
     <state id_sms="1004" time="" err="1">not_deliver</state>
+    <state id_sms="1005" time="" err="0">send</state>
 </response>

data/spec/smslist/client/balance_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Smslist::Client::Balance do
-  let(:client) { Smslist::Client.new(:token => 'secret') }
+  let(:client) { Smslist::Client.new(token: 'secret') }
 
   describe '#balance' do
     it 'returns remaining balance' do

data/spec/smslist/client/sms_spec.rb

@@ -6,7 +6,7 @@ describe Smslist::Client::Sms do
 
   describe '#send_sms' do
     context 'sender is set' do
-      let(:client) { Smslist::Client.new(:token => 'secret', :sender => '4000') }
+      let(:client) { Smslist::Client.new(token: 'secret', sender: '4000') }
       let(:recipients) { %w(79031234567 79032345678 79033456789 79034567890) }
 
       before(:each) { stub_post('').to_return(xml_response('sms.xml')) }
@@ -16,18 +16,18 @@ describe Smslist::Client::Sms do
       end
 
       it 'includes a Hash for sent messages, with status, id and parts count' do
-        expect(client.send_sms('Hello everyone', recipients, :flash => true))
-          .to include('79031234567' => { :status => :ok, :id => 1001, :parts => 2 })
+        expect(client.send_sms('Hello everyone', recipients, flash: true)).
+          to include('79031234567' => { status: :ok, id: 1001, parts: 2 })
       end
 
       it 'includes a Hash for not sent messages' do
-        expect(client.send_sms('Hello everyone', recipients))
-          .to include('79034567890' => { :error => 'Номер телефона присутствует в стоп-листе.' })
+        expect(client.send_sms('Hello everyone', recipients)).
+          to include('79034567890' => { error: 'Номер телефона присутствует в стоп-листе.' })
       end
     end
 
     context 'sender is not set' do
-      let(:client) { Smslist::Client.new(:token => 'secret') }
+      let(:client) { Smslist::Client.new(token: 'secret') }
       let(:recipients) { %w(79031234567) }
 
       it 'raises NoSenderError' do

data/spec/smslist/client/state_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Smslist::Client::State do
 
   describe '#state' do
-    let(:client) { Smslist::Client.new(:token => 'secret') }
+    let(:client) { Smslist::Client.new(token: 'secret') }
     let(:message_ids) { %w(1001 1002 1003 1004) }
 
     before(:each) { stub_post('state.php').to_return(xml_response('state.xml')) }
@@ -24,9 +24,14 @@ describe Smslist::Client::State do
     end
 
     it 'includes a Hash for not delivered messages' do
-      expect(client.state(message_ids))
-        .to include('1004' => { :state => 'not_deliver',
-          :error => 'The subscriber is absent or out of a coverage' })
+      expect(client.state(message_ids)).
+        to include('1004' => { state: 'not_deliver',
+          error: 'The subscriber is absent or out of a coverage' })
+    end
+
+    it 'includes a Hash for pending messages' do
+      expect(client.state(message_ids)).
+        to include('1005' => { state: 'send', datetime: nil })
     end
   end
 end

data/spec/smslist/client_spec.rb

@@ -13,19 +13,19 @@ describe Smslist::Client do
     describe '#authentication' do
       it 'hash with a token, if token, login and password are set' do
         client = Smslist::Client.new(
-          :login => 'username',
-          :password => 'secret',
-          :token => 'api_token'
+          login: 'username',
+          password: 'secret',
+          token: 'api_token'
         )
-        expect(client.authentication).to eql({ :token => 'api_token' })
+        expect(client.authentication).to eql({ token: 'api_token' })
       end
 
       it 'hash with login and password, if login and password are set' do
         client = Smslist::Client.new(
-          :login => 'username',
-          :password => 'secret'
+          login: 'username',
+          password: 'secret'
         )
-        expect(client.authentication).to eql({ :login => 'username', :password => 'secret' })
+        expect(client.authentication).to eql({ login: 'username', password: 'secret' })
       end
 
       it 'raises Smslist::UnauthorizedError, if credentials are not set' do
@@ -38,7 +38,7 @@ describe Smslist::Client do
   end
 
   context 'wrong credentials' do
-    let(:client) { Smslist::Client.new(:token => 'secret') }
+    let(:client) { Smslist::Client.new(token: 'secret') }
     before(:each) do
       stub_post('balance.php').to_return(xml_response('wrong_credentials.xml'))
     end

data/spec/smslist_spec.rb

@@ -8,6 +8,22 @@ describe Smslist do
     end
   end
 
+  describe '.method_missing' do
+    context 'delegates to new client' do
+      let(:client) { Smslist }
+      it 'delegates method to Smslist::Client' do
+        expect(client.respond_to?(:configure)).to eq(true)
+      end
+    end
+
+    context 'delegates to Smslist' do
+      let(:client) { Smslist.new }
+      it 'delegates method to Smslist::Client' do
+        expect(client.respond_to?(:balance)).to eq(true)
+      end
+    end
+  end
+
   describe '.respond_to?' do
     it 'is true if method exists' do
       expect(Smslist.respond_to?(:new, true)).to eq(true)

data/spec/spec_helper.rb

@@ -25,9 +25,9 @@ end
 
 def xml_response(file)
   {
-    :body => fixture(file),
-    :headers => {
-      :content_type => 'text/xml; charset=utf-8'
+    body: fixture(file),
+    headers: {
+      content_type: 'text/xml; charset=utf-8'
     }
   }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smslist
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty