cachai 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2771f0f431dbdfe8167760a4181b00e233f454e
-  data.tar.gz: 0b9fd384140c9aa2f142947c6152820372d004fc
+  metadata.gz: 12ab8f63663887eb16edbe178e1289d8c92d8e79
+  data.tar.gz: 8840bce666685bf34f3eaf4388d81f1a2c97f93c
 SHA512:
-  metadata.gz: 9d7dd2ab773f193801139f79dc765113932f870a4c6fd41ed78eeabd6e21d40ab75daa465e511f745ade360f742a70a3ff51d810fb82bb17ccc7a2e1ca91c31f
-  data.tar.gz: 2d83937bac6ba16abd4a3fd936a97074161216c5c3decaf6ad3eed589d4c1a775819099487188bcbff5a224f01e8db19c73aac6e47e888bce6c26efd6f857905
+  metadata.gz: e0097506b4e9d93e7e12e2733b588b2562ba6f1caf809bbd7e72b7c28ba6566dcb0ecfbb18f93da0cc6a9858a9988c6c7af78ff3d1a182cb8391ce4b97b597da
+  data.tar.gz: 4f4f39f81b688598f50452d9da0315f395189eb40205144e94f6f44a3792c5efa37f8525566ad1938f109b6c2d69ad8d4630bf904f79ca22a801af01390c88a7

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

data/lib/cachai.rb

@@ -23,9 +23,10 @@ module Cachai
     end
 
     def initialize(app, opts = {})
-      domain     = opts.delete(:domain) or raise 'Domain required.'
-      redis_host = opts.delete(:redis_host) || 'localhost'
-      @duration  = opts.delete(:duration)
+      domain       = opts.delete(:domain) or raise 'Domain required.'
+      redis_host   = opts.delete(:redis_host) || 'localhost'
+      @duration    = opts.delete(:duration)
+      @blocked_ips = opts.delete(:blocked_ips) || []
 
       Cachai.boot(domain, redis_host)
 
@@ -100,10 +101,12 @@ module Cachai
           :author_email => data['author_email'],
           :author_url   => data['author_url'],
           :parent_id    => data['parent_id'].to_i,
-          :author_ip    => request.ip
+          :author_ip    => request.ip,
+          :approved     => is_blocked?(request.ip) ? 0 : 1
         }
 
         response = Response.create!(attrs.merge(:post_id => post.id))
+
         Cachai.clear_cache(data['path'])
         notify_new_response(response, data['path']) if @recipient
 
@@ -149,6 +152,10 @@ module Cachai
       return obj.is_a?(String) ? obj : obj.to_json
     end
 
+    def is_blocked?(user_ip)
+      @blocked_ips.include?(user_ip)
+    end
+
     def is_spam?(data, link, request)
       return false unless @akismet
       # return true if blacklisted?(name, email, content)

data/spec/post_comments_spec.rb

@@ -7,7 +7,7 @@ describe 'post comment' do
     TestApp
   end
 
-  def post_comment(opts = {})
+  def post_comment(opts = {}, env_opts = {})
     data = {
       :domain       => 'domain.com',
       :protocol     => 'http',
@@ -18,7 +18,7 @@ describe 'post comment' do
       :author_url   => 'http://url.com'
     }.merge(opts)
 
-    post '/comments.json', data.to_json, { 'CONTENT_TYPE' => 'application/json' }
+    post '/comments.json', data.to_json, { 'CONTENT_TYPE' => 'application/json' }.merge(env_opts)
   end
 
   describe 'no domain' do
@@ -107,10 +107,34 @@ describe 'post comment' do
             Cachai::Post.last.created_at.should_not be_nil
           end
 
-          it 'creates a new response for that post' do
-            expect do
+          describe 'if not blocked' do
+
+            it 'creates a new response for that post' do
+              expect do
+                post_comment
+              end.to change(Cachai::Response, :count).by(1)
+            end
+
+            it 'post is approved' do
               post_comment
-            end.to change(Cachai::Response, :count).by(1)
+              expect(Cachai::Response.last.approved).to eql(1)
+            end
+
+          end
+
+          describe 'if blocked' do
+
+            it 'creates a new response for that post' do
+              expect do
+                post_comment({}, {'REMOTE_ADDR' => '12.12.12.12'})
+              end.to change(Cachai::Response, :count).by(1)
+            end
+
+            it 'post is not approved' do
+              post_comment({}, {'REMOTE_ADDR' => '12.12.12.12'})
+              expect(Cachai::Response.last.approved).to eql(0)
+            end
+
           end
 
         end
@@ -129,10 +153,34 @@ describe 'post comment' do
 
           describe 'if within comments duration' do
 
-            it 'creates a new response for that post' do
-              expect do
+            describe 'if not blocked' do
+
+              it 'creates a new response for that post' do
+                expect do
+                  post_comment
+                end.to change(Cachai::Response, :count).by(1)
+              end
+
+              it 'post is approved' do
                 post_comment
-              end.to change(Cachai::Response, :count).by(1)
+                expect(Cachai::Response.last.approved).to eql(1)
+              end
+
+            end
+
+            describe 'if blocked' do
+
+              it 'creates a new response for that post' do
+                expect do
+                  post_comment({}, {'REMOTE_ADDR' => '12.12.12.12'})
+                end.to change(Cachai::Response, :count).by(1)
+              end
+
+              it 'post is not approved' do
+                post_comment({}, {'REMOTE_ADDR' => '12.12.12.12'})
+                expect(Cachai::Response.last.approved).to eql(0)
+              end
+
             end
 
           end

data/spec/spec_helper.rb

@@ -23,7 +23,8 @@ class TestApp < Sinatra::Base
     :sendgrid  => {
       :api_key  => 'test',
       :api_user => 'test'
-    }
+    },
+    :blocked_ips => [ "12.12.12.12" ]
   }
 
   get '/' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cachai
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Tomás Pollak