textmagic 0.4.0 → 0.5.0

data/.gitignore

@@ -1,8 +1,17 @@
-*.sw?
-.DS_Store
-.rvmrc
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
 coverage
-rdoc
+doc/
+lib/bundler/man
 pkg
-_layouts
-_site
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/Rakefile

@@ -1,99 +1,11 @@
-# encoding: utf-8
-
 require "rubygems"
 require "rake"
-require "yaml"
 require "rake/testtask"
 require "rake/rdoctask"
 
-begin
-  require "jeweler"
-  Jeweler::Tasks.new do |gem|
-    gem.name = "textmagic"
-    gem.summary = %Q{Ruby interface to the TextMagic's Bulk SMS Gateway}
-    gem.description = %Q{
-      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.email = "vladimir.tuzinsky@gmail.com"
-    gem.homepage = "http://github.com/bobes/textmagic"
-    gem.authors = ["Vladimír Bobeš Tužinský"]
-    gem.rubyforge_project = "textmagic"
-    gem.add_runtime_dependency "httparty", ">= 0.5.2"
-    gem.add_development_dependency "mocha", ">= 0.9.8"
-    gem.add_development_dependency "shoulda", ">= 2.10.3"
-    gem.add_development_dependency "fakeweb", ">= 1.2.8"
-    gem.add_development_dependency "mcmire-matchy", ">= 0.5.2"
-  end
-
-  Jeweler::RubyforgeTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
 Rake::TestTask.new(:test) do |test|
   test.libs << "lib" << "test"
   test.pattern = "test/**/test_*.rb"
   test.verbose = true
 end
 task :default => :test
-
-begin
-  require "rcov/rcovtask"
-  Rcov::RcovTask.new do |test|
-    test.libs << "test"
-    test.pattern = "test/**/test_*.rb"
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-Rake::RDocTask.new do |rdoc|
-  if File.exist?("VERSION.yml")
-    config = YAML.load(File.read("VERSION.yml"))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "textmagic #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.options << '--charset' << 'utf8'
-  rdoc.options << '--fmt' << 'shtml'
-  rdoc.template = 'direct'
-end
-
-desc "Build, commit and publish the RDOC files"
-task :doc => :rerdoc do
-  cmd = <<-EOS
-  echo 'Packing and deleting rdoc directory'
-  tar -cf rdoc.tar rdoc
-  rm -rf rdoc
-  echo 'Checking out gh-pages branch'
-  git checkout -m gh-pages
-  echo 'Replacing rdoc directory'
-  rm -rf rdoc
-  tar -xf rdoc.tar
-  rm rdoc.tar
-  echo 'Commiting'
-  git add rdoc
-  git commit -m 'Updated RDoc'
-  echo 'Pushing to origin'
-  git push origin gh-pages
-  EOS
-
-  system cmd.split(/\n\s*/).join(" && ")
-
-  system <<-EOS
-  echo 'Checking out master'
-  git checkout master
-  echo 'Done'
-  EOS
-end

data/lib/textmagic.rb

@@ -1,9 +1,8 @@
-require "rubygems"
-gem "httparty"
 require "httparty"
-%w[charset validation api response executor error].each do |lib|
-  require File.join(File.dirname(__FILE__), lib)
+
+%w[charset validation api response executor error version].each do |lib|
+  require File.join(File.dirname(__FILE__), "textmagic", lib)
 end
 
-module TextMagic #:nodoc:
+module Textmagic
 end

data/lib/textmagic/.rb

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

data/lib/{api.rb → textmagic/api.rb}

@@ -79,7 +79,7 @@ module TextMagic
     #
     #  api.send("Two hours later", "999314159265", :send_time => Time.now.to_i + 7200)
     def send(text, *args)
-      raise Error.new(1, "Message text is empty") if text.nil? || text.blank?
+      raise Error.new(1, "Message text is empty") unless text
       options = args.last.is_a?(Hash) ? args.pop : {}
       unicode = API.is_unicode(text)
       options[:unicode] = case options[:unicode]

data/lib/{executor.rb → textmagic/executor.rb}

@@ -20,12 +20,10 @@ module TextMagic
       # 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 = {})
-        raise TextMagic::API::Error.new(3, "Command is undefined") if command.nil? || command.blank?
-        if username.nil? || username.blank? || password.nil? || password.blank?
-          raise TextMagic::API::Error.new(5, "Invalid username & password combination")
-        end
+        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.delete_if { |key, value| key.nil? || key.to_s.blank? || value.nil? || value.to_s.blank? }
+        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

data/lib/{response.rb → textmagic/response.rb}

@@ -33,11 +33,11 @@ module TextMagic
         hash.each do |message_id, message_hash|
           status = message_hash["status"].dup
           metaclass = class << status; self; end
-          metaclass.send :attr_accessor, :text, :credits_cost, :reply_number, :message_status, :created_time, :completed_time
+          metaclass.send :attr_accessor, :text, :credits_cost, :reply_number, :status, :created_time, :completed_time
           status.text = message_hash["text"]
           status.credits_cost = message_hash["credits_cost"]
           status.reply_number = message_hash["reply_number"]
-          status.message_status = message_hash["message_status"]
+          status.status = message_hash["status"]
           status.created_time = Time.at(message_hash["created_time"].to_i) if message_hash["created_time"]
           status.completed_time = Time.at(message_hash["completed_time"].to_i) if message_hash["completed_time"]
           response[message_id] = status

data/lib/textmagic/version.rb

@@ -0,0 +1,3 @@
+module Textmagic
+  VERSION = "0.5.0"
+end

data/test/test_api.rb

@@ -95,8 +95,8 @@ class APITest < Test::Unit::TestCase
       lambda { @api.send(@text, random_string) }.should raise_error(TextMagic::API::Error)
     end
 
-    should "raise an error if text is empty" do
-      lambda { @api.send("", @phone) }.should raise_error(TextMagic::API::Error)
+    should "raise an error if text is nil" do
+      lambda { @api.send(nil, @phone) }.should raise_error(TextMagic::API::Error)
     end
 
     should "raise an error if text is too long" do

data/test/test_executor.rb

@@ -34,27 +34,27 @@ class ExecutorTest < Test::Unit::TestCase
     end
 
     should "send a POST request to proper uri" do
-      response = random_string
+      response = "{}"
       FakeWeb.register_uri(:post, @uri, :body => response)
       TextMagic::API::Executor.execute(@command, @username, @password, @options)
     end
 
-    should "not send parameters with empty keys" do
-      options_with_empty_values = @options.merge(nil => random_string, "" => random_string)
+    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)
       TextMagic::API::Executor.execute(@command, @username, @password, options_with_empty_values)
     end
 
-    should "not send parameters with empty values" do
-      options_with_empty_values = @options.merge(random_string => nil, random_string => "")
+    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)
       TextMagic::API::Executor.execute(@command, @username, @password, options_with_empty_values)
     end
 
     should "raise an error if the response contains error_code" do
-      response = "{error_code:#{1 + rand(10)}}"
+      response = "{\"error_code\":#{1 + rand(10)}}"
       FakeWeb.register_uri(:post, @uri, :body => response)
       lambda {
         TextMagic::API::Executor.execute(@command, @username, @password, @options)

data/test/test_response.rb

@@ -120,6 +120,10 @@ class ResponseTest < Test::Unit::TestCase
     should "have credits_cost" do
       @response.credits_cost.should be_close(@credits_cost, 1e-10)
     end
+
+    should "have status" do
+      @response.status.should == @status
+    end
   end
 
   context "Response to message_status command with multiple ids" do
@@ -172,6 +176,10 @@ class ResponseTest < Test::Unit::TestCase
       @response.values.first.reply_number.should == @reply_number
     end
 
+    should "have status for all statuses" do
+      @response.values.first.status.should == @status
+    end
+
     should "have credits_cost for all statuses" do
       @response.values.first.credits_cost.should be_close(@credits_cost, 1e-10)
     end

data/textmagic.gemspec

@@ -1,92 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.expand_path("../lib/textmagic/version", __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{textmagic}
-  s.version = "0.4.0"
+Gem::Specification.new do |gem|
+  gem.authors       = ["Vladimir Bobes Tuzinsky"]
+  gem.email         = ["vladimir@tuzinsky.com"]
+  gem.summary       = %q{Ruby interface to the TextMagic's Bulk SMS Gateway}
+  gem.description   = %q{
+    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      = ""
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Vladimír Bobeš Tužinský"]
-  s.date = %q{2010-06-01}
-  s.default_executable = %q{tm}
-  s.description = %q{
-      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.
-    }
-  s.email = %q{vladimir.tuzinsky@gmail.com}
-  s.executables = ["tm"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "History.txt",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/tm",
-     "lib/api.rb",
-     "lib/charset.rb",
-     "lib/error.rb",
-     "lib/executor.rb",
-     "lib/response.rb",
-     "lib/textmagic.rb",
-     "lib/validation.rb",
-     "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",
-     "textmagic.gemspec"
-  ]
-  s.homepage = %q{http://github.com/bobes/textmagic}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{textmagic}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Ruby interface to the TextMagic's Bulk SMS Gateway}
-  s.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"
-  ]
+  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.require_paths = ["lib"]
+  gem.version       = Textmagic::VERSION
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0.5.2"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
-      s.add_development_dependency(%q<fakeweb>, [">= 1.2.8"])
-      s.add_development_dependency(%q<mcmire-matchy>, [">= 0.5.2"])
-    else
-      s.add_dependency(%q<httparty>, [">= 0.5.2"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.3"])
-      s.add_dependency(%q<fakeweb>, [">= 1.2.8"])
-      s.add_dependency(%q<mcmire-matchy>, [">= 0.5.2"])
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0.5.2"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<shoulda>, [">= 2.10.3"])
-    s.add_dependency(%q<fakeweb>, [">= 1.2.8"])
-    s.add_dependency(%q<mcmire-matchy>, [">= 0.5.2"])
-  end
+  gem.add_runtime_dependency "httparty", ">= 0.5.2"
+  gem.add_development_dependency "mocha", ">= 0.9.8"
+  gem.add_development_dependency "shoulda", ">= 2.10.3"
+  gem.add_development_dependency "fakeweb", ">= 1.2.8"
+  gem.add_development_dependency "mcmire-matchy", ">= 0.5.2"
 end
-

metadata

@@ -1,128 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: textmagic
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease: 
 platform: ruby
-authors: 
-- "Vladim\xC3\xADr Bobe\xC5\xA1 Tu\xC5\xBEinsk\xC3\xBD"
+authors:
+- Vladimir Bobes Tuzinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-06-01 00:00:00 +02:00
-default_executable: tm
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70140940266900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70140940266900
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70140940265840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70140940265840
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70140940263280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 33
-        segments: 
-        - 2
-        - 10
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.10.3
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70140940263280
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70140940261980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 2
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.8
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mcmire-matchy
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70140940261980
+- !ruby/object:Gem::Dependency
+  name: mcmire-matchy
+  requirement: &70140940261020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.2
   type: :development
-  version_requirements: *id005
-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 TextMagic account to use this gem. You can get one at http://www.textmagic.com.\n    "
-email: vladimir.tuzinsky@gmail.com
-executables: 
+  prerelease: false
+  version_requirements: *70140940261020
+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
+  TextMagic account to use this gem. You can get one at http://www.textmagic.com.\n
+  \ "
+email:
+- vladimir@tuzinsky.com
+executables:
 - tm
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
 - .document
 - .gitignore
+- Gemfile
 - History.txt
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION.yml
 - bin/tm
-- lib/api.rb
-- lib/charset.rb
-- lib/error.rb
-- lib/executor.rb
-- lib/response.rb
 - lib/textmagic.rb
-- lib/validation.rb
+- lib/textmagic/.rb
+- lib/textmagic/api.rb
+- lib/textmagic/charset.rb
+- lib/textmagic/error.rb
+- lib/textmagic/executor.rb
+- lib/textmagic/response.rb
+- lib/textmagic/validation.rb
+- lib/textmagic/version.rb
 - test/test_api.rb
 - test/test_charset.rb
 - test/test_error.rb
@@ -131,41 +103,31 @@ files:
 - test/test_response.rb
 - test/test_validation.rb
 - textmagic.gemspec
-has_rdoc: true
-homepage: http://github.com/bobes/textmagic
+homepage: ''
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: textmagic
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby interface to the TextMagic's Bulk SMS Gateway
-test_files: 
+test_files:
 - test/test_api.rb
 - test/test_charset.rb
 - test/test_error.rb

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:major: 0
-:minor: 4
-:patch: 0
-:build: