globalsms 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8316fc1436ba0bd9a51031ad5e00a15050280f4d
-  data.tar.gz: 8b217ff274da38ed17fe540ba4bfbbc05b699c75
+  metadata.gz: 9e616d4e78940b24811200b28634529951b3fa3a
+  data.tar.gz: 4e1bcf400397c449b2d72d3e03d8c78b5efdcba7
 SHA512:
-  metadata.gz: c7d224e9447d916832985479fa716ed17f9fac36b68bb9b663d0cff752ba64511cd37001a83a5bd6be582508f8df7e38ce8dab0432e7eefdcc74a1fcebabd588
-  data.tar.gz: 2d7b7fc73cd93cf3579fad7591f5ce48528c9a5ee084b8c1e61a4462bcb92e3e41108fa0ac486cdd9ebec794bc023101925c7c27fc19f1aa0dc2b9eb7470e2e1
+  metadata.gz: 8a7615613b0398f9833d0e627b292a329ea5ed2683930348716d6a558e728dbf0f4a4d04ba78c06da9fc2efd05d83db8c7087fdfb0d6efdaff627a63fbee98e4
+  data.tar.gz: 06aefe8d3a34363c2d348e498935abea02bacb43a60e2e576abcf97c1a718eb41577058d643bdf5d70c4f5ae9557225355d4d9e792642f3ffe1e2d2c2d2301de

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Emre Can Yılmaz
+Copyright (c) 2015 Salih Özdemir
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -37,7 +37,7 @@ Kullanıcının gireceği değerler:
     numbers: "5493666154"
     text: "Mesaj Metni"
 
-#### (single_send) Tek mesaj gönderen örnek kod:
+#### Bir mesaj gönderme
 
 ```ruby
 require 'globalsms'
@@ -58,9 +58,9 @@ sms.single_send(argv)
 # }
 ```
 
-#### (bulk_send) Aynı mesajı birden fazla numaraya gönderen örnek kod:
+#### Aynı mesajı birden fazla numaraya gönderme
 
-NOT: Bu yöntem ile mesaj gönderilirken birden fazla numaraya gönderilen aynı mesajlar, tek bir `message_id` üretir.
+NOT: Tek mesaj gönderme yöntemiyle aynıdır. Sadece `numbers` değerine dizi olarak birden fazla numara verilir. Tek bir `message_id` üretir.
 
 ```ruby
 require 'globalsms'
@@ -74,7 +74,7 @@ argv = {
   turkish_character: "1"
 }
 
-sms.bulk_send(argv)
+sms.single_send(argv)
 
 # {
 #   "result" => true, "message_id" => "239922", "numbers" => ["5493666154", "5493666155", "5493666156", "5493666157"
@@ -83,7 +83,7 @@ sms.bulk_send(argv)
 # }
 ```
 
-#### (multi_send) Tek bir çağrıda birden fazla numaraya farklı mesajlar gönderen örnek kod:
+#### Tek bir çağrıda birden fazla numaraya farklı mesajlar gönderme
 
 ```ruby
 require 'globalsms'
@@ -135,14 +135,14 @@ sms.multi_send(argv)
 
 Gönderilmiş mesajlara ait raporları almak için fonksiyonlara argüman olarak tek bir çağrı için `message_id`, birden fazla çağrı için `message_id` leri içeren bir array verilir. Fonksiyon geriye **hash** döndürür.
 
-#### (single_report) Tek mesaja ait raporları döndüren örnek kod:
+#### Bir mesaja ait raporları görüntüleme
 
 ```ruby
 require 'globalsms'
 
 sms = GlobalSMS::REPORT.new('api-key', 'api-secret')
 
-sms.single_report(239916)
+sms.message(239916)
 
 # {
 #   "result" => true, "data" => [{
@@ -153,47 +153,7 @@ sms.single_report(239916)
 # }
 ```
 
-#### (bulk_report) Birden fazla mesaja ait raporları döndüren örnek kod:
-
-```ruby
-require 'globalsms'
-
-sms = GlobalSMS::REPORT.new('api-key', 'api-secret')
-
-arr = ["239928", "239929", "239930", "239931"]
-
-sms.bulk_report(arr)
-
-# {
-#   "239928" => {
-#     "result" => true, "data" => [{
-#       "id" => "34163260", "created_datetime" => "2015-05-05 15:00:52", "gsm_no" => "5493666154", "gsm_operator" => "2", "sent_status" => "2", "sent_datetime" => "2015-05-05 15:00:53", "out_status" => "255", "out_datetime" => "2015-05-05 15:00:53", "report_message" => "COMMAND_ERROR", "name" => nil
-#     }], "totals" => {
-#       "total_number" => "1", "message_id" => "239928", "total_sent" => "1", "num_reached" => "0", "num_not_reached" => "0", "num_waiting_for_time" => "0", "paid_coin" => "1"
-#     }
-#   }, "239929" => {
-#     "result" => true, "data" => [{
-#       "id" => "34163261", "created_datetime" => "2015-05-05 15:00:52", "gsm_no" => "5493666155", "gsm_operator" => "2", "sent_status" => "2", "sent_datetime" => "2015-05-05 15:00:53", "out_status" => "255", "out_datetime" => "2015-05-05 15:00:53", "report_message" => "COMMAND_ERROR", "name" => nil
-#     }], "totals" => {
-#       "total_number" => "1", "message_id" => "239929", "total_sent" => "1", "num_reached" => "0", "num_not_reached" => "0", "num_waiting_for_time" => "0", "paid_coin" => "1"
-#     }
-#   }, "239930" => {
-#     "result" => true, "data" => [{
-#       "id" => "34163262", "created_datetime" => "2015-05-05 15:00:52", "gsm_no" => "5493666156", "gsm_operator" => "2", "sent_status" => "2", "sent_datetime" => "2015-05-05 15:00:53", "out_status" => "255", "out_datetime" => "2015-05-05 15:00:53", "report_message" => "COMMAND_ERROR", "name" => nil
-#     }], "totals" => {
-#       "total_number" => "1", "message_id" => "239930", "total_sent" => "1", "num_reached" => "0", "num_not_reached" => "0", "num_waiting_for_time" => "0", "paid_coin" => "1"
-#     }
-#   }, "239931" => {
-#     "result" => true, "data" => [{
-#       "id" => "34163263", "created_datetime" => "2015-05-05 15:00:52", "gsm_no" => "5493666157", "gsm_operator" => "2", "sent_status" => "2", "sent_datetime" => "2015-05-05 15:00:53", "out_status" => "255", "out_datetime" => "2015-05-05 15:00:53", "report_message" => "COMMAND_ERROR", "name" => nil
-#     }], "totals" => {
-#       "total_number" => "1", "message_id" => "239931", "total_sent" => "1", "num_reached" => "0", "num_not_reached" => "0", "num_waiting_for_time" => "0", "paid_coin" => "1"
-#     }
-#   }
-# }
-```
-
-#### (report_last) Son x mesaja ait raporları döndüren örnek kod:
+#### Son x mesaja ait raporları görüntüleme
 
 Argüman verilmezse, ön tanımlı olarak en son yollanan (1) mesaja ait raporu döndürür.
 
@@ -202,7 +162,7 @@ require 'globalsms'
 
 sms = GlobalSMS::REPORT.new('api-key', 'api-secret')
 
-sms.report_last(10)
+sms.last_n(10)
 
 # {
 #   "result" => true, "data" => [{
@@ -231,7 +191,7 @@ sms.report_last(10)
 # }
 ```
 
-#### (report_between) Belirli tarihler arasında gönderilmiş mesajlara ait raporları döndüren örnek kod:
+#### Belirli tarihler arasında gönderilmiş mesajlara ait raporları görüntüleme
 
 Bu fonsiyon argüman olarak **hash** alır ve sonuç olarak **hash** döner.
 
@@ -257,7 +217,7 @@ argv = {
   end_time: "20:22:00"
 }
 
-sms.report_between(argv)
+sms.between(argv)
 
 # {
 #   "result" => true, "data" => [{
@@ -268,14 +228,16 @@ sms.report_between(argv)
 # }
 ```
 
-#### (originator_list) Orinigator (gönderici adı) listeleyen örnek kod:
+### Bilgi Alma
+
+#### Gönderici adlarını görüntüleme
 
 Bu fonksiyon argüman almaz.
 
 ```ruby
 require 'globalsms'
 
-sms = GlobalSMS::REPORT.new('api-key', 'api-secret')
+sms = GlobalSMS::INFO.new('api-key', 'api-secret')
 
 sms.originator_list
 
@@ -286,12 +248,12 @@ sms.originator_list
 # }
 ```
 
-#### (user_info) Kullanıcı detaylarını ve kalan kredi bilgisini döndüren örnek kod:
+#### Kullanıcı detaylarını ve kalan kredi bilgisini görüntüleme
 
 ```ruby
 require 'globalsms'
 
-sms = GlobalSMS::REPORT.new('api-key', 'api-secret')
+sms = GlobalSMS::INFO.new('api-key', 'api-secret')
 
 sms.user_info
 
@@ -308,7 +270,7 @@ Bu Gem, GlobalHaberlesme.com dan bağımsız bir geliştirici tarafından oluşt
 
 ## Katkıda Bulunma
 
-Geliştirmeye yapacağınız öneri ve katkılarınızı bekliyorum.
+Geliştirmeye yapacağınız öneri ve katkılarınızı bekliyoruz.
 
 ## Lisans
 
@@ -318,4 +280,4 @@ Bu Gem, MIT Lisansı ile korunur.
 
 Orijinal API Dokümantasyonu `http://uye.globalhaberlesme.com/uploads/api_user.pdf`
 
-RubyGems `https://rubygems.org/gems/globalsms`
+RubyGems `https://rubygems.org/gems/globalsms`

data/globalsms.gemspec

@@ -16,21 +16,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  # end
-
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-
-
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency "httpclient"

data/lib/globalsms.rb

@@ -1,7 +1,7 @@
+require 'httpclient'
+require 'json'
 require File.expand_path('../globalsms/defaults', __FILE__)
+require File.expand_path('../globalsms/info', __FILE__)
 require File.expand_path('../globalsms/sms', __FILE__)
 require File.expand_path('../globalsms/report', __FILE__)
 require File.expand_path('../globalsms/version', __FILE__)
-
-module GlobalSMS
-end

data/lib/globalsms/defaults.rb

@@ -1,2 +1,3 @@
 module GlobalSMS
-end
+  API_BASE_URL = 'http://api.globalhaberlesme.com'
+end

data/lib/globalsms/info.rb

@@ -0,0 +1,26 @@
+module GlobalSMS
+  class INFO
+    def initialize(api_key, api_secret)
+      @api_key = api_key
+      @api_secret = api_secret
+    end
+
+    def originator_list
+      uri = "/originator/list?key=#{@api_key}&secret=#{@api_secret}"
+      get_to_api(uri)
+    end
+
+    def user_info
+      uri = "/user/info?key=#{@api_key}&secret=#{@api_secret}"
+      get_to_api(uri)
+    end
+
+    private
+
+    def get_to_api(uri)
+      client = HTTPClient.new
+      response = client.get("#{API_BASE_URL}#{uri}")
+      JSON.parse(response.body)
+    end
+  end
+end

data/lib/globalsms/report.rb

@@ -1,59 +1,37 @@
-require "globalsms/version"
-require 'httpclient'
-require 'json'
-
 module GlobalSMS
   class REPORT
     def initialize(api_key, api_secret)
-      @api_base_url = "http://api.globalhaberlesme.com"
       @api_key = api_key
       @api_secret = api_secret
     end
 
-    def single_report(argv)
-      uri = "#{@api_base_url}/sms/report/#{argv}?key=#{@api_key}&secret=#{@api_secret}"
-      c = HTTPClient.new
-      return JSON.parse(c.get(uri).body)
-    end
-
-    def bulk_report(argv)
-      res = {}
-      argv.each do |message_id|
-        body = JSON.parse(HTTPClient.new.get("#{@api_base_url}/sms/report/#{message_id}?key=#{@api_key}&secret=#{@api_secret}").body)
-        res[message_id] = body
-      end
-      return res
+    def message(message_id)
+      uri = "/sms/report/#{message_id}?key=#{@api_key}&secret=#{@api_secret}"
+      get_to_api(uri)
     end
 
-    def report_last(argv=1)
-      uri = "#{@api_base_url}/sms/report/sent?limit=#{argv}&key=#{@api_key}&secret=#{@api_secret}"
-      c = HTTPClient.new
-      return JSON.parse(c.get(uri).body)
+    def last_n(limit=1)
+      uri = "/sms/report/sent?limit=#{limit}&key=#{@api_key}&secret=#{@api_secret}"
+      get_to_api(uri)
     end
 
-    def report_between(argv)
+    def between(argv)
       argv = {
-        start_time: "00:00:00",
-        end_time: "23:59:59"
+        start_time: '00:00:00',
+        end_time: '23:59:59'
       }.merge(argv)
 
-      uri_with_whitespace = "#{@api_base_url}/sms/report/sent?between_start=#{argv[:start_date]} #{argv[:start_time]}&between_end=#{argv[:end_date]} #{argv[:end_time]}&key=#{@api_key}&secret=#{@api_secret}"
-      uri = URI.parse(URI.encode(uri_with_whitespace.strip))
-
-      c = HTTPClient.new
-      return JSON.parse(c.get(uri).body)
+      uri = "/sms/report/sent?between_start=#{argv[:start_date]} #{argv[:start_time]}&between_end=#{argv[:end_date]} #{argv[:end_time]}&key=#{@api_key}&secret=#{@api_secret}"
+      safe_uri = URI.parse(URI.encode(uri))
+      get_to_api(safe_uri)
     end
-    
-    def originator_list
-      uri = "#{@api_base_url}/originator/list?key=#{@api_key}&secret=#{@api_secret}"
-      c = HTTPClient.new
-      return JSON.parse(c.get(uri).body)
-    end
-    
-    def user_info
-      uri = "#{@api_base_url}/user/info?key=#{@api_key}&secret=#{@api_secret}"
-      c = HTTPClient.new
-      return JSON.parse(c.get(uri).body)
+
+    private
+
+    def get_to_api(uri)
+      client = HTTPClient.new
+      response = client.get("#{API_BASE_URL}#{uri}")
+      JSON.parse(response.body)
     end
   end
-end
+end

data/lib/globalsms/sms.rb

@@ -1,55 +1,32 @@
-require "globalsms/version"
-require 'httpclient'
-require 'json'
-
 module GlobalSMS
   class SMS
     def initialize(api_key, api_secret)
-      @api_base_url = "http://api.globalhaberlesme.com" #TODO: DEFAULTS a çıkart
       @api_key = api_key
       @api_secret = api_secret
+      @default_args = {
+        time: 'now',
+        turkish_character: '0'
+      }
     end
-    
-    def single_send(argv)
-      argv = {
-        time: "now",
-        turkish_character: "0"
-      }.merge(argv)
-
-      body = "data=#{argv.to_json.to_s}"
-      uri = "#{@api_base_url}/sms/send/single?key=#{@api_key}&secret=#{@api_secret}"
 
-      c = HTTPClient.new
-      return JSON.parse(c.post(uri, body).body)
+    def single_send(message)
+      message = @default_args.merge(message)
+      post_to_api('single', message)
     end
 
-    def bulk_send(argv)
-      argv = {
-        time: "now",
-        turkish_character: "0"
-      }.merge(argv)
-
-      body = "data=#{argv.to_json.to_s}"
-      uri = "#{@api_base_url}/sms/send/single?key=#{@api_key}&secret=#{@api_secret}"
-
-      c = HTTPClient.new
-      return JSON.parse(c.post(uri, body).body)
+    def multi_send(messages)
+      messages = messages.map { |message| @default_args.merge(message) }
+      post_to_api('multi', messages)
     end
 
-    def multi_send(argv)
-
-      argv_def = {
-        time: "now",
-        turkish_character: "0"
-      }
-
-      argv_array = argv.map { |arg| argv_def.merge(arg) }
-
-      body = "data=#{argv_array.to_json.to_s}"
-      uri = "#{@api_base_url}/sms/send/multi?key=#{@api_key}&secret=#{@api_secret}"
+    private
 
-      c = HTTPClient.new
-      return JSON.parse(c.post(uri, body).body)
+    def post_to_api(to, data)
+      client = HTTPClient.new
+      data = "data=#{data.to_json.to_s}"
+      uri = "#{API_BASE_URL}/sms/send/#{to}?key=#{@api_key}&secret=#{@api_secret}"
+      response = client.post(uri, data)
+      JSON.parse(response.body)
     end
   end
-end
+end

data/lib/globalsms/version.rb

@@ -1,3 +1,3 @@
 module GlobalSMS
-  VERSION = "0.3.1"
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: globalsms
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Salih Özdemir
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - globalsms.gemspec
 - lib/globalsms.rb
 - lib/globalsms/defaults.rb
+- lib/globalsms/info.rb
 - lib/globalsms/report.rb
 - lib/globalsms/sms.rb
 - lib/globalsms/version.rb
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: GlobalHaberlesme.com API leri İçin Ruby Gem