acts_as_readable 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44f09001b617edaeaaeb303302ff7806c787574e
-  data.tar.gz: aed97cd3809d30621c534da9f3cbe31c40f92336
+  metadata.gz: 16e3538346fdcbac00fb9006e4ce67e7e39eafb5
+  data.tar.gz: 1516dc9da9ccc137e7224f1c36064a07b7e5f427
 SHA512:
-  metadata.gz: ca634e25c362eb653545e2ba6b2213ec636bd038946609e7de37331d67372addbe03c8261df81c88c979c9d17c50439d526b611fea61c739e7d222c95d14d8ca
-  data.tar.gz: b5ae7f2ad8c44ab52b340613efa8bd1c3d1fe9635e71b491e9c4904e6e2a59629ffb689f3caf2f821d0d6a30dad278264635335c81b2a4f9e880ad557d683892
+  metadata.gz: c9df46bdaffac4f1b4c2d1e80e7beb989d2dea722f2f1a57747dfc190d455cd7932eb4426c1d7769bd1a6e2ce4b43295157f116b66fe2bb5ce90eb23460c380e
+  data.tar.gz: 844f36b301c376382a10740871538c13b809c418ddd2f68fdadcfb4941765a099111af4a48058db85f6c367386b92cfa41d5ab02c8508a5da18d7fd837eff09f

data/lib/acts_as_readable/acts_as_readable.rb

@@ -6,11 +6,13 @@ module ActsAsReadable
       class_attribute :acts_as_readable_options
       self.acts_as_readable_options = options
 
-      has_many :readings, :as => :readable
-      has_many :readers, :through => :readings, :source => :user, :conditions => {:readings => {:state => 'read'}}
+      User.has_many :readings,  :dependent => :delete_all
 
-      scope :read_by, lambda {|user| ActsAsReadable::HelperMethods.outer_join_readings(self, user).where(ActsAsReadable::HelperMethods.read_conditions(self, user))}
-      scope :unread_by, lambda {|user| ActsAsReadable::HelperMethods.outer_join_readings(self, user).where(ActsAsReadable::HelperMethods.unread_conditions(self, user))}
+      has_many :readings,       :as => :readable, :dependent => :delete_all
+      has_many :readers,        lambda { where :readings => {:state => 'read'} }, :through => :readings, :source => :user
+
+      scope :read_by,           lambda {|user| ActsAsReadable::HelperMethods.outer_join_readings(all, user).where(ActsAsReadable::HelperMethods.read_conditions(self, user))}
+      scope :unread_by,         lambda {|user| ActsAsReadable::HelperMethods.outer_join_readings(all, user).where(ActsAsReadable::HelperMethods.unread_conditions(self, user))}
 
       extend ActsAsReadable::ClassMethods
       include ActsAsReadable::InstanceMethods
@@ -31,8 +33,8 @@ module ActsAsReadable
       user[readable_class.acts_as_readable_options[:cache]] if readable_class.acts_as_readable_options[:cache]
     end
 
-    def self.outer_join_readings(readable_class, user)
-      Reading.joins("LEFT OUTER JOIN readings ON readings.readable_type = '#{readable_class.name}' AND readings.readable_id = #{readable_class.table_name}.id AND readings.user_id = #{user.id}")
+    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
 
@@ -74,7 +76,7 @@ module ActsAsReadable
 
     def read_by!(user)
       # Find an existing reading and update the record so we can know when the thing was first read, and the last time we read it
-      reading = Reading.find_or_initialize_by_user_id_and_readable_id_and_readable_type(user.id, self.id, self.class.name)
+      reading = Reading.find_or_initialize_by(:user_id => user.id, :readable_id => self.id, :readable_type => self.class.name)
       reading.updated_at = Time.now # Explicitly set the read time to now in order to force a save in case we haven't changed anything else about the reading
       reading.state = :read
       reading.save!
@@ -84,7 +86,7 @@ module ActsAsReadable
     end
 
     def unread_by!(user)
-      reading = Reading.find_or_initialize_by_user_id_and_readable_id_and_readable_type(user.id, self.id, self.class.name)
+      reading = Reading.find_or_initialize_by(:user_id => user.id, :readable_id => self.id, :readable_type => self.class.name)
       reading.state = :unread
       reading.save!
     end
@@ -93,13 +95,13 @@ module ActsAsReadable
       if cached_reading
         cached_reading.read?
       elsif cached_reading == false
-        user[acts_as_readable_options[:cache]].to_f > self.updated_at.to_f
+        user[acts_as_readable_options[:cache]].to_f > self.created_at.to_f
       elsif readers.loaded?
         readers.include?(user)
       elsif reading = readings.find_by_user_id(user.id)
         reading.read?
       else
-        user[acts_as_readable_options[:cache]].to_f > self.updated_at.to_f
+        user[acts_as_readable_options[:cache]].to_f > self.created_at.to_f
       end
     end
 
@@ -110,11 +112,11 @@ module ActsAsReadable
 
     def latest_update_read_by?(user)
       if cached_reading
-        cached_reading.updated_at > self.updated_at
+        cached_reading.read? && cached_reading.updated_at > self.updated_at
       elsif cached_reading == false
         user[acts_as_readable_options[:cache]].to_f > self.updated_at.to_f
-      elsif reading = readings.where(:user_id => user.id, :state => :read).first
-        reading.updated_at > self.updated_at
+      elsif reading = readings.find_by_user_id(user.id)
+        reading.read? && reading.updated_at > self.updated_at
       else
         user[acts_as_readable_options[:cache]].to_f > self.updated_at.to_f
       end

data/spec/acts_as_readable_spec.rb

@@ -54,12 +54,18 @@ describe 'acts_as_readable' do
     end
   end
 
-  describe "when checking a specific record" do
-    it "should return true if the record hasn't explicitly been read, but the user has 'read all' since the last time the record was updated" do
+  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
     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
+    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
@@ -76,6 +82,43 @@ describe 'acts_as_readable' do
       Comment.read_by! @user
       @comment.read_by?(@user).should be_true
     end
-  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
+    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
+    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
+    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
+    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
+    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
+    end
+  end
 end
 `dropdb acts_as_readable_test`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_readable
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -10,7 +10,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2014-01-28 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: 
 email: contact@culturecode.ca
 executables: []