cachai 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30fc83e3066f50a0c604c9491d162620e656abe2
-  data.tar.gz: 230bbda6e5ea18c7423232aef1b77140684b6118
+  metadata.gz: b3b3122123c313c1e0eb4c2fd843ce971e484018
+  data.tar.gz: f35981e1eedad868a4efc3c19d59b9f0c9444521
 SHA512:
-  metadata.gz: da12f0377d0f63859e1a11e7f634c4d4a3586360e077d7eb10b17919fe75b81a03da04d4b4c57d2d3a91d537bd519169f49815e041cb8bdcca794bdb3166faf1
-  data.tar.gz: 5274c7264da974acf125f72dae62f7c30256867dc9718e8117bfa5f354bf8ee122051ed9027472965b3be8f394f7f18e9b2154e33cf8c69992c21190e8701c97
+  metadata.gz: df702d38631c267a6d141f8a3680e1fc2b6f565597288c4ae455ae704bf701bc38ea25bcfdafb4e361ab60e54ecda1f885f7de7809e1d3ac7b41bc189e6cb134
+  data.tar.gz: a20dcf35e6547d2e45d9a843cd222cbb111df210b36e117d9d906b908f6ff928409cc24f7ce9a5f25373b1d2c726e23f012431b4044779487faf411007ead185

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

data/db/schema.rb

@@ -12,15 +12,30 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20130901232253) do
-  create_table "comments", force: true do |t|
+
+  create_table "posts", force: true do |t|
+    t.integer  "comments_allowed", :default => 1, :null => false
+    t.string   "path", :null => false
+  end
+
+  create_table "responses", force: true do |t|
+    t.integer  "post_id", :null => false
+    t.string   "response_type", :default => 'comment', :null => false
     t.string   "author_name", :null => false
     t.string   "author_email", :null => false
     t.string   "author_url"
+    t.string   "author_ip", :length => 15
     t.text     "content", :null => false
-    t.text     "path", :null => false
+    t.integer  "parent_id"
+    t.integer  "approved", :default => 1, :length => 1, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index :comments, :path
+  add_index :posts, :path, :unique => true
+  add_index :responses, :approved
+  add_index :responses, :response_type
+  add_index :responses, :post_id
+  add_index :responses, :parent_id
+
 end

data/lib/cachai.rb

@@ -3,7 +3,7 @@ require 'redis'
 require 'json'
 require 'rake'
 
-require_relative 'comment'
+require_relative 'models'
 require_relative 'akismet'
 
 module Cachai
@@ -23,7 +23,7 @@ module Cachai
       opts = opts || {}
       @domain = opts.delete(:domain) or raise 'Domain required.'
 
-      load_schema unless schema_loaded?
+      Cachai.load_db!
 
       redis_host = opts.delete(:redis_host) || 'localhost'
       @redis = Redis.new(:host => redis_host)
@@ -37,9 +37,19 @@ module Cachai
       super(app)
     end
 
+    get '/pingbacks.?:format?' do
+      # TODO
+    end
+
+    post '/pingbacks.?:format?' do
+      # TODO
+    end
+
     get '/comments.?:format?' do
       check_domain!(params[:domain])
 
+      @redis.del(redis_key(params[:path])) if params[:nocache]
+
       # puts "Comments for: #{params[:domain]}#{params[:path]}"
       json_list = get_comments(params[:path])
 
@@ -62,17 +72,19 @@ module Cachai
         halt(400, "No spam allowed") if is_spam?(data, permalink, request)
 
         attrs = {
-          :path         => data['path'],
           :content      => data['content'],
           :author_name  => data['author_name'],
           :author_email => data['author_email'],
-          :author_url   => data['author_url']
+          :author_url   => data['author_url'],
+          :parent_id    => data['parent_id'],
+          :author_ip    => request.ip
         }
 
-        comment = Comment.create!(attrs)
+        post = Post.find_by_path!(data['path'])
+        response = Response.create!(attrs.merge(:post_id => post.id))
 
         @redis.del(redis_key(data['path']))
-        json({ :status => 'ok', :comment => comment })
+        json({ :status => 'ok', :comment => response })
 
       rescue JSON::ParserError
         status 400 and json({ :error => 'Invalid JSON.' })
@@ -94,20 +106,6 @@ module Cachai
       # expires 1.year.ago
     end
 
-    def load_schema
-      require 'sinatra/activerecord/rake'
-      require_relative '../db/schema.rb'
-    end
-
-    def schema_loaded?
-      Comment.first
-      true
-    rescue ActiveRecord::StatementInvalid => e
-      # SQLite3::SQLException => e
-      # return !e.message['no such table']
-      false
-    end
-
     def check_domain!(domain)
       halt(400, 'Invalid domain.') unless domain == @domain
     end
@@ -125,13 +123,34 @@ module Cachai
       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
+        post = Post.find_by_path!(path)
+        json_list = get_and_sort_comments_for(post).to_json
         @redis.set(key, json_list)
         @redis.expire(key, 60 * 60) # one hour
       end
       json_list
     end
 
+    def get_and_sort_comments_for(post)
+      result = []
+      top_level = post.responses.comment.top_level
+      nested    = post.responses.comment.nested
+
+      puts top_level.count
+      puts nested.count
+
+      top_level.each_with_index do |comment, i|
+        obj = comment.as_json
+        children = nested.select do |nested|
+          nested.parent_id == comment.id
+        end
+        obj.merge!(:children => children) if children.any?
+        result.push(obj)
+      end
+
+      result
+    end
+
     def redis_key(path)
       "comments:#{@domain}:#{path}"
     end

data/lib/models.rb

@@ -0,0 +1,67 @@
+require 'sinatra/activerecord'
+require 'digest/md5'
+require 'sqlite3'
+require_relative 'time_ago'
+
+ENV_NAME = ENV['RACK_ENV'] || 'development'
+
+module Cachai
+
+  def self.load_db!
+    load_schema unless schema_loaded?
+  end
+
+  def self.load_schema
+    require_relative '../db/schema.rb'
+  end
+
+  def self.schema_loaded?
+    Post.first
+    true
+  rescue ActiveRecord::StatementInvalid => e
+    # SQLite3::SQLException => e
+    # return !e.message['no such table']
+    false
+  end
+
+  class Post < ActiveRecord::Base
+    has_many :responses
+
+    validates_presence_of :path
+    validates_uniqueness_of :path
+  end
+
+  class Response < ActiveRecord::Base
+    belongs_to :post
+    validates_presence_of :author_name, :author_name, :author_email, :content
+
+    scope :approved, lambda { where(:approved => 1) }
+    scope :comment, lambda { where(:response_type => 'comment') }
+    scope :pingback, lambda { where(:response_type => 'pingback') }
+    scope :top_level, lambda { where(:parent_id => 0) }
+    scope :nested, lambda { where("parent_id != 0") }
+
+
+    def as_json(options = {})
+      {
+        :id           => id,
+        :author_name  => author_name,
+        # :author_email => author_email,
+        :author_img   => author_img,
+        :author_url   => author_url,
+        :content      => content,
+        :timestamp    => created_at.to_i,
+        :parent_id    => parent_id,
+        :type         => response_type,
+        # :created_at   => created_at,
+        :created_ago  => Timeago.since(created_at)
+      }
+    end
+
+    def author_img(size = 50)
+      id = Digest::MD5::hexdigest(author_email.strip.downcase)
+      "https://www.gravatar.com/avatar/#{id}.jpg?s=#{size}"
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cachai
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,7 @@ files:
 - db/schema.rb
 - lib/akismet.rb
 - lib/cachai.rb
-- lib/comment.rb
+- lib/models.rb
 - lib/time_ago.rb
 - test/app_test.rb
 homepage: ''

data/lib/comment.rb

@@ -1,33 +0,0 @@
-require 'sinatra/activerecord'
-require 'digest/md5'
-require 'sqlite3'
-require_relative 'time_ago'
-
-ENV_NAME = ENV['RACK_ENV'] || 'development'
-
-module Cachai
-  class Comment < ActiveRecord::Base
-
-    validates_presence_of :author_name, :author_name, :author_email, :content, :path
-
-    def as_json(options = {})
-      {
-        :id           => id,
-        :author_name  => author_name,
-        # :author_email => author_email,
-        :author_img   => author_img,
-        :author_url   => author_url,
-        :content      => content,
-        :timestamp    => created_at.to_i,
-        # :created_at   => created_at,
-        :created_ago  => Timeago.since(created_at)
-      }
-    end
-
-    def author_img(size = 50)
-      id = Digest::MD5::hexdigest(author_email.strip.downcase)
-      "https://www.gravatar.com/avatar/#{id}.jpg?s=#{size}"
-    end
-
-  end
-end