cachai 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50e4a0cf28a5023457d6ef13943c0e414fa0b260
-  data.tar.gz: 28f0b3c3a87ef6a572d25ad106035c9bb8410972
+  metadata.gz: 778a415e54b0b9ed2f7d2ceec0c29eb5470b41d4
+  data.tar.gz: 8dadf9f3784b8b1160e3ff2b0f3095b6f21e8de1
 SHA512:
-  metadata.gz: c58272c69f77b00efe29462e5cee098039df79aa38b3f1ec4faad4ff0898dd2f2d87690dea5da78bbfa4383bc54520d9c4294666f2d2174072e3d4836c1f14ef
-  data.tar.gz: 4b4540d5f5c198404f5de336cf1ba94ead68e614853514370c6bacdcaf61115ccd2489b8e450e458c0e64fe74082379a9efe417578647f29e3d663220002c53a
+  metadata.gz: 1ea53e02c97f929b3c3f7cbc806d0ef5380b86715e0ef072542c5648ccc18c0159710f2c5528c85f3957e167db9c0063214e2b9e3861d29360bb9a6da1f2033d
+  data.tar.gz: 22efbdfaf5ee0c488cf80455ca3297b5907040e159d7fa054af41e5508f55acca5fcb84cd33a8e15fab20ae0909de9db0022d21ac4437e6ed85196c72feddf7b

data/cachai.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "cachai"
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = ["Tomás Pollak"]
   spec.email         = ["tomas@forkhq.com"]
   spec.description   = %q{Middleware for embedabble comments.}
@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra-activerecord"
   spec.add_dependency "sqlite3"
   spec.add_dependency "rake"
-  spec.add_dependency "sendgrid-ruby"
+  spec.add_dependency "rest-client"
 end

data/lib/cachai.rb

@@ -34,9 +34,10 @@ module Cachai
         puts "No Akismet key found! Will not check comments for spam."
       end
 
-      if sendgrid_opts = opts.delete(:sendgrid)
-        require 'sendgrid-ruby'
-        @sendgrid  = SendGrid::Client.new(sendgrid_opts)
+      if mailgun_opts = opts.delete(:mailgun)
+        require 'rest-client'
+        @mailgun_domain  = mailgun_opts[:domain]
+        @mailgun_api_key = mailgun_opts[:api_key]
         @recipient = opts.delete(:recipient) or raise "No recipient set!"
       end
 
@@ -88,7 +89,7 @@ module Cachai
         post = Post.find_or_create_by_path(data['path'])
         response = Response.create!(attrs.merge(:post_id => post.id))
         Cachai.clear_cache(data['path'])
-        notify_new_response(response, data['path']) if @sendgrid
+        notify_new_response(response, data['path']) if @recipient
 
         json({ :status => 'ok', :comment => response })
 
@@ -192,17 +193,14 @@ module Cachai
     end
 
     def notify_new_response(response, path)
-      mail = SendGrid::Mail.new do |m|
-        m.to       = @recipient
-        m.from     = 'comments@' + Cachai.domain
-        m.reply_to = response.author_email
-        m.subject  = "New comment from #{response.author_name} at #{path}"
-        m.text     = "#{response.content}\n\n--\nhttp://#{Cachai.domain}/#{path}"
-      end
-
-      puts @sendgrid.send(mail)
-    rescue SendGrid::Exception => e
-      puts e.inspect
+      RestClient.post "https://api:#{@mailgun_api_key}"\
+        "@api.mailgun.net/v3/#{@mailgun_domain}/messages",
+        :from    => 'comments@' + Cachai.domain
+        :to      => @recipient,
+        :subject => "New comment from #{response.author_name} at #{path}",
+        :text    => "#{response.content}\n\n--\nhttp://#{Cachai.domain}/#{path}"
+    rescue => e
+      puts "MAIL ERROR: #{e.message}"
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cachai
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tomás Pollak
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sendgrid-ruby
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="