acts_as_readable 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16e3538346fdcbac00fb9006e4ce67e7e39eafb5
-  data.tar.gz: 1516dc9da9ccc137e7224f1c36064a07b7e5f427
+  metadata.gz: 3d8d2b78dd717f7f730d3421f544bd3ee2364e27
+  data.tar.gz: 09ffc7e7cfd1ef5107a0dc42c36fc9c39ac99c6c
 SHA512:
-  metadata.gz: c9df46bdaffac4f1b4c2d1e80e7beb989d2dea722f2f1a57747dfc190d455cd7932eb4426c1d7769bd1a6e2ce4b43295157f116b66fe2bb5ce90eb23460c380e
-  data.tar.gz: 844f36b301c376382a10740871538c13b809c418ddd2f68fdadcfb4941765a099111af4a48058db85f6c367386b92cfa41d5ab02c8508a5da18d7fd837eff09f
+  metadata.gz: cc2801ab538a63cfc9840465eb850b1e894f9692d4a8606fb0f7001c1d557b79208469d90535d98439393dd6c6f3922917a19dedf5d3ce5c00ce387c96373f5b
+  data.tar.gz: 420399273b939da92a3f93375a4ccf7eb57b2a0829928f57903d0d92dd6961a3f0ae70fa873dc99bc5ca463c8e5b0a8704ee098041336d0c7317f73b7cfa9173

data/lib/acts_as_readable/acts_as_readable.rb

@@ -1,5 +1,5 @@
 module ActsAsReadable
-  module ActMethod  
+  module ActMethod
     # OPTIONS
     # :cache  => the name under which to cache timestamps for a "mark all as read" action to avoid the need to actually create readings for each record marked as read
     def acts_as_readable(options = {})
@@ -21,12 +21,18 @@ module ActsAsReadable
 
   module HelperMethods
     def self.read_conditions(readable_class, user)
-      ["(readable_type IS NULL AND COALESCE(#{readable_class.table_name}.updated_at < ?, TRUE)) OR (readable_type IS NOT NULL AND COALESCE(readings.updated_at < ?, TRUE)) OR (readings.state = 'read')", all_read_at(readable_class, user), all_read_at(readable_class, user)]
+      ["(readable_type IS NULL     AND COALESCE(#{readable_class.table_name}.updated_at < :all_read_at, :true))
+     OR (readable_type IS NOT NULL AND COALESCE(readings.updated_at < :all_read_at, :true))
+     OR (readings.state = 'read')",
+     :all_read_at => all_read_at(readable_class, user), :true => true]
     end
 
     def self.unread_conditions(readable_class, user)
       # IF there is no reading and it has been updated since we last read all OR there is an unreading and we haven't read all since then
-      ["(readable_type IS NULL AND COALESCE(#{readable_class.table_name}.updated_at > ?, TRUE)) OR (readings.state = 'unread' AND COALESCE(readings.updated_at > ?, TRUE))", all_read_at(readable_class, user), all_read_at(readable_class, user)]
+      ["(readings.state IS NULL    AND COALESCE(#{readable_class.table_name}.updated_at > :all_read_at, :true))
+     OR (readings.state = 'unread' AND COALESCE(readings.updated_at > :all_read_at, :true))
+     OR (readings.state = 'read'   AND COALESCE(#{readable_class.table_name}.updated_at > readings.updated_at, :true))",
+     :all_read_at => all_read_at(readable_class, user), :true => true]
     end
 
     def self.all_read_at(readable_class, user)
@@ -35,7 +41,7 @@ module ActsAsReadable
 
     def self.outer_join_readings(scope, user)
       scope.joins("LEFT OUTER JOIN readings ON readings.readable_type = '#{scope.model.name}' AND readings.readable_id = #{scope.model.table_name}.id AND readings.user_id = #{user.id}")
-    end        
+    end
   end
 
   module ClassMethods

data/spec/acts_as_readable_spec.rb

@@ -8,117 +8,134 @@ describe 'acts_as_readable' do
   end
 
   describe "the unread scope" do
+    it "should not return records explicitly marked as read" do
+      @comment.read_by! @user
+      expect( Comment.unread_by(@user) ).not_to include(@comment)
+    end
+
     it "should return records without readings if the user hasn't 'read all'" do
-      Comment.unread_by(@user).exists?(@comment).should be_true
+      expect( Comment.unread_by(@user) ).to include(@comment)
     end
 
     it "should return records explicitly marked as unread if the user hasn't 'read all'" do
       @comment.unread_by! @user
-      Comment.unread_by(@user).exists?(@comment).should be_true
+      expect( Comment.unread_by(@user) ).to include(@comment)
     end
 
     it "should return records explicitly marked as unread if the user has 'read all' before the record was marked unread" do
       Comment.read_by! @user
       @comment.unread_by! @user
-      Comment.unread_by(@user).exists?(@comment).should be_true
+      expect( Comment.unread_by(@user) ).to include(@comment)
     end
 
     it "should not return records explicitly marked as unread if the user has 'read all' after the record was marked unread" do
       @comment.unread_by! @user
       Comment.read_by! @user
-      Comment.unread_by(@user).exists?(@comment).should be_false
+      expect( Comment.unread_by(@user) ).not_to include(@comment)
+    end
+
+    it "should return records that have been updated since they were last read" do
+      @comment.read_by! @user
+      @comment.touch
+      expect( Comment.unread_by(@user) ).to include(@comment)
+    end
+
+    it "should return records that have been updated since they were last unread" do
+      @comment.unread_by! @user
+      @comment.touch
+      expect( Comment.unread_by(@user) ).to include(@comment)
     end
   end
 
   describe "the read scope" do
     it "should return records without readings if the user has 'read all' since the last time the record was updated" do
       Comment.read_by! @user
-      Comment.read_by(@user).exists?(@comment).should be_true
+      expect( Comment.read_by(@user) ).to include(@comment)
     end
 
     it "should return records explicitly marked as read if the user hasn't 'read all'" do
       @comment.read_by! @user
-      Comment.read_by(@user).exists?(@comment).should be_true
+      expect( Comment.read_by(@user) ).to include(@comment)
     end
 
     it "should return records explicitly marked as read if the user has 'read all' before the record was marked unread" do
       Comment.read_by! @user
       @comment.read_by! @user
-      Comment.read_by(@user).exists?(@comment).should be_true
+      expect( Comment.read_by(@user) ).to include(@comment)
     end
 
     it "should return records explicitly marked as unread if the user has 'read all' after the record was marked unread" do
       @comment.unread_by! @user
       Comment.read_by! @user
-      Comment.read_by(@user).exists?(@comment).should be_true
+      expect( Comment.read_by(@user) ).to include(@comment)
     end
   end
 
   describe "when checking a specific record for read_by?" do
     it "should return true if the record hasn't explicitly been read, but the user has 'read all' since the record was created" do
       Comment.read_by! @user
-      @comment.read_by?(@user).should be_true
+      expect( @comment.read_by?(@user) ).to be_truthy
     end
 
     it "should return true if the record hasn't explicitly been read and the user has 'read all' since the record was created but not since it was updated" do
       Comment.read_by! @user
       @comment.touch
-      @comment.read_by?(@user).should be_true
+      expect( @comment.read_by?(@user) ).to be_truthy
     end
 
     it "should return true if the record has been explicitly marked as read and the user hasn't 'read all'" do
       @comment.read_by! @user
-      @comment.read_by?(@user).should be_true
+      expect( @comment.read_by?(@user) ).to be_truthy
     end
 
     it "should return false if the user 'read all' before and then marked the record as unread" do
       Comment.read_by! @user
       @comment.unread_by! @user
-      @comment.read_by?(@user).should be_false
+      expect( @comment.read_by?(@user) ).to be_falsey
     end
 
     it "should return true if the user has explicitly marked it as unread and then 'reads all'" do
       @comment.unread_by! @user
       Comment.read_by! @user
-      @comment.read_by?(@user).should be_true
+      expect( @comment.read_by?(@user) ).to be_truthy
     end
   end
 
   describe "when checking a specific record for latest_update_read_by?" do
     it "should return true if the record hasn't explicitly been read, but the user has 'read all' since the record was updated" do
       Comment.read_by! @user
-      @comment.latest_update_read_by?(@user).should be_true
+      expect( @comment.latest_update_read_by?(@user) ).to be_truthy
     end
 
     it "should return false if the record hasn't explicitly been read and the user has 'read all' since the record was created but not since it was updated" do
       Comment.read_by! @user
       @comment.touch
-      @comment.latest_update_read_by?(@user).should be_false
+      expect( @comment.latest_update_read_by?(@user) ).to be_falsey
     end
 
     it "should return true if the record has been explicitly marked as read and the user hasn't 'read all'" do
       @comment.read_by! @user
-      @comment.latest_update_read_by?(@user).should be_true
+      expect( @comment.latest_update_read_by?(@user) ).to be_truthy
     end
 
     it "should return false if the user 'read all' before and then marked the record as unread" do
       Comment.read_by! @user
       @comment.unread_by! @user
-      @comment.latest_update_read_by?(@user).should be_false
+      expect( @comment.latest_update_read_by?(@user) ).to be_falsey
     end
 
     it "should return true if the user has explicitly marked it as unread and then 'reads all'" do
       @comment.unread_by! @user
       Comment.read_by! @user
-      @comment.latest_update_read_by?(@user).should be_true
+      expect( @comment.latest_update_read_by?(@user) ).to be_truthy
     end
 
     it "should return false if the user 'read all' before and then marked the record as unread using cached readings" do
       Comment.read_by! @user
       @comment.unread_by! @user
       Comment.cache_readings_for([@comment], @user)
-      @comment.latest_update_read_by?(@user).should be_false
+      expect( @comment.latest_update_read_by?(@user) ).to be_falsey
     end
   end
 end
-`dropdb acts_as_readable_test`
+`dropdb acts_as_readable_test`

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'active_record'
 require 'acts_as_readable'
 
-ActiveRecord::Base.establish_connection(:adapter => "postgresql", :database => "acts_as_readable_test")
+ActiveRecord::Base.establish_connection(:adapter => "postgresql", :database => "acts_as_readable_test") # Not using sqlite3 for testing because of its ridiculous boolean handling
 
 ActiveRecord::Schema.define(:version => 0) do
   create_table :users, :force => true do |t|
@@ -27,3 +27,12 @@ end
 class Comment < ActiveRecord::Base
   acts_as_readable :cache => :comments_read_at
 end
+
+
+def debug_queries
+  logger = ActiveRecord::Base.logger
+  ActiveRecord::Base.logger = Logger.new(STDOUT)
+  yield
+ensure
+  ActiveRecord::Base.logger = logger
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_readable
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails