unread 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a7a52ce94c2d2bf78f926c90869494d43c7c0d5
-  data.tar.gz: 3f75e1d043b89b5ec6cee60f5b1197106399df23
+  metadata.gz: b42af3056d22efa6bd8f01efb9015ce13f4e2655
+  data.tar.gz: 99e1e8ba04db00f7d29e40dfb5ac4370511d3fe5
 SHA512:
-  metadata.gz: 576527e97d9c23f90a6d96061598e890a86c3fcb06a36030472e4e12f04a5abfe231eea980c6a122335319f9630c9c71bb4604e77f01018a7b378046dda736ae
-  data.tar.gz: 34fd6607a8935bf86ca508def361545f0d1a56d6b9c5057102db317dca29769d27a47d98b8059750d6063bb74a6adfee348db47c18453848ed859f4c1e3f2a83
+  metadata.gz: d4cd7ed7703aa74f878b8c3a93b2c5b083775b04735590db2431d745e2f68e271c7f3546cb8494de38c1969ad552894cc5a0e776a9303a63d6ed0d1bb1b796de
+  data.tar.gz: 98263bf4a54954ce81777b2c6aefde0baee14938da8ecea81462bfa693c263a7862bc2ff5fbb9c14bb948916ff5febee9f303df1b3fa24c5cb660111c6b2e486

data/.travis.yml

@@ -16,5 +16,7 @@ sudo: false
 env:
   - DB=sqlite
   - DB=mysql
+  - DB=postgres
 before_script:
   - 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"

data/README.md

@@ -21,6 +21,7 @@ Ruby gem to manage read/unread status of ActiveRecord objects - and it's fast.
 
 * Ruby 1.9.3 or newer
 * Rails 3 (including 3.0, 3.1, 3.2) and Rails 4. For use with Rails 2.3 there is a branch named "rails2"
+* MySQL, PostgreSQL or SQLite
 * Needs a timestamp field in your models (like created_at or updated_at) with a database index on it
 
 

data/bin/console

@@ -20,7 +20,7 @@ require 'spec/app/models/email'
 # Pry.start
 
 ActiveRecord::Base.configurations = YAML.load_file('spec/database.yml')
-ActiveRecord::Base.establish_connection(:sqlite)
+ActiveRecord::Base.establish_connection((ENV['DB'] || 'sqlite').to_sym)
 ActiveRecord::Migration.verbose = false
 
 UnreadMigration.up

data/ci/Gemfile-rails-3-0

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 3.0.20'
 gem 'sqlite3'
 gem 'activerecord-mysql2-adapter'
+gem 'pg'
 gem 'timecop'
 gem 'rake'
 gem 'rspec'

data/ci/Gemfile-rails-3-1

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 3.1.12'
 gem 'sqlite3'
 gem 'mysql2', '~> 0.3.10'
+gem 'pg'
 gem 'timecop'
 gem 'rake'
 gem 'rspec'

data/ci/Gemfile-rails-3-2

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 3.2.17'
 gem 'sqlite3'
 gem 'mysql2', '~> 0.3.10'
+gem 'pg'
 gem 'timecop'
 gem 'rake'
 gem 'rspec'

data/ci/Gemfile-rails-4-0

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 4.0.4'
 gem 'sqlite3'
 gem 'mysql2', '~> 0.3.10'
+gem 'pg'
 gem 'timecop'
 gem 'rake'
 gem 'rspec'

data/ci/Gemfile-rails-4-1

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 4.1.0'
 gem 'sqlite3'
 gem 'mysql2', '~> 0.3.13'
+gem 'pg'
 gem 'timecop'
 gem 'rake'
 gem 'rspec'

data/ci/Gemfile-rails-4-2

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 4.2.0'
 gem 'sqlite3'
 gem 'mysql2', '~> 0.3.13'
+gem 'pg'
 gem 'timecop'
 gem 'rake'
 gem 'rspec'

data/lib/unread/garbage_collector.rb

@@ -30,7 +30,7 @@ module Unread
         reader_scope.
         joins(:read_marks).
         where(:read_marks => { :readable_type => readable_class.base_class.name }).
-        group('read_marks.reader_type, read_marks.reader_id').
+        group("read_marks.reader_type, read_marks.reader_id, #{reader_class.quoted_table_name}.#{reader_class.quoted_primary_key}").
         having('COUNT(read_marks.id) > 1')
     end
 

data/lib/unread/readable.rb

@@ -122,7 +122,7 @@ module Unread
       private
 
       def read_mark_id_belongs_to?(reader)
-        self.read_mark_reader_id == reader.id &&
+        self.read_mark_reader_id.to_i == reader.id &&
           self.read_mark_reader_type == reader.class.base_class.name
       end
     end

data/lib/unread/reader.rb

@@ -35,7 +35,7 @@ module Unread
 
       def read_mark_id_belongs_to?(readable)
         self.read_mark_readable_type == readable.class.base_class.name &&
-        (self.read_mark_readable_id.nil? || self.read_mark_readable_id == readable.id)
+        (self.read_mark_readable_id.nil? || self.read_mark_readable_id.to_i == readable.id)
       end
 
       # We assume that a new reader should not be tackled by tons of old messages created BEFORE he signed up.

data/lib/unread/version.rb

@@ -1,3 +1,3 @@
 module Unread
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/app/models/reader.rb

@@ -1,8 +1,8 @@
 class Reader < ActiveRecord::Base
   self.primary_key = 'number'
 
-  scope :not_foo, -> { where('name <> "foo"') }
-  scope :not_bar, -> { where('name <> "bar"') }
+  scope :not_foo, -> { where("name <> 'foo'") }
+  scope :not_bar, -> { where("name <> 'bar'") }
 
   acts_as_reader
 

data/spec/database.yml

@@ -6,3 +6,7 @@ mysql:
   database: unread_test
   username: root
   encoding: utf8
+postgres:
+  adapter: postgresql
+  database: unread_test
+  username: postgres

data/spec/support/matchers/perform_queries.rb

@@ -1,4 +1,6 @@
 RSpec::Matchers.define :perform_queries do |expected|
+  supports_block_expectations
+
   match do |block|
     query_count(&block) == expected
   end
@@ -12,11 +14,6 @@ RSpec::Matchers.define :perform_queries do |expected|
     ActiveSupport::Notifications.subscribe('sql.active_record', @counter.to_proc)
     yield
     ActiveSupport::Notifications.unsubscribe(@counter.to_proc)
-
     @counter.query_count
   end
-
-  def supports_block_expectations?
-    true
-  end
 end

data/unread.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'mysql2', '~> 0.3.13'
+  s.add_development_dependency 'pg'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'coveralls', '>= 0.8.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unread
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -68,6 +68,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.13
+- !ruby/object:Gem::Dependency
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="