monocle 0.2.2 → 0.2.3

data/lib/monocle.rb

@@ -51,6 +51,15 @@ module Monocle
           field = v.call
           field.is_a?(String) ? field : field.to_i
         end
+
+        define_method("#{k}_clicks_count") do
+          self._monocle_redis_connection.hget(self.class.monocle_key(id), self.send("#{k}_clicks_field")).to_i || 0
+        end
+
+        define_method("#{k}_clicks_field") do
+          field = v.call
+          field.is_a?(String) ? field : field.to_i
+        end
       end
     end
 
@@ -90,10 +99,32 @@ module Monocle
     end
   end
 
+  def click!
+    results = self._monocle_redis_connection.pipelined do
+      self._monocle_view_types.keys.each do |view_type|
+        self._monocle_redis_connection.hincrby(self.class.monocle_key(id), self.send("#{view_type}_clicks_field"), 1)
+      end
+      self._monocle_redis_connection.zadd(self.class.monocle_key('recently_clicked'), Time.now.to_i, id)
+      self._monocle_redis_connection.zincrby(self.class.monocle_key('click_counts'), 1, id)
+    end
+
+    if should_cache_view_count?
+      self._monocle_view_types.keys.each_with_index do |view_type, i|
+        cache_click_count(view_type, results[i])
+      end
+      self.update_column(self._monocle_options[:cache_threshold_check_field].to_sym, Time.now) if respond_to?(:update_column)
+      self.set(self._monocle_options[:cache_threshold_check_field].to_sym, Time.now) if respond_to?(:set)
+    end
+  end
+
   def cache_field_for_view(view_type)
     :"#{view_type}_views"
   end
 
+  def cache_field_for_click(view_type)
+    :"#{view_type}_clicks"
+  end
+
   def should_cache_view_count?
     if self._monocle_options[:cache_view_counts]
       self.send(self._monocle_options[:cache_threshold_check_field]) < (Time.now - self._monocle_options[:cache_threshold])
@@ -107,6 +138,11 @@ module Monocle
     set(cache_field_for_view(view_type), count) if respond_to?(:set)
   end
 
+  def cache_click_count(view_type, count)
+    update_column(cache_field_for_click(view_type), count) if respond_to?(:update_column)
+    set(cache_field_for_click(view_type), count) if respond_to?(:set)
+  end
+
   def destroy_views
     self._monocle_redis_connection.del(self.class.monocle_key(id))
   end

data/lib/monocle/server.rb

@@ -1,4 +1,6 @@
 require 'sinatra/base'
+require 'base64'
+require 'uri'
 
 module Monocle
   class Server < Sinatra::Base
@@ -10,6 +12,14 @@ module Monocle
       view_object(params[:type], params[:id])
     end
 
+    get '/:type/click/:id.:format' do
+      click_object(params[:type], params[:id], params[:redirect_to])
+    end
+
+    get '/:type/click/:redirect_to/:id.:format' do
+      click_object(params[:type], params[:id], params[:redirect_to])
+    end
+
     def view_object(type, id)
       if object = type.classify.constantize.find(id)
         object.view!
@@ -18,5 +28,12 @@ module Monocle
         'o_0'
       end
     end
+
+    def click_object(type, id, redirect_to)
+      if object = type.classify.constantize.find(id)
+        object.click!
+        redirect(Base64.decode64(URI.unescape(redirect_to)), 301)
+      end
+    end
   end
 end

data/lib/monocle/version.rb

@@ -1,3 +1,3 @@
 module Monocle
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/monocle_spec.rb

@@ -21,6 +21,10 @@ class TestObject
   attr_accessor :weekly_views, :daily_views, :hourly_views
   attr_accessor :quarterly_views
 
+  attr_accessor :overall_clicks, :yearly_clicks, :monthly_clicks
+  attr_accessor :weekly_clicks, :daily_clicks, :hourly_clicks
+  attr_accessor :quarterly_clicks
+
   def self.find(id)
     o = new
     o.id = id.to_i
@@ -29,7 +33,7 @@ class TestObject
 
   def initialize
     @id = '12345'
-    @overall_views = 0
+    @overall_views, @overall_clicks = 0
     @updated_at = Time.now - 1.hour
   end
 
@@ -43,6 +47,7 @@ def make_viewed_objects(number_of_objects_to_make)
     o = TestObject.new
     o.id = i
     o.view!
+    o.click!
   end
 end
 
@@ -81,12 +86,14 @@ describe Monocle do
       object.view!
       object.destroy_views
       REDIS.hget('monocle:test_object:12345', 'overall_views').should == nil
+      REDIS.hget('monocle:test_object:12345', 'overall_clicks').should == nil
     end
   end
 
   describe '#cache_field_for_view' do
     it 'returns the cache field for the given view type' do
       object.cache_field_for_view('overall').should == :overall_views
+      object.cache_field_for_click('overall').should == :overall_clicks
     end
   end
 
@@ -117,7 +124,7 @@ describe Monocle do
   context 'when cache time is over threshold' do
     describe '#view!' do
       before { object.stub(:updated_at).and_return(Time.now - 1.hour) }
-      before { 50.times { object.view! }}
+      before { 50.times { object.view! } }
       after { object.destroy_views }
 
       %w(overall yearly monthly weekly daily hourly quarterly).each do |view_type|
@@ -130,6 +137,22 @@ describe Monocle do
         end
       end
     end
+
+    describe '#click!' do
+      before { object.stub(:updated_at).and_return(Time.now - 1.hour) }
+      before { 50.times { object.click! } }
+      after { object.destroy_views }
+
+      %w(overall yearly monthly weekly daily hourly quarterly).each do |view_type|
+        it "sets #{view_type} views count" do
+          object.send("#{view_type}_clicks_count").should == 50
+        end
+
+        it "updates cached #{view_type} views count" do
+          object.send("#{view_type}_clicks").should == 50
+        end
+      end
+    end
   end
 
   context 'when cache time is under threshold' do
@@ -148,5 +171,21 @@ describe Monocle do
         end
       end
     end
+
+    describe '#click!' do
+      before { object.stub(:updated_at).and_return(Time.now) }
+      before { 50.times { object.click! }}
+      after { object.destroy_views }
+
+      %w(overall yearly monthly weekly daily hourly quarterly).each do |view_type|
+        it "sets #{view_type} views count" do
+          object.send("#{view_type}_clicks_count").should == 50
+        end
+
+        it "updates cached #{view_type} views count" do
+          object.send("#{view_type}_clicks").to_i.should == 0
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monocle
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -74,7 +74,6 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/monocle.rb
 - lib/monocle/core_ext.rb
 - lib/monocle/server.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.1