cachai 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12ab8f63663887eb16edbe178e1289d8c92d8e79
-  data.tar.gz: 8840bce666685bf34f3eaf4388d81f1a2c97f93c
+  metadata.gz: d538da3df5551924790c3a94e17161d09dc20dd4
+  data.tar.gz: a9ee1fe10e59f1a52a17d7c63bfb77f6a7d59d99
 SHA512:
-  metadata.gz: e0097506b4e9d93e7e12e2733b588b2562ba6f1caf809bbd7e72b7c28ba6566dcb0ecfbb18f93da0cc6a9858a9988c6c7af78ff3d1a182cb8391ce4b97b597da
-  data.tar.gz: 4f4f39f81b688598f50452d9da0315f395189eb40205144e94f6f44a3792c5efa37f8525566ad1938f109b6c2d69ad8d4630bf904f79ca22a801af01390c88a7
+  metadata.gz: 199c5691844b8dc21449da8315c9a2a76911394aaa05462dde71e94572b22f9f7dc6cb771f18ffa2871dab2713ea5925f8081d853b65b8a08d9136201b2c5de2
+  data.tar.gz: 79d440f2f003ddb363dd7ffb8816e8e3f8c73292caf755677c0ff82f23bda7922dbc97b46c19610e3499681ebba8a126962fbc5d490e4d2fc7d1e3cbc7a9a870

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.2.7'
+  spec.version       = '0.2.8'
   spec.authors       = ["Tomás Pollak"]
   spec.email         = ["tomas@forkhq.com"]
   spec.description   = %q{Middleware for embedabble comments.}

data/lib/cachai.rb

@@ -106,9 +106,12 @@ module Cachai
         }
 
         response = Response.create!(attrs.merge(:post_id => post.id))
-
         Cachai.clear_cache(data['path'])
-        notify_new_response(response, data['path']) if @recipient
+
+        if response.approved?
+          notify_new_response_to_admin(response, data['path']) if @recipient
+          # notify_new_response_to_parent(response, data['path']) if response.parent
+        end
 
         headers['Access-Control-Allow-Origin'] = data['protocol'] + '//' + data['domain']
         json({ :status => 'ok', :comment => response })
@@ -181,15 +184,25 @@ module Cachai
       false
     end
 
-    def notify_new_response(response, path)
+    def notify_new_response_to_admin(response, path)
+      subject = "Nuevo comentario de #{response.author_name} at #{path}"
+      send_email(content: response.content, to: @recipient, path: path, subject: subject)
+    end
+
+    def notify_new_response_to_parent(response, path)
+      subject = "Respuesta de #{response.author_name} a tu comentario en #{path}"
+      send_email(content: response.content, to: response.parent.author_email, path: path, subject: subject)
+    end
+
+    def send_email(data)
       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}"
+        :from    => data[:from] || 'comments@' + Cachai.domain,
+        :to      => data[:to],
+        :subject => data[:subject],
+        :text    => "#{data[:content]}\n\n--\nhttp://#{Cachai.domain}#{data[:path]}"
+    # rescue => e
+    #  puts "MAIL ERROR: #{e.message}"
     end
 
   end

data/lib/models.rb

@@ -133,6 +133,10 @@ module Cachai
     scope :top_level, lambda { where(:parent_id => 0) }
     scope :nested, lambda { where("parent_id != 0") }
 
+    def parent
+      @parent ||= Response.find(parent_id) rescue nil
+    end
+
     def as_json(options = {})
       {
         :id           => id,

data/spec/post_comments_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'rest-client'
 
 describe 'post comment' do
   include Rack::Test::Methods
@@ -90,6 +91,10 @@ describe 'post comment' do
 
       describe 'valid data' do
 
+        before do
+          allow(RestClient).to receive(:post).and_return(true)
+        end
+
         describe 'unexisting post' do
 
           before do
@@ -120,6 +125,16 @@ describe 'post comment' do
               expect(Cachai::Response.last.approved).to eql(1)
             end
 
+            it 'sends emails' do
+              expect(RestClient).to receive(:post).with("https://api:key-aoidjoaijdoaijdoaijsd@api.mailgun.net/v3/foobartest1234.mailgun.org/messages", {
+                :from    =>"comments@domain.com",
+                :to      =>"test@example.com",
+                :subject =>"Nuevo comentario de Some author at /another/blog/post.html",
+                :text    =>"New comment\n\n--\nhttp://domain.com/another/blog/post.html"
+              }).and_return(true)
+              post_comment
+            end
+
           end
 
           describe 'if blocked' do
@@ -135,6 +150,11 @@ describe 'post comment' do
               expect(Cachai::Response.last.approved).to eql(0)
             end
 
+            it 'does not send emails' do
+              expect(RestClient).not_to receive(:post)
+              post_comment({}, {'REMOTE_ADDR' => '12.12.12.12'})
+            end
+
           end
 
         end
@@ -166,6 +186,50 @@ describe 'post comment' do
                 expect(Cachai::Response.last.approved).to eql(1)
               end
 
+              it 'sends admin emails' do
+                expect(RestClient).to receive(:post).with("https://api:key-aoidjoaijdoaijdoaijsd@api.mailgun.net/v3/foobartest1234.mailgun.org/messages", {
+                  :from    =>"comments@domain.com",
+                  :to      =>"test@example.com",
+                  :subject =>"Nuevo comentario de Some author at /another/blog/post.html",
+                  :text    =>"New comment\n\n--\nhttp://domain.com/another/blog/post.html"
+                }).and_return(true)
+
+                post_comment
+              end
+
+              describe 'if comment is response to parent' do
+
+                before do
+                  post =  Cachai::Post.find_by_path('/another/blog/post.html')
+                  @parent = post.responses.create!({
+                    :content      => 'Content',
+                    :author_name  => 'Some guy',
+                    :author_email => 'some@email.com',
+                    :author_ip    => '22.33.44.55'
+                  })
+                end
+
+                it 'sends email both to admin and to parent comment guy' do
+
+                  expect(RestClient).to receive(:post).with("https://api:key-aoidjoaijdoaijdoaijsd@api.mailgun.net/v3/foobartest1234.mailgun.org/messages", {
+                    :from    => "comments@domain.com",
+                    :to      => "test@example.com",
+                    :subject => "Nuevo comentario de Some author at /another/blog/post.html",
+                    :text    => "New comment\n\n--\nhttp://domain.com/another/blog/post.html"
+                  }).and_return(true)
+
+                  expect(RestClient).to receive(:post).with("https://api:key-aoidjoaijdoaijdoaijsd@api.mailgun.net/v3/foobartest1234.mailgun.org/messages", {
+                    :from    => "comments@domain.com",
+                    :to      => "some@email.com",
+                    :subject => "Respuesta de Some author a tu comentario en /another/blog/post.html",
+                    :text    => "New comment\n\n--\nhttp://domain.com/another/blog/post.html"
+                  }).and_return(true)
+
+                  post_comment(parent_id: @parent.id)
+                end
+
+              end
+
             end
 
             describe 'if blocked' do
@@ -181,6 +245,11 @@ describe 'post comment' do
                 expect(Cachai::Response.last.approved).to eql(0)
               end
 
+              it 'does not send emails' do
+                expect(RestClient).not_to receive(:post)
+                post_comment({}, {'REMOTE_ADDR' => '12.12.12.12'})
+              end
+
             end
 
           end

data/spec/spec_helper.rb

@@ -20,9 +20,9 @@ class TestApp < Sinatra::Base
     :domain    => 'domain.com',
     :recipient => 'test@example.com',
     :duration  => 30,
-    :sendgrid  => {
-      :api_key  => 'test',
-      :api_user => 'test'
+    :mailgun   => {
+      domain: 'foobartest1234.mailgun.org',
+      api_key: 'key-aoidjoaijdoaijdoaijsd'
     },
     :blocked_ips => [ "12.12.12.12" ]
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cachai
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Tomás Pollak
@@ -198,4 +198,3 @@ test_files:
 - spec/post_comments_spec.rb
 - spec/spec_helper.rb
 - test/app_test.rb
-has_rdoc: