filthy 2.0.0 → 2.0.1

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('filthy', '2.0.0') do |p|
+Echoe.new('filthy', '2.0.1') do |p|
   p.description    = "Check if an attribute was changed after the last save."
   p.url            = "http://github.com/sealabcore/filthy"
   p.author         = "Mike Taylor"

data/filthy.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "filthy"
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Taylor"]
-  s.date = "2012-02-08"
+  s.date = "2013-09-09"
   s.description = "Check if an attribute was changed after the last save."
   s.email = "michael.taylor@bookrenter.com"
   s.extra_rdoc_files = ["README.md", "README.rdoc", "lib/filthy.rb"]

data/lib/filthy.rb

@@ -7,10 +7,10 @@ module Filthy
 
     def filthy_attributes(*args)
       raise ArgumentError if args.empty?
-      class_inheritable_accessor :filthy_columns, :filthy_attribute_methods
+      class_attribute :filthy_columns, :filthy_attribute_methods
 
-      if self.filthy_columns
-        self.filthy_columns |= args
+      if defined?(self.superclass.filthy_columns) && self.superclass.filthy_columns.present?
+        self.filthy_columns = args + self.superclass.filthy_columns
       else
         self.filthy_columns = args
       end

data/test/filthy_test.rb

@@ -92,6 +92,7 @@ class MovieTest < Test::Unit::TestCase
     context "with a subclass with different filthy_attributes defined" do
       should "inherit the parent class's filthy attributes and add to them" do
         assert_same_elements [:best_boy_grip, :title, :director], Documentary.filthy_columns
+        assert_same_elements [:iphone_movie, :title, :director], ReallyShort.filthy_columns
       end
 
       should "not alter the parent class's filthy attributes" do

data/test/helper.rb

@@ -31,6 +31,10 @@ class Documentary < Movie
   filthy_attributes :best_boy_grip
 end
 
+class ReallyShort < Short
+  filthy_attributes :iphone_movie
+end
+
 class Actor < ActiveRecord::Base
   include Filthy
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filthy
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70268718749540 !ruby/object:Gem::Requirement
+  requirement: &70163544319140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268718749540
+  version_requirements: *70163544319140
 - !ruby/object:Gem::Dependency
   name: active_record
-  requirement: &70268718748840 !ruby/object:Gem::Requirement
+  requirement: &70163544318660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268718748840
+  version_requirements: *70163544318660
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70268718748120 !ruby/object:Gem::Requirement
+  requirement: &70163544318200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268718748120
+  version_requirements: *70163544318200
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70268718747380 !ruby/object:Gem::Requirement
+  requirement: &70163544317740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268718747380
+  version_requirements: *70163544317740
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70268718746660 !ruby/object:Gem::Requirement
+  requirement: &70163544317260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268718746660
+  version_requirements: *70163544317260
 description: Check if an attribute was changed after the last save.
 email: michael.taylor@bookrenter.com
 executables: []