unread 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15bcd9b02294f143149629be616cb1299000b90a
-  data.tar.gz: 02641fa74f93b396f2368c0766c51c32b41f0620
+  metadata.gz: 22da2f765c42c94461c4bf67560a057ed1f76d8f
+  data.tar.gz: 3d45b07e1d0fc2a3af20b81a8a8fa0b1ff2bf9de
 SHA512:
-  metadata.gz: 3784de0accd1416b0fd9d3f1e7948e23636c1aa57c9f4a843b613a5da34ae29c2edba5a8720c3ef10aa3c8c23755f9b7df239305cdbe81e38d4f248a12004b5e
-  data.tar.gz: 11aa961213755d8d9740a3782d2f91192a7d584776ecabea1ded9ccafe30a61d56c5b1eb80452d756684b7bb08818720f19ae7ce36cd4fc13265edf75c7cc9c9
+  metadata.gz: c51a5ad38b6a49467f3f3d542e06177c9ea3226cadd1001b66f407bea2f1edf65d7f45bad871184697b526938e62a08905e1e44cb154288eb37a886396d5f53a
+  data.tar.gz: 53b3e25c4723f78121aa3a1f066a68c91b462cbc3a56f5489ac416ba58cb7bb4ea917bc3c174c4b25a852dee4228c10e90c7c054da2f16ceb73b1e5044e79b1b

data/.travis.yml

@@ -1,14 +1,9 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
 gemfile:
-  - ci/Gemfile.rails-3.0.x
-  - ci/Gemfile.rails-3.1.x
-  - ci/Gemfile.rails-3.2.x
-  - ci/Gemfile.rails-4.0.x
-matrix:
-  exclude:
-    - rvm: 1.8.7
-      gemfile: ci/Gemfile.rails-4.0.x
+  - ci/Gemfile-rails-3-0
+  - ci/Gemfile-rails-3-1
+  - ci/Gemfile-rails-3-2
+  - ci/Gemfile-rails-4-0

data/README.md

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

data/changelog.md

@@ -1,58 +1,75 @@
 # Changelog
 
-## 0.3.0 - 2013/03/17
+## 0.3.1 - 2013-12-04
+
+* Use Time.current instead of Time.now to avoid time zone trouble. Issue #18 (thanks to @henrythe9th)
+* Handle primary keys other than "id". Issue #29 (thanks to @bcavileer)
+
+
+## 0.3.0 - 2013-03-17
 
 * Support for Rails 4 (beta1)
 
-## 0.2.0 - 2013/02/18
+
+## 0.2.0 - 2013-02-18
 
 * Support for Rails 2 dropped
 * Refactoring
 * Added migration generator
 
-## 0.1.2 - 2013/01/27
+
+## 0.1.2 - 2013-01-27
 
 * Scopes: Improved parameter check
 
-## 0.1.1 - 2012/05/01
+
+## 0.1.1 - 2012-05-01
 
 * Fixed handling namespaced classes. Closes #10 (thanks to @stanislaw)
 
-## 0.1.0 - 2012/04/21
+
+## 0.1.0 - 2012-04-21
 
 * Added scope "with_read_marks_for"
 * Fixed #7: Added attr_accessible to all ReadMark attributes (thanks to @negative)
 
-## 0.0.7 - 2012/02/29
+
+## 0.0.7 - 2012-02-29
 
 * Cleanup files
 * acts_as_reader: Using inverse_of (available since Rails 2.3.6)
 
-## 0.0.6 - 2011/11/11
+
+## 0.0.6 - 2011-11-11
 
 * Fixed #5: Gemspec dependency fix (thanks to @bricker88)
 * Fixed #6: Removed hard coded dependency on a class named "User" (thanks to @mixandgo)
 * Some cleanup
 
-## 0.0.5 - 2011/09/09
+
+## 0.0.5 - 2011-09-09
 
 * Fixed class loading issue in development environment
 
-## 0.0.4 - 2011/08/31
+
+## 0.0.4 - 2011-08-31
 
 * Ignore multiple calls of acts_as_*
 * Improved error messages
 * Tested with Rails 3.1
 
-## 0.0.3 - 2011/08/01
+
+## 0.0.3 - 2011-08-01
 
 * Fixed gemspec by adding development dependencies
 * Testing with Travis CI
 
-## 0.0.2 - 2011/06/23
+
+## 0.0.2 - 2011-06-23
 
 * Fixed scoping for ActiveRecord 2.x
 
-## 0.0.1 - 2011/06/23
+
+## 0.0.1 - 2011-06-23
 
 * Released as Gem

data/ci/{Gemfile.rails-4.0.x → Gemfile-rails-4-0}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '4.0.0.beta1'
+gem 'activerecord', '4.0.0.rc1'
 gem 'sqlite3'
 gem 'timecop'
 gem 'rake'

data/lib/unread/read_mark.rb

@@ -8,7 +8,7 @@ class ReadMark < ActiveRecord::Base
 
   scope :global, lambda { where(:readable_id => nil) }
   scope :single, lambda { where('readable_id IS NOT NULL') }
-  scope :older_than, lambda { |timestamp| where([ 'timestamp < ?', timestamp]) }
+  scope :older_than, lambda { |timestamp| where([ 'timestamp < ?', timestamp ]) }
 
   # Returns the class defined by acts_as_reader
   def self.reader_class

data/lib/unread/readable.rb

@@ -71,7 +71,7 @@ module Unread
           ReadMark.delete_all :readable_type => self.base_class.name
           ReadMark.connection.execute <<-EOT
             INSERT INTO read_marks (user_id, readable_type, timestamp)
-            SELECT id, '#{self.base_class.name}', '#{Time.now.to_s(:db)}'
+            SELECT #{ReadMark.reader_class.primary_key}, '#{self.base_class.name}', '#{Time.current.to_s(:db)}'
             FROM #{ReadMark.reader_class.table_name}
           EOT
         end
@@ -82,7 +82,7 @@ module Unread
 
         ReadMark.transaction do
           ReadMark.delete_all :readable_type => self.base_class.name, :user_id => user.id
-          ReadMark.create!    :readable_type => self.base_class.name, :user_id => user.id, :timestamp => Time.now
+          ReadMark.create!    :readable_type => self.base_class.name, :user_id => user.id, :timestamp => Time.current
         end
       end
 

data/lib/unread/reader.rb

@@ -3,7 +3,9 @@ module Unread
     module InstanceMethods
       def read_mark_global(klass)
         instance_var_name = "@read_mark_global_#{klass.name.gsub('::','_')}"
-        instance_variable_get(instance_var_name) || begin # memoize
+        if instance_variables.include?(instance_var_name.to_sym)
+          instance_variable_get(instance_var_name)
+        else # memoize
           obj = self.read_marks.where(:readable_type => klass.base_class.name).global.first
           instance_variable_set(instance_var_name, obj)
         end

data/lib/unread/scopes.rb

@@ -5,7 +5,7 @@ module Unread
         assert_reader(user)
 
         joins "LEFT JOIN read_marks ON read_marks.readable_type  = '#{base_class.name}'
-                                   AND read_marks.readable_id    = #{table_name}.id
+                                   AND read_marks.readable_id    = #{table_name}.#{primary_key}
                                    AND read_marks.user_id        = #{user.id}
                                    AND read_marks.timestamp     >= #{table_name}.#{readable_options[:on]}"
       end
@@ -26,4 +26,4 @@ module Unread
       end
     end
   end
-end
+end

data/lib/unread/version.rb

@@ -1,3 +1,3 @@
 module Unread
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/test/schema.rb

@@ -1,9 +1,9 @@
 ActiveRecord::Schema.define(:version => 0) do
-  create_table :readers, :force => true do |t|
+  create_table :readers, :primary_key => 'number', :force => true do |t|
     t.string :name
   end
 
-  create_table :emails, :force => true do |t|
+  create_table :emails, :primary_key => 'messageid', :force => true do |t|
     t.string :subject
     t.text :content
     t.datetime :created_at

data/test/test_helper.rb

@@ -14,10 +14,13 @@ load(File.dirname(__FILE__) + "/schema.rb")
 require 'unread'
 
 class Reader < ActiveRecord::Base
+  self.primary_key = 'number'
   acts_as_reader
 end
 
 class Email < ActiveRecord::Base
+  self.primary_key = 'messageid'
+
   acts_as_readable :on => :updated_at
 end
 

data/test/unread_test.rb

@@ -126,7 +126,7 @@ class UnreadTest < ActiveSupport::TestCase
   def test_mark_all_as_read
     Email.mark_as_read! :all, :for => @reader
 
-    assert_equal Time.now.utc, @reader.read_mark_global(Email).timestamp.utc
+    assert_equal Time.current, @reader.read_mark_global(Email).timestamp
     assert_equal [], @reader.read_marks.single
     assert_equal 0, ReadMark.single.count
     assert_equal 2, ReadMark.global.count

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: unread
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: timecop
   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: sqlite3
   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'
 description: 'This gem creates a scope for unread objects and adds methods to mark
@@ -74,17 +74,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - changelog.md
-- ci/Gemfile.rails-3.0.x
-- ci/Gemfile.rails-3.1.x
-- ci/Gemfile.rails-3.2.x
-- ci/Gemfile.rails-4.0.x
+- ci/Gemfile-rails-3-0
+- ci/Gemfile-rails-3-1
+- ci/Gemfile-rails-3-2
+- ci/Gemfile-rails-4-0
 - lib/generators/unread/migration/migration_generator.rb
 - lib/generators/unread/migration/templates/migration.rb
 - lib/unread.rb
@@ -108,17 +108,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: unread
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Manages read/unread status of ActiveRecord objects