unread 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b54928f534685b22218df3b892e9be469dda4a22
-  data.tar.gz: 847e2b242a01ac7489bf0f59f0fa88be9e2ee67b
+  metadata.gz: 05f0404c7e8d4778e3c417c8ea555ea8281770ec
+  data.tar.gz: d528c0105fe90d6e8e354a6828e6edf0fb5d0349
 SHA512:
-  metadata.gz: 87aa05f39bb03471ae1eec26b7e51deae00529b93a6bedb99b00f63a13b6a6df7266b717286c728ae9fe7e87ad42dfef0e57f040390ad768bb10eb9a67eb2db0
-  data.tar.gz: b9a815db5ea3ae66df1c7e60737a74f103b5cbe2e8364ea1abe0a7a1fb8f3b6daa1d6ef5811d0364ae58db78e1b3f8884e5c4e7c40d177d8a0ca43c5cd9174f3
+  metadata.gz: d378c5dec0dde8062d584f012b50552af831d6aac3917e7e9df201a1806b0012a35fd878279ae4bfdbe83ee45b2bda760d2eaa56b798ba061f7b380e3c4aed3a
+  data.tar.gz: 8f3b85a26665a94e989351320c9ae6ba9b724e035170d6007333e06ae722515417e5685f9ceab0e0718f8c441fb902771ac745f72f404059a9ed0e3d07509cc9

data/.travis.yml

@@ -13,3 +13,8 @@ gemfile:
   - ci/Gemfile-rails-4-2
 before_install: gem update bundler
 sudo: false
+env:
+  - DB=sqlite
+  - DB=mysql
+before_script:
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS unread_test;'; fi"

data/ci/Gemfile-rails-3-0

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

data/ci/Gemfile-rails-3-1

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

data/ci/Gemfile-rails-3-2

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

data/ci/Gemfile-rails-4-0

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

data/ci/Gemfile-rails-4-1

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

data/ci/Gemfile-rails-4-2

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

data/lib/unread/base.rb

@@ -5,7 +5,7 @@ module Unread
 
   module Base
     def acts_as_reader(options={})
-      ReadMark.belongs_to :user, :class_name => self.to_s
+      ReadMark.belongs_to :user, :class_name => self.to_s, inverse_of: :read_marks
 
       has_many :read_marks, :dependent => :delete_all, :foreign_key => 'user_id', :inverse_of => :user
 
@@ -32,7 +32,7 @@ module Unread
       options.reverse_merge!(:on => :updated_at)
       self.readable_options = options
 
-      has_many :read_marks, :as => :readable, :dependent => :delete_all
+      has_many :read_marks, :as => :readable, :dependent => :delete_all, inverse_of: :readable
 
       ReadMark.readable_classes ||= []
       ReadMark.readable_classes << self unless ReadMark.readable_classes.include?(self)

data/lib/unread/readable_scopes.rb

@@ -7,7 +7,7 @@ module Unread
         joins "LEFT JOIN read_marks
                 ON read_marks.readable_type  = '#{base_class.name}'
                AND read_marks.readable_id    = #{quoted_table_name}.#{quoted_primary_key}
-               AND read_marks.user_id        = #{user.id}
+               AND read_marks.user_id        = #{quote_bound_value(user.id)}
                AND read_marks.timestamp     >= #{quoted_table_name}.#{connection.quote_column_name(readable_options[:on])}"
       end
 
@@ -15,32 +15,28 @@ module Unread
         result = join_read_marks(user)
 
         if global_time_stamp = user.read_mark_global(self).try(:timestamp)
-          result = result.where("read_marks.id IS NULL
-                                 AND #{quoted_table_name}.#{connection.quote_column_name(readable_options[:on])} > ?", global_time_stamp)
+          result.where("read_marks.id IS NULL
+                        AND #{quoted_table_name}.#{connection.quote_column_name(readable_options[:on])} > ?", global_time_stamp)
         else
-          result = result.where('read_marks.id IS NULL')
+          result.where('read_marks.id IS NULL')
         end
-
-        result
       end
 
       def read_by(user)
         result = join_read_marks(user)
 
         if global_time_stamp = user.read_mark_global(self).try(:timestamp)
-          result = result.where("read_marks.id IS NOT NULL
-                                 OR #{quoted_table_name}.#{connection.quote_column_name(readable_options[:on])} <= ?", global_time_stamp)
+          result.where("read_marks.id IS NOT NULL
+                        OR #{quoted_table_name}.#{connection.quote_column_name(readable_options[:on])} <= ?", global_time_stamp)
         else
-          result = result.where('read_marks.id IS NOT NULL')
+          result.where('read_marks.id IS NOT NULL')
         end
-
-        result
       end
 
       def with_read_marks_for(user)
         join_read_marks(user).select("#{quoted_table_name}.*,
                                      read_marks.id AS read_mark_id,
-                                     #{user.id} AS read_mark_user_id")
+                                     #{quote_bound_value(user.id)} AS read_mark_user_id")
       end
     end
   end

data/lib/unread/reader_scopes.rb

@@ -12,7 +12,7 @@ module Unread
       end
 
       def have_not_read(readable)
-        join_read_marks(readable).where("read_marks.id IS NULL")
+        join_read_marks(readable).where('read_marks.id IS NULL')
       end
 
       def have_read(readable)

data/lib/unread/version.rb

@@ -1,3 +1,3 @@
 module Unread
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/spec/database.yml

@@ -0,0 +1,8 @@
+sqlite:
+  adapter: sqlite3
+  database: ":memory:"
+mysql:
+  adapter: mysql2
+  database: unread_test
+  username: root
+  encoding: utf8

data/spec/readable_spec.rb

@@ -25,6 +25,11 @@ describe Unread::Readable do
       expect(Email.unread_by(@other_reader)).to eq [@email1, @email2]
     end
 
+    it "should return empty array directly after marking all as read" do
+      Email.mark_as_read! :all, :for => @reader
+      expect(Email.unread_by(@reader)).to eq([])
+    end
+
     it "should not allow invalid parameter" do
       [ 42, nil, 'foo', :foo, {} ].each do |not_a_reader|
         expect {

data/spec/spec_helper.rb

@@ -51,9 +51,15 @@ if I18n.respond_to?(:enforce_available_locales=)
 end
 
 def setup_db
-  puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+  configs = YAML.load_file('spec/database.yml')
+  ActiveRecord::Base.configurations = configs
 
-  ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
+  db_name = ENV['DB'] || 'sqlite'
+
+  puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING} on #{db_name}"
+
+  ActiveRecord::Base.establish_connection(db_name.to_sym)
+  ActiveRecord::Base.default_timezone = :utc
   ActiveRecord::Migration.verbose = false
 
   require File.expand_path('../../lib/generators/unread/migration/templates/migration.rb', __FILE__)

data/unread.gemspec

@@ -5,11 +5,13 @@ require "unread/version"
 Gem::Specification.new do |s|
   s.name        = "unread"
   s.version     = Unread::VERSION
+  s.licenses    = ['MIT']
   s.authors     = ["Georg Ledermann"]
   s.email       = ["mail@georg-ledermann.de"]
-  s.homepage    = ""
+  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 = '>= 1.9.3'
 
   s.rubyforge_project = "unread"
 
@@ -23,6 +25,7 @@ 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 '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.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +153,7 @@ files:
 - lib/unread/reader_scopes.rb
 - lib/unread/version.rb
 - spec/base_spec.rb
+- spec/database.yml
 - spec/model/email.rb
 - spec/model/reader.rb
 - spec/read_mark_spec.rb
@@ -149,8 +164,9 @@ files:
 - spec/support/query_counter.rb
 - spec/support/timecop.rb
 - unread.gemspec
-homepage: ''
-licenses: []
+homepage: https://github.com/ledermann/unread
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -160,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -168,12 +184,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: unread
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Manages read/unread status of ActiveRecord objects
 test_files:
 - spec/base_spec.rb
+- spec/database.yml
 - spec/model/email.rb
 - spec/model/reader.rb
 - spec/read_mark_spec.rb