attribute-filters 1.0.2 → 1.0.3

data/.yardopts

@@ -3,6 +3,8 @@
 --readme README.md
 --no-private
 --hide-void-return
+-p docs/yard-tpl
+-t default
 -
 docs/USAGE
 docs/HISTORY

data/ChangeLog

@@ -1,3 +1,72 @@
+commit 60ca933e0a03f70ea9f04684ebab8b888388e9a3
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Tue Jul 10 11:35:52 2012 +0200
+
+    ChangeLog updated
+
+commit 19e31e31f6f9039eec91cdb97133112cd597d429
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Tue Jul 10 11:27:31 2012 +0200
+
+    Bugfix release 1.0.3
+
+commit 6b5aaf23fe3cb6926dac83f733544af16d3b726b
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Jun 29 02:13:21 2012 +0200
+
+    Updated release-related files
+
+commit c4fe9eb630f342f2b5ffd4d6ff72948e0e77a864
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Jun 29 02:10:56 2012 +0200
+
+    Attributes filtering code optimization
+    
+    - Removed unneeded caching that might cause troubles;
+    - Removed calls to accessible_attributes;
+    - Added a flag to iterate over/filter all attributes from set;
+    - Added a flag controlling attributes presence checking;
+    - Moved main logic to the method operate_on_attrs_from_set;
+    - Renamed the method call_attrs_from_set to for_each_attr_from_set;
+    - Module is now more DRY and clean;
+    - Inline documentation updated.
+
+commit 11e85ab7d0f0028c2569b0c1f46e6296559e0bda
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Jun 29 02:04:10 2012 +0200
+
+    Module AttributeFilters moved totally to ActiveModel namespace
+
+commit 8ddf4312278fa6538ce746b210be504e817bc265
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Jun 29 02:03:00 2012 +0200
+
+    README updated
+
+commit fd5ece4acf16b0beb068f69f0f874019a8383879
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Jun 29 02:02:49 2012 +0200
+
+    Added custom.css and custom YARD template
+
+commit d60d50b868f9b4a0eb91960ba4e5fa9a573da7b1
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Thu Jun 28 15:09:32 2012 +0200
+
+    README updated
+
+commit c3353208b5787ce20b80daa129a6cbd6eafcafbc
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Thu Jun 28 15:03:54 2012 +0200
+
+    README updated
+
+commit 1db1ff90bc56e6798d1bd6e80e43345fcded9c26
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Thu Jun 28 14:47:13 2012 +0200
+
+    README updated
+
 commit fc3cd20ea98315736374780179bf49637646aa34
 Author: Paweł Wilk <siefca@gnu.org>
 Date:   Thu Jun 28 14:29:29 2012 +0200

data/Manifest.txt

@@ -15,6 +15,7 @@ docs/LGPL-LICENSE
 docs/TODO
 docs/USAGE
 docs/rdoc.css
+docs/yard-tpl/default/fulldoc/html/css/common.css
 init.rb
 lib/attribute-filters.rb
 lib/attribute-filters/attribute_set.rb

data/README.md

@@ -20,10 +20,18 @@ model attributes in a concise and clean way.
 When?
 -----
 
-If your Rails application often filters the attributes that has changed
-recently and uses callbacks to achieve that, then you may consider
-refining that process and write methods for handling common operations
-not certain attributes. See what I mean below.
+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
+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.
+
+Enough words, let's see that approach in action.
 
 ### Before ###
 
@@ -57,7 +65,8 @@ class User < ActiveRecord::Base
 end
 ```
   
-(The more attributes there is the more messy it becomes and the filtering code is not reusable.)
+The more attributes there is the more messy it becomes.
+The filtering code is not reusable since it operates on specific attributes.
 
 ### After ###
 
@@ -92,8 +101,10 @@ class User < ActiveRecord::Base
 end
 ```
 
-(Names of new attributes that have to be altered in the same way can just be added to sets
-and you can use the same altering methods across all models if you wish to.)
+Attributes that have to be altered in a common ways simply may be added to sets
+and then filtered with more generic methods. You can share these methods 
+across all your models if you wish to by putting them into some base class
+or (better) by including your own handy module to your models.
 
 Usage
 -----
@@ -132,12 +143,14 @@ quite often; e.g. ActiveRecord and other popular ORM-s use it. (I'm calling it
 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.
 
-If something will go wrong however or your application is somehow unusual, you can always
+However, if something would go wrong or your application is somehow unusual, you can always
 include the AttributeFilters module manually in any of your models:
 
-  class ExampleModel
-    include ActiveModel::AttributeFilters
-  end
+```
+class ExampleModel
+  include ActiveModel::AttributeFilters
+end
+```
 
 Requirements
 ------------

data/Rakefile

@@ -29,13 +29,13 @@ Hoe.plugin :yard
 Hoe.plugin :gemspec
 
 Hoe.spec 'attribute-filters' do
-  developer               AttributeFilters::DEVELOPER, AttributeFilters::EMAIL
+  developer               ActiveModel::AttributeFilters::DEVELOPER, ActiveModel::AttributeFilters::EMAIL
 
-  self.version         =  AttributeFilters::VERSION
-  self.rubyforge_name  =  AttributeFilters::NAME
-  self.summary         =  AttributeFilters::SUMMARY
-  self.description     =  AttributeFilters::DESCRIPTION
-  self.url             =  AttributeFilters::URL
+  self.version         =  ActiveModel::AttributeFilters::VERSION
+  self.rubyforge_name  =  ActiveModel::AttributeFilters::NAME
+  self.summary         =  ActiveModel::AttributeFilters::SUMMARY
+  self.description     =  ActiveModel::AttributeFilters::DESCRIPTION
+  self.url             =  ActiveModel::AttributeFilters::URL
 
   self.remote_rdoc_dir = ''
   self.rsync_args      << '--chmod=a+rX'
@@ -76,12 +76,13 @@ end
 
 desc "Create signed tag in Git"
 task :tag do
-  sh %{git tag -s v#{AttributeFilters::VERSION} -m 'version #{AttributeFilters::VERSION}'}
+  sh %{git tag -s v#{ActiveModel::AttributeFilters::VERSION} -m 'version #{ActiveModel::AttributeFilters::VERSION}'}
 end
 
 desc "Create external GnuPG signature for Gem"
 task :gemsign do
-  sh %{gpg -u #{AttributeFilters::EMAIL} -ab pkg/#{AttributeFilters::NAME}-#{AttributeFilters::VERSION}.gem \
-           -o pkg/#{AttributeFilters::NAME}-#{AttributeFilters::VERSION}.gem.sig}
+  sh %{gpg -u #{ActiveModel::AttributeFilters::EMAIL} \
+           -ab pkg/#{ActiveModel::AttributeFilters::NAME}-#{ActiveModel::AttributeFilters::VERSION}.gem \
+            -o pkg/#{ActiveModel::AttributeFilters::NAME}-#{ActiveModel::AttributeFilters::VERSION}.gem.sig}
 end
 

data/attribute-filters.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "attribute-filters"
-  s.version = "1.0.2.20120628142850"
+  s.version = "1.0.3.20120710112322"
 
   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-06-28"
+  s.date = "2012-07-10"
   s.description = "Concise way of filtering model attributes in Rails."
   s.email = ["pw@gnu.org"]
   s.extra_rdoc_files = ["Manifest.txt"]
-  s.files = [".rspec", ".yardopts", "ChangeLog", "Gemfile", "Gemfile.lock", "LGPL-LICENSE", "Manifest.txt", "README.md", "Rakefile", "attribute-filters.gemspec", "docs/COPYING", "docs/HISTORY", "docs/LEGAL", "docs/LGPL-LICENSE", "docs/TODO", "docs/USAGE", "docs/rdoc.css", "init.rb", "lib/attribute-filters.rb", "lib/attribute-filters/attribute_set.rb", "lib/attribute-filters/attribute_set_query.rb", "lib/attribute-filters/common_filters.rb", "lib/attribute-filters/dsl_filters.rb", "lib/attribute-filters/dsl_sets.rb", "lib/attribute-filters/railtie.rb", "lib/attribute-filters/version.rb", "spec/attribute-filters_spec.rb", "spec/spec_helper.rb", ".gemtest"]
+  s.files = [".rspec", ".yardopts", "ChangeLog", "Gemfile", "Gemfile.lock", "LGPL-LICENSE", "Manifest.txt", "README.md", "Rakefile", "attribute-filters.gemspec", "docs/COPYING", "docs/HISTORY", "docs/LEGAL", "docs/LGPL-LICENSE", "docs/TODO", "docs/USAGE", "docs/rdoc.css", "docs/yard-tpl/default/fulldoc/html/css/common.css", "init.rb", "lib/attribute-filters.rb", "lib/attribute-filters/attribute_set.rb", "lib/attribute-filters/attribute_set_query.rb", "lib/attribute-filters/common_filters.rb", "lib/attribute-filters/dsl_filters.rb", "lib/attribute-filters/dsl_sets.rb", "lib/attribute-filters/railtie.rb", "lib/attribute-filters/version.rb", "spec/attribute-filters_spec.rb", "spec/spec_helper.rb", ".gemtest"]
   s.homepage = "https://rubygems.org/gems/attribute-filters/"
   s.rdoc_options = ["--title", "Attribute::Filters Documentation", "--quiet"]
   s.require_paths = ["lib"]

data/docs/HISTORY

@@ -1,3 +1,9 @@
+=== 1.0.3 / 2012-07-10
+
+* major bugfixes
+
+  * fixed a typo in AttrQuery proxy class that caused errors during processing
+
 === 0.0.1 / 2012-06-27
 
 * 1 major enhancement

data/docs/TODO

@@ -1,6 +1,7 @@
 
+* test for method changed_attributes
 
-* test for methods changed_attributes and ... and if not then include ActiveModel...
+* replace flags by some simple hash given as the second, optional argument
 
 * add some predefined, often used filters/sets
 

data/docs/rdoc.css

@@ -18,3 +18,4 @@
 #documentation .method-description > p + ul {
   margin-left: 1.8em;
 }
+

data/docs/yard-tpl/default/fulldoc/html/css/common.css

@@ -0,0 +1,5 @@
+
+.signature .aliases, h3.signature .aliases {
+  margin-top: 2ex;
+}
+

data/lib/attribute-filters/attribute_set_query.rb

@@ -66,7 +66,7 @@ module ActiveModel
             @attribute_set.method(method_sym).call(*args, &block)
           end
         else
-          method_sym, args, block = @next_method
+          m, args, block = @next_method
           @next_method = nil
           @attribute_set.method(m).call { |a| @am_object[a].method(method_sym).call(*args, &block) }
         end

data/lib/attribute-filters/dsl_filters.rb

@@ -8,71 +8,85 @@
 
 module ActiveModel
   module AttributeFilters
+    # @private
+    PROCESSING_FLAGS = {
+      :process_blank      => false,
+      :process_all        => false,
+      :no_presence_check  => false
+    }.freeze
+
     # Gets names of attributes for which filters should be applied by
-    # selecting attributes that 1. have changed and 2. their names belong to
-    # the given set of attributes.
+    # selecting attributes that are meeting certain criteria and belong
+    # to the given attribute set.
     # 
-    # @param process_unchanged [Boolean] if set to +true+ then all accessible attributes will
-    #  be tested (which are also present in set o course), not just the changed ones
-    # @param set_name [AttributeSet] set of attributes used to select attributes
-    # @return [Hash{Symbol => Object}] list of attributes (attribute name => previous_value)
-    def attributes_to_filter(set_name, process_unchanged = false)
-      @__attr_op_apply ||= Array.new
-      if process_unchanged
-        @__attr_op_apply[0] ||= Hash.new
-        @__attr_op_apply[0][set_name] || begin
-          buf = @__attr_op_apply[0][set_name] = Hash.new
-          (attribute_set(set_name) & self.class.accessible_attributes.to_a).each do |a|
-            buf[a] = nil
-          end
-          buf
-        end
+    # @param set_name [AttributeSet] set of attributes used to get attributes
+    # @param alter_mode [Boolean] if set then the existence
+    #   of attribute is checked by testing if writer is defined; otherwise the reader is checked
+    # @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 (see also +alter_mode+)
+    # @return [AttributeSet] set of attributes (attribute name => previous_value)
+    def attributes_to_filter(set_name, alter_mode = true, process_all = false, no_presence_check = false)
+      if process_all
+        atf = attribute_set(set_name)
+        needs_write = alter_mode ? "=" : ""
+        no_presence_check ? atf : atf.select{ |atr| respond_to?("#{atr}#{needs_write}") }
       else
-        @__attr_op_apply[1] ||= Hash.new
-        @__attr_op_apply[1][set_name] ||= changed_attributes.select do |a,pv|
-          attribute_set(set_name).include?(a)
-        end
+        attribute_set(set_name) & changed_attributes.keys
       end
     end
 
-    # This generic method applies a result of execution of the passed block
-    # to each of all changed attributes that are present in the given
-    # set of attributes. It is useful in creating filtering methods.
-    # The result of a block is used to set a new value for each processed attribute.
-    # 
-    # @param set_name [Symbol] name of the attributes set
-    # @param args [Array] optional additional arguments that will be passed to the block
-    # @yield [attribute_value, previous_value, set_name, attribute_name, *args] block that will be called for each attribute
-    # @yieldparam attribute_value [Object] current attribute value that should be altered
-    # @yieldparam previous_value [Object] the value of an attribute before change was made by ORM
-    # @yieldparam set_name [Symbol] a name of the processed attribute set
-    # @yieldparam attribute_name [Object] a name of currently processed attribute
-    # @yieldparam args [Array] optional arguments passed to the method
-    # @yieldreturn [Object] the result of calling the block 
-    # @return [void]
-    # 
-    # @example
-    #   class User < ActiveRecord::Base
-    #     
-    #     attributes_that :should_be_downcased => [ :username, :email ]
-    #     before_filter :downcase_names
-    #     
-    #     def downcase_names
-    #       filter_attributes_that :should_be_downcased do |atr|
-    #         atr.mb_chars.downcase.to_s
+    # @overload filter_attrs_from_set(set_name, *flags, *args, &block)
+    #   
+    #   @note Combining the flags +process_all+ and +no_presence_check+ may raise
+    #     exception if some attribute from the given set doesn't exist
+    #   
+    #   This generic method writes the result of execution of the passed block
+    #   to each attribute that belongs to the given set of attributes.
+    #   It's major purpose is to create filtering methods.
+    #   
+    #   Only the
+    #   {http://rubydoc.info/gems/activemodel/ActiveModel/Dirty#changed_attributes-instance_method changed attributes}
+    #   are selected, unless the +process_all+ flag is
+    #   given. If that flag is given then presence of each attribute is verified,
+    #   unless the +no_presence_check+ flag is also set. The presence is tested
+    #   by checking whether the setter method exists; if it doesn't then the attribute
+    #   is excluded from processing. Attributes with empty or unset values are ignored
+    #   too (but see the flag called +process_blank+).
+    #   
+    #   The result of the given block is used to set a new values for processed attributes. 
+    #   
+    #   @param set_name [Symbol] name of the attribute set
+    #   @param args [Array] optional additional arguments that will be passed to the block
+    #   @param flags [Array<Symbol>] optional additional flags controlling the processing of attributes:
+    #     * +:process_blank+ – tells to also process attributes that are blank (empty or +nil+)
+    #     * +:process_all+ - tells to process all attributes, not just the ones that has changed
+    #     * +:no_presence_check+ – tells not to check for existence of each processed attribute when processing
+    #       all attributes; increases performance but you must care about putting into set only the existing attributes
+    #   @yield [attribute_value, set_name, attribute_name, *args] block that will be called for each attribute
+    #   @yieldparam attribute_value [Object] current attribute value that should be altered
+    #   @yieldparam set_name [Symbol] a name of the processed attribute set
+    #   @yieldparam attribute_name [Object] a name of currently processed attribute
+    #   @yieldparam args [Array] optional arguments passed to the method
+    #   @yieldreturn [Object] the result of calling the block 
+    #   @return [void]
+    #   
+    #   @example
+    #     class User < ActiveRecord::Base
+    #       
+    #       attributes_that should_be_downcased: [ :username, :email ]
+    #       before_filter :downcase_names
+    #       
+    #       def downcase_names
+    #         filter_attributes_that :should_be_downcased do |atr|
+    #           atr.mb_chars.downcase.to_s
+    #         end
     #       end
+    #     
     #     end
-    #   
-    #   end
     def filter_attrs_from_set(set_name, *args, &block)
-      flags = attr_filter_process_flags(args)
-      pb = flags[:process_blank]
-      pu = flags[:process_unchanged]
-      attributes_to_filter(set_name, pu).each do |a, pv|
-        v = self[a]
-        pv = v if pu
-        self[a] = yield(v, pv, set_name, a, *args) if (pb || v.present?)
-      end
+       operate_on_attrs_from_set(set_name, true, *args, &block)
     end
     alias_method :attribute_filter_for_set,     :filter_attrs_from_set
     alias_method :filter_attributes_which,      :filter_attrs_from_set
@@ -84,62 +98,106 @@ module ActiveModel
     alias_method :alter_attributes_that_are,    :filter_attrs_from_set
     alias_method :alter_attributes_which_are,   :filter_attrs_from_set
 
-    # This generic method calls the passed block
-    # on each of all changed attributes that are present in the given
-    # set of attributes. It is useful in creating filtering methods.
-    # The result of a block is ignored, so the only effective way of
-    # altering attribute values is calling altering method on attributes
-    # (usually with bang methods).
+    # @overload for_each_attr_from_set(set_name, *flags, *args, &block)
+    #   
+    #   @note If you're looking for a method that is designed to alter attributes
+    #     by rewritting their contents see {#filter_attrs_from_set}
     # 
-    # @param set_name [Symbol] name of the attributes set
-    # @param args [Array] optional additional arguments that will be passed to the block
-    # @yield [attribute_value, previous_value, set_name, attribute_name, *args] block that will be called for each attribute
-    # @yieldparam attribute_value [Object] current attribute value that should be altered
-    # @yieldparam previous_value [Object] the value of an attribute before change was made by ORM
-    # @yieldparam set_name [Symbol] a name of the processed attribute set
-    # @yieldparam attribute_name [Object] a name of currently processed attribute
-    # @yieldparam args [Array] optional arguments passed to the method
-    # @yieldreturn [void]
-    # @return [void]
+    #   @note Combining the flags +process_all+ and +no_presence_check+ may raise
+    #     exception if some attribute from the given set doesn't exist
     # 
-    # @example
-    #   class User < ActiveRecord::Base
+    #   This generic method calls the passed block for each attribute
+    #   that belongs to the given set of attributes.
+    #   It's major purpose is to iterate through attributes and/or work directly with their values.
+    #   
+    #   Only the
+    #   {http://rubydoc.info/gems/activemodel/ActiveModel/Dirty#changed_attributes-instance_method changed attributes}
+    #   are selected, unless the +process_all+ flag is
+    #   given. If that flag is given then presence of each attribute is verified,
+    #   unless the +no_presence_check+ flag is also set. The presence is tested
+    #   by checking whether the method of the same name as the attribute exists (the getter);
+    #   if it doesn't then the attribute is excluded from processing. Attributes with
+    #   empty or unset values are ignored too (but see the flag called +process_blank+).
+    #   
+    #   The result of the given block is not used to set the processed attribute.
+    #   The only way to alter attribute values using this method is to use bang
+    #   method in a block or explicitly assign new, calculated value to the attribute
+    #   using its name (also passed to a block as one of arguments).
     #   
-    #     attributes_that :should_be_stripped => [ :username, :email ]
-    #     before_filter :strip_names
+    #   @param set_name [Symbol] name of the attribute set
+    #   @param args [Array] optional additional arguments that will be passed to a block
+    #   @param flags [Array<Symbol>] optional additional flags controlling the processing of attributes:
+    #     * +:process_blank+ – tells to also process attributes that are blank (empty or +nil+)
+    #     * +:process_all+ - tells to process all attributes, not just the ones that has changed
+    #     * +:no_presence_check+ – tells not to check for existence of each processed attribute when processing
+    #       all attributes; increases performance but you must care about putting into set only the existing attributes
+    #   @yield [attribute_value, set_name, attribute_name, *args] block that will be called for each attribute
+    #   @yieldparam attribute_value [Object] current attribute value that should be altered
+    #   @yieldparam set_name [Symbol] a name of the processed attribute set
+    #   @yieldparam attribute_name [Object] a name of currently processed attribute
+    #   @yieldparam args [Array] optional arguments passed to the method
+    #   @yieldreturn [Object] the result of calling the block 
+    #   @return [void]
+    #   
+    #   @example
+    #     class User < ActiveRecord::Base
     #     
-    #     def strip_names
-    #       for_attributes_that :should_be_stripped do |atr|
-    #         atr.strip!
+    #       attributes_that should_be_stripped: [ :username, :email ]
+    #       before_filter :strip_names
+    #       
+    #       def strip_names
+    #         for_attributes_that :should_be_stripped do |atr|
+    #           atr.strip!
+    #         end
     #       end
+    #     
     #     end
-    #   
-    #   end
-    def call_attrs_from_set(set_name, *args, &block)
-      flags = attr_filter_process_flags(args)
-      pb = flags[:process_blank]
-      pu = flags[:process_unchanged]
-      attributes_to_filter(set_name, pu).each do |a, pv|
-        v = self[a]
-        pv = v if pu
-        yield(v, pv, set_name, a, *args) if (pb || v.present?)
-      end
+    def for_each_attr_from_set(set_name, *args, &block)
+      operate_on_attrs_from_set(set_name, false, *args, &block)
     end
-    alias_method :attribute_call_for_set,   :call_attrs_from_set
-    alias_method :for_attributes_which,     :call_attrs_from_set
-    alias_method :for_attributes_that,      :call_attrs_from_set
-    alias_method :for_attributes_that_are,  :call_attrs_from_set
-    alias_method :for_attributes_which_are, :call_attrs_from_set
+    alias_method :attribute_call_for_set,   :for_each_attr_from_set
+    alias_method :call_attrs_from_set,      :for_each_attr_from_set
+    alias_method :for_attributes_which,     :for_each_attr_from_set
+    alias_method :for_attributes_that,      :for_each_attr_from_set
+    alias_method :for_attributes_that_are,  :for_each_attr_from_set
+    alias_method :for_attributes_which_are, :for_each_attr_from_set
 
     private
 
     def attr_filter_process_flags(args)
-      flags = { :process_blank => false, :process_unchanged => false }
+      flags = ActiveModel::AttributeFilters::PROCESSING_FLAGS.dup
       while flags.key?(a=args[0]) do
         flags[a] = !!args.shift
       end
       flags
     end
 
-  end
-end
+    def operate_on_attrs_from_set(set_name, alter_mode, *args, &block)
+      flags             = attr_filter_process_flags(args)
+      process_all       = flags[:process_all]
+      process_blank     = flags[:process_blank]
+      no_presence_check = flags[:no_presence_check]
+      attrs_to_process  = attributes_to_filter(set_name, alter_mode, process_all, no_presence_check)
+      if alter_mode
+        if process_blank
+          attrs_to_process.each { |atr| self[atr] = yield(self[atr], set_name, atr, *args) }
+        else
+          attrs_to_process.each do |atr|
+            v = self[atr]
+            self[atr] = yield(v, set_name, atr, *args) if v.present?
+          end
+        end
+      else
+        if process_blank
+          attrs_to_process.each { |atr| yield(self[atr], set_name, atr, *args) }
+        else
+          attrs_to_process.each do |atr|
+            v = self[atr]
+            yield(v, set_name, atr, *args) if v.present?
+          end
+        end
+      end
+    end
+
+  end # module AttributeFilters
+end # module ActiveModel

data/lib/attribute-filters/railtie.rb

@@ -8,39 +8,42 @@
 
 require 'attribute-filters'
 
-module AttributeFilters
-  require 'rails'
+module ActiveModel
+  module AttributeFilters
+    require 'rails'
+    
+    # This class is a glue that allows us to integrate with Rails.
+    class Railtie < ::Rails::Railtie
+      # Alters ActiveModel::AttributeMethods.inluded method so
+      # when that module is included the ActiveModel::AttributeFilters
+      # module is also included.
+      def self.insert
+        require 'active_model'
+        if defined?(ActiveModel::AttributeMethods)
   
-  # This class is a glue that allows us to integrate with Rails.
-  class Railtie < ::Rails::Railtie
-    # Alters ActiveModel::AttributeMethods.inluded method so
-    # when that module is included the ActiveModel::AttributeFilters
-    # module is also included.
-    def self.insert
-      require 'active_model'
-      if defined?(ActiveModel::AttributeMethods)
-
-        ActiveModel::AttributeMethods.class_eval do
-
-          def self.included_with_attribute_methods(base)
-            base.class_eval do
-              include ActiveModel::AttributeFilters
-              if method_defined?(:included_without_attribute_methods)
-                included_without_attribute_methods(base)
+          ActiveModel::AttributeMethods.class_eval do
+  
+            def self.included_with_attribute_methods(base)
+              base.class_eval do
+                include ActiveModel::AttributeFilters
+                if method_defined?(:included_without_attribute_methods)
+                  included_without_attribute_methods(base)
+                end
               end
             end
-          end
-          if singleton_class.method_defined?(:included)      
-            singleton_class.send(:alias_method_chain, :included, :attribute_methods)
-          end
-
-        end # ActiveModel::AttributeMethods.class_eval
-
-      end # if defined?(ActiveModel::AttributeMethods)
-    end # def self.insert
-  end # class Railtie
+            if singleton_class.method_defined?(:included)      
+              singleton_class.send(:alias_method_chain, :included, :attribute_methods)
+            end
+  
+          end # ActiveModel::AttributeMethods.class_eval
+  
+        end # if defined?(ActiveModel::AttributeMethods)
+      end # def self.insert
+    end # class Railtie
+  
+    class Railtie
+      AttributeFilters::Railtie.insert
+    end # class Railtie
+  end # module AttributeFilters
+end # module ActiveModel
 
-  class Railtie
-    AttributeFilters::Railtie.insert
-  end # class Railtie
-end # module AttributeFilters

data/lib/attribute-filters/version.rb

@@ -6,19 +6,21 @@
 # 
 # This file contains version information.
 
-module AttributeFilters
-      # @private
-      DEVELOPER   = 'Paweł Wilk'
-      # @private
-      EMAIL       = 'pw@gnu.org'
-      # @private
-      VERSION     = '1.0.2'
-      # @private
-      NAME        = 'attribute-filters'
-      # @private
-      SUMMARY     = 'Concise way of filtering model attributes in Rails'
-      # @private
-      URL         = 'https://rubygems.org/gems/attribute-filters/'
-      # @private
-      DESCRIPTION = 'Concise way of filtering model attributes in Rails.'
+module ActiveModel
+  module AttributeFilters
+    # @private
+    DEVELOPER   = 'Paweł Wilk'
+    # @private
+    EMAIL       = 'pw@gnu.org'
+    # @private
+    VERSION     = '1.0.3'
+    # @private
+    NAME        = 'attribute-filters'
+    # @private
+    SUMMARY     = 'Concise way of filtering model attributes in Rails'
+    # @private
+    URL         = 'https://rubygems.org/gems/attribute-filters/'
+    # @private
+    DESCRIPTION = 'Concise way of filtering model attributes in Rails.'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attribute-filters
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -48,11 +48,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2157562220 !ruby/object:Gem::Requirement
+  requirement: &2157667380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157562220
+  version_requirements: *2157667380
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2157561760 !ruby/object:Gem::Requirement
+  requirement: &2157666920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157561760
+  version_requirements: *2157666920
 - !ruby/object:Gem::Dependency
   name: hoe-yard
-  requirement: &2157561300 !ruby/object:Gem::Requirement
+  requirement: &2157666480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -82,10 +82,10 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *2157561300
+  version_requirements: *2157666480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157560820 !ruby/object:Gem::Requirement
+  requirement: &2157666000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -93,10 +93,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2157560820
+  version_requirements: *2157666000
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2157560280 !ruby/object:Gem::Requirement
+  requirement: &2157665520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,10 +104,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2157560280
+  version_requirements: *2157665520
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2157559820 !ruby/object:Gem::Requirement
+  requirement: &2157665080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -115,10 +115,10 @@ dependencies:
         version: 3.8.0
   type: :development
   prerelease: false
-  version_requirements: *2157559820
+  version_requirements: *2157665080
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2157559380 !ruby/object:Gem::Requirement
+  requirement: &2157664640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2157559380
+  version_requirements: *2157664640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157558880 !ruby/object:Gem::Requirement
+  requirement: &2157664200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -137,10 +137,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *2157558880
+  version_requirements: *2157664200
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
-  requirement: &2157558440 !ruby/object:Gem::Requirement
+  requirement: &2157663760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2157558440
+  version_requirements: *2157663760
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
-  requirement: &2157574360 !ruby/object:Gem::Requirement
+  requirement: &2157663320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -159,10 +159,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157574360
+  version_requirements: *2157663320
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2157573920 !ruby/object:Gem::Requirement
+  requirement: &2157662880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,7 +170,7 @@ dependencies:
         version: '2.16'
   type: :development
   prerelease: false
-  version_requirements: *2157573920
+  version_requirements: *2157662880
 description: Concise way of filtering model attributes in Rails.
 email:
 - pw@gnu.org
@@ -196,6 +196,7 @@ files:
 - docs/TODO
 - docs/USAGE
 - docs/rdoc.css
+- docs/yard-tpl/default/fulldoc/html/css/common.css
 - init.rb
 - lib/attribute-filters.rb
 - lib/attribute-filters/attribute_set.rb
@@ -225,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1969500921463447156
+      hash: 1024401863572671819
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: