spec/activesms/connection_adapters/abstract_adapter_spec.rb @@ -39,6 +39,7 @@ script/txt2html setup.rb sms_brasil.gemspec spec/activesms/base_spec.rb +spec/activesms/connection_adapters/abstract_adapter_spec.rb spec/activesms/connection_adapters/human_adapter_spec.rb spec/activesms/email_spec.rb spec/activesms/sms2email_spec.rb Manifest.txt @@ -9,15 +9,12 @@ module ActiveSms #:nodoc# conf_yml ||= YAML::load(File.open("#{RAILS_CONFIG_ROOT}/sms.yml")) # # - # Get general parameters + # # Get general parameters CONFIG = conf_yml['config'] # # # Get the configured gateway GATEWAY = conf_yml['gateway'] - - # # - # Get all carriers - CARRIERS = conf_yml['carriers'] + end lib/activesms/config.rb @@ -74,10 +74,7 @@ module ActiveSms } # Human supports scheduling # if we got some date, share with em! - if sms.schedule - human_schedule = date_format_human(sms.schedule) - params[:schedule] = human_schedule - end + params[:schedule] = date_format_human(sms.schedule) if sms.schedule # Send it! send_http_request(@service_url, params) end lib/activesms/connection_adapters/human_adapter.rb @@ -40,7 +40,6 @@ module ActiveSms #:nodoc# # The exceptions AdapterNotSpecified, AdapterNotFound, and ArgumentError # may be returned. def establish_connection(config) - # config ||= GATEWAY config = config.symbolize_keys unless config.key?(:adapter) raise AdapterNotSpecified, "#{config} adapter is not configured" lib/activesms/connections.rb @@ -1,8 +1,13 @@ +require 'yaml' +#require 'activesms/config' + module ActiveSms #:nodoc# module Email - # @config ||= CONFIG - @@carriers ||= CARRIERS - @@from_address ||= CONFIG['from_address'] + 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}/sms.yml")) + @@carriers ||= conf_yml['carriers'] + @@from_address ||= conf_yml['config']['from_address'] def carriers @@carriers.dup @@ -14,7 +19,7 @@ module ActiveSms #:nodoc# carrier = sms.carrier # number = format_number(number) - #options[:limit] ||= message.length + #options[:limit] ||= message.length #options[:from] ||= @@from_address #message = message[0..options[:limit]-1] sms_email = determine_sms_email(number, carrier)#format_number(number),carrier) lib/activesms/email.rb @@ -22,38 +22,49 @@ describe Email do Noter.deliver(sms) end - describe "Instantiated" do - before(:each) do - @email = Class.new { include ActiveSms::Email }.new - # @email = Aa.new - end + describe "Include Module" do + include Email - it "should be valid" do - violated unless @email + it "should format number" do + stub!(:valid?).and_return(false) + format_number('555444').should eql('555555555') end it "should determine a correct email address" do - @email.get_sms_address('5543214321', 'tim').should eql('5543214321@tim.com.br') - @email.get_sms_address('5543214321', 'oi').should eql('5543214321@sms.oi.com.br') + get_sms_address('5543214321', 'tim').should eql('5543214321@tim.com.br') + get_sms_address('5543214321', 'oi').should eql('5543214321@sms.oi.com.br') + end + + it "should be valid with more than 10 digits" do + is_valid?('1234567890').should be_true + end + + it "should be invalid with lesse than 10 digits" do + is_valid?('123456789').should_not be_true end - it "should clean the number" do - @email.get_sms_address('5-543-2=14321', 'tim').should eql('5543214321@tim.com.br') - @email.get_sms_address('55g432g14fd321', 'oi').should eql('5543214321@sms.oi.com.br') + it "should be invalid if it has something that is not a number.. NaN hehe" do + is_valid?('123456789a').should_not be_true + end + + it "should clean the number from evil chars" do + get_sms_address('5-54g3-2=143h21', 'tim').should eql('5543214321@tim.com.br') end it "should throw an error if the carrier is not known" do - lambda {@email.get_sms_address('5543214321', 'nofxx-telecom')}.should raise_error(ActiveSms::CarrierException) + lambda {get_sms_address('5543214321', 'nofxx-telecom')}.should raise_error(ActiveSms::CarrierException) end it "should throw an error if the carrier is blank" do - lambda {@email.get_sms_address('5543214321', '')}.should raise_error(ActiveSms::CarrierException) - end + lambda {get_sms_address('5543214321', '')}.should raise_error(ActiveSms::CarrierException) + end + + describe "Email2Sms" do it "should throw an error if the carrier is blank" do @sms = ActiveSms::Sms.new - lambda {@email.email_deliver(@sms)}.should raise_error(ActiveSms::CarrierException) + lambda {email_deliver(@sms)}.should raise_error(ActiveSms::CarrierException) end end end spec/activesms/email_spec.rb @@ -7,12 +7,10 @@ rescue LoadError end $:.unshift(File.dirname(__FILE__) + '/../lib') -$:.unshift(File.dirname(__FILE__) + '/../lib/activesms') -$:.unshift(File.dirname(__FILE__) + '/../lib/activesms/connection_adapters') -require 'activesms/sms' +#$:.unshift(File.dirname(__FILE__) + '/../lib/activesms') +#$:.unshift(File.dirname(__FILE__) + '/../lib/activesms/connection_adapters') require 'activesms' -# -# require 'activesms/connection_adapters/abstract_adapter' + include ActiveSms # # spec/spec_helper.rb c87d22b2a55ea93381c3dc39adfc13fa33e0d6db Marcos Augusto x@nofxx.com http://github.com/nofxx/activesms/commit/53e4589b6def10ee77fddb15b9ad619f43eafbdc 53e4589b6def10ee77fddb15b9ad619f43eafbdc 2008-08-17T17:13:19-07:00 2008-08-17T17:13:19-07:00 better..more tests... 7501f3f4fb67fa9d2eb7e6a687be02302ced2930 Marcos Augusto x@nofxx.com