cachai 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d0befb3a839b4323421a53cd76689d3b17f631c
-  data.tar.gz: 53f40303c117b425d195244f8b1fe541125dd505
+  metadata.gz: 30fc83e3066f50a0c604c9491d162620e656abe2
+  data.tar.gz: 230bbda6e5ea18c7423232aef1b77140684b6118
 SHA512:
-  metadata.gz: 58bb54f64b485bf09c84db2afc4663640edb5e7e934508f377afe7c3bcecacff9ff9914e418bcb900fed6cafe07954bf57418964e6e0a723320151750bccc768
-  data.tar.gz: bd4b23febe2c4e8c36b061aaa5f3d939287f335461b6b35d5ab7ca2055f2e681a1719b050a7ab41ebbe939a3787104b10b7a362a13890d46bce5420669cf64f6
+  metadata.gz: da12f0377d0f63859e1a11e7f634c4d4a3586360e077d7eb10b17919fe75b81a03da04d4b4c57d2d3a91d537bd519169f49815e041cb8bdcca794bdb3166faf1
+  data.tar.gz: 5274c7264da974acf125f72dae62f7c30256867dc9718e8117bfa5f354bf8ee122051ed9027472965b3be8f394f7f18e9b2154e33cf8c69992c21190e8701c97

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.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ["Tomás Pollak"]
   spec.email         = ["tomas@forkhq.com"]
   spec.description   = %q{Middleware for embedabble comments.}
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rspec", "~> 2.6"
 
+  spec.add_dependency "redis"
   spec.add_dependency "sinatra"
   spec.add_dependency "sinatra-activerecord"
   spec.add_dependency "sqlite3"

data/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.

data/lib/cachai.rb

@@ -1,6 +1,8 @@
 require 'sinatra/base'
+require 'redis'
 require 'json'
 require 'rake'
+
 require_relative 'comment'
 require_relative 'akismet'
 
@@ -11,6 +13,10 @@ module Cachai
     # set :database_file, "config/database.yml"
     # set :public_folder, File.join(settings.root, 'public')
     # set :protection, true
+    # set :logging, nil
+
+    # use Rack::CommonLogger, LOGGER
+    # use Rack::Static, :urls => %w(/css /img /js /favicon.ico), :root => 'public'
     use ActiveRecord::ConnectionAdapters::ConnectionManagement
 
     def initialize(app, opts = nil)
@@ -19,6 +25,9 @@ module Cachai
 
       load_schema unless schema_loaded?
 
+      redis_host = opts.delete(:redis_host) || 'localhost'
+      @redis = Redis.new(:host => redis_host)
+
       if key = opts.delete(:akismet_key)
         @akismet = Akismet.new(:api_key => key, :blog => "http://#{@domain}")
       else
@@ -32,18 +41,17 @@ module Cachai
       check_domain!(params[:domain])
 
       # puts "Comments for: #{params[:domain]}#{params[:path]}"
-      list = get_comments(params[:path])
+      json_list = get_comments(params[:path])
 
       if params[:callback]
         content_type 'application/javascript'
-        "#{params[:callback]}(#{list.to_json});"
+        "#{params[:callback]}(#{json_list});"
       else
         json(list)
       end
     end
 
     post '/comments.?:format?' do
-
       begin
         data = JSON.parse(request.body.read)
         check_domain!(data['domain'])
@@ -62,6 +70,8 @@ module Cachai
         }
 
         comment = Comment.create!(attrs)
+
+        @redis.del(redis_key(data['path']))
         json({ :status => 'ok', :comment => comment })
 
       rescue JSON::ParserError
@@ -73,9 +83,19 @@ module Cachai
 
     private
 
+    def set_cache(timestamp)
+      return if timestamp.nil?
+      last_modified timestamp
+      cache_control :public, :must_revalidate, :max_age => 60
+    end
+
+    def prevent_cache
+      cache_control :public, :no_cache, :no_store, :must_revalidate, :max_age => 0
+      # expires 1.year.ago
+    end
+
     def load_schema
       require 'sinatra/activerecord/rake'
-      # Rake::Task['db:schema:load'].invoke
       require_relative '../db/schema.rb'
     end
 
@@ -83,7 +103,7 @@ module Cachai
       Comment.first
       true
     rescue ActiveRecord::StatementInvalid => e
-      # SQLite3::SQLException => e 
+      # SQLite3::SQLException => e
       # return !e.message['no such table']
       false
     end
@@ -98,11 +118,22 @@ module Cachai
 
     def json(obj)
       content_type 'application/json'
-      obj.to_json
+      return obj.is_a?(String) ? obj : obj.to_json
+    end
+
+    def get_comments(path)
+      key = redis_key(path)
+      unless json_list = @redis.get(key)
+        puts "Not cached. Getting from DB: #{path}"
+        json_list = Comment.where({ :path => path }).to_json
+        @redis.set(key, json_list)
+        @redis.expire(key, 60 * 60) # one hour
+      end
+      json_list
     end
 
-    def get_comments(document_path)
-      Comment.where({ :path => document_path })
+    def redis_key(path)
+      "comments:#{@domain}:#{path}"
     end
 
     def is_spam?(data, link, request)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cachai
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tomás Pollak
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -134,10 +148,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Middleware for embedabble comments.
 test_files:
 - test/app_test.rb
-has_rdoc: