little_sms 0.2.0 → 0.2.1

data/Gemfile

@@ -3,11 +3,11 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem "json_pure"
+gem "rbx-require-relative", :platform => [:ruby_18]
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda"
   gem "bundler"
   gem "jeweler"
   gem "rcov"

data/README.md

@@ -1,5 +1,5 @@
 # LittleSMS
-This gem provides access to LittleSMS.ru API from ruby.
+This gem provides access to LittleSMS.ru API from ruby (mri 1.8.7 and 1.9.2 supported).
 
 # Installation
     $ gem install little_sms

data/lib/little_sms.rb

@@ -1,9 +1,7 @@
-libdir = File.dirname(__FILE__)
-$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-
-require "#{libdir}/little_sms/component"
-require "#{libdir}/little_sms/little_sms"
+require "require_relative" unless Kernel.respond_to?(:require_relative)
 
+require_relative "./little_sms/component"
+require_relative "./little_sms/little_sms"
 
 class LittleSMS; end
 

data/lib/little_sms/component.rb

@@ -1,8 +1,8 @@
 require "json"
 require "net/http"
 require "net/https"
-require 'digest/md5'
-require 'digest/sha1'
+require "digest/md5"
+require "digest/sha1"
 require_relative "responce"
 
 class LittleSMS
@@ -23,9 +23,7 @@ class LittleSMS
 
     private
     def request_api_method(method, options = {})
-      options ||= {}
-      options = Hash[options.sort]
-      options[:sign] = sign_request(options)
+      options[:sign] = sign_request(options || {})
       options[:user] = @api_user
 
       uri = @api_uri.merge("#{@component}/#{method}")
@@ -33,9 +31,9 @@ class LittleSMS
       req.set_form_data(options.delete_if {|k, v| k == :key})
 
       uri.scheme, uri.port, use_ssl = if LittleSMS.use_ssl
-        ['https', 443, true]
+        ["https", 443, true]
       else
-        ['http', 80, false]
+        ["http", 80, false]
       end
       res = Net::HTTP.new(uri.host, uri.port)
       res.use_ssl = use_ssl
@@ -49,7 +47,8 @@ class LittleSMS
     end
 
     def sign_request(options)
-      Digest::MD5.hexdigest(Digest::SHA1.hexdigest("#{@api_user}#{options.values.join}#{@api_key}"))
+      sorted_options = options.map{|k, v| [k.to_s, v]}.sort.inject(""){|str, value| str += value[1].to_s}
+      Digest::MD5.hexdigest(Digest::SHA1.hexdigest("#{@api_user}#{sorted_options}#{@api_key}"))
     end
   end
 end

data/lib/little_sms/enumerable.rb

@@ -1,11 +1,18 @@
 # Convert all keys to symbols
 module Enumerable
-  def recursive_symbolize_keys
-    symbolize = lambda { |v| v.respond_to?(:map) ? v.recursive_symbolize_keys : v }
-    if self.kind_of? Hash
-      Hash[ self.map { |k, v| [k.to_sym, symbolize.call(v)] } ]
+  def symbolize_keys
+    symbolize = lambda { |v| v.respond_to?(:map) ? v.symbolize_keys : v }
+    case self
+    when Hash
+      Hash[ self.map { |key, value|
+        k = key.kind_of?(String) ? key.to_sym : key
+        v = symbolize.call(value)
+        [k, v]
+      }]
+    when Array
+      self.map { |value| symbolize.call(value) }
     else
-      self.map { |v| symbolize.call(v) }
+      self
     end
   end
 end

data/lib/little_sms/responce.rb

@@ -3,7 +3,7 @@ require_relative "enumerable"
 class LittleSMS
   class Responce
     def initialize(json)
-      @json = json.recursive_symbolize_keys
+      @json = json.symbolize_keys
     end
 
     def success?
@@ -15,11 +15,11 @@ class LittleSMS
     end
 
     def error
-      if error? then @json[:error] else nil end
+      @json[:error] if error?
     end
 
     def message
-      if error? then @json[:message] else nil end
+      @json[:message] if error?
     end
 
     def method_missing(name, *args)

data/little_sms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{little_sms}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Artyom Bolshakov"]
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
@@ -29,7 +28,7 @@ Gem::Specification.new do |s|
     "lib/little_sms/little_sms.rb",
     "lib/little_sms/responce.rb",
     "little_sms.gemspec",
-    "test/auth.rb",
+    "test/helper.rb",
     "test/test_component.rb",
     "test/test_little_sms.rb",
     "test/test_responce.rb"
@@ -45,20 +44,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json_pure>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<rbx-require-relative>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<json_pure>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rbx-require-relative>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<json_pure>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rbx-require-relative>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/test/helper.rb

@@ -0,0 +1,37 @@
+require "require_relative" unless Kernel.respond_to?(:require_relative)
+require "test/unit"
+require_relative "../lib/little_sms"
+
+module Auth
+  def self.included(other)
+    other.class_eval do
+      def auth
+        [:"acc-4fe53b2b", :"OZkgGZ7g"]
+      end
+    end
+  end
+end
+
+# https://github.com/sandal/rbp/blob/master/testing/test_unit_extensions.rb
+module Test::Unit
+  # Used to fix a minor minitest/unit incompatibility in flexmock
+  AssertionFailedError = Class.new(StandardError)
+
+  class TestCase
+
+    def self.must(name, &block)
+      test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+      defined = instance_method(test_name) rescue false
+      raise "#{test_name} is already defined in #{self}" if defined
+      if block_given?
+        define_method(test_name, &block)
+      else
+        define_method(test_name) do
+          flunk "No implementation provided for #{name}"
+        end
+      end
+    end
+
+  end
+end
+

data/test/test_component.rb

@@ -1,33 +1,28 @@
-require 'test/unit'
-require 'shoulda'
-require_relative '../lib/little_sms'
-require_relative "auth"
+require File.expand_path(File.dirname(__FILE__) + "/helper")
 
 class ComponentTest < Test::Unit::TestCase
   include Auth
-  context "A LittleSMS::Component" do
-    def setup
-      @api_user, @api_key = self.auth
-      @options = {:message=>"test", :recipients=>"+79213752462", :user=>@api_user, :key=>@api_key}
-      @component = LittleSMS::Component.new(:message, "Christ", "Jesus")
-    end
+  def setup
+    @api_user, @api_key = self.auth
+  end
 
-    should "should sign request" do
-      sign = @component.method(:sign_request).call(@options)
-      assert_equal "b616ddc6d0e15aaa92ce79ca78806337", sign
-    end
+  must "sign request" do
+    options = {:message=>"test", :recipients=>"+79213752462"}
+    component = LittleSMS::Component.new(:message, @api_user, @api_key)
+    sign = component.method(:sign_request).call(options)
+    assert_equal "da7a3ceb9f29874825b7451d40117adb", sign
+  end
 
-    should "format output" do
-      out = {"recipients"=>["911", "112"], "messages_id"=>[], "count"=>1, "parts"=>1, "price"=>0.5, "balance"=>9, "test"=>1, "status"=>"success"}
-      formatted = {:recipients=>["911", "112"], :messages_id=>[], :count=>1, :parts=>1, :price=>0.5, :balance=>9, :test=>1, :status=>"success"}
-      assert_equal formatted, out.recursive_symbolize_keys
-    end
+  must "format output" do
+    out = {"recipients"=>["911", "112"], "messages_id"=>[], "count"=>1, "parts"=>1, "price"=>0.5, "balance"=>9, "test"=>1, "status"=>"success"}
+    formatted = {:recipients=>["911", "112"], :messages_id=>[], :count=>1, :parts=>1, :price=>0.5, :balance=>9, :test=>1, :status=>"success"}
+    assert_equal formatted, out.symbolize_keys
+  end
 
-    should "return LittleSMS::Responce object" do
-      api = LittleSMS.new(@api_user, @api_key)
-      resp = api.message.send(:recipients => "+79213752462", :message => "Test", :test => "1")
-      assert_equal(resp.class, LittleSMS::Responce)
-    end
+  must "return LittleSMS::Responce object" do
+    api = LittleSMS.new(@api_user, @api_key)
+    resp = api.message.send(:recipients => "+79213752462", :message => "Test", :test => "1")
+    assert_equal(resp.class, LittleSMS::Responce)
   end
 end
 

data/test/test_little_sms.rb

@@ -1,33 +1,30 @@
-require 'test/unit'
-require 'shoulda'
-require_relative '../lib/little_sms'
+require File.expand_path(File.dirname(__FILE__) + "/helper")
 
 class LittleSMSTest < Test::Unit::TestCase
   include Auth
-  context "A LittleSMS" do
-    def setup
-      @api_user, @api_key = self.auth
-      @sms = LittleSMS.new @api_user, @api_key
-    end
 
-    should "create Component for unknown method" do
-      @sms.foo
-      assert_equal(@sms.instance_eval { @components[:foo].class }, LittleSMS::Component)
-    end
+  def setup
+    @api_user, @api_key = self.auth
+    @sms = LittleSMS.new @api_user, @api_key
+  end
 
-    should "accept block" do
-      mes = nil
-      LittleSMS.new @api_user, @api_key do
-        mes = message
-      end
-      assert_equal(LittleSMS::Component, mes.class)
-    end
+  must "create Component for unknown method" do
+    @sms.foo
+    assert_equal(@sms.instance_eval { @components[:foo].class }, LittleSMS::Component)
+  end
 
-    should "send message" do
-      api = LittleSMS.new(@api_user, @api_key)
-      resp = api.message.send(:recipients => "+79213752462", :message => "Test", :test => "1")
-      assert_equal(resp.success?, true)
+  must "accept block" do
+    mes = nil
+    LittleSMS.new @api_user, @api_key do
+      mes = message
     end
+    assert_equal(LittleSMS::Component, mes.class)
+  end
+
+  must "send message" do
+    api = LittleSMS.new(@api_user, @api_key)
+    resp = api.message.send(:recipients => "+79213752462", :message => "Test", :test => "1")
+    assert_equal(resp.success?, true)
   end
 end
 

data/test/test_responce.rb

@@ -1,55 +1,50 @@
-require "test/unit"
-require "shoulda"
-require_relative "../lib/little_sms/responce"
+require File.expand_path(File.dirname(__FILE__) + "/helper")
 
 class ResponceTest < Test::Unit::TestCase
-  context "A Responce" do
-    def setup
-      @simple_json = {:foo => "bar"}
-      @resp = LittleSMS::Responce.new(@simple_json)
-    end
-
-    should "create new responce object" do
-      assert_equal(@resp.instance_eval { @json }, @simple_json)
-    end
+  def setup
+    @simple_json = {:foo => "bar"}
+    @resp = LittleSMS::Responce.new(@simple_json)
+  end
 
-    should "success?" do
-      resp = LittleSMS::Responce.new({:status => "success"})
-      assert_equal(resp.success?, true)
-      assert_equal(resp.error?, false)
-    end
+  must "create new responce object" do
+    assert_equal(@resp.instance_eval { @json }, @simple_json)
+  end
 
-    should "error?" do
-      resp = LittleSMS::Responce.new({:status => "error"})
-      assert_equal(resp.error?, true)
-      assert_equal(resp.success?, false)
-    end
+  must "success?" do
+    resp = LittleSMS::Responce.new({:status => "success"})
+    assert_equal(resp.success?, true)
+    assert_equal(resp.error?, false)
+  end
 
-    should "return error code and message" do
-      responce_json = {:status => "error", :error => 2, :message => "invalid signature"}
-      resp = LittleSMS::Responce.new(responce_json)
-      assert_equal(resp.error, responce_json[:error])
-      assert_equal(resp.message, responce_json[:message])
-    end
+  must "error?" do
+    resp = LittleSMS::Responce.new({:status => "error"})
+    assert_equal(resp.error?, true)
+    assert_equal(resp.success?, false)
+  end
 
-    should "map responce fields to methods" do
-      responce_json = {:recipients=>["79213752462"], :price=>0.5, :balance=>0, :test=>1}
-      resp = LittleSMS::Responce.new(responce_json)
-      assert_equal(resp.price, 0.5)
-      assert_equal(resp.balance, 0)
-    end
+  must "return error code and message" do
+    responce_json = {:status => "error", :error => 2, :message => "invalid signature"}
+    resp = LittleSMS::Responce.new(responce_json)
+    assert_equal(resp.error, responce_json[:error])
+    assert_equal(resp.message, responce_json[:message])
+   end
+
+  must "map responce fields to methods" do
+    responce_json = {:recipients=>["79213752462"], :price=>0.5, :balance=>0, :test=>1}
+    resp = LittleSMS::Responce.new(responce_json)
+    assert_equal(resp.price, 0.5)
+    assert_equal(resp.balance, 0)
+  end
 
-    should "respond to mapped method" do
-      assert_respond_to(@resp, :foo)
-    end
+  must "respond to mapped method" do
+    assert_respond_to(@resp, :foo)
+  end
 
-    should "raise error if unknown methods invoked" do
-      resp = LittleSMS::Responce.new({:foo => "foo"})
-      assert_raise NoMethodError do
-        resp.bar
-      end
+  must "raise error if unknown methods invoked" do
+    resp = LittleSMS::Responce.new({:foo => "foo"})
+    assert_raise NoMethodError do
+      resp.bar
     end
-
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: little_sms
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &21494940 !ruby/object:Gem::Requirement
+  requirement: &12770400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +22,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21494940
+  version_requirements: *12770400
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &21485800 !ruby/object:Gem::Requirement
+  name: rbx-require-relative
+  requirement: &12768680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *21485800
+  version_requirements: *12768680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21484880 !ruby/object:Gem::Requirement
+  requirement: &12767580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21484880
+  version_requirements: *12767580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21483820 !ruby/object:Gem::Requirement
+  requirement: &12765980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21483820
+  version_requirements: *12765980
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &21482980 !ruby/object:Gem::Requirement
+  requirement: &12764660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21482980
+  version_requirements: *12764660
 description: LittleSMS.ru API binding
 email: tweekane@gmail.com
 executables: []
@@ -76,7 +76,6 @@ extra_rdoc_files:
 - README.md
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -87,7 +86,7 @@ files:
 - lib/little_sms/little_sms.rb
 - lib/little_sms/responce.rb
 - little_sms.gemspec
-- test/auth.rb
+- test/helper.rb
 - test/test_component.rb
 - test/test_little_sms.rb
 - test/test_responce.rb
@@ -107,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 423631933341830267
+      hash: 2522468301336257385
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile.lock

@@ -1,22 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json_pure (1.4.6)
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  jeweler
-  json_pure
-  rcov
-  shoulda

data/test/auth.rb

@@ -1,10 +0,0 @@
-module Auth
-  def self.included(other)
-    other.class_eval do
-      def auth
-        [:"acc-4fe53b2b", :"OZkgGZ7g"]
-      end
-    end
-  end
-end
-