unread 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05b6ec999b0b08aecbed6fc07c6e1d8e24fa5220d9b360b1fb6a1aa7293cbadc
-  data.tar.gz: be06fff51e62ecdaeddb2d5d86e89c950c3080db70dbed8b4736d976e17ab1a5
+  metadata.gz: da2c0da709d4464ceda393f45c8fa5aa6858c3bf458cbd75351491145a9b4905
+  data.tar.gz: b6a4938837521be8b1a86e38aa2b181572cf4ec2731b765389e71538a3822a0a
 SHA512:
-  metadata.gz: 9b0c1ac98cdf02095d66c6b77959a039083f5dc9e0a5d350aff8274ba9d6589cf873a46872a32c9a09080bc52f5dce4ab4fcf9450fbe0f4088f2efe6bec80224
-  data.tar.gz: '0879f93f42eee16f150e64bce7a1271dce8dc5c728f1ece62d7da2ed8c47d7d034c98a7a3619564fb6f8e4a4d35e7e111d123c0dad6e7e0234328e73b47321da'
+  metadata.gz: 9b3980715732e4f3dc0fbf2e63b3367322b6f3c03ced30516b6cba94e31e4b54e6a707ae192e4aa5a00fd2ad83b3501c93ba7f89c3d9081903fc36966a183765
+  data.tar.gz: '0228314b73218e74d9583860892b77d9fd1f9ed3f41ff9c07b6985095e895be1b609fb4ac9befa34b64c3352b45ffb0c229295e74c1d16e7fdfaf7c7b6e34ee4'

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 gemfile:
+  - gemfiles/rails_6_0.gemfile
   - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_0.gemfile
@@ -13,13 +13,19 @@ gemfile:
   - gemfiles/rails_4_0.gemfile
 matrix:
   exclude:
-    - rvm: 2.4.3
+    - rvm: 2.4.6
       gemfile: gemfiles/rails_4_0.gemfile
-    - rvm: 2.4.3
+    - rvm: 2.4.6
       gemfile: gemfiles/rails_4_1.gemfile
-    - rvm: 2.5.0
+    - rvm: 2.4.6
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: 2.5.5
       gemfile: gemfiles/rails_4_0.gemfile
-    - rvm: 2.5.0
+    - rvm: 2.5.5
+      gemfile: gemfiles/rails_4_1.gemfile
+    - rvm: 2.6.3
+      gemfile: gemfiles/rails_4_0.gemfile
+    - rvm: 2.6.3
       gemfile: gemfiles/rails_4_1.gemfile
 before_install: gem update bundler
 sudo: false
@@ -27,7 +33,12 @@ env:
   - DB=sqlite
   - DB=mysql
   - DB=postgres
+services:
+  - mysql
+  - postgres
 before_script:
   - gem update --system # https://github.com/travis-ci/travis-ci/issues/8978
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS unread_test;'; fi"
   - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database unread_test;' -U postgres; fi"
+addons:
+  postgresql: "9.4"

data/Appraisals

@@ -1,29 +1,48 @@
+appraise "rails-6-0" do
+  gem "activerecord", "~> 6.0.0.beta3"
+  gem "mysql2", ">= 0.4.4"
+  gem "pg", ">= 0.18", "< 2.0"
+  gem "sqlite3", "~> 1.4"
+end
+
 appraise "rails-5-2" do
-  gem "activerecord", "~> 5.2.0.beta2"
-  gem "mysql2", ">= 0.3.18", "< 0.5", "!= 0.4.3"
+  gem "activerecord", "~> 5.2.3"
+  gem "mysql2", ">= 0.4.4", "< 0.6.0"
+  gem "pg", ">= 0.18", "< 2.0"
+  gem "sqlite3", "~> 1.3", ">= 1.3.6"
 end
 
 appraise "rails-5-1" do
-  gem "activerecord", "~> 5.1.0"
-  gem 'mysql2', '>= 0.3.18', '< 0.5'
+  gem "activerecord", "~> 5.1.7"
+  gem "mysql2", ">= 0.3.18", "< 0.6.0"
+  gem "pg", ">= 0.18", "< 2.0"
+  gem "sqlite3", "~> 1.3", ">= 1.3.6"
 end
 
 appraise "rails-5-0" do
-  gem "activerecord", "~> 5.0.0"
-  gem 'mysql2', '>= 0.3.18', '< 0.5'
+  gem "activerecord", "~> 5.0.7"
+  gem 'mysql2', '>= 0.3.18', '< 0.6.0'
+  gem "pg", ">= 0.18", "< 2.0"
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails-4-2" do
-  gem "activerecord", "~> 4.2.5"
-  gem 'mysql2', '>= 0.3.13', '< 0.5'
+  gem "activerecord", "~> 4.2.11"
+  gem 'mysql2', '>= 0.3.13', '< 0.6.0'
+  gem "pg", "~> 0.15"
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails-4-1" do
-  gem "activerecord", "~> 4.1.14"
-  gem "mysql2", '~> 0.3.13'
+  gem "activerecord", "~> 4.1.16"
+  gem 'mysql2', '~> 0.3.13'
+  gem "pg", "~> 0.11"
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails-4-0" do
   gem "activerecord", "~> 4.0.13"
   gem "mysql2", '~> 0.3.10'
+  gem "pg", "~> 0.11"
+  gem 'sqlite3', '~> 1.3.6'
 end

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2010-2018 Georg Ledermann
+Copyright (c) 2010-2019 Georg Ledermann
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -19,8 +19,8 @@ Ruby gem to manage read/unread status of ActiveRecord objects - and it's fast.
 
 ## Requirements
 
-* Ruby 2.2 or newer
-* Rails 4.0 or newer (including Rails 5.1 and 5.2)
+* Ruby 2.4 or newer
+* Rails 4.0 or newer (including Rails 6)
 * MySQL, PostgreSQL or SQLite
 * Needs a timestamp field in your models (like created_at or updated_at) with a database index on it
 
@@ -160,6 +160,30 @@ users[1].have_read?(message2)
 Message.cleanup_read_marks!
 ```
 
+## Getting read/unread stats through a relationship
+
+```ruby
+class Document < ApplicationRecord
+  has_many :comments
+end
+
+class Comment < ApplicationRecord
+  acts_as_readable on: :created_at
+  belongs_to :document
+end
+
+# Get unread comments count for a document
+document = Document.find(1)
+default_hash = Hash.new { |h, k| h[k] = { unread: 0, total: 0 } }
+document.comments.with_read_marks_for(current_user).reduce(default_hash) do |hash, comment|
+  hash[comment.id][:unread] += 1 if comment.unread?(current_user)
+  hash[comment.id][:total] += 1
+  hash
+end
+# => {20=>{:unread=>1, :total=>10}, 82=>{:unread=>0, :total=>4}
+```
+
+Using `with_read_marks_for` here is the key. It uses just one query and makes sure that the following `unread?` invocations use the result of the first query.
 
 ## How does it work?
 
@@ -199,4 +223,4 @@ AND messages.created_at > '2010-10-20 08:50:00'
 Hint: You should add a database index on `messages.created_at`.
 
 
-Copyright (c) 2010-2018 [Georg Ledermann](http://www.georg-ledermann.de) and [contributors](https://github.com/ledermann/unread/graphs/contributors), released under the MIT license
+Copyright (c) 2010-2019 [Georg Ledermann](http://www.georg-ledermann.de) and [contributors](https://github.com/ledermann/unread/graphs/contributors), released under the MIT license

data/gemfiles/rails_4_0.gemfile

@@ -4,5 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.0.13"
 gem "mysql2", "~> 0.3.10"
+gem "pg", "~> 0.11"
+gem "sqlite3", "~> 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails_4_1.gemfile

@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.1.14"
+gem "activerecord", "~> 4.1.16"
 gem "mysql2", "~> 0.3.13"
+gem "pg", "~> 0.11"
+gem "sqlite3", "~> 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails_4_2.gemfile

@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.5"
-gem "mysql2", ">= 0.3.13", "< 0.5"
+gem "activerecord", "~> 4.2.11"
+gem "mysql2", ">= 0.3.13", "< 0.6.0"
+gem "pg", "~> 0.15"
+gem "sqlite3", "~> 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails_5_0.gemfile

@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0"
-gem "mysql2", ">= 0.3.18", "< 0.5"
+gem "activerecord", "~> 5.0.7"
+gem "mysql2", ">= 0.3.18", "< 0.6.0"
+gem "pg", ">= 0.18", "< 2.0"
+gem "sqlite3", "~> 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.1.0"
-gem "mysql2", ">= 0.3.18", "< 0.5"
+gem "activerecord", "~> 5.1.7"
+gem "mysql2", ">= 0.3.18", "< 0.6.0"
+gem "pg", ">= 0.18", "< 2.0"
+gem "sqlite3", "~> 1.3", ">= 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.2.0.beta2"
-gem "mysql2", ">= 0.3.18", "< 0.5", "!= 0.4.3"
+gem "activerecord", "~> 5.2.3"
+gem "mysql2", ">= 0.4.4", "< 0.6.0"
+gem "pg", ">= 0.18", "< 2.0"
+gem "sqlite3", "~> 1.3", ">= 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0.beta3"
+gem "mysql2", ">= 0.4.4"
+gem "pg", ">= 0.18", "< 2.0"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"

data/lib/unread/reader_scopes.rb

@@ -12,7 +12,7 @@ module Unread
 
         joins "LEFT JOIN #{ReadMark.quoted_table_name}
                 ON #{ReadMark.quoted_table_name}.readable_type  = '#{readable.class.readable_parent.name}'
-               AND (#{ReadMark.quoted_table_name}.readable_id   = #{readable.id} OR #{ReadMark.quoted_table_name}.readable_id IS NULL)
+               AND (#{ReadMark.quoted_table_name}.readable_id   = #{quote_bound_value(readable.id)} OR #{ReadMark.quoted_table_name}.readable_id IS NULL)
                AND #{ReadMark.quoted_table_name}.reader_id      = #{quoted_table_name}.#{quoted_primary_key}
                AND #{ReadMark.quoted_table_name}.reader_type    = '#{connection.quote_string base_class.name}'
                AND #{ReadMark.quoted_table_name}.timestamp     >= '#{connection.quoted_date readable.send(readable.class.readable_options[:on])}'"
@@ -31,8 +31,8 @@ module Unread
 
         join_read_marks(readable).select("#{quoted_table_name}.*,
                                           #{ReadMark.quoted_table_name}.id AS read_mark_id,
-                                          #{quote_bound_value readable.class.name}#{postgresql_string_cast} AS read_mark_readable_type,
-                                          #{readable.id} AS read_mark_readable_id")
+                                          #{quote_bound_value(readable.class.name)}#{postgresql_string_cast} AS read_mark_readable_type,
+                                          #{quote_bound_value(readable.id)} AS read_mark_readable_id")
       end
     end
   end

data/lib/unread/version.rb

@@ -1,3 +1,3 @@
 module Unread
-  VERSION = '0.10.1'
+  VERSION = '0.11.0'
 end

data/unread.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/ledermann/unread"
   s.summary     = %q{Manages read/unread status of ActiveRecord objects}
   s.description = %q{This gem creates a scope for unread objects and adds methods to mark objects as read }
-  s.required_ruby_version = '>= 2.2'
+  s.required_ruby_version = '>= 2.4'
 
   s.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'mysql2'
-  s.add_development_dependency 'pg', '< 1'
+  s.add_development_dependency 'pg'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'term-ansicolor'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unread
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2019-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -98,16 +98,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ files:
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
 - lib/generators/unread/migration/migration_generator.rb
 - lib/generators/unread/migration/templates/migration.rb
 - lib/generators/unread/polymorphic_reader_migration/polymorphic_reader_migration_generator.rb
@@ -227,15 +228,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Manages read/unread status of ActiveRecord objects