sendhub 0.1.10 → 0.1.11

data/README.textile

@@ -28,31 +28,43 @@ h2. Rails 2.x Example
 
 config/enviroment.rb
 
-<pre><code>config.gem 'sendhub'
-require 'sendhub'
+<pre><code>Rails::Initializer.run do |config|
+  ...
+  config.gem 'sendhub'
+  require 'sendhub'
+  ...
+end
 </code></pre>
 
 config/enviroments/production.rb
 
-<pre><code>config.action_mailer.delivery_method = :sendhub
+<pre><code>...
+config.action_mailer.delivery_method = :sendhub
 config.action_mailer.sendhub_settings = {
   :api_key => "YOUR_API_KEY",
   :secret_key => "YOUR_SECRET_KEY"
 }
+...
 </code></pre>
 
 h2. Rails 3.x Example
 
-config/enviroment.rb
+Gemfile
 
-<pre><code>config.gem 'sendhub'
+<pre><code>...
+gem 'sendhub'
+...
 </code></pre>
 
 config/enviroments/production.rb
 
-<pre><code>config.action_mailer.delivery_method = :sendhub
-config.action_mailer.sendhub_settings = {
-  :api_key => "YOUR_API_KEY",
-  :secret_key => "YOUR_SECRET_KEY"
-}
+<pre><code>YOUR_APP::Application.configure do
+  ...
+  config.action_mailer.delivery_method = :sendhub
+  config.action_mailer.sendhub_settings = {
+    :api_key => "YOUR_API_KEY",
+    :secret_key => "YOUR_SECRET_KEY"
+  }
+  ...
+end
 </code></pre>

data/lib/sendhub/client.rb

@@ -1,11 +1,12 @@
 module Sendhub
   class Client
   
-    VERSION = '0.1.10'
+    VERSION = '0.1.11'
     
     def initialize(config=nil)
       config[:host] ||= 'api.sendhub.net'
-      @uri = URI.parse('http://'+config[:host]+'/')
+      config[:protocol] ||= 'https'
+      @uri = URI.parse(config[:protocol]+'://'+config[:host]+'/')
       
       @api_key = config[:api_key]
       @secret_key = config[:secret_key]
@@ -15,13 +16,12 @@ module Sendhub
     
     def send_email(options={})
       res = _post '/emails', nil, options
-      #res.merge!('redirect_url' => @uri.to_s+"merchants/#{@merchant_id}/transactions/#{res['id']}")
-      #res.merge!('secret_token' => securely_hash_data("#{res['id']}-#{res['amount']}"))
       Sendhub::Response.new(res)
     end
     
-    def get(options={})
-      res = _get('/email/' + options[:email_id])
+    def get_email(options={})
+      email_id = options.delete(:id)
+      res = _get('/emails/' + email_id, options)
       Sendhub::Response.new(res)
     end
       

data/lib/sendhub/http.rb

@@ -1,8 +1,8 @@
 module Sendhub
   class Client
     private
-      def _get(path)
-        http(Net::HTTP::Get, path)
+      def _get(path, options={})
+        http(Net::HTTP::Get, path, nil, options)
       end
 
       def _post(path, body = nil, options={})
@@ -20,19 +20,24 @@ module Sendhub
         options.merge!(:unique => Time.now.utc.to_i)
         options.merge!(:secret => securely_hash_data(options[:unique]))
         
-        #if ssl?
-          #connection.use_ssl = true
-          #connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        if @uri.scheme == 'https'
+          connection.use_ssl = true
+          connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
           #connection.ca_file = Configuration.ca_file
           #connection.verify_callback = proc { |preverify_ok, ssl_context| verify_ssl_certificate(preverify_ok, ssl_context) }
-        #end
+        end
         connection.start do |http|
-          request = http_method.new("/v1#{path}")
+          if http_method.inspect == 'Net::HTTP::Get' and !options.empty?
+            puts options.collect { |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.join("&")
+            request = http_method.new("/v1#{path}" + "?" + (options.collect { |k,v| "#{k}=#{CGI::escape(v.to_s)}" }).join("&"))
+          else
+            request = http_method.new("/v1#{path}")
+          end
           request["Accept"] = "application/xml"
           request["User-Agent"] = 'SendhubRubyClient/'+Sendhub::Client::VERSION
           request["Accept-Encoding"] = "gzip"
           request["X-ApiVersion"] = Sendhub::Client::VERSION
-          request.basic_auth @api_key, @secret_key
+          # request.basic_auth @api_key, @secret_key
           if body
             request["Content-Type"] = "application/xml"
             request.body = body
@@ -41,6 +46,7 @@ module Sendhub
             request.set_form_data(options)
           end
           response = http.request(request)
+          puts response.body
           return JSON.parse(response.body)
         end
         

data/lib/sendhub/plugins/rails3.rb

@@ -8,6 +8,7 @@ module Sendhub
     end
 
     def deliver!(message)
+      
       res = @client.send_email(
         :from => message.from,
         :to => message.to,
@@ -15,6 +16,8 @@ module Sendhub
         :body => message.body,
         :content_type => message.content_type
       )
+      
+      puts res.inspect
     end
   end
 end

data/lib/sendhub.rb

@@ -1,6 +1,8 @@
 require 'uri'
 require 'net/http'
+require 'net/https'
 require 'digest/sha1'
+require 'cgi'
 
 require 'rubygems'
 require 'json'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sendhub
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Richard Taylor
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +01:00
+date: 2010-11-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency