sms16client 0.0.2 → 0.1.0

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,7 @@
+source :rubygems
+
+platforms :jruby do
+  gem 'jruby-openssl'
+end
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: .
+  specs:
+    sms16client (0.0.3)
+      builder
+      sax-machine
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.1.4)
+    coderay (1.0.8)
+    diff-lcs (1.1.3)
+    fakeweb (1.3.0)
+    method_source (0.8.1)
+    nokogiri (1.5.5)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    rake (10.0.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    sax-machine (0.1.0)
+      nokogiri (> 0.0.0)
+    slop (3.3.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakeweb
+  jruby-openssl
+  pry
+  rake
+  rspec
+  sms16client!

data/LICENSE.md

@@ -0,0 +1,19 @@
+Copyright (c) 2010-2013 Nikolay Burlov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,27 @@
+# Sms16Client
+
+Sms16Client is a gem that provides an interface for sms16.ru API.
+
+## Usage
+
+```ruby
+sms16 = Sms16Client.new 'username', 'password'
+
+sms16.get_balance
+# => {:money=>{:currency=>"RUR", :amount=>"3924.45"}, :sms=>[{:area=>"Россия", :amount=>"26163"}, {:area=>"Украина", :amount=>"0"}]}
+sms16.send_message "hello world", "12345678900", "author"
+# => {:information=>{:number_sms=>"1", :id_sms=>"111", :parts=>"1", :response=>"send"}}
+sms16.get_message_state "111"
+# => {:state=>{:id_sms=>"111", :time=>"2012-12-04 05:39:36", :err=>"000", :response=>"deliver"}}
+```
+
+## Installation
+
+    gem install sms16client
+
+## Changelog
+
+    0.1.0 - Minor release that includes:
+      - Remove obsolete class Client
+      - Change method responses from original sms16.ru api xml's to our own hashes
+      - Update README, add LICENSE and specs

data/Rakefile

@@ -1,12 +1,8 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-Echoe.new('sms16client', '0.0.2') do |p|
-  p.description    = "Sms16 client"
-  p.url            = "http://github.com/kohgpat/sms16client/"
-  p.author         = "Nikolay Burlov"
-  p.email          = "kohgpat@gmail.com"
-  p.ignore_pattern = ["tmp/*", "script/*"]
-  p.development_dependencies = []
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+task :test => :spec

data/lib/sms16client/parser.rb

@@ -0,0 +1,55 @@
+class Sms16Client
+  class Money
+    include SAXMachine
+    attribute :currency
+    value :text
+  end
+
+  class Sms
+    include SAXMachine
+    attribute :area
+    value :text
+  end
+
+  class Information
+    include SAXMachine
+    attribute :number_sms
+    attribute :id_sms
+    attribute :parts
+    value :text
+  end
+
+  class State
+    include SAXMachine
+    attribute :id_sms
+    attribute :time
+    attribute :err
+    value :text
+  end
+
+  class Response
+    include SAXMachine
+    element :error
+    element :money, :class => Money
+    elements :sms, :class => Sms
+    element :information, :class => Information
+    element :state, :class => State
+
+    # helpers to determine response case
+    def error?
+      @error ? true : false
+    end
+
+    def money?
+      @money ? true : false
+    end
+
+    def information?
+      @information ? true : false
+    end
+
+    def state?
+      @state ? true : false
+    end
+  end
+end

data/lib/sms16client.rb

@@ -1,83 +1,141 @@
-# encoding: UTF-8
+# encoding: utf-8
 
-require 'rubygems'
-require 'builder'
+$:.push File.expand_path(File.dirname(__FILE__) + "/../lib")
+
+# stdlib
 require 'net/http'
 require 'net/https'
-require 'uri'
-
-module Sms16Client
-	VERSION = '0.0.2'
-	
-	class Client
-		attr_accessor :login, :password, :query
-	
-		def initialize(login, password)
-			@login = login
-			@password = password
-			@query = String.new
-		end
-		
-		def get_balance
-		  @query = String.new
-			xml = Builder::XmlMarkup.new(:target => @query)
-
-			xml.request {
-				xml.security {
-					xml.login(:value => @login)
-					xml.password(:value => @password)
-				}
-			}
-			
-			return execute_query(@query, 'https://my.sms16.ru/xml/balance.php')
-		end
-		
-		def send_message(message, destination, source)
-		  @query = String.new
-			xml = Builder::XmlMarkup.new(:target => @query)
-
-			xml.request {
-				xml.message(:type => "sms") {
-					xml.sender source.to_s
-					xml.text message.to_s
-					xml.abonent(:phone => destination.to_s, :number_sms => "1")
-				}
-				xml.security {
-					xml.login(:value => @login)
-					xml.password(:value => @password)
-				}
-			}
-			
-			return execute_query(@query, 'https://my.sms16.ru/xml/')
-		end
-		
-		def get_message_state(message_id)
-		  @query = String.new
-			xml = Builder::XmlMarkup.new(:target => @query)
-			
-			xml.request {
-				xml.security {
-					xml.login(:value => @login)
-					xml.password(:value => @password)
-				}
-				xml.get_state {
-					xml.id_sms message_id.to_s
-				}
-			}
-			
-			return execute_query(@query, 'https://my.sms16.ru/xml/state.php')
-		end
-		
-		private
-		
-			def execute_query(query, uri)
-				url = URI.parse(uri)
-				headers = {"Content-Type" => "text/xml"}
-				
-				request = Net::HTTP.new(url.host, url.port)
-				request.use_ssl = true
-				
-				return request.post(url.path, query, headers).body
-			end
-	end
+
+# external dependency
+require 'builder'
+require 'sax-machine'
+
+# internal dependency
+require 'sms16client/parser'
+
+class Sms16Client
+  Version = '0.1.0'
+
+  attr_accessor :login, :password
+
+  def initialize(login, password)
+    @login = login
+    @password = password
+  end
+
+  def get_balance
+    query = ""
+    
+    xml = Builder::XmlMarkup.new(:target => query)
+    xml.request {
+      xml.security {
+        xml.login(:value => login)
+        xml.password(:value => password)
+      }
+    }
+
+    return parse_response(execute_query(query, 'https://my.sms16.ru/xml/balance.php'))
+  end
+
+  def send_message(message, destination, source)
+    query = ""
+
+    xml = Builder::XmlMarkup.new(:target => query)
+    xml.request {
+      xml.security {
+        xml.login(:value => login)
+        xml.password(:value => password)
+      }
+      xml.message(:type => "sms") {
+        xml.sender source
+        xml.text message
+        xml.abonent(:phone => destination, :number_sms => "1")
+      }
+    }
+
+    return parse_response(execute_query(query, 'https://my.sms16.ru/xml/'))
+  end
+
+  def get_message_state(message_id)
+    query = ""
+
+    xml = Builder::XmlMarkup.new(:target => query)
+    xml.request {
+      xml.security {
+        xml.login(:value => login)
+        xml.password(:value => password)
+      }
+      xml.get_state {
+        xml.id_sms message_id
+      }
+    }
+
+    return parse_response(execute_query(query, 'https://my.sms16.ru/xml/state.php'))
+  end
+
+  private
+
+  def execute_query(query, uri)
+    url = URI.parse(uri)
+    headers = {"Content-Type" => "text/xml"}
+    request = Net::HTTP.new(url.host, url.port)
+    request.use_ssl = true
+    request.post(url.path, query, headers).body
+  end
+
+  def parse_response(response)
+    response = Response.parse(response)
+
+    return error_response(response) if response.error? 
+    return balance_response(response) if response.money?
+    return information_response(response) if response.information?
+    return state_response(response) if response.state?
+  end
+
+  def error_response(response)
+    {
+      :error => response.error
+    }
+  end
+
+  def balance_response(response)
+    {
+      :money => {
+        :currency => response.money.currency,
+        :amount => response.money.text
+      },
+      :sms => [
+        {
+          :area => response.sms[0].area,
+          :amount => response.sms[0].text
+        },
+        {
+          :area => response.sms[1].area,
+          :amount => response.sms[1].text
+        }
+      ] 
+    }
+  end
+
+  def information_response(response)
+    {
+      :information => {
+        :number_sms => response.information.number_sms,
+        :id_sms => response.information.id_sms,
+        :parts => response.information.parts,
+        :response => response.information.text
+      }
+    }
+  end
+
+  def state_response(response)
+    {
+      :state => {
+        :id_sms => response.state.id_sms,
+        :time => response.state.time,
+        :err => response.state.err,
+        :response => response.state.text
+      }
+    }
+  end
 end

data/sms16client.gemspec

@@ -1,29 +1,25 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
-Gem::Specification.new do |s|
-  s.name = %q{sms16client}
-  s.version = "0.0.2"
+Gem::Specification.new do |spec|
+  spec.name = 'sms16client'
+  spec.description = %q{A gem that provides an interface to sms16.ru API.}
+  spec.authors = ['Nikolay Burlov']
+  spec.email = ['kohgpat@gmail.com']
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nikolay Burlov"]
-  s.date = %q{2011-04-04}
-  s.description = %q{Sms16 client}
-  s.email = %q{kohgpat@gmail.com}
-  s.extra_rdoc_files = ["README", "lib/sms16client.rb"]
-  s.files = ["README", "Rakefile", "lib/sms16client.rb", "sms16client.gemspec", "Manifest"]
-  s.homepage = %q{http://github.com/kohgpat/sms16client/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sms16client", "--main", "README"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{sms16client}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Sms16 client}
+  spec.add_dependency 'builder'
+  spec.add_dependency 'sax-machine'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'fakeweb'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  spec.version = '0.1.0'
+  spec.files = `git ls-files`.split("\n")
+  spec.homepage = 'http://github.com/kohgpat/sms16client'
+  spec.licenses = ['MIT']
+  spec.require_paths = ['lib']
+  spec.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
+  spec.summary = %q{A gem that provides an interface to sms16.ru API.}
+  spec.test_files = `git ls-files -- {test,spec,feature}/*`.split("\n")
 end

data/spec/sms16client_spec.rb

@@ -0,0 +1,60 @@
+# encoding: utf-8
+
+require 'fakeweb'
+
+$:.push File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'sms16client'
+
+describe Sms16Client do
+  before do
+    @sms16 = Sms16Client.new 'test', 'test'
+  end
+
+  it "incorrect credentials" do
+    FakeWeb.register_uri(
+      :post, 'https://my.sms16.ru/xml/balance.php',
+      :body => "<?xml version=\"1.0\" encoding=\"utf-8\"?><response><error>Неправильный логин или пароль</error></response>")
+
+    @sms16.get_balance[:error].should == "Неправильный логин или пароль"
+  end
+
+  it "balance" do
+    FakeWeb.register_uri(
+      :post, 'https://my.sms16.ru/xml/balance.php',
+      :body => "<?xml version=\"1.0\" encoding=\"utf-8\"?><response><money currency=\"RUR\">3924.9</money><sms area=\"Россия\">26166</sms><sms area=\"Украина\">0</sms></response>")
+
+    response = @sms16.get_balance
+
+    response[:money][:currency].should == "RUR"
+    response[:money][:amount].should == "3924.9"
+    response[:sms][0][:area].should == "Россия"
+    response[:sms][0][:amount].should == "26166"
+  end
+
+  it "send message" do
+    FakeWeb.register_uri(
+      :post, 'https://my.sms16.ru/xml/',
+      :body => "<?xml version=\"1.0\" encoding=\"utf-8\"?><response><information number_sms=\"1\" id_sms=\"111\" parts=\"1\">send</information></response>")
+
+    response = @sms16.send_message('test message', 'phone number', 'author')
+
+    response[:information][:number_sms].should == "1"
+    response[:information][:id_sms].should == "111"
+    response[:information][:parts].should == "1"
+    response[:information][:response].should == "send"
+  end
+
+  it "get message state" do
+    FakeWeb.register_uri(
+      :post, 'https://my.sms16.ru/xml/state.php',
+      :body => "<?xml version=\"1.0\" encoding=\"utf-8\"?><response><state id_sms=\"111\" time=\"2012-12-04 05:20:19\" err=\"000\">deliver</state></response>")
+
+    response = @sms16.get_message_state('111')
+
+    response[:state][:id_sms].should == "111"
+    response[:state][:time].should == "2012-12-04 05:20:19"
+    response[:state][:err].should == "000"
+    response[:state][:response].should == "deliver"
+  end
+end

metadata

@@ -1,66 +1,152 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sms16client
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Nikolay Burlov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-04 00:00:00 +09:00
-default_executable: 
-dependencies: []
-
-description: Sms16 client
-email: kohgpat@gmail.com
+date: 2012-12-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sax-machine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A gem that provides an interface to sms16.ru API.
+email:
+- kohgpat@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README
-- lib/sms16client.rb
-files: 
-- README
+extra_rdoc_files: []
+files:
+- .rspec
+- Gemfile
+- Gemfile.lock
+- LICENSE.md
+- README.md
 - Rakefile
 - lib/sms16client.rb
+- lib/sms16client/parser.rb
 - sms16client.gemspec
-- Manifest
-has_rdoc: true
-homepage: http://github.com/kohgpat/sms16client/
-licenses: []
-
+- spec/sms16client_spec.rb
+homepage: http://github.com/kohgpat/sms16client
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Sms16client
-- --main
-- README
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.3.6
 requirements: []
-
-rubyforge_project: sms16client
-rubygems_version: 1.6.2
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Sms16 client
+summary: A gem that provides an interface to sms16.ru API.
 test_files: []
-

data/Manifest

@@ -1,5 +0,0 @@
-README
-Rakefile
-lib/sms16client.rb
-sms16client.gemspec
-Manifest