cachai 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c36116e0dedcd0acb87163ee6ff79ee9aa29439
-  data.tar.gz: 921d378a62e1b6f784d90577ac553b1768d462fd
+  metadata.gz: d1077a9878d131805e696c2e1b2105c52dcc6578
+  data.tar.gz: 572ed93566a73bf464953dc844b7469f95becdfa
 SHA512:
-  metadata.gz: 7b69c92fdf62712fa2c509088ac70e091ea1c284e366f3ca6101f43fc7f07026b5ffc32ac4e7ea02b66199e7e767fce6602629b88af625adb123638c63baf38f
-  data.tar.gz: c13f891bdde3ba0b87b8cedaf587444a5980f3d4be7de04dec1ae26ef50c3da348b35eae4dafb98568f78ca87f1bc5eeef32f9b9d878a6728de28bb448f7c011
+  metadata.gz: bc98cd8492e345a9a3bb1bbd1c983c34b72f746a3c2648977aa60f4ae92684c035e0bbc6e984b5f69b402216c0c9c10afc4e3a124636ef9c07ef7832f1a0cc78
+  data.tar.gz: 7e8b2dd17bac39e58840db4e91c4574e0b9e325bd8564e26aaf8342fa2f829adba41bdd812b6e7861c46c401b556d33e340943d9df9db97a22fc2c8bb50055b6

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

data/lib/cachai.rb

@@ -18,7 +18,9 @@ module Cachai
     # use Rack::Static, :urls => %w(/css /img /js /favicon.ico), :root => 'public'
     use ActiveRecord::ConnectionAdapters::ConnectionManagement
 
-    CACHE_MINUTES = 10 * 60 # 10 minutes
+    error do
+      'Oops, nasty error: ' + env['sinatra.error'].message
+    end
 
     def initialize(app, opts = {})
       domain     = opts.delete(:domain) or raise 'Domain required.'
@@ -146,6 +148,7 @@ module Cachai
         :referrer             => request.referrer,
         :user_agent           => request.user_agent,
         :permalink            => link,
+        :blog                 => 'http://' + data['domain'],
         :comment_type         => 'comment',
         :comment_content      => data['content'],
         :comment_author       => data['author_name'],

data/lib/models.rb

@@ -7,6 +7,8 @@ ENV_NAME = ENV['RACK_ENV'] || 'development'
 
 module Cachai
 
+  CACHE_MINUTES = 10 * 60 # 10 minutes
+
   def self.boot(domain, redis_host = 'localhost')
     self.domain = domain
     self.cache = Redis.new(:host => redis_host)
@@ -54,8 +56,8 @@ module Cachai
   end
 
   def self.key_for(path)
-    raise "Domain not set!" unless @domain
-    "comments:#{@domain}:#{path}"
+    raise "Domain not set!" unless domain
+    "comments:#{domain}:#{path}"
   end
 
   def self.get_comments_for(path, nocache = false)

data/spec/akismet_spec.rb

@@ -0,0 +1,77 @@
+require './lib/akismet'
+
+describe 'Akismet' do
+
+  def check(opts = {})
+    comment = {
+      :user_ip              => "#{rand(255)}.#{rand(255)}.#{rand(255)}.#{rand(255)}",
+      :referrer             => 'http://www.google.com',
+      :user_agent           => user_agent,
+      :permalink            => link,
+      :blog                 => "http://#{domain}",
+      :comment_type         => 'comment',
+      :comment_content      => opts['content'],
+      :comment_author       => opts['author_name'],
+      :comment_author_url   => opts['author_url'],
+      :comment_author_email => opts['author_email']
+    }.merge(opts)
+
+    client.check_comment(comment)
+  end
+
+  def client
+    Akismet.new(:api_key => key, :blog => "http://#{domain}")
+  end
+
+  let(:domain) {
+    'test.com'
+  }
+
+  let(:user_agent) {
+    'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36'
+  }
+
+  let(:link) {
+    "http://#{domain}/blog/#{Time.now.year}/#{Time.now.month}/welcome-back.html"
+  }
+
+  describe 'with valid key' do
+
+    let(:key) { 'e4c6b40ac9e0' } # test key
+
+    describe 'with spammy comment' do
+
+      it 'says its spam' do
+        resp = check({
+          :content      => 'Buy viagra',
+          :author_name  => 'Viagra guy',
+          :author_url   => 'http://viagra.com/buy',
+          :author_email => 'viagra@viagra.com'
+        })
+
+        resp[:spam].should eql(true)
+        resp[:message].should eql("true")
+      end
+
+    end
+
+    describe 'with not spammy comment' do
+
+      it 'says its not spam' do
+        resp = check({
+          :content      => "Hey man, it's me for the #{rand(1000)}th time.",
+          :author_name  => 'jk2000',
+          :author_url   => nil,
+          :author_email => 'jk2000@gmial.com'
+        })
+
+        # puts resp.inspect
+        resp[:spam].should eql(false)
+        resp[:message].should eql("false")
+      end
+
+    end
+
+  end
+
+end

data/spec/{get_comments_test.rb → get_comments_spec.rb}

@@ -7,6 +7,11 @@ describe 'get comments' do
     TestApp
   end
 
+  before do
+    Cachai.domain = 'domain.com'
+    Cachai.cache  = Redis.new
+  end
+
   describe 'no domain' do
 
     it 'returns 400' do
@@ -49,6 +54,7 @@ describe 'get comments' do
 
         it 'returns 200' do
           get '/comments.json', :domain => 'domain.com', :path => '/blog/post.html'
+          File.open('/tmp/error.html', 'w') { |f| f.write(last_response.body) }
           last_response.status.should == 200
         end
 

data/spec/{post_comments_test.rb → post_comments_spec.rb}

@@ -17,6 +17,7 @@ describe 'post comment' do
       :author_email => 'test@email.com',
       :author_url   => 'http://url.com'
     }.merge(opts)
+
     post '/comments.json', data.to_json, { 'CONTENT_TYPE' => 'application/json' }
   end
 

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ class TestApp < Sinatra::Base
       :api_user => 'test'
     }
   }
+
   get '/' do
     'Hello world'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cachai
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tomás Pollak
@@ -163,8 +163,9 @@ files:
 - lib/views/comments.erb
 - lib/views/layout.erb
 - lib/views/posts.erb
-- spec/get_comments_test.rb
-- spec/post_comments_test.rb
+- spec/akismet_spec.rb
+- spec/get_comments_spec.rb
+- spec/post_comments_spec.rb
 - spec/spec_helper.rb
 - test/app_test.rb
 homepage: ''
@@ -192,8 +193,9 @@ signing_key:
 specification_version: 4
 summary: Middleware for embedabble comments.
 test_files:
-- spec/get_comments_test.rb
-- spec/post_comments_test.rb
+- spec/akismet_spec.rb
+- spec/get_comments_spec.rb
+- spec/post_comments_spec.rb
 - spec/spec_helper.rb
 - test/app_test.rb
 has_rdoc: