action_smser 2.1.2 → 2.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2350764320f6928baacedb55468d17ec9b7a8a4a
+  data.tar.gz: 1c8121397346aeacf82842955aa1ae3b53fd460a
+SHA512:
+  metadata.gz: 19a8c025c2de53b900bc678236e5a12f16a150e9df4b5e189015094f7176872bfd564b7702e636887ca67aa924b5d6d6c277a960a6d11023149d1f277b840624
+  data.tar.gz: d86fdce835d1d978c3642a280653f172faa39c95ef8dd746a608e9a3eed5ccc154918f9c7bf6533867cf369da0b90110617beaae6c6da2b1e38ff89a7530490c

data/README.md

@@ -226,23 +226,14 @@ end
 
 ```
 
-# Requirements
-
-Gem has been tested with ruby 1.9.2 and Rails 3.1.
-
-[<img src="https://secure.travis-ci.org/holli/action_smser.png" />](http://travis-ci.org/holli/action_smser)
-
-http://travis-ci.org/#!/holli/action_smser
-
-### Changes
-
-Version 2.0 dropped support for ruby 1.8.7. Versions below 2.0 were tested also with ruby 1.8.7
-
-
 # Support
 
 Submit suggestions or feature requests as a GitHub Issue or Pull Request. Remember to update tests. Tests are quite extensive.
 
+Check travis for what environments are supported http://travis-ci.org/#!/holli/action_smser
+
+[<img src="https://secure.travis-ci.org/holli/action_smser.png" />](http://travis-ci.org/holli/action_smser)
+
 
 ### Similar gems
 

data/lib/action_smser/base.rb

@@ -53,7 +53,11 @@ class ActionSmser::Base
 
   # Called from class.method_missing with own_sms_message when you call OwnMailer.own_sms_message
   def initialize(method_name = 'no_name_given', *args)
-    @delivery_options = ActionSmser.delivery_options.deep_dup
+    @delivery_options = {}
+    ActionSmser.delivery_options.each do |key,value|
+      value = value.dup if value.is_a?(Hash) || value.is_a?(Array)
+      @delivery_options[key] = value
+    end
     @valid = true
     @sms_action = method_name
     @sms_type = "#{self.class}.#{@sms_action}"
@@ -86,7 +90,7 @@ class ActionSmser::Base
 
     return false unless valid?
 
-    logger.info "Sending sms - Delivery_method: #{delivery_options[:delivery_method]} -  Sms: (#{self.to_s})"
+    ActionSmser::Logger.info "Sending sms - Delivery_method: #{delivery_options[:delivery_method]} -  Sms: (#{self.to_s})"
 
     response = delivery_method.deliver(self)
 
@@ -139,10 +143,5 @@ class ActionSmser::Base
     ttl.blank? ? ActionSmser.delivery_options[:default_ttl] : ttl.to_i
   end
 
-  def logger
-    ActionSmser::Logger
-  end
-
-
 end
 

data/lib/action_smser/delivery_methods/nexmo.rb

@@ -8,7 +8,7 @@ module ActionSmser::DeliveryMethods
   # Also optional code (=unicode) is possible. See https://docs.nexmo.com/index.php/messaging-sms-api/send-message
   # overwrite deliver_path(sms, options) with your own if you have different type of path
   class Nexmo < SimpleHttp
-    
+
     def self.deliver(sms)
       options = sms.delivery_options[:nexmo] || {}
       options = options.dup
@@ -23,8 +23,8 @@ module ActionSmser::DeliveryMethods
         deliver_path = self.deliver_path(sms, to, options)
         response = self.deliver_http_request(sms, options, deliver_path)
 
-        logger.info "Nexmo delivery http ||| #{deliver_path} ||| #{response.inspect}"
-        logger.info response.body if !response.blank?
+        ActionSmser::Logger.info "Nexmo delivery http ||| #{deliver_path} ||| #{response.inspect}"
+        ActionSmser::Logger.info response.body if !response.blank?
 
         sms.delivery_info.push(response)
 

data/lib/action_smser/delivery_methods/simple_http.rb

@@ -8,14 +8,14 @@ module ActionSmser::DeliveryMethods
   # overwrite deliver_path(sms, options) with your own if you have different type of path
   # When save_delivery_reports=true it expects collection msg_ids in each line in http response
   class SimpleHttp
-    
+
     def self.deliver(sms, options = nil)
       options = options ? options : sms.delivery_options[:simple_http]
       deliver_path = self.deliver_path(sms, options)
       response = self.deliver_http_request(sms, options, deliver_path)
 
-      logger.info "SimpleHttp delivery ||| #{deliver_path} ||| #{response.inspect}"
-      logger.info response.body if !response.blank?
+      ActionSmser::Logger.info "SimpleHttp delivery ||| #{deliver_path} ||| #{response.inspect}"
+      ActionSmser::Logger.info response.body if !response.blank?
       sms.delivery_info = response
 
       # Results include sms_id or error code in each line
@@ -38,7 +38,7 @@ module ActionSmser::DeliveryMethods
       # http://notetoself.vrensk.com/2008/09/verified-https-in-ruby/
 
       response = nil
-      
+
       server_port = options[:use_ssl] ? 443 : 80
       http = Net::HTTP.new(options[:server], server_port)
       if options[:use_ssl]
@@ -50,7 +50,7 @@ module ActionSmser::DeliveryMethods
           response = http.request(Net::HTTP::Get.new(path)) unless Rails.env.test? #Never request by accident in test environment.
         end
       else
-        logger.warn "DeliveryMethods does never make real http requests in test environment!"
+        ActionSmser::Logger.warn "DeliveryMethods does never make real http requests in test environment!"
       end
 
       response
@@ -60,9 +60,5 @@ module ActionSmser::DeliveryMethods
       "/api/sendsms/plain?user=#{options[:username]}&password=#{options[:password]}&sender=#{sms.from_encoded}&SMSText=#{sms.body_encoded_escaped}&GSM=#{sms.to_encoded}"
     end
 
-    def self.logger
-      ActionSmser::Logger
-    end
-
   end
 end

data/lib/action_smser/delivery_methods/smstrade.rb

@@ -33,8 +33,8 @@ module ActionSmser::DeliveryMethods
         deliver_path = self.deliver_path(sms, to, options)
         response = self.deliver_http_request(sms, options, deliver_path)
 
-        logger.info "Smstrade delivery http ||| #{deliver_path} ||| #{response.inspect}"
-        logger.info response.body if !response.blank?
+        ActionSmser::Logger.info "Smstrade delivery http ||| #{deliver_path} ||| #{response.inspect}"
+        ActionSmser::Logger.info response.body if !response.blank?
 
         sms.delivery_info.push(response)
 

data/lib/action_smser/version.rb

@@ -1,3 +1,3 @@
 module ActionSmser
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

data/test/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -8,8 +9,24 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 0) do
+ActiveRecord::Schema.define(version: 20120102215215) do
+
+  create_table "action_smser_delivery_reports", force: true do |t|
+    t.string   "msg_id"
+    t.string   "status"
+    t.datetime "status_updated_at"
+    t.string   "sms_type"
+    t.text     "log"
+    t.string   "to"
+    t.string   "from"
+    t.string   "body"
+    t.string   "gateway"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "action_smser_delivery_reports", ["msg_id"], name: "index_action_smser_delivery_reports_on_msg_id"
 
 end