filthy 1.0.1 → 2.0.0

data/README.md

@@ -10,6 +10,7 @@ gem install filthy
 
 ```ruby
 class Movie < ActiveRecord::Base
+  include Filthy
   
   filthy_attributes :title, :director
 
@@ -31,7 +32,7 @@ end
 
 # Credits
 
-Filthy is maintained by [Mike Taylor](http://github.com/sealabcore) and is funded by [BookRenter.com](http://www.bookrenter.com "BookRenter.com"). Many of the ideas that have inspired Filthy come from practical usage by the Bookrenter software development team and conversations with Bookrenter developers [Andrew Wheeler](http://github.com/jawheeler), [Michael Pearce](http://github.com/michaelgpearce), and [Philippe Huibonhoa](http://github.com/phuibonhoa).
+Filthy is maintained by [Mike Taylor](http://github.com/sealabcore) and is funded by [BookRenter.com](http://www.bookrenter.com "BookRenter.com"). Many of the ideas that have inspired Filthy come from practical usage by the Bookrenter software development team and conversations with Bookrenter developers [Andrew Wheeler](http://github.com/jawheeler), [Michael Pearce](http://github.com/michaelgpearce), [Philippe Huibonhoa](http://github.com/phuibonhoa), and [Ben Somers](http://github.com/bensomers).
 
 ![BookRenter.com Logo](http://assets0.bookrenter.com/images/header/bookrenter_logo.gif "BookRenter.com")
 

data/README.rdoc

@@ -10,6 +10,7 @@ Rails gem to check if an attribute was changed on the last save. Useful in after
 
 
   class Movie < ActiveRecord::Base
+    include Filthy
     
     filthy_attributes :title, :director
 
@@ -35,4 +36,4 @@ Filthy is maintained by Mike Taylor and is funded by BookRenter.com. Many of the
 
 == Copyright
 
-Copyright (c) 2012 Mike Taylor, Bookrenter.com.
+Copyright (c) 2012 Mike Taylor, Bookrenter.com.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('filthy', '1.0.1') do |p|
+Echoe.new('filthy', '2.0.0') 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 = "1.0.1"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Taylor"]
-  s.date = "2012-01-20"
+  s.date = "2012-02-08"
   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

@@ -6,11 +6,17 @@ module Filthy
   module ClassMethods
 
     def filthy_attributes(*args)
-      class_variable_set(:@@filthy_attributes, args)
-            
-      class_variable_set(:@@filthy_attribute_methods, class_variable_get(:@@filthy_attributes).collect { |attribute| :"#{attribute}_filthy" })
+      raise ArgumentError if args.empty?
+      class_inheritable_accessor :filthy_columns, :filthy_attribute_methods
+
+      if self.filthy_columns
+        self.filthy_columns |= args
+      else
+        self.filthy_columns = args
+      end
+      self.filthy_attribute_methods = self.filthy_columns.collect { |attribute| :"#{attribute}_filthy" }
       
-      class_variable_get(:@@filthy_attribute_methods).each do |method|
+      self.filthy_attribute_methods.each do |method|
         attr_accessor method
         
         send(:define_method, :"#{method}?") do
@@ -23,19 +29,19 @@ module Filthy
   module InstanceMethods
     
     def has_filthy_attributes?
-      self.class.class_variables.include?("@@filthy_attributes")
+      defined?(filthy_columns) and self.filthy_columns.present?
     end
     
     def set_filthy_before_save
       clean_filthy_attributes
-      filthy_attributes = changes.keys.select { |attribute| self.class.send(:class_variable_get, :@@filthy_attributes).include? attribute.to_sym }
+      filthy_attributes = changes.keys.select { |attribute| self.class.filthy_columns.include? attribute.to_sym }
       filthy_attributes.each do |filthy_attribute|
         send("#{filthy_attribute}_filthy=", true)
       end
     end
 
     def clean_filthy_attributes
-      self.class.send(:class_variable_get, :@@filthy_attribute_methods).each { |fa| send("#{fa}=", nil) }
+      self.class.filthy_attribute_methods.each { |fa| send("#{fa}=", nil) }
     end
 
   end
@@ -47,7 +53,3 @@ module Filthy
   end
   
 end
-
-class ActiveRecord::Base
-  include Filthy
-end

data/test/filthy_test.rb

@@ -7,6 +7,12 @@ class MovieTest < Test::Unit::TestCase
       @movie = Movie.new
     end
 
+    context "with no arguments" do
+      should "raise an ArgumentError" do
+        assert_raise(ArgumentError) { Movie.filthy_attributes }
+      end
+    end
+
     context "with passed attributes" do
       context "on a new record" do
         should "create accessors" do
@@ -82,7 +88,18 @@ class MovieTest < Test::Unit::TestCase
         assert @short.title_filthy?
       end
     end
+
+    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
+      end
+
+      should "not alter the parent class's filthy attributes" do
+        assert_same_elements [:title, :director], Movie.filthy_columns
+      end
+    end
   end
+
     
 end
 

data/test/helper.rb

@@ -10,6 +10,7 @@ ActiveRecord::Base.establish_connection(config['test'])
 ActiveRecord::Base.connection.create_table :movies, :force => true do |table|
   table.column :title, :string
   table.column :director, :string
+  table.column :best_boy_grip, :string
 end
 
 ActiveRecord::Base.connection.create_table :actors, :force => true do |table|
@@ -18,14 +19,19 @@ ActiveRecord::Base.connection.create_table :actors, :force => true do |table|
 end
 
 class Movie < ActiveRecord::Base
+  include Filthy
   
   filthy_attributes :title, :director
-
 end
 
 class Short < Movie
 end
 
+class Documentary < Movie
+  filthy_attributes :best_boy_grip
+end
+
 class Actor < ActiveRecord::Base
+  include Filthy
 
 end

metadata

@@ -1,103 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: filthy
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Mike Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70268718749540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: active_record
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70268718749540
+- !ruby/object:Gem::Dependency
+  name: active_record
+  requirement: &70268718748840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: active_support
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70268718748840
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: &70268718748120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70268718748120
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70268718747380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: shoulda-context
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70268718747380
+- !ruby/object:Gem::Dependency
+  name: shoulda-context
+  requirement: &70268718746660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70268718746660
 description: Check if an attribute was changed after the last save.
 email: michael.taylor@bookrenter.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - README.rdoc
 - lib/filthy.rb
-files: 
+files:
 - README.md
 - README.rdoc
 - Rakefile
@@ -109,42 +86,33 @@ files:
 - filthy.gemspec
 homepage: http://github.com/sealabcore/filthy
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Filthy
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: filthy
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Check if an attribute was changed after the last save.
-test_files: 
+test_files:
 - test/filthy_test.rb