messenger 0.5.0 → 0.6.0

data/Rakefile

@@ -10,7 +10,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/bin/messenger

@@ -60,12 +60,6 @@ EOS
   opt :jabber_id, "The jabber ID to connect as (user@example.com)", :type => String
   opt :jabber_password, "The password for your jabber id", :type => String
 
-  # Notifo options
-  opt :notifo_api_username, "The service's API username", :type => String
-  opt :notifo_api_secret, "The service's API secret", :type => String
-  opt :notifo_title, "The notificaiton title", :type => String
-  opt :notifo_url, "Open this URL", :type => String
-
   # CLI options
   # opt :silent, "Don't print anything to stdout", :default => false
   # opt :verbose, "Print verbose output on success", :default => false

data/lib/messenger.rb

@@ -5,5 +5,4 @@ require 'messenger/email'
 require 'messenger/web'
 require 'messenger/campfire'
 require 'messenger/jabber'
-require 'messenger/notifo'
 require 'messenger/version'

data/lib/messenger/campfire.rb

@@ -34,7 +34,7 @@ class Messenger::Campfire
 private
 
   def self.matcher(url)
-    url.match(/^campfire(-ssl)?:\/\/([^:]+):([^@]+)@([^\.]+).campfirenow.com/)[1,4]
+    url.match(/\Acampfire(-ssl)?:\/\/([^:]+):([^@]+)@([^\.]+).campfirenow.com/)[1,4]
   end
 
   def self.success?(response)

data/lib/messenger/email.rb

@@ -3,7 +3,7 @@ require 'mail'
 class Messenger::Email
 
   def self.valid_url?(url)
-    !!url.match(/^(mailto:)?[^@]+@.*$/)
+    !!url.match(/\A(mailto:)?[^@]+@.*\Z/)
   end
 
   # URL format:
@@ -16,7 +16,7 @@ class Messenger::Email
     raise Messenger::URLError, "The URL provided is invalid" unless valid_url?(url)
     mail = Mail.new do
           from options[:email_from]
-            to url.sub(/mailto:/, '')
+            to url.sub(/\Amailto:/, '')
        subject options[:email_subject]
           body message
     end

data/lib/messenger/messenger.rb

@@ -34,11 +34,10 @@ module Messenger
     #   twitter://username
     #   aim://username
     case url
-    when /^http/ then      :http
-    when /^campfire/ then  :campfire
-    when /^jabber/ then    :jabber
-    when /^notifo/ then    :notifo
-    when /^mailto|@+/ then :email
+    when /\Ahttp/ then      :http
+    when /\Acampfire/ then  :campfire
+    when /\Ajabber/ then    :jabber
+    when /\Amailto|@+/ then :email
     end
   end
 
@@ -48,7 +47,6 @@ module Messenger
     when :http then     Messenger::Web
     when :campfire then Messenger::Campfire
     when :jabber then   Messenger::Jabber
-    when :notifo then   Messenger::Notifo
     else
       raise Messenger::ProtocolError, "Malformed service URL: #{url}. Either this syntax is wrong or this service type is not yet implemented."
     end

data/lib/messenger/version.rb

@@ -1,3 +1,3 @@
 module Messenger
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/lib/messenger/web.rb

@@ -1,11 +1,12 @@
+require 'addressable/uri'
 require 'httparty'
 require 'cgi'
 
 class Messenger::Web
 
   def self.valid_url?(url)
-    !!URI.parse(url)
-  rescue URI::InvalidURIError
+    !!Addressable::URI.parse(url)
+  rescue Addressable::URI::InvalidURIError
     false
   end
 
@@ -18,21 +19,20 @@ class Messenger::Web
     raise Messenger::URLError, "The URL provided is invalid" unless valid_url?(url)
     options      = options.dup
     method       = options.delete(:method) || :post
-    uri          = URI.parse(url)
+    uri          = Addressable::URI.parse(url)
     user         = CGI.unescape(uri.user) if uri.user
     password     = CGI.unescape(uri.password) if uri.password
     options      = options.merge(:basic_auth => {:username => user, :password => password}) if user || password
-    uri.user     = nil if user
-    uri.password = nil if password
+    uri.userinfo = nil if user || password
     response     = HTTParty.send(method, uri.to_s, options.merge(:body => body))
     Messenger::Result.new(success?(response), response)
   end
 
   def self.obfuscate(url)
     raise Messenger::URLError, "The URL provided is invalid" unless valid_url?(url)
-    path = URI.parse(url)
+    path = Addressable::URI.parse(url)
     if path.password
-      url.sub(/#{path.password}/, 'xxxx')
+      url.sub(/#{Regexp.escape(path.password)}/, 'xxxx')
     else
       url
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: messenger
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Brandon Arbini
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-17 00:00:00 Z
+date: 2013-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: scashin133-xmpp4r-simple
@@ -75,7 +75,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: addressable
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -86,10 +86,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: shoulda
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -103,7 +103,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: webmock
+  name: mocha
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -116,6 +116,48 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: "Messenger: easy message sending for various protocols."
 email: brandon@zencoder.com
 executables: 
@@ -131,7 +173,6 @@ files:
 - lib/messenger/errors.rb
 - lib/messenger/jabber.rb
 - lib/messenger/messenger.rb
-- lib/messenger/notifo.rb
 - lib/messenger/result.rb
 - lib/messenger/version.rb
 - lib/messenger/web.rb
@@ -169,9 +210,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: messenger
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: "Messenger: easy message sending"
 test_files: []
 
+has_rdoc: 

data/lib/messenger/notifo.rb

@@ -1,43 +0,0 @@
-require 'httparty'
-require 'json'
-
-class Messenger::Notifo
-
-  def self.valid_url?(url)
-    !!url.match(/^notifo:\/\/.+$/)
-  end
-
-  # URL format:
-  #     notifo://username
-  #
-  # Options:
-  #     :notifo_api_username => The service's API username
-  #     :notifo_api_secret => The service's API secret
-  #     :notifo_title => The notificaiton title
-  #     :notifo_url => Open this URL
-  def self.deliver(url, message, options={})
-    raise Messenger::URLError, "The URL provided is invalid" unless valid_url?(url)
-    username = matcher(url)
-    response = HTTParty.post("https://api.notifo.com/v1/send_notification",
-                                      :body => { :to => username, :msg => message, :title => options[:notifo_title], :uri => options[:notifo_url] },
-                                      :basic_auth => {:username => options[:notifo_api_username], :password => options[:notifo_api_secret]})
-    Messenger::Result.new(success?(response), response)
-  end
-
-  def self.obfuscate(url)
-    raise Messenger::URLError, "The URL provided is invalid" unless valid_url?(url)
-    url
-  end
-
-
-private
-
-  def self.matcher(url)
-    url.match(/^notifo:\/\/(.+)/)[1]
-  end
-
-  def self.success?(response)
-    response.code == 200
-  end
-
-end