generators/sms/templates/sms.yml @@ -11,7 +11,7 @@ generators/sms/USAGE generators/sms/sms_generator.rb generators/sms/templates/fixture.rhtml generators/sms/templates/model.rb -generators/sms/templates/smsconfig.yml +generators/sms/templates/sms.yml generators/sms/templates/unit_test.rb init.rb lib/activesms.rb Manifest.txt @@ -17,9 +17,9 @@ class SmsGenerator < Rails::Generator::NamedBase class_path, "#{file_name}_test.rb") - m.template "smsconfig.yml", File.join('config', + m.template "sms.yml", File.join('config', class_path, - "smsconfig.yml") + "sms.yml") # Create fixture for each action. actions.each do |action| generators/sms/sms_generator.rb @@ -1,4 +1,4 @@ -require 'rubygems' +#require 'rubygems' require 'activesms' #TODO: check out if we are in rails ActiveSms::Base.logger = RAILS_DEFAULT_LOGGER rescue nil \ No newline at end of file init.rb @@ -104,9 +104,13 @@ module ActiveSms #:nodoc: @@deliveries = [] cattr_accessor :deliveries - + + # Method to deliver :gateway or :email adv_attr_accessor :delivery - adv_attr_accessor :carrier + + # If email we should have a carrier + adv_attr_accessor :carrier + # The recipient numbers for the message, either as a string (for a single # recipient) or an array (for multiple recipientipients). adv_attr_accessor :recipients @@ -189,7 +193,7 @@ module ActiveSms #:nodoc: # alternate has been give as the prameter, this will fail. def deliver!(sms = @sms) #:nodoc: raise "no SMS object available for delivery!" unless sms - logger.info "Sending SMS: #{sms}" unless logger.nil? + logger.info "Sending SMS: #{sms} via #{sms.delivery}" unless logger.nil? begin send("perform_delivery_#{sms.delivery}", sms) if perform_deliveries @@ -210,6 +214,7 @@ module ActiveSms #:nodoc: end def create_sms + raise SmsException unless body && recipients sms = Sms.new sms.delivery = delivery sms.carrier = carrier if carrier @@ -217,12 +222,7 @@ module ActiveSms #:nodoc: sms.from = from sms.body = body sms.id = id if id - sms.schedule = schedule if schedule - - # # - # Change delivery mode - #@@delivery_method = sms.delivery || :email - + sms.schedule = schedule if schedule @sms = sms end @@ -235,9 +235,7 @@ module ActiveSms #:nodoc: #raise ConnectionNotEstablished unless email deliver_sms(sms) end - - - + def perform_delivery_test(sms) deliveries << sms end lib/activesms/base.rb @@ -1,13 +1,12 @@ require 'yaml' module ActiveSms #:nodoc# - # # # Check out if we are on rails # if not, use default yml with only email RAILS_CONFIG_ROOT = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config" : "#{File.dirname(__FILE__)}/../../generators/sms/templates" unless defined?(RAILS_CONFIG_ROOT) # and load what we have! - conf_yml ||= YAML::load(File.open("#{RAILS_CONFIG_ROOT}/smsconfig.yml")) + conf_yml ||= YAML::load(File.open("#{RAILS_CONFIG_ROOT}/sms.yml")) # # # Get general parameters lib/activesms/config.rb @@ -1,122 +1,55 @@ require 'activesms/sms2email' -module ActiveSms #:nodoc# - +module ActiveSms #:nodoc# class Base - #@@email = nil @config ||= CONFIG @@carriers ||= CARRIERS - - #class << self - def carriers - @@carriers.dup - end - def deliver_sms(sms)#number,carrier,message,options={}) + def carriers + @@carriers.dup + end - number = sms.recipients - carrier = sms.carrier - # number = Email::format_number(number) - # raise SMSFuException.new("Cannot deliver an empty message to #{number}") if message.nil? or message.empty? + def deliver_sms(sms)#number,carrier,message,options={}) - #options[:limit] ||= message.length - #message = message[0..options[:limit]-1] - sms_email = determine_sms_email(number, carrier)#format_number(number),carrier) + number = sms.recipients + carrier = sms.carrier + # number = format_number(number) - Sms2Email.deliver_sms_message(sms_email, sms.body) - rescue CarrierException => exception - raise exception - end + #options[:limit] ||= message.length + #message = message[0..options[:limit]-1] + sms_email = determine_sms_email(number, carrier)#format_number(number),carrier) - def get_sms_address(number,carrier) - number = format_number(number) - determine_sms_email(number,carrier) - end - - #private - - def format_number(number) - pre_formatted = number.gsub("-","").strip - formatted = (pre_formatted.length == 11 && pre_formatted[0,1] == "1") ? pre_formatted[1..pre_formatted.length] : pre_formatted - - #return is_valid?(formatted) ? formatted : (raise SMSFuException.new("Phone number (#{number}) is not formatted correctly")) - end - # - # def is_valid?(number) - # return (number.length >= 10 && number[/^.\d+$/]) ? true : false - # end - - def determine_sms_email(phone_number, carrier) - carrier = carrier.downcase - - #unless config.key?(:adapter) - if carriers.has_key?(carrier) - "#{phone_number}#{carriers[carrier]}" - else - raise CarrierException.new("Specified carrier, #{carrier} is not supported.") - end - end - # end - end + Sms2Email.deliver_sms_message(sms_email, sms.body) + rescue CarrierException => exception + raise exception + end + def get_sms_address(number,carrier) + number = format_number(number) + determine_sms_email(number,carrier) + end + + private + + # def format_number(number) + # pre_formatted = number.gsub("-","").strip + # formatted = (pre_formatted.length == 11 && pre_formatted[0,1] == "1") ? pre_formatted[1..pre_formatted.length] : pre_formatted + # + # #return is_valid?(formatted) ? formatted : (raise SMSFuException.new("Phone number (#{number}) is not formatted correctly")) + # end + # + # def is_valid?(number) + # return (number.length >= 10 && number[/^.\d+$/]) ? true : false + # end + + def determine_sms_email(phone_number, carrier) + carrier = carrier.downcase - -end - - -# require 'yaml' -# require 'sms_notifier' - - -# -# module SMSFu -# RAILS_CONFIG_ROOT = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config" : "#{File.dirname(__FILE__)}/../templates" unless defined?(RAILS_CONFIG_ROOT) -# @config ||= YAML::load(File.open("#{RAILS_CONFIG_ROOT}/sms_fu.yml")) -# @@carriers ||= @config['carriers'] -# -# def self.carriers -# @@carriers.dup -# end -# -# def deliver_sms(number,carrier,message,options={}) -# number = format_number(number) -# raise SMSFuException.new("Cannot deliver an empty message to #{number}") if message.nil? or message.empty? -# -# options[:limit] ||= message.length -# message = message[0..options[:limit]-1] -# sms_email = determine_sms_email(format_number(number),carrier) -# -# SmsNotifier.deliver_sms_message(sms_email,message) -# rescue SMSFuException => exception -# raise exception -# end -# -# def get_sms_address(number,carrier) -# number = format_number(number) -# determine_sms_email(number,carrier) -# end -# -# private -# -# def format_number(number) -# pre_formatted = number.gsub("-","").strip -# formatted = (pre_formatted.length == 11 && pre_formatted[0,1] == "1") ? pre_formatted[1..pre_formatted.length] : pre_formatted -# -# return is_valid?(formatted) ? formatted : (raise SMSFuException.new("Phone number (#{number}) is not formatted correctly")) -# end -# -# def is_valid?(number) -# return (number.length >= 10 && number[/^.\d+$/]) ? true : false -# end -# -# def determine_sms_email(phone_number, carrier) -# if @@carriers.has_key?(carrier.downcase) -# "#{phone_number}#{@@carriers[carrier.downcase]}" -# else -# raise SMSFuException.new("Specified carrier, #{carrier} is not supported.") -# end -# end -# -# class SMSFuException < StandardError; end -# end -# + if carriers.has_key?(carrier) + "#{phone_number}#{carriers[carrier]}" + else + raise CarrierException.new("Specified carrier, #{carrier} is not supported.") + end + end + end +end \ No newline at end of file lib/activesms/email.rb @@ -22,6 +22,10 @@ module ActiveSms #:nodoc: # Problems with email carriers class CarrierException < ActiveSmsError + end + + # Blank message + class SmsException < ActiveSmsError end end lib/activesms/exceptions.rb @@ -25,32 +25,4 @@ module ActiveSms end end -end - - -# require 'yaml' - -# -# class SmsNotifier < ActionMailer::Base -# @config = YAML::load(File.open("#{RAILS_ROOT}/config/sms_fu.yml")) -# @@from_address = @config['config']['from_address'] -# cattr_accessor :from_address -# -# def sms_message(recipient, message) -# content_type "text/plain" -# recipients recipient -# from from_address -# -# body['message'] = message -# end -# -# view_path = File.join(File.dirname(__FILE__), '..', 'views') -# if public_methods.include?('append_view_path') -# self.append_view_path view_path -# elsif public_methods.include?("view_paths") -# self.view_paths << view_path -# else -# self.template_root = view_path -# end -# -# end \ No newline at end of file +end \ No newline at end of file lib/activesms/sms2email.rb @@ -2,7 +2,7 @@ module ActiveSms #:nodoc: module VERSION #:nodoc: MAJOR = 0 MINOR = 8 - TINY = 6 + TINY = 7 STRING = [MAJOR, MINOR, TINY].join('.') end lib/activesms/version.rb @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = %q{activesms} - s.version = "0.8.6" + s.version = "0.8.7" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Robert Cottrell", "Ben Curren", "Dean Mao"] @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.description = %q{Active SMS is a framework for sending and receiving SMS messages} s.email = ["rgcottrell@rubyforge.org", "ben@esomnie.com", "dean@esomnie.com"] s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "website/index.txt"] - s.files = ["CHANGELOG", "History.txt", "License.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "config/hoe.rb", "config/requirements.rb", "generators/sms/USAGE", "generators/sms/sms_generator.rb", "generators/sms/templates/fixture.rhtml", "generators/sms/templates/model.rb", "generators/sms/templates/smsconfig.yml", "generators/sms/templates/unit_test.rb", "init.rb", "lib/activesms.rb", "lib/activesms/adv_attr_accessor.rb", "lib/activesms/base.rb", "lib/activesms/config.rb", "lib/activesms/connection_adapters/abstract_adapter.rb", "lib/activesms/connection_adapters/bulk_sms_adapter.rb", "lib/activesms/connection_adapters/clickatell_adapter.rb", "lib/activesms/connection_adapters/human_adapter.rb", "lib/activesms/connection_adapters/simplewire_adapter.rb", "lib/activesms/connections.rb", "lib/activesms/email.rb", "lib/activesms/exceptions.rb", "lib/activesms/sms.rb", "lib/activesms/sms2email.rb", "lib/activesms/validations.rb", "lib/activesms/version.rb", "scripts/console", "scripts/destroy", "scripts/generate", "scripts/txt2html", "setup.rb", "sms_brasil.gemspec", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "test/connection_adapters/test_simplewire_adapter.rb", "test/test_activesms.rb", "test/test_helper.rb", "views/active_sms/base/sms2_email/sms_message.html.erb", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.html.erb", "website/template.rhtml"] + s.files = ["CHANGELOG", "History.txt", "License.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "config/hoe.rb", "config/requirements.rb", "generators/sms/USAGE", "generators/sms/sms_generator.rb", "generators/sms/templates/fixture.rhtml", "generators/sms/templates/model.rb", "generators/sms/templates/sms.yml", "generators/sms/templates/unit_test.rb", "init.rb", "lib/activesms.rb", "lib/activesms/adv_attr_accessor.rb", "lib/activesms/base.rb", "lib/activesms/config.rb", "lib/activesms/connection_adapters/abstract_adapter.rb", "lib/activesms/connection_adapters/bulk_sms_adapter.rb", "lib/activesms/connection_adapters/clickatell_adapter.rb", "lib/activesms/connection_adapters/human_adapter.rb", "lib/activesms/connection_adapters/simplewire_adapter.rb", "lib/activesms/connections.rb", "lib/activesms/email.rb", "lib/activesms/exceptions.rb", "lib/activesms/sms.rb", "lib/activesms/sms2email.rb", "lib/activesms/validations.rb", "lib/activesms/version.rb", "scripts/console", "scripts/destroy", "scripts/generate", "scripts/txt2html", "setup.rb", "sms_brasil.gemspec", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "test/connection_adapters/test_simplewire_adapter.rb", "test/test_activesms.rb", "test/test_helper.rb", "views/active_sms/base/sms2_email/sms_message.html.erb", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.html.erb", "website/template.rhtml"] s.has_rdoc = true s.homepage = %q{http://activesms.rubyforge.org} s.post_install_message = %q{} sms_brasil.gemspec generators/sms/templates/smsconfig.yml 605a654bd9c9dea100f16ec2796472355f113303 Marcos Augusto x@nofxx.com http://github.com/nofxx/activesms/commit/f4fcaa1b6784d3d7f91b187c0748a28b2834d70f f4fcaa1b6784d3d7f91b187c0748a28b2834d70f 2008-07-23T12:27:29-07:00 2008-07-23T12:27:29-07:00 Last fixes and refactoring e930a3545eb31f5cdd8b84472f0cb2f544d0cdac Marcos Augusto x@nofxx.com