unread 0.0.3 → 0.0.4

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
 gemfile:
   - ci/Gemfile.rails-2.3.x
   - ci/Gemfile.rails-3.0.x
+  - ci/Gemfile.rails-3.1.x
 env:
   - DB=sqlite
   - DB=mysql

data/README.md

@@ -3,7 +3,7 @@ Unread
 
 Gem to manage read/unread status of ActiveRecord objects - and it's fast.
 
-[![Build Status](http://travis-ci.org/ledermann/unread.png)](http://travis-ci.org/ledermann/unread)
+[![Build Status](https://secure.travis-ci.org/ledermann/unread.png)](http://travis-ci.org/ledermann/unread)
 
 ## Features
 
@@ -17,8 +17,8 @@ Gem to manage read/unread status of ActiveRecord objects - and it's fast.
 
 ## Requirements
 
-* Ruby 1.8.7, REE or 1.9.2
-* ActiveRecord >= 2.3 (tested with SQLite and MySQL)
+* Ruby 1.8.7 or 1.9.2
+* ActiveRecord 2.3.x, 3.0.x, 3.1.x (tested with SQLite and MySQL)
 * Needs a timestamp field in your models (e.g. created_at) with a database index on it
 
 

data/changelog.md

@@ -1,3 +1,9 @@
+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
 
 * Fixed gemspec by adding development dependencies

data/ci/Gemfile.rails-2.3.x

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'activerecord', '~> 2.3'
+gem 'activerecord', '~> 2.3.14'
 gem 'sqlite3'
 gem 'mysql2', '~> 0.2.11'
 gem 'mocha'

data/ci/Gemfile.rails-3.0.x

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'activerecord', '~> 3.0'
+gem 'activerecord', '~> 3.0.10'
 gem 'sqlite3'
 gem 'mysql2', '~> 0.2.11'
 gem 'mocha'

data/ci/Gemfile.rails-3.1.x

@@ -0,0 +1,7 @@
+source :rubygems
+
+gem 'activerecord', '~> 3.1.0'
+gem 'sqlite3'
+gem 'mysql2', '>= 0.3.6'
+gem 'mocha'
+gem 'rake'

data/lib/unread/acts_as_readable.rb

@@ -5,6 +5,9 @@ module Unread
   
   module ActsAsReadable
     def acts_as_reader
+      # Ignore multiple calls
+      return if ReadMark.reader_class
+      
       ReadMark.reader_class = self
       
       has_many :read_marks, :dependent => :delete_all
@@ -17,6 +20,9 @@ module Unread
     end
     
     def acts_as_readable(options={})
+      # Ignore multiple calls
+      return if self.included_modules.include?(InstanceMethods)
+      
       options.reverse_merge!({ :on => :updated_at })
       if respond_to?(:class_attribute)
         class_attribute :readable_options
@@ -34,8 +40,7 @@ module Unread
       scope_method = ActiveRecord::VERSION::MAJOR < 3 ? :named_scope : :scope
       
       send scope_method, :unread_by, lambda { |user| 
-        check_reader
-        raise ArgumentError unless user.is_a?(ReadMark.reader_class)
+        assert_reader(user)
 
         result = { :joins => "LEFT JOIN read_marks ON read_marks.readable_type  = '#{self.base_class.name}'
                                                   AND read_marks.readable_id    = #{self.table_name}.id
@@ -55,11 +60,10 @@ module Unread
   
   module ClassMethods
     def mark_as_read!(target, options)
-      check_reader
       raise ArgumentError unless target == :all || target.is_a?(Array)
       
       user = options[:for]
-      raise ArgumentError unless user.is_a?(ReadMark.reader_class)
+      assert_reader(user)
       
       if target == :all
         reset_read_marks!(user)
@@ -80,9 +84,7 @@ module Unread
     end
     
     def read_mark(user)
-      check_reader
-      raise ArgumentError unless user.is_a?(ReadMark.reader_class)
-      
+      assert_reader(user)
       user.read_marks.readable_type(self.base_class.name).global.first
     end
     
@@ -110,7 +112,7 @@ module Unread
     end
 
     def cleanup_read_marks!
-      check_reader
+      assert_reader
       
       ReadMark.reader_class.find_each do |user|
         ReadMark.transaction do
@@ -130,7 +132,7 @@ module Unread
     end
     
     def reset_read_marks!(user = :all)
-      check_reader
+      assert_reader
 
       ReadMark.transaction do
         if user == :all
@@ -149,8 +151,14 @@ module Unread
       true
     end
     
-    def check_reader
-      raise RuntimeError, 'Plugin "unread": No reader defined!' unless ReadMark.reader_class
+    def assert_reader(user=nil)
+      if ReadMark.reader_class
+        if user && !user.is_a?(ReadMark.reader_class)
+          raise ArgumentError, "Class #{user.class.name} is not registered by acts_as_reader!"
+        end
+      else
+        raise RuntimeError, 'There is no class using acts_as_reader!'
+      end
     end
   end
   
@@ -160,10 +168,8 @@ module Unread
     end
     
     def mark_as_read!(options)
-      self.class.check_reader
-      
       user = options[:for]
-      raise ArgumentError unless user.is_a?(ReadMark.reader_class)
+      self.class.assert_reader(user)
       
       ReadMark.transaction do
         if unread?(user)

data/lib/unread/version.rb

@@ -1,3 +1,3 @@
 module Unread
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/test/test_helper.rb

@@ -1,17 +1,13 @@
 require 'rubygems'
 
-gem 'activerecord'
-gem 'mocha'
-
 require 'test/unit'
-require 'active_record'
 require 'active_support'
 require 'active_support/test_case'
+require 'active_record'
 
 require File.dirname(__FILE__) + '/../init.rb'
 
-
-configs = YAML.load_file('test/database.yml')
+configs = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
 ActiveRecord::Base.configurations = configs
 
 db_name = ENV['DB'] || 'sqlite'
@@ -25,4 +21,6 @@ end
 
 class Email < ActiveRecord::Base
   acts_as_readable :on => :updated_at
-end
+end
+
+puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"

data/test/unread_test.rb

@@ -26,6 +26,10 @@ class UnreadTest < ActiveSupport::TestCase
     
     assert_equal 2, Email.unread_by(@user).count
     assert_equal 2, Email.unread_by(@other_user).count
+    
+    assert_raise(ArgumentError) {
+      Email.unread_by(42)
+    }
   end
   
   def test_scope_after_reset
@@ -35,9 +39,13 @@ class UnreadTest < ActiveSupport::TestCase
     assert_equal 1, Email.unread_by(@user).count
   end
 
-  def test_unread_by
+  def test_unread_after_create
     assert_equal true, @email1.unread?(@user)
     assert_equal true, @email1.unread?(@other_user)
+    
+    assert_raise(ArgumentError) {
+      @email1.unread?(42)
+    }
   end
   
   def test_unread_after_update

data/unread.gemspec

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "unread/version"
+require 'active_record/version'
 
 Gem::Specification.new do |s|
   s.name        = "unread"
@@ -23,5 +24,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'mysql2', '~> 0.2.11'
+  
+  if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR >= 1
+    s.add_development_dependency 'mysql2', '>= 0.3.6'
+  else
+    s.add_development_dependency 'mysql2', '~> 0.2.11'
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unread
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Georg Ledermann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 Z
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -80,14 +80,14 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 31
         segments: 
         - 0
-        - 2
-        - 11
-        version: 0.2.11
+        - 3
+        - 6
+        version: 0.3.6
   type: :development
   version_requirements: *id005
 description: "This gem creates a scope for unread objects and adds methods to mark objects as read "
@@ -109,6 +109,7 @@ files:
 - changelog.md
 - ci/Gemfile.rails-2.3.x
 - ci/Gemfile.rails-3.0.x
+- ci/Gemfile.rails-3.1.x
 - init.rb
 - lib/app/models/read_mark.rb
 - lib/unread.rb
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: unread
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Manages read/unread status of ActiveRecord objects