unread 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '031127638582f162534dd12b0c7634728d8cbaef'
-  data.tar.gz: 8c142d460544502dfc8c3b6d5be2ab0edb745f49
+  metadata.gz: 302efc346d484f76d5346d27288d5e095062df99
+  data.tar.gz: 81d1a2fa58f5b4a6a7a78c3bede1d812033a1882
 SHA512:
-  metadata.gz: c3eefb5e01849958b959e8982b2f28da7c1264af88a60c8e43a5e28c563b298b7ea5da4440f148a9995d0e0006be7b1485edbfe8cbe2e073ad057931c333b3bf
-  data.tar.gz: 527a7d87fbc85f7edc88178f8d66d50fc38628722c1fac9faa2e7cdad6cc1f263ae77beac94b5bf30f91ecd99608d33701c398bbbb70117d80812def371b7ce6
+  metadata.gz: 7d79c07ac3de9d382349db73507e078156ed7731664cef4d0475b46a147299ab10037b12d874bbccb98b177d379eecc628c9cd4691c23f41bf9a91adff382db9
+  data.tar.gz: 5f4863448e71c179e30f61751d7849fee31d7bd6c1419db43c3f57d0d410683dbe9d7d8b069e902f54f4a1c3535c2040526254ecdcad23d3e6f5082ba742a832

data/lib/generators/unread/migration/templates/migration.rb

@@ -6,7 +6,7 @@ class UnreadMigration < ActiveRecord::Migration
       t.datetime :timestamp
     end
 
-    add_index ReadMark, [:reader_id, :reader_type, :readable_type, :readable_id], name: 'read_marks_reader_readable_index'
+    add_index ReadMark, [:reader_id, :reader_type, :readable_type, :readable_id], name: 'read_marks_reader_readable_index', unique: true
   end
 
   def self.down

data/lib/generators/unread/polymorphic_reader_migration/templates/unread_polymorphic_reader_migration.rb

@@ -4,7 +4,7 @@ class UnreadPolymorphicReaderMigration < ActiveRecord::Migration
     rename_column :read_marks, :user_id, :reader_id
     add_column :read_marks, :reader_type, :string
     execute "update read_marks set reader_type = 'User'"
-    add_index :read_marks, [:reader_id, :reader_type, :readable_type, :readable_id], name: 'read_marks_reader_readable_index'
+    add_index :read_marks, [:reader_id, :reader_type, :readable_type, :readable_id], name: 'read_marks_reader_readable_index', unique: true
   end
 
   def self.down

data/lib/unread/base.rb

@@ -36,5 +36,9 @@ module Unread
       extend Readable::ClassMethods
       extend Readable::Scopes
     end
+
+    def using_postgresql?
+      connection.adapter_name.match(/postgres/i)
+    end
   end
 end

data/lib/unread/readable.rb

@@ -27,11 +27,18 @@ module Unread
             if global_timestamp && global_timestamp >= timestamp
               # The object is implicitly marked as read, so there is nothing to do
             else
-              rm = obj.read_marks.where(:reader_id => reader.id, :reader_type => reader.class.base_class.name).first || obj.read_marks.build
-              rm.reader_id   = reader.id
-              rm.reader_type = reader.class.base_class.name
-              rm.timestamp   = timestamp
-              rm.save!
+              # This transaction is needed, so that parent transaction won't rollback even there's an error.
+              ReadMark.transaction(requires_new: true) do
+                begin
+                  rm = obj.read_marks.where(reader_id: reader.id, reader_type: reader.class.base_class.name).first || obj.read_marks.build
+                  rm.reader_id   = reader.id
+                  rm.reader_type = reader.class.base_class.name
+                  rm.timestamp   = timestamp
+                  rm.save!
+                rescue ActiveRecord::RecordNotUnique
+                  raise ActiveRecord::Rollback
+                end
+              end
             end
           end
         end
@@ -71,7 +78,7 @@ module Unread
           rm = reader.read_marks.new
           rm.readable_type = self.readable_parent.name
           rm.timestamp = Time.current
-          rm.save!    
+          rm.save!
         end
 
         reader.forget_memoized_read_mark_global

data/lib/unread/readable_scopes.rb

@@ -35,9 +35,11 @@ module Unread
       end
 
       def with_read_marks_for(reader)
+        postgresql_string_cast = using_postgresql? ? '::varchar' : ''
+
         join_read_marks(reader).select("#{quoted_table_name}.*,
                                         #{ReadMark.quoted_table_name}.id AS read_mark_id,
-                                        #{quote_bound_value(reader.class.base_class.name)} AS read_mark_reader_type,
+                                        #{quote_bound_value(reader.class.base_class.name)}#{postgresql_string_cast} AS read_mark_reader_type,
                                         #{quote_bound_value(reader.id)} AS read_mark_reader_id")
       end
     end

data/lib/unread/reader_scopes.rb

@@ -27,9 +27,11 @@ module Unread
       end
 
       def with_read_marks_for(readable)
+        postgresql_string_cast = using_postgresql? ? '::varchar' : ''
+
         join_read_marks(readable).select("#{quoted_table_name}.*,
                                           #{ReadMark.quoted_table_name}.id AS read_mark_id,
-                                         '#{readable.class.name}' AS read_mark_readable_type,
+                                          #{quote_bound_value readable.class.name}#{postgresql_string_cast} AS read_mark_readable_type,
                                           #{readable.id} AS read_mark_readable_id")
       end
     end

data/lib/unread/version.rb

@@ -1,3 +1,3 @@
 module Unread
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/spec/unread/readable_spec.rb

@@ -266,6 +266,20 @@ describe Unread::Readable do
       expect(@email2.unread?(@reader)).to be_falsey
     end
 
+    it "should mark the rest as read when the first record is not unique" do
+      Email.mark_as_read! [ @email1 ], for: @reader
+
+      allow(@email1).to receive_message_chain("read_marks.build").and_return(@email1.read_marks.build)
+      allow(@email1).to receive_message_chain("read_marks.where").and_return([])
+
+      expect do
+        Email.mark_as_read! [ @email1, @email2 ], for: @reader
+      end.to change(ReadMark, :count).by(1)
+
+      expect(@email1.unread?(@reader)).to be_falsey
+      expect(@email2.unread?(@reader)).to be_falsey
+    end
+
     it "should perform less queries if the objects are already read" do
       Email.mark_as_read! :all, :for => @reader
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unread
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord