attribute-filters 1.2.1 → 1.2.2

data/ChangeLog

@@ -1,3 +1,69 @@
+commit c1220554066705edceb097b7c26c665d26785271
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Aug 3 00:51:17 2012 +0200
+
+    Release 1.2.2
+
+commit 163cc3bc64a36b60ef3a1169b9921fe2224bb2b3
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Wed Jul 18 01:15:40 2012 +0200
+
+    Added contributor - thanx Robert!
+
+commit 4e2b2dd088267cbb7ef7a29737807b4144e668ae
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Wed Jul 18 01:05:51 2012 +0200
+
+    Common filters splitted into submodules.
+
+commit a363955e72d5c81509f8a4cf17b83869533220ff
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Wed Jul 18 01:05:36 2012 +0200
+
+    Filtering methods now accept AttributeSet objects as arguments.
+
+commit 0759dbb26b766a327406103dbb57c9a363f316a5
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Wed Jul 18 01:04:52 2012 +0200
+
+    Added is_a? overrides in proxy classes.
+
+commit fcb6276a9b06a981ae0c3a7e03c333dce843d66f
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Mon Jul 16 10:18:29 2012 +0200
+
+    Typo fixed in README
+
+commit 6dd35c429ffbeb21348df996a854e467483678d1
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Tue Jul 10 12:38:22 2012 +0200
+
+    Documentation updated
+
+commit ad796840fc35470fd2794b38f297dd23eb592d12
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Tue Jul 10 10:17:56 2012 +0200
+
+    Fixed sentence order in USAGE
+
+commit b453533b1a2a0dd68a9ea2cad76d66f341b05c37
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Tue Jul 10 09:50:44 2012 +0200
+
+    Documentation updated
+
+commit 8122f404f2a037b699ccd0e303f22b371e8256f6
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Tue Jul 10 09:45:40 2012 +0200
+
+    More fixes in README
+
+commit ed2a5f89072e0c9c3bef85c73af90774090d155c
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Tue Jul 10 09:41:09 2012 +0200
+
+    Fixed some typos in documentation
+
 commit 653b456c00b6a9825c87549f013c2d10e36c76ba
 Author: Paweł Wilk <siefca@gnu.org>
 Date:   Tue Jul 10 09:30:09 2012 +0200

data/Gemfile

@@ -9,7 +9,7 @@ gem "activemodel", "~>3.0"
 
 gem "hoe-yard", ">=0.1.2", :group => [:development, :test]
 gem "rspec", ">=2.6.0", :group => [:development, :test]
-gem "yard", ">=0.7.2", :group => [:development, :test]
+gem "yard", ">=0.8.2", :group => [:development, :test]
 gem "rdoc", ">=3.8.0", :group => [:development, :test]
 gem "redcarpet", ">=2.1.0", :group => [:development, :test]
 gem "supermodel", ">=0.1.6", :group => [:development, :test]

data/Gemfile.lock

@@ -2,9 +2,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionpack (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
+    actionpack (3.0.16)
+      activemodel (= 3.0.16)
+      activesupport (= 3.0.16)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -12,16 +12,16 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.15)
-      activesupport (= 3.0.15)
+    activemodel (3.0.16)
+      activesupport (= 3.0.16)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
+    activerecord (3.0.16)
+      activemodel (= 3.0.16)
+      activesupport (= 3.0.16)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.15)
+    activesupport (3.0.16)
     arel (2.0.10)
     builder (2.1.2)
     diff-lcs (1.1.3)
@@ -36,15 +36,15 @@ GEM
     hoe-yard (0.1.2)
       yard (>= 0.2.3.1)
     i18n (0.5.0)
-    json (1.7.3)
+    json (1.7.4)
     rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    railties (3.0.15)
-      actionpack (= 3.0.15)
-      activesupport (= 3.0.15)
+    railties (3.0.16)
+      actionpack (= 3.0.16)
+      activesupport (= 3.0.16)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
@@ -52,14 +52,14 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.1.1)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
+    rspec-mocks (2.11.1)
     supermodel (0.1.6)
       activemodel (~> 3.0.0)
     thor (0.14.6)
@@ -82,4 +82,4 @@ DEPENDENCIES
   redcarpet (>= 2.1.0)
   rspec (>= 2.6.0)
   supermodel (>= 0.1.6)
-  yard (>= 0.7.2)
+  yard (>= 0.8.2)

data/README.md

@@ -5,15 +5,16 @@ Attribute Filters for Rails
 
 * https://rubygems.org/gems/attribute-filters
 * https://github.com/siefca/attribute-filters/tree
-* mailto:pw@gnu.org
+* pw@gnu.org
 
 
 Summary
 -------
 
-Attribute Filters adds couple of DSL keywords and some syntactic sugar
-to Rails thereby allowing you to express filtering and groupping
-model attributes in a concise and clean way.
+Attribute Filters extension adds couple of DSL keywords
+and some syntactic sugar to Rails, thereby allowing you
+to express filtering and grouping model attributes
+in a concise and clean way.
 
 When?
 -----
@@ -21,15 +22,15 @@ When?
 You may want to try it when your Rails application often modifies
 attribute values that changed recently and uses callbacks to do that.
 
-When the number of attributes that are altered in such a way increases
-then you can observe that the same thing happends with your filtering
+When the number of attributes that are altered in such a way increases,
+you can observe the same thing happening with your filtering
 methods. That's because each one is tied to some attribute.
 
 To refine that process you may write more generic methods
 for altering attributes. They should be designed to handle
-common operations and not tied to certain attributes.
+common operations and not be tied to certain attributes.
 
-Enough words, let's see that in action.
+Let's see that in action.
 
 ### Before ###
 
@@ -100,27 +101,20 @@ or even shorter:
 
 ```ruby
 class User < ActiveRecord::Base
-  include ActiveModel::AttributeFilters::Common
+  include ActiveModel::AttributeFilters::Common::Strip
+  include ActiveModel::AttributeFilters::Common::Downcase
+  include ActiveModel::AttributeFilters::Common::Titleize  
 
-  attributes_that should_be_stripped:           [ :username, :email, :real_name ]
-  attributes_that should_be_downcased:          [ :username, :email ]
-  attributes_that should_be_fully_capitalized:  [ :real_name ]
+  attributes_that should_be_stripped:   [ :username, :email, :real_name ]
+  attributes_that should_be_downcased:  [ :username, :email ]
+  attributes_that should_be_titleized:  [ :real_name ]
 
   before_validation :strip_attributes
   before_validation :downcase_attributes
-  before_validation :fully_capitalize_attributes
+  before_validation :titleize_attributes
 end
 ```
 
-Attributes that have to be altered may be simply added to the attribute sets
-that you define and then filtered with generic methods. You can use
-these methods in all your models if you wish.
-
-The last action can be performed by putting the filtering methods into
-some base class that models inherit form or (better) into your own
-handy module that is included in your models. Alternatively you can
-use predefined filters from `ActiveModel::AttributeFilters::Common` module.
-
 If you would rather like to group filters by attribute names then
 the alternative syntax may be helpful:
 
@@ -132,8 +126,18 @@ class User < ActiveRecord::Base
 end
 ```
 
-Usage
------
+Attributes that should be altered may be simply added
+to the attribute sets that you define and then filtered
+with generic methods. You can use these methods in all
+your models if you wish.
+
+The last action can be performed by putting the filtering methods into
+some base class that all your models inherit form or (better) into your own
+handy module that is included in all your models. Alternatively you can
+use predefined filters from `ActiveModel::AttributeFilters::Common` module.
+
+More examples and usage
+-----------------------
 
 You can use it to filter attributes (as presented above) but you can also
 use it to express some logic
@@ -142,22 +146,38 @@ use it to express some logic
 * See [USAGE](http://rubydoc.info/gems/attribute-filters/file/docs/USAGE.md) for examples and detailed information about the usage.
 * See [whole documentation](http://rubydoc.info/gems/attribute-filters/) to browse all documents.
 
+### Sneak peeks ###
+
+```ruby
+  @user.attributes_that(:should_be_stripped).all.present?
+  # => false
+  
+  @user.attributes_that(:should_be_stripped).list.present?
+  # => #<ActiveModel::AttributeSet: {"username", "email"}>
+  
+  @user.the_attribute(:username).should_be_stripped?
+  # => true
+  
+  @user.the_attribute(:username).list.sets
+  # => #<ActiveModel::AttributeSet: {:should_be_downcased, :should_be_stripped}>
+```
+
 How it works?
 -------------
 
 It creates a new Active Model submodule called `AttributeFilters`. That module
 contains the needed DSL that goes into your models. It also creates `ActiveModel::AttributeSet`
-class which is just a new kind of set, a structure for storing sets of attribute names.
+class which is just a new kind of set, a structure for storing attribute names.
 
-Then it forces Rails to include the AttributeFilters in any model that
-at any time will include ActiveModel::AttributeMethods. The last one is included
-quite often; e.g. Active Record and other popular ORM-s use it. (I'm calling it
+Then it forces Rails to include the `ActiveModel::AttributeFilters` in any model that
+at any time includes `ActiveModel::AttributeMethods`. The last one is included
+quite often; e.g. Active Record and other popular ORM-s use it. (I'm calling that thechnique
 "the accompanying module".)
 
 That's why you can make use of attribute filters without explicitly including
-the module, as long as your application relies on any popular ORM.
+the module, as long as your application uses some popular ORM.
 
-However, if something would go wrong or your application is somehow unusual, you can always
+However, if something goes wrong or your application is somehow unusual, you can always
 include the `AttributeFilters` module manually in any of your models:
 
 ```ruby
@@ -217,6 +237,7 @@ Credits
 
 * [iConsulting](http://www.iconsulting.pl/) supports Free Software and has contributed to this library by paying for me to eat when I've been coding.
 * [MrZYX (Jonne Haß)](https://github.com/MrZYX) contributed by giving me some hints and answering basic questions on IRC – THX!
+* [Robert Pankowecki](https://github.com/paneq/) contributed by suggesting selective inclusion of filtering helpers
 
 License
 -------

data/Rakefile

@@ -45,7 +45,7 @@ Hoe.spec 'attribute-filters' do
   extra_deps          << ['railties',         '~> 3.0']     <<
                          ['activemodel',      '~> 3.0']
   extra_dev_deps      << ['rspec',            '>= 2.6.0']   <<
-                         ['yard',             '>= 0.7.2']   <<
+                         ['yard',             '>= 0.8.2']   <<
                          ['rdoc',             '>= 3.8.0']   <<
                          ['redcarpet',        '>= 2.1.0']   <<
                          ['supermodel',       '>= 0.1.6']   <<

data/attribute-filters.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = "attribute-filters"
-  s.version = "1.2.1.20120710092708"
+  s.version = "1.2.2.20120803004107"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pawe\u{142} Wilk"]
   s.cert_chain = ["/Users/siefca/.gem/gem-public_cert.pem"]
-  s.date = "2012-07-10"
+  s.date = "2012-08-02"
   s.description = "Concise way of filtering model attributes in Rails."
   s.email = ["pw@gnu.org"]
   s.extra_rdoc_files = ["Manifest.txt"]
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activemodel>, ["~> 3.0"])
       s.add_development_dependency(%q<hoe-yard>, [">= 0.1.2"])
       s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
-      s.add_development_dependency(%q<yard>, [">= 0.7.2"])
+      s.add_development_dependency(%q<yard>, [">= 0.8.2"])
       s.add_development_dependency(%q<rdoc>, [">= 3.8.0"])
       s.add_development_dependency(%q<redcarpet>, [">= 2.1.0"])
       s.add_development_dependency(%q<supermodel>, [">= 0.1.6"])
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activemodel>, ["~> 3.0"])
       s.add_dependency(%q<hoe-yard>, [">= 0.1.2"])
       s.add_dependency(%q<rspec>, [">= 2.6.0"])
-      s.add_dependency(%q<yard>, [">= 0.7.2"])
+      s.add_dependency(%q<yard>, [">= 0.8.2"])
       s.add_dependency(%q<rdoc>, [">= 3.8.0"])
       s.add_dependency(%q<redcarpet>, [">= 2.1.0"])
       s.add_dependency(%q<supermodel>, [">= 0.1.6"])
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activemodel>, ["~> 3.0"])
     s.add_dependency(%q<hoe-yard>, [">= 0.1.2"])
     s.add_dependency(%q<rspec>, [">= 2.6.0"])
-    s.add_dependency(%q<yard>, [">= 0.7.2"])
+    s.add_dependency(%q<yard>, [">= 0.8.2"])
     s.add_dependency(%q<rdoc>, [">= 3.8.0"])
     s.add_dependency(%q<redcarpet>, [">= 2.1.0"])
     s.add_dependency(%q<supermodel>, [">= 0.1.6"])

data/docs/HISTORY

@@ -1,3 +1,14 @@
+=== 1.2.2 / 2012-08-03
+
+  * major enhancements
+
+    * Common filtering methods modularized
+
+  * minor enhancements
+
+    * Added is_a?() overrides in proxy classes
+    * Method attributes_to_filter now also takes attribute set as an argument
+
 === 1.2.1 / 2012-07-09
 
   * minor bugfixes

data/docs/USAGE.md

@@ -8,8 +8,8 @@ Attribute set is a set of attribute names. It's like an array
 or, to be exact, like a set (a hash that can only have true values
 assigned to elements in order to just know whether the key exists or not).
 
-Attribute sets have simple function; **they group attribute names**. What you
-can do with that? For example you can use it to perform some tasks
+Attribute sets have simple function; **they group attribute names**. What can
+you do with that? For example you can use it to perform some tasks
 on all attributes that are listed in a set.
 
 ### Data structures ###
@@ -28,7 +28,7 @@ a method that returns a set of attributes or even
 a set of set names, the returned value will probably
 be an instance of the class `AttributeSet`.
 
-Note that when sets are returned the convntion is that:
+Note that when sets are returned the convention is that:
 
   * **attribute names are strings**
   * **set names are symbols**
@@ -314,7 +314,7 @@ practice there are two groups of methods with two sets of DSL features.
 First group (querying attribute sets):
 
 * [`attribute_set`](#attribute_set_set_name_0) and aliases
-* [`attributes_to_filter`](attributes_to_filter_set_name_____)
+* [`attributes_to_filter`](#attributes_to_filter_set_name_____)
 
 Second group (querying attributes for sets they belong to):
 
@@ -495,7 +495,7 @@ Example:
 * **`set?`**
 * **`is_one_that?`**
 * **`one_that?`**
-* **`that?
+* **`that?`**
 
 These methods allow to test if the attribute belongs to the given
 attribute set or sets. You may consider the methods above aliases
@@ -678,7 +678,7 @@ Instead of `filter_attrs_from_set` you may also use one of the aliases:
   * `attribute_call_for_set`, `call_attrs_from_set`,       
     `for_attributes_which`, `for_attributes_that`, `for_attributes_that_are`, `for_attributes_which_are`
 
-#### `attributes_to_filter(set_name,...)` ####
+#### `attributes_to_filter(set,...)` ####
 
 The [`attributes_to_filter`](http://rubydoc.info/gems/attribute-filters/ActiveModel/AttributeFilters:attributes_to_filter)
 method is used for **getting the attributes that should be filtered**.
@@ -687,9 +687,9 @@ to be processed but you can use it on your own. It returns an `AttributeSet` ins
 attribute names that match the given criteria (by default: that are in a set of the given name,
 that are present and that have changed lately).
 
-The method takes one manatory argument (`set_name`) and two optional arguments (`process_all` and `no_presence_check`)
-that can be `true` or `false` (default). The first optional argument (`process_all`),
-when set to `true`, forces method to return also the attributes that haven't changed lately.
+The method takes one manatory argument (`set`) and two optional arguments (`process_all` and `no_presence_check`)
+that can be `true` or `false` (default). The `set` may be an object which is kind of String, Symbol (in that case it should contain the name of a set) or it can be an object which is a kind of `AttributeSet` (in that case it should contain a proper object). The first optional argument (`process_all`), when set to `true`, forces method to return also the attributes that haven't changed lately.
+
 By default the result will be narrowed to the attributes that have changed and haven't been saved yet.
 The second optional argument (`no_presence_check`) will tell the method to omit the presence check
 for each attribute. By default only the attributes that are real attributes (are present
@@ -762,29 +762,49 @@ or pass their names to callback hooks.
 
 To use predefined filters you have to manually
 include the [`ActiveModel::AttributeFilters::Common`](http://rubydoc.info/gems/attribute-filters/ActiveModel/AttributeFilters/Common)
-module.
+module. If you don't want to include portions of code that you'll never use, you can also include some filters selectively. To do that just include just a submodule containing certain filtering method.
 
 Here is a list of the predefined filtering methods:
 
-* **`capitalize_attributes`**
-* **`fully_capitalize_attributes`**
-* **`downcase_attributes`**
-* **`upcase_attributes`**
-* **`strip_attributes`**
+* `capitalize_attributes` (submodule: `Capitalize`)
+* `fully_capitalize_attributes` (submodule: `Capitalize`)
+* `titleize_attributes` (submodule: `Titleize`)
+* `downcase_attributes` (submodule: `Downcase` or `Case`)
+* `upcase_attributes` (submodule: `Upcase` or `Case`)
+* `strip_attributes` (submodule: `Strip`)
+* `squeeze_attributes` (submodule: `Squeeze`)
 
 Example:
 
 ```ruby
 class User < ActiveRecord::Base
   include ActiveModel::AttributeFilters::Common
+  
+  the_attribute user:   [:should_be_stripped, :should_be_downcased  ]
+  the_attribute email:  [:should_be_stripped, :should_be_downcased  ]
+  the_attribute name:   [:should_be_stripped, :should_be_downcased, :should_be_titleized ]
+  
+  before_validation :strip_attributes
+  before_validation :downcase_attributes
+  before_validation :titleize_attributes
+end
+```
+
+or (better):
 
+```ruby
+class User < ActiveRecord::Base
+  include ActiveModel::AttributeFilters::Common::Stip
+  include ActiveModel::AttributeFilters::Common::Downcase
+  include ActiveModel::AttributeFilters::Common::Titleize
+  
   the_attribute user:   [:should_be_stripped, :should_be_downcased  ]
   the_attribute email:  [:should_be_stripped, :should_be_downcased  ]
-  the_attribute name:   [:should_be_stripped, :should_be_downcased, :should_be_fully_capitalized ]
+  the_attribute name:   [:should_be_stripped, :should_be_downcased, :should_be_titleized ]
   
   before_validation :strip_attributes
   before_validation :downcase_attributes
-  before_validation :fully_capitalize_attributes
+  before_validation :titleize_attributes
 end
 ```
 

data/lib/attribute-filters/attribute_set_attrquery.rb

@@ -69,6 +69,13 @@ module ActiveModel
           @set_object.respond_to?(name) || name.to_s.slice(-1,1) == '?'
         end
       end
+
+      # @private
+      def is_a?(klass)
+        super || @set_object.is_a?(klass)
+      end
+      alias_method :kind_of?, :is_a?
+
     end # class AttrQuery
   end # class AttributeSet
 end # module ActiveModel

data/lib/attribute-filters/attribute_set_query.rb

@@ -88,6 +88,12 @@ module ActiveModel
         end
       end
 
+      # @private
+      def is_a?(klass)
+        super || @set_object.is_a?(klass)
+      end
+      alias_method :kind_of?, :is_a?
+
       protected
 
       # Queues any method of the given name to be called when next

data/lib/attribute-filters/common_filters.rb

@@ -12,68 +12,128 @@ module ActiveModel
   module AttributeFilters
     # This module contains common, ready-to-use filtering methods.
     module Common
+
       # Strips attributes from leading and trailing spaces.
-      # 
-      # The attrubutes to be stripped are taken from the attribute set called
-      # +should_be_stripped+. It operates directly on attribute's contents.
-      # 
-      # @return [void]
-      def strip_attributes
-        call_attrs_from_set(:should_be_stripped) { |atr| atr.strip! }
+      module Strip
+        # Strips attributes from leading and trailing spaces.
+        # 
+        # The attrubutes to be stripped are taken from the attribute set called
+        # +should_be_stripped+. It operates directly on attribute's contents.
+        # 
+        # @return [void]
+        def strip_attributes
+          filter_attrs_from_set(:should_be_stripped) { |atr| atr.strip }
+        end
       end
 
       # Downcases attributes.
-      # 
-      # The attrubutes to be downcased are taken from the attribute set
-      # called +should_be_downcased+. This method is safe to be
-      # used with multibyte strings (containing diacritics).
-      # 
-      # @return [void]
-      def downcase_attributes
-        filter_attrs_from_set(:should_be_downcased) do |atr|
-          atr.mb_chars.downcase.to_s
+      module Downcase
+        # Downcases attributes.
+        # 
+        # The attrubutes to be downcased are taken from the attribute set
+        # called +should_be_downcased+. This method is safe to be
+        # used with multibyte strings (containing diacritics).
+        # 
+        # @return [void]
+        def downcase_attributes
+          filter_attrs_from_set(:should_be_downcased) do |atr|
+            atr.mb_chars.downcase.to_s
+          end
         end
       end
 
       # Upcases attributes.
-      # 
-      # The attrubutes to be upcased are taken from the attribute set
-      # called +should_be_upcased+. This method is safe to be
-      # used with multibyte strings (containing diacritics).
-      # 
-      # @return [void]
-      def upcase_attributes
-        filter_attrs_from_set(:should_be_upcased) do |atr|
-          atr.mb_chars.upcase.to_s
+      module Upcase
+        # Upcases attributes.
+        # 
+        # The attrubutes to be upcased are taken from the attribute set
+        # called +should_be_upcased+. This method is safe to be
+        # used with multibyte strings (containing diacritics).
+        # 
+        # @return [void]
+        def upcase_attributes
+          filter_attrs_from_set(:should_be_upcased) do |atr|
+            atr.mb_chars.upcase.to_s
+          end
         end
       end
 
-      # Capitalize attributes.
-      # 
-      # The attrubutes to be capitalized are taken from the attribute set
-      # called +should_be_capitalized+. This method is safe to be
-      # used with multibyte strings (containing diacritics).
-      # 
-      # @return [void]
-      def capitalize_attributes
-        filter_attrs_from_set(:should_be_capitalized) do |atr|
-          atr.mb_chars.capitalize.to_s
+      # Operates on attributes' case.
+      module Case
+        include Upcase
+        include Downcase
+      end
+
+      # Capitalizes attributes.
+      module Capitalize
+        # Capitalizes attributes.
+        # 
+        # The attrubutes to be capitalized are taken from the attribute set
+        # called +should_be_capitalized+. This method is safe to be
+        # used with multibyte strings (containing diacritics).
+        # 
+        # @return [void]
+        def capitalize_attributes
+          filter_attrs_from_set(:should_be_capitalized) do |atr|
+            atr.mb_chars.capitalize.to_s
+          end
+        end
+
+        # Fully capitalizes attributes (capitalizes each word and squeezes spaces).
+        # 
+        # The attrubutes to be fully capitalized are taken from the attribute set
+        # called +should_be_fully_capitalized+ and from set +should_be_titleized+.
+        # This method is safe to be used with multibyte strings (containing diacritics).
+        # 
+        # @return [void]
+        def titleize_with_squeezed_spaces
+          s = attribute_set(:should_be_fully_capitalized) + attribute_set(:should_be_titleized)
+          filter_attrs_from_set(s) do |atr|
+            atr.mb_chars.split(' ').map { |n| n.capitalize }.join(' ')
+          end          
         end
+        alias_method :fully_capitalize_attributes, :titleize_with_squeezed_spaces
+
       end
 
-      # Fully capitalize attributes (capitalize each word).
-      # 
-      # The attrubutes to be fully capitalized are taken from the attribute set
-      # called +should_be_fully_capitalized+. This method is safe to be
-      # used with multibyte strings (containing diacritics).
-      # 
-      # @return [void]
-      def fully_capitalize_attributes
-        filter_attrs_from_set(:should_be_fully_capitalized) do |atr|
-          atr.mb_chars.split(' ').map { |n| n.capitalize }.join(' ')
+      # Squeezes white characters in attributes.
+      module Squeeze
+        # Squeezes white characters in attributes.
+        # 
+        # The attrubutes to be squeezed are taken from the attribute set
+        # called +should_be_squeezed+. This method is safe to be
+        # used with multibyte strings (containing diacritics).
+        # 
+        # @return [void]
+        def squeeze_attributes
+          filter_attrs_from_set(:should_be_squeezed) do |atr|
+            atr.mb_chars.squeeze.to_s
+          end
         end
       end
 
+      # Titleizes attributes.
+      module Titleize
+        # Titleizes attributes.
+        # 
+        # The attrubutes to be titleized are taken from the attribute set
+        # called +should_be_titleized+. This method is safe to be
+        # used with multibyte strings (containing diacritics).
+        # 
+        # @return [void]
+        def titleize_attributes
+          filter_attrs_from_set(:should_be_titleized) do |atr|
+            atr.mb_chars.titleize.to_s
+          end
+        end
+      end
+
+      include Case;
+      include Strip;
+      include Capitalize;
+      include Titleize;
+      include Squeeze;
+
     end # module Common
   end # module AttributeFilters
 end # module ActiveModel

data/lib/attribute-filters/dsl_filters.rb

@@ -20,14 +20,23 @@ module ActiveModel
     # selecting attributes that are meeting certain criteria and belong
     # to the given attribute set.
     # 
-    # @param set_name [AttributeSet] set of attributes used to get attributes
-    # @param process_all [Boolean] if set then all the attributes from the attribute set are selected,
-    #   not just attributes that has changed
-    # @param no_presence_check [Boolean] if set then the checking whether attribute exists will be
-    #   disabled (matters only when +process_all+ is also set
-    # @return [AttributeSet] set of attributes (attribute name => previous_value)
+    # @overload attributes_to_filter(set_name, process_all, no_presence_check)
+    #   @param set_name [String,Symbol] name of a set of attributes used to get attributes
+    #   @param process_all [Boolean] if set then all the attributes from the attribute set are selected,
+    #     not just attributes that has changed (defaults to +false+)
+    #   @param no_presence_check [Boolean] if set then the checking whether attribute exists will be
+    #     disabled (matters only when +process_all+ is also set) (defaults to +false+)
+    #   @return [AttributeSet] set of attributes (attribute name => previous_value)
+    # 
+    # @overload attributes_to_filter(attribute_set, process_all, no_presence_check)
+    #   @param attribute_set [AttributeSet] set of attributes used to get attributes
+    #   @param process_all [Boolean] if set then all the attributes from the attribute set are selected,
+    #     not just attributes that has changed (defaults to +false+)
+    #   @param no_presence_check [Boolean] if set then the checking whether attribute exists will be
+    #     disabled (matters only when +process_all+ is also set) (defaults to +false+)
+    #   @return [AttributeSet] set of attributes (attribute name => previous_value)
     def attributes_to_filter(set_name, process_all = false, no_presence_check = false)
-      atf = attribute_set(set_name)
+      atf = set_name.is_a?(::ActiveModel::AttributeSet) ? set_name : attribute_set(set_name)
       if process_all
         no_presence_check ? atf : atf & (__vatrf(no_presence_check) + attributes.keys)
       else

data/lib/attribute-filters/version.rb

@@ -14,7 +14,7 @@ module ActiveModel
     # @private
     EMAIL       = 'pw@gnu.org'
     # @private
-    VERSION     = '1.2.1'
+    VERSION     = '1.2.2'
     # @private
     NAME        = 'attribute-filters'
     # @private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attribute-filters
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -48,11 +48,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2156154140 !ruby/object:Gem::Requirement
+  requirement: &2155091400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156154140
+  version_requirements: *2155091400
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2156153060 !ruby/object:Gem::Requirement
+  requirement: &2155090940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156153060
+  version_requirements: *2155090940
 - !ruby/object:Gem::Dependency
   name: hoe-yard
-  requirement: &2156344520 !ruby/object:Gem::Requirement
+  requirement: &2155090500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -82,10 +82,10 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *2156344520
+  version_requirements: *2155090500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156342400 !ruby/object:Gem::Requirement
+  requirement: &2155090020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -93,21 +93,21 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156342400
+  version_requirements: *2155090020
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156339960 !ruby/object:Gem::Requirement
+  requirement: &2155089540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *2156339960
+  version_requirements: *2155089540
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152030040 !ruby/object:Gem::Requirement
+  requirement: &2155089100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -115,10 +115,10 @@ dependencies:
         version: 3.8.0
   type: :development
   prerelease: false
-  version_requirements: *2152030040
+  version_requirements: *2155089100
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2152028180 !ruby/object:Gem::Requirement
+  requirement: &2155088660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2152028180
+  version_requirements: *2155088660
 - !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &2152026800 !ruby/object:Gem::Requirement
+  requirement: &2155088220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -137,10 +137,10 @@ dependencies:
         version: 0.1.6
   type: :development
   prerelease: false
-  version_requirements: *2152026800
+  version_requirements: *2155088220
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152025940 !ruby/object:Gem::Requirement
+  requirement: &2155087780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2152025940
+  version_requirements: *2155087780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152024500 !ruby/object:Gem::Requirement
+  requirement: &2155087340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -159,10 +159,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *2152024500
+  version_requirements: *2155087340
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
-  requirement: &2152063560 !ruby/object:Gem::Requirement
+  requirement: &2155086900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -170,10 +170,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2152063560
+  version_requirements: *2155086900
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
-  requirement: &2152060520 !ruby/object:Gem::Requirement
+  requirement: &2155102820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,10 +181,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152060520
+  version_requirements: *2155102820
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2152058300 !ruby/object:Gem::Requirement
+  requirement: &2155102380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -192,7 +192,7 @@ dependencies:
         version: '2.16'
   type: :development
   prerelease: false
-  version_requirements: *2152058300
+  version_requirements: *2155102380
 description: Concise way of filtering model attributes in Rails.
 email:
 - pw@gnu.org
@@ -252,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2621466584613753326
+      hash: -2940101135055655246
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: