skuby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3a7223daf23c2b544211d00cf23ef18b4105817
-  data.tar.gz: fb4b363f23d4e9b3f8d7e0c0fc71082ff3594254
+  metadata.gz: 5f12a818c34ac6ec0a049df74d619b9958b41251
+  data.tar.gz: 26ae01e0da07a5737bfc46ca17515d0993627fa5
 SHA512:
-  metadata.gz: f3d95b18eba653c4003c5aecc6ef129977028ddd6b0c1dbb9c209805442749cc70c0d6dc155749d90ddb995b903f033416e9b5befc346c0b9c1c3a0609189edf
-  data.tar.gz: e619a585c8b796bbe002c74aaaf4b947a9a79423202d493ee17fc06d24ab7aeccc722cfc90475f874df51293dbf420a23cea8e4edbafb5fb07958cdc46eb5627
+  metadata.gz: 3ab2e7826d9278ad9b7717cff589cb04c16c73ce93416beedfe6fb0e322270accd7314331cb2922b9d2c66b30a7ac49d1a67b94650b9b46d7d4d2dfbacae23e3
+  data.tar.gz: e999cd80bccf59e8180443f963e10ca14e39a25bc52866c32d701b85358793aa2cd98b2014c3cbedfd7c8a5e5b7d5e3f44cf228eafb44be8405918a0a94ebc76

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/welaika/skuby.png?branch=master)](https://travis-ci.org/welaika/skuby)
 [![Coverage Status](https://coveralls.io/repos/welaika/skuby/badge.png)](https://coveralls.io/r/welaika/skuby)
+[![Code Climate](https://codeclimate.com/github/welaika/skuby.png)](https://codeclimate.com/github/welaika/skuby)
 [![Dependency Status](https://gemnasium.com/welaika/skuby.png)](https://gemnasium.com/welaika/skuby)
 
 A Ruby interface for Skebby

data/fixtures/skebby_report/delivered.yaml

@@ -0,0 +1,10 @@
+---
+method: notify
+skebby_dispatch_id: '666'
+skebby_message_id: '777'
+recipient: '393471234567'
+status: DELIVERED
+error_code: '1'
+user_reference: '12345'
+skebby_date_time: Mon, 19 Feb 2012 17:52:01 +0000
+operator_date_time: Mon, 19 Feb 2012 17:51:01 +0000

data/fixtures/skebby_report/error.yaml

@@ -0,0 +1,10 @@
+---
+method: notify
+skebby_dispatch_id: '444'
+skebby_message_id: '333'
+recipient: '393471234567'
+status: UNDELIVERABLE
+error_code: '502'
+user_reference: '12345'
+skebby_date_time: Mon, 15 Aug 2005 15:52:01 +0000
+operator_date_time: Mon, 15 Aug 2005 15:51:01 +0000

data/lib/skuby/gateway.rb

@@ -5,7 +5,7 @@ module Skuby
 
     def self.send_sms(text = '', recipients = '')
       params = build_params(text, recipients)
-      SmsResponse.new(self.post('', body: params))
+      SMSResponse.new(self.post('', body: params), text, recipients)
     end
 
     def self.build_params(text, recipients)

data/lib/skuby/report.rb

@@ -44,10 +44,6 @@ module Skuby
       status == "DELIVERED"
     end
 
-    def failure?
-      !success?
-    end
-
     def status
       @raw["status"]
     end
@@ -65,7 +61,7 @@ module Skuby
     end
 
     def delivered_at
-      @raw["operator_date_time"]
+      Time.parse(@raw["operator_date_time"])
     end
 
   end

data/lib/skuby/sms_response.rb

@@ -1,41 +1,39 @@
 module Skuby
-  class SmsResponse
-    attr_reader :raw
+  class SMSResponse
+    attr_reader :response, :text, :recipients
 
-    def initialize(query)
-      @raw = CGI.parse(query)
+    def initialize(response, text, recipients)
+      @response = CGI.parse(response)
+      @text = text
+      @recipients = Array(recipients)
     end
 
     def success?
       status == "success"
     end
 
-    def failed?
-      !success?
-    end
-
     def sms_id?
       sms_id.present?
     end
 
     def status
-      @raw["status"].first
+      @response["status"].first
     end
 
     def remaining_sms
-      @raw["remaining_sms"].first.to_i
+      @response["remaining_sms"].first.to_i
     end
 
     def sms_id
-      @raw["id"].first
+      @response["id"].first
     end
 
     def error_code
-      @raw["code"].first.to_i
+      @response["code"].first.to_i
     end
 
     def error_message
-      @raw["message"].first
+      @response["message"].first
     end
 
   end

data/lib/skuby/version.rb

@@ -1,3 +1,3 @@
 module Skuby
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/credit_spec.rb

@@ -12,7 +12,7 @@ describe Skuby::Credit do
 
   context "::balance" do
     it "returns balance in euro" do
-      VCR.use_cassette('get_credit', match_requests_on: [:body]) do
+      VCR.use_cassette('get_credit') do
         request = Skuby::Credit.balance
         expect(request).to eq(9.49)
       end
@@ -22,7 +22,7 @@ describe Skuby::Credit do
       before { Skuby.setup do |config| config.password = 'wrong_password' end }
 
       it "returns nil if something's wrong" do
-        VCR.use_cassette('get_credit_wrong_credentials', match_requests_on: [:body]) do
+        VCR.use_cassette('get_credit_wrong_credentials') do
           expect(Skuby::Credit.balance).to be_nil
         end
       end

data/spec/gateway_spec.rb

@@ -14,11 +14,13 @@ describe Skuby::Gateway do
     before { Skuby.setup do |config| config.method = 'send_sms_classic' end }
 
     it "successfully send an sms" do
-      VCR.use_cassette('send_sms_classic', match_requests_on: [:body]) do
+      VCR.use_cassette('send_sms_classic') do
         response = Skuby::Gateway.send_sms('Lorem ipsum', '393290000000')
         expect(response.success?).to be_true
         expect(response.sms_id?).to be_false
         expect(response.remaining_sms).to eq(152)
+        expect(response.text).to eq('Lorem ipsum')
+        expect(response.recipients).to eq(['393290000000'])
       end
     end
   end
@@ -27,11 +29,13 @@ describe Skuby::Gateway do
     before { Skuby.setup do |config| config.method = 'send_sms_basic' end }
 
     it "successfully send an sms" do
-      VCR.use_cassette('send_sms_basic', match_requests_on: [:body]) do
+      VCR.use_cassette('send_sms_basic') do
         response = Skuby::Gateway.send_sms('Lorem ipsum', '393290000000')
         expect(response.success?).to be_true
         expect(response.sms_id?).to be_false
         expect(response.remaining_sms).to eq(207)
+        expect(response.text).to eq('Lorem ipsum')
+        expect(response.recipients).to eq(['393290000000'])
       end
     end
   end
@@ -40,12 +44,14 @@ describe Skuby::Gateway do
     before { Skuby.setup do |config| config.method = 'send_sms_classic_report' end }
 
     it "successfully send an sms" do
-      VCR.use_cassette('send_sms_classic_report', match_requests_on: [:body]) do
+      VCR.use_cassette('send_sms_classic_report') do
         response = Skuby::Gateway.send_sms('Lorem ipsum', '393290000000')
         expect(response.success?).to be_true
         expect(response.sms_id?).to be_true
         expect(response.sms_id).to eq('64608933')
         expect(response.remaining_sms).to eq(150)
+        expect(response.text).to eq('Lorem ipsum')
+        expect(response.recipients).to eq(['393290000000'])
       end
     end
   end
@@ -55,11 +61,13 @@ describe Skuby::Gateway do
 
     context "no recipient" do
       it "returns an error" do
-        VCR.use_cassette('send_sms_no_recipient', match_requests_on: [:body]) do
+        VCR.use_cassette('send_sms_no_recipient') do
           response = Skuby::Gateway.send_sms('Lorem ipsum')
           expect(response.success?).to be_false
           expect(response.error_code).to eq(25)
           expect(response.error_message).to be_present
+          expect(response.text).to eq('Lorem ipsum')
+          expect(response.recipients).to eq([""])
         end
       end
     end
@@ -68,11 +76,13 @@ describe Skuby::Gateway do
       before { Skuby.setup do |config| config.password = 'wrong_password' end }
 
       it "returns an error" do
-        VCR.use_cassette('send_sms_wrong_credentials', match_requests_on: [:body]) do
+        VCR.use_cassette('send_sms_wrong_credentials') do
           response = Skuby::Gateway.send_sms('Lorem ipsum', '393290000000')
           expect(response.success?).to be_false
           expect(response.error_code).to eq(21)
           expect(response.error_message).to be_present
+          expect(response.text).to eq('Lorem ipsum')
+          expect(response.recipients).to eq(['393290000000'])
         end
       end
     end

data/spec/report_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'yaml'
+
+describe Skuby::Report do
+  let(:report) { Skuby::Report.new(params) }
+
+  context "with errors" do
+    let(:params) { YAML.load(File.open(fixture_for_skebby_report('error.yaml'))) }
+
+    it "parses skebby response" do
+      expect(report.success?).to be_false
+      expect(report.error_code).to eq(502)
+      expect(report.error_message).to be_present
+      expect(report.sms_id).to eq('333')
+      expect(report.delivered_at).to eq(Time.new(2005,8,15,17,51,1))
+    end
+  end
+
+  context "without errors" do
+    let(:params) { YAML.load(File.open(fixture_for_skebby_report('delivered.yaml'))) }
+
+    it "parses skebby response" do
+      expect(report.success?).to be_true
+      expect(report.sms_id).to eq('777')
+      expect(report.delivered_at).to eq(Time.new(2012,2,19,18,51,1))
+    end
+  end
+
+  def fixture_for_skebby_report(name)
+    File.join(File.dirname(__FILE__), '..', 'fixtures', 'skebby_report', name)
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -20,6 +20,7 @@ RSpec.configure do |config|
 end
 
 VCR.configure do |c|
+  c.default_cassette_options = { match_requests_on: [:method, :uri, :body] }
   c.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
   c.hook_into :webmock
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skuby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Fabrizio Monti
@@ -166,6 +166,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- fixtures/skebby_report/delivered.yaml
+- fixtures/skebby_report/error.yaml
 - lib/skuby.rb
 - lib/skuby/configuration.rb
 - lib/skuby/credit.rb
@@ -183,6 +185,7 @@ files:
 - spec/fixtures/vcr_cassettes/send_sms_no_recipient.yml
 - spec/fixtures/vcr_cassettes/send_sms_wrong_credentials.yml
 - spec/gateway_spec.rb
+- spec/report_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/welaika/skuby
 licenses:
@@ -218,5 +221,6 @@ test_files:
 - spec/fixtures/vcr_cassettes/send_sms_no_recipient.yml
 - spec/fixtures/vcr_cassettes/send_sms_wrong_credentials.yml
 - spec/gateway_spec.rb
+- spec/report_spec.rb
 - spec/spec_helper.rb
 has_rdoc: