cachai 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1077a9878d131805e696c2e1b2105c52dcc6578
-  data.tar.gz: 572ed93566a73bf464953dc844b7469f95becdfa
+  metadata.gz: 3798691a1372fd5f11bbb2a04d67ca5f76c33133
+  data.tar.gz: 0ac3cafdb7f2fd8fed54ef8ecddf864f0b261157
 SHA512:
-  metadata.gz: bc98cd8492e345a9a3bb1bbd1c983c34b72f746a3c2648977aa60f4ae92684c035e0bbc6e984b5f69b402216c0c9c10afc4e3a124636ef9c07ef7832f1a0cc78
-  data.tar.gz: 7e8b2dd17bac39e58840db4e91c4574e0b9e325bd8564e26aaf8342fa2f829adba41bdd812b6e7861c46c401b556d33e340943d9df9db97a22fc2c8bb50055b6
+  metadata.gz: b8fc4320584cc9216cc59a347a3f3d43432b2614a7d549375024fe9deb54d784105fc0b476351ae5a7132d8223c24beb76911b341781c32460f2ab775278b9b6
+  data.tar.gz: 5672e5803fd65fa80ce4d7dbb869891d96e39a4f034e31de0fcd5e8332b35fd040c81e414b8456cf9cc40435a53b82566d002a92c56ece03d99d0adcedd39adb

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

data/db/schema.rb

@@ -14,8 +14,9 @@
 ActiveRecord::Schema.define(version: 20130901232253) do
 
   create_table "posts", force: true do |t|
-    t.integer  "comments_allowed", :default => 1, :null => false
-    t.string   "path", :null => false
+    t.integer   "comments_allowed", :default => 1, :null => false
+    t.string    "path", :null => false
+    t.timestamp "created_at"
   end
 
   create_table "responses", force: true do |t|

data/lib/cachai.rb

@@ -25,6 +25,7 @@ module Cachai
     def initialize(app, opts = {})
       domain     = opts.delete(:domain) or raise 'Domain required.'
       redis_host = opts.delete(:redis_host) || 'localhost'
+      @duration  = opts.delete(:duration)
 
       Cachai.boot(domain, redis_host)
 
@@ -78,11 +79,20 @@ module Cachai
         end
 
         check_domain!(data['domain'])
-        halt(400, "Missing params") if data['protocol'].blank? or data['path'].blank?
+        if data['protocol'].blank? or data['path'].blank?
+          return halt(422, "Missing params.")
+        end
+
+        post = Post.find_or_create_by_path(data['path'])
+        if @duration && post.created_at < @duration.days.ago
+          return halt(400, "Comments closed.")
+        end
 
-        headers['Access-Control-Allow-Origin'] = data['protocol'] + '//' + data['domain']
         permalink = 'http://' + data['domain'] + data['path']
-        halt(400, "No spam allowed") if is_spam?(data, permalink, request)
+
+        if is_spam?(data, permalink, request)
+          return halt(401, "No spam allowed.")
+        end
 
         attrs = {
           :content      => data['content'],
@@ -93,11 +103,11 @@ module Cachai
           :author_ip    => request.ip
         }
 
-        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 @recipient
 
+        headers['Access-Control-Allow-Origin'] = data['protocol'] + '//' + data['domain']
         json({ :status => 'ok', :comment => response })
 
       rescue JSON::ParserError

data/spec/post_comments_spec.rb

@@ -25,7 +25,6 @@ describe 'post comment' do
 
     it 'returns 400' do
       post_comment :domain => nil
-      puts last_response.body
       last_response.status.should == 400
     end
 
@@ -35,7 +34,7 @@ describe 'post comment' do
 
     it 'returns 400' do
       post_comment :protocol => nil
-      last_response.status.should == 400
+      last_response.status.should == 422
     end
 
   end
@@ -44,7 +43,7 @@ describe 'post comment' do
 
     it 'returns 400' do
       post_comment :path => nil
-      last_response.status.should == 400
+      last_response.status.should == 422
     end
 
   end
@@ -113,16 +112,45 @@ describe 'post comment' do
 
         describe 'existing post' do
 
+          before do
+            Cachai::Post.find_by_path('/another/blog/post.html').should be_a(Cachai::Post)
+          end
+
           it 'does not create a new post entry' do
             expect do
               post_comment
             end.not_to change(Cachai::Post, :count).by(1)
           end
 
-          it 'creates a new response for that post' do
-            expect do
+          describe 'if within comments duration' do
+
+            it 'creates a new response for that post' do
+              expect do
+                post_comment
+              end.to change(Cachai::Response, :count).by(1)
+            end
+
+          end
+
+          describe 'if after comments duration' do
+
+            before do
+              post = Cachai::Post.find_by_path('/another/blog/post.html')
+              post.update_attribute(:created_at, 100.days.ago)
+            end
+
+            it 'returns 400' do
               post_comment
-            end.to change(Cachai::Response, :count).by(1)
+              last_response.status.should == 400
+            end
+
+            it 'does not create a new response for that post' do
+              expect do
+                post_comment
+              end.not_to change(Cachai::Response, :count)
+            end
+
+
           end
 
         end

data/spec/spec_helper.rb

@@ -19,6 +19,7 @@ class TestApp < Sinatra::Base
   use Cachai::Middleware, {
     :domain    => 'domain.com',
     :recipient => 'test@example.com',
+    :duration  => 30,
     :sendgrid  => {
       :api_key  => 'test',
       :api_user => 'test'
@@ -29,3 +30,8 @@ class TestApp < Sinatra::Base
     'Hello world'
   end
 end
+
+
+RSpec.configure do |config|
+  config.color = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cachai
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler