moonshado-sms 0.3.1 → 0.4.0

data/Rakefile

@@ -9,10 +9,10 @@ begin
     gem.email = "tech@moonshado.com"
     gem.homepage = "http://github.com/moonshado/moonshado-sms"
     gem.authors = ["Kevin Patel"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_runtime_dependency "rest-client", '1.4.2'
-    gem.add_runtime_dependency "json", '1.2.0'
-    gem.add_runtime_dependency "activesupport", "2.3.5"
+    gem.add_development_dependency "shoulda", ">= 0"
+    gem.add_development_dependency "webmock", ">= 0"
+    gem.add_runtime_dependency "rest-client", '1.5.1'
+    gem.add_runtime_dependency "yajl-ruby", '0.7.6'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -23,7 +23,7 @@ end
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
@@ -31,7 +31,7 @@ begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
     test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
+    test.pattern = 'test/**/*_test.rb'
     test.verbose = true
   end
 rescue LoadError

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 3
+:patch: 0
 :build: 
-:patch: 1
 :major: 0
+:minor: 4

data/lib/moonshado-sms.rb

@@ -1,8 +1,11 @@
-gem 'rest-client', '1.4.2'
+require 'rubygems'
+require 'restclient'
+require 'yajl'
+require 'moonshado/configuration'
+require 'moonshado/sms'
+require 'moonshado/keywords'
+require 'moonshado/sender'
 
-module Moonshado end
-
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/moonshado')
-
-require 'sms'
-require 'keywords'
+module Moonshado
+  
+end

data/lib/moonshado/configuration.rb

@@ -0,0 +1,82 @@
+module Moonshado
+  class Configuration
+
+    OPTIONS = [:api_key, :development_environments, :keywords,
+               :sms_uri, :keyword_uri, :auto_register_keyword,
+               :environment_name, :host, :http_open_timeout,
+               :http_read_timeout, :port, :protocol, :secure].freeze
+
+    attr_accessor :api_key
+    attr_accessor :keywords
+    attr_accessor :sms_uri
+    attr_accessor :keywords_uri
+    attr_accessor :secure
+    attr_accessor :http_open_timeout
+    attr_accessor :http_read_timeout
+    attr_accessor :host
+    attr_accessor :auto_register_keywords
+    attr_accessor :production_environment
+
+    alias_method :secure?, :secure
+
+    def initialize
+      @secure                   = false
+      @host                     = 'heroku.moonshado.com'
+      @http_open_timeout        = 2
+      @http_read_timeout        = 5
+      @production_environment   = true
+      @sms_uri                  = '/sms'
+      @keywords_uri             = '/keywords'
+      @auto_register_keywords    = false
+    end
+
+    def api_key
+      formatted_api_key if @production_environment
+    end
+
+    def formatted_api_key
+      url_obj = URI.parse(@api_key)
+
+      if (url_obj.class == URI::Generic)
+        @api_key
+      else
+        url_obj.user
+      end
+    end
+
+    def [](option)
+      send(option)
+    end
+
+    def to_hash
+      OPTIONS.inject({}) do |hash, option|
+        hash.merge(option.to_sym => send(option))
+      end
+    end
+
+    def merge(hash)
+      to_hash.merge(hash)
+    end
+
+    def port
+      @port || default_port
+    end
+
+    def protocol
+      if secure?
+        'https'
+      else
+        'http'
+      end
+    end
+
+    private
+      def default_port
+        if secure?
+          443
+        else
+          80
+        end
+      end
+  end
+end

data/lib/moonshado/keywords.rb

@@ -1,39 +1,48 @@
-require 'active_support'
-require 'rest_client'
-require 'json'
-
 module Moonshado
-  class Keywords
-    def self.config
-      Moonshado::Sms.config
-    end
+  class Sms
+    class Keywords
+      class << self
+        def list
+          response = sender.get(configuration.keywords_uri)
 
-    def self.url
-      @url ||= URI.parse(Moonshado::Sms.config[:sms_api_url])
-      "#{@url.scheme}://#{@url.user}:#{@url.password}@#{@url.host}:#{@url.port}/keywords"
-    end
+          parse(response.body)
+        end
 
-    def self.list
-      response = RestClient.get(url)
+        def register_keywords
+          raise MoonshadoSMSException.new("no keywords specified") unless valid_keywords?
+          response = sender.send_to_moonshado({:keywords => configuration.keywords}, configuration.keywords_uri)
 
-      JSON.parse(response.body)
-    end
+          parse(response.body)
+        end
 
-    def self.register_keywords
-      begin
-        unless Moonshado::Sms.config[:keywords].nil?
-          response = RestClient.post(url, {:keywords => Moonshado::Sms.config[:keywords]})
-          JSON.parse(response.body)
+        # def self.destory(keyword)
+        #   response = RestClient.delete("#{url}/#{keyword}")
+        #   parse(response.body)
+        # end
+
+        def valid_keywords?
+          configuration.keywords.is_a?(Hash) && (!configuration.keywords.empty?)
         end
-      rescue Exception => e
-        puts "** Moonshado-Sms: error registering keywords"
-      end
-    end
 
-    def self.destory(keyword)
-      response = RestClient.delete("#{url}/#{keyword}")
-      JSON.parse(response.body)
-    end
+        class MoonshadoSMSException < StandardError; end
+
+        private
+          def sender
+            Moonshado::Sms.sender
+          end
+
+          def configuration
+            Moonshado::Sms.configuration
+          end
 
+          def production_environment?
+            configuration.production_environment
+          end
+
+          def parse(json)
+            parser = Yajl::Parser.new.parse(json)
+          end
+      end
+    end
   end
-end
+end

data/lib/moonshado/sender.rb

@@ -0,0 +1,46 @@
+module Moonshado
+  class Sender
+    attr_reader :host, :port, :secure, :http_open_timeout, :http_read_timeout, :protocol, :api_key
+
+    def initialize(options = {})
+      [:protocol, :host, :port, :secure, :http_open_timeout, :http_read_timeout, :api_key].each do |option|
+        instance_variable_set("@#{option}", options[option])
+      end
+    end
+
+    def send_to_moonshado(data, uri)
+      http  = RestClient::Resource.new(
+                url(uri),
+                :user => api_key,
+                :timeout => http_read_timeout,
+                :open_timeout => http_open_timeout
+              )
+
+      response = http.post(data)
+    end
+
+    def get(uri)
+      http  = RestClient::Resource.new(
+                url(uri),
+                :user => api_key,
+                :timeout => http_read_timeout,
+                :open_timeout => http_open_timeout
+              )
+
+      response = http.get
+    end
+
+    private
+      def url(uri = "")
+        URI.parse("#{protocol}://#{host}:#{port}").merge(uri).to_s
+      end
+
+      def configuration
+        Moonshado::Sms.configuration
+      end
+
+      def production_environment?
+        configuration.production_environment
+      end
+  end
+end

data/lib/moonshado/sms.rb

@@ -1,23 +1,18 @@
-require 'active_support'
-require 'rest_client'
-require 'json'
-
 module Moonshado
   class Sms
-    cattr_accessor :config
     attr_accessor :number, :message
 
-    def self.url
-      @url ||= URI.parse(config[:sms_api_url])
-      "#{@url.scheme}://#{@url.user}:#{@url.password}@#{@url.host}:#{@url.port}/sms"
-    end
+    class << self
+      attr_accessor :configuration
+      attr_accessor :sender
 
-    def self.find(id)
-      if config[:test_env] == true
-        {:sms => {:id => id, :reports => '[{"update_date":"2010-01-03T22:56:45-08:00","status_info":"test"}]'}, :stat => "ok"}
-      else
-        response = RestClient.get("#{url}/#{id}")
-        JSON.parse(response.body)
+      def configure
+        self.configuration ||= Configuration.new
+        yield(configuration)
+        self.sender = Sender.new(configuration)
+        if configuration.auto_register_keywords
+          Moonshado::Sms::Keywords.register_keywords
+        end
       end
     end
 
@@ -26,25 +21,33 @@ module Moonshado
       @message = message
     end
 
+    # def self.find(id)
+    #   if config[:test_env] == true
+    #     {:sms => {:id => id, :reports => '[{"update_date":"2010-01-03T22:56:45-08:00","status_info":"test"}]'}, :stat => "ok"}
+    #   else
+    #     response = RestClient.get("#{url}/#{id}")
+    #     JSON.parse(response.body)
+    #   end
+    # end
+
     def deliver_sms
       raise MoonshadoSMSException.new("Invalid message") unless is_message_valid?(@message)
 
-      if config[:test_env] == true
-        {:stat => 'ok', :id => Digest::SHA1.hexdigest(Time.now.to_s + rand(12341234).to_s)[1..16]}
-      else
-        response = RestClient.post(
-          Moonshado::Sms.url,
-          {:sms => {:device_address => format_number(@number), :message => @message}}
-        )
+      data = {:sms => {:device_address => format_number(@number), :message => @message}}
 
-        JSON.parse(response.body)
+      if production_environment?
+        response = sender.send_to_moonshado(data, configuration.sms_uri)
+      else
+        response = RestClient::Response.create('{"stat":"ok","id":"sms_id_mock"}', "", {})
       end
+
+      parse(response.to_s)
     rescue MoonshadoSMSException => exception
       raise exception
     end
 
     def format_number(number)
-      formatted = number.gsub("-","").strip
+      formatted = number.scan(/\d+/i).join
       return is_number_valid?(formatted) ? formatted : (raise MoonshadoSMSException.new("Phone number (#{number}) is not formatted correctly"))
     end
 
@@ -57,5 +60,22 @@ module Moonshado
     end
 
     class MoonshadoSMSException < StandardError; end
+
+    private
+      def sender
+        Moonshado::Sms.sender
+      end
+
+      def configuration
+        Moonshado::Sms.configuration
+      end
+
+      def production_environment?
+        configuration.production_environment
+      end
+
+      def parse(json)
+        parser = Yajl::Parser.new.parse(json)
+      end
   end
 end

data/moonshado-sms.gemspec

@@ -0,0 +1,68 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{moonshado-sms}
+  s.version = "0.4.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Kevin Patel"]
+  s.date = %q{2010-06-10}
+  s.email = %q{tech@moonshado.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "gems/moonshado-sms-0.0.1/.gitignore",
+     "lib/moonshado-sms.rb",
+     "lib/moonshado/configuration.rb",
+     "lib/moonshado/keywords.rb",
+     "lib/moonshado/sender.rb",
+     "lib/moonshado/sms.rb",
+     "moonshado-sms.gemspec",
+     "test/helper.rb"
+  ]
+  s.homepage = %q{http://github.com/moonshado/moonshado-sms}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Moonshado SMS gem}
+  s.test_files = [
+    "test/configuration_test.rb",
+     "test/helper.rb",
+     "test/keywords_test.rb",
+     "test/sms_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, ["= 1.5.1"])
+      s.add_runtime_dependency(%q<yajl-ruby>, ["= 0.7.6"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 0"])
+      s.add_dependency(%q<rest-client>, ["= 1.5.1"])
+      s.add_dependency(%q<yajl-ruby>, ["= 0.7.6"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 0"])
+    s.add_dependency(%q<rest-client>, ["= 1.5.1"])
+    s.add_dependency(%q<yajl-ruby>, ["= 0.7.6"])
+  end
+end
+

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: moonshado-sms
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Kevin Patel
@@ -14,61 +15,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 -04:00
+date: 2010-06-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: webmock
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 1
-        - 4
-        - 2
-        version: 1.4.2
-  type: :runtime
+        - 0
+        version: "0"
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rest-client
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
-        - 2
-        - 0
-        version: 1.2.0
+        - 5
+        - 1
+        version: 1.5.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: yajl-ruby
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
+        - 0
+        - 7
+        - 6
+        version: 0.7.6
   type: :runtime
   version_requirements: *id004
 description: 
@@ -89,9 +96,15 @@ files:
 - VERSION.yml
 - gems/moonshado-sms-0.0.1/.gitignore
 - lib/moonshado-sms.rb
+- lib/moonshado/configuration.rb
 - lib/moonshado/keywords.rb
+- lib/moonshado/sender.rb
 - lib/moonshado/sms.rb
+- moonshado-sms.gemspec
 - test/helper.rb
+- test/configuration_test.rb
+- test/keywords_test.rb
+- test/sms_test.rb
 has_rdoc: true
 homepage: http://github.com/moonshado/moonshado-sms
 licenses: []
@@ -102,27 +115,32 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Moonshado SMS gem
 test_files: 
+- test/configuration_test.rb
 - test/helper.rb
-- test/moonshado/sms.rb
-- test/test_moonshado.rb
+- test/keywords_test.rb
+- test/sms_test.rb