attribute-filters 1.1.0 → 1.1.2

data/ChangeLog

@@ -1,3 +1,48 @@
+commit 0235e6184da1ca9ef4264a772032c820d76fec19
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sun Jul 1 00:42:03 2012 +0200
+
+    Release 1.1.2
+
+commit dacfbe8987f3405386279884fd87f702ddc18434
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Jun 30 23:44:55 2012 +0200
+
+    Major clean-ups in attributes selecting and accessing methods (used send instead of method)
+    
+    Flags parsing moved to ActiveModel::AttributeFilters::AttributeFiltersHelpers as module function;
+    SuperModel based test model passes specification test.
+
+commit c34ce901a0fe2c00dbba7dfd4f900fbe4a457a18
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Jun 29 11:22:39 2012 +0200
+
+    Prepared for RSpec, added the supermodel gem
+
+commit 91d46ba829c987a3d93f027a75cb259d7b50dff8
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Jun 29 11:22:06 2012 +0200
+
+    Removed trailing spaces
+
+commit 959e2b53cb96e8501c3707551cf95318128c5b0b
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Jun 29 11:19:26 2012 +0200
+
+    AttributeFilters module is now loaded even if there's no full Rails stack, just the ActiveModel
+
+commit 05098f61691ad0937d4ee97cb38bf64af760be82
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Jun 29 02:53:47 2012 +0200
+
+    Typo fixed in README
+
+commit 04328cb9a4bdcce7d70faab8b952ebe673e6e743
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Fri Jun 29 02:41:56 2012 +0200
+
+    Release 1.1.0
+
 commit 6b5aaf23fe3cb6926dac83f733544af16d3b726b
 Author: Paweł Wilk <siefca@gnu.org>
 Date:   Fri Jun 29 02:13:21 2012 +0200

data/Gemfile

@@ -12,6 +12,8 @@ gem "rspec", ">=2.6.0", :group => [:development, :test]
 gem "yard", ">=0.7.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]
+gem "activerecord", ">=3.0", :group => [:development, :test]
 gem "bundler", ">=1.0.10", :group => [:development, :test]
 gem "hoe-bundler", ">=1.1.0", :group => [:development, :test]
 gem "hoe-gemspec", ">=1.0.0", :group => [:development, :test]

data/Gemfile.lock

@@ -1,26 +1,32 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-    activesupport (3.2.6)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    builder (3.0.0)
+    abstract (1.0.0)
+    actionpack (3.0.15)
+      activemodel (= 3.0.15)
+      activesupport (= 3.0.15)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.15)
+      activesupport (= 3.0.15)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.15)
+      activemodel (= 3.0.15)
+      activesupport (= 3.0.15)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.15)
+    arel (2.0.10)
+    builder (2.1.2)
     diff-lcs (1.1.3)
-    erubis (2.7.0)
-    hike (1.2.1)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     hoe (2.16.1)
       rake (~> 0.8)
     hoe-bundler (1.1.0)
@@ -29,24 +35,19 @@ GEM
       hoe (>= 2.2.0)
     hoe-yard (0.1.2)
       yard (>= 0.2.3.1)
-    i18n (0.6.0)
-    journey (1.0.4)
+    i18n (0.5.0)
     json (1.7.3)
-    multi_json (1.3.6)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    railties (3.2.6)
-      actionpack (= 3.2.6)
-      activesupport (= 3.2.6)
-      rack-ssl (~> 1.3.2)
+    railties (3.0.15)
+      actionpack (= 3.0.15)
+      activesupport (= 3.0.15)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (~> 0.14.4)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -59,12 +60,10 @@ GEM
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.15.3)
-    tilt (1.3.3)
+    supermodel (0.1.6)
+      activemodel (~> 3.0.0)
+    thor (0.14.6)
+    tzinfo (0.3.33)
     yard (0.8.2.1)
 
 PLATFORMS
@@ -72,6 +71,7 @@ PLATFORMS
 
 DEPENDENCIES
   activemodel (~> 3.0)
+  activerecord (>= 3.0)
   bundler (>= 1.0.10)
   hoe (~> 2.16)
   hoe-bundler (>= 1.1.0)
@@ -81,4 +81,5 @@ DEPENDENCIES
   rdoc (>= 3.8.0)
   redcarpet (>= 2.1.0)
   rspec (>= 2.6.0)
+  supermodel (>= 0.1.6)
   yard (>= 0.7.2)

data/Manifest.txt

@@ -18,11 +18,13 @@ docs/rdoc.css
 docs/yard-tpl/default/fulldoc/html/css/common.css
 init.rb
 lib/attribute-filters.rb
+lib/attribute-filters/active_model_insert.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/helpers.rb
 lib/attribute-filters/railtie.rb
 lib/attribute-filters/version.rb
 spec/attribute-filters_spec.rb

data/README.md

@@ -76,20 +76,20 @@ class User < ActiveRecord::Base
   
   attributes_that should_be_stripped:     [ :username, :email, :real_name ]
   attributes_that should_be_downcased:    [ :username, :email ]
-  attributes_that should_be_capitalized:  [ :username, :email ]
+  attributes_that should_be_capitalized:  [ :real_name ]
   
   before_validation :strip_names
   before_validation :downcase_names
   before_validation :capitalize_names
   
   def downcase_names
-    filter_attributes_that(:should_be_downcased) do |atr|
+    filter_attributes_that :should_be_downcased do |atr|
       atr.mb_chars.downcase.to_s
     end
   end
   
   def capitalize_names
-    filter_attributes_that(:should_be_capitalized) do |atr|
+    filter_attributes_that :should_be_capitalized do |atr|
       atr.mb_chars.split(' ').map { |n| n.capitalize }.join(' ')
     end
   end
@@ -101,10 +101,13 @@ class User < ActiveRecord::Base
 end
 ```
 
-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.
+Attributes that need 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.
 
 Usage
 -----
@@ -184,8 +187,8 @@ Specs
 
 You can run RSpec examples both with
 
-* `rake spec` or just `rake`
-* run a test file directly, e.g. `ruby -Ilib -Ispec spec/attribute-filters_spec.rb`
+* `bundle exec rake spec` or just `bundle exec rake`
+* run a test file directly, e.g. `ruby -S rspec spec/attribute-filters_spec.rb -Ispec:lib`
 
 Common rake tasks
 -----------------
@@ -210,7 +213,7 @@ Copyright (c) 2012 by Paweł Wilk.
 
 attribute-filters is copyrighted software owned by Paweł Wilk (pw@gnu.org).
 You may redistribute and/or modify this software as long as you
-comply with either the terms of the LGPL (see {file:docs/LGPL}),
+comply with either the terms of the LGPL (see {file:docs/LGPL-LICENSE}),
 or Ruby's license (see {file:docs/COPYING}).
 
 THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS

data/Rakefile

@@ -15,7 +15,7 @@ require "attribute-filters"
 require 'attribute-filters/version'
 require 'hoe'
 
-task :default => [:test]
+task :default => [:spec]
 
 desc "install by setup.rb"
 task :install do
@@ -48,6 +48,8 @@ Hoe.spec 'attribute-filters' do
                          ['yard',             '>= 0.7.2']   <<
                          ['rdoc',             '>= 3.8.0']   <<
                          ['redcarpet',        '>= 2.1.0']   <<
+                         ['supermodel',       '>= 0.1.6']   <<
+                         ['activerecord',     '>= 3.0']     <<
                          ['bundler',          '>= 1.0.10']  <<
                          ['hoe-bundler',      '>= 1.1.0']   <<
                          ['hoe-gemspec',      '>= 1.0.0']

data/attribute-filters.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "attribute-filters"
-  s.version = "1.1.0.20120629021118"
+  s.version = "1.1.2.20120701004000"
 
   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-29"
+  s.date = "2012-06-30"
   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/active_model_insert.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/helpers.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"]
@@ -31,6 +31,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, [">= 0.7.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"])
+      s.add_development_dependency(%q<activerecord>, [">= 3.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.10"])
       s.add_development_dependency(%q<hoe-bundler>, [">= 1.1.0"])
       s.add_development_dependency(%q<hoe-gemspec>, [">= 1.0.0"])
@@ -43,6 +45,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<yard>, [">= 0.7.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"])
+      s.add_dependency(%q<activerecord>, [">= 3.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.10"])
       s.add_dependency(%q<hoe-bundler>, [">= 1.1.0"])
       s.add_dependency(%q<hoe-gemspec>, [">= 1.0.0"])
@@ -56,6 +60,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<yard>, [">= 0.7.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"])
+    s.add_dependency(%q<activerecord>, [">= 3.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.10"])
     s.add_dependency(%q<hoe-bundler>, [">= 1.1.0"])
     s.add_dependency(%q<hoe-gemspec>, [">= 1.0.0"])

data/docs/HISTORY

@@ -1,6 +1,52 @@
-=== 0.0.1 / 2012-06-27
+=== 1.1.2 / 2012-06-30
 
-* 1 major enhancement
+* major bugfixes
+
+  * In operate_on_attrs_from_set: replaced self[attr] and method(attr) calls with send (to be ORM agnostic)
+  * In attributes_to_filter: inefficient respond_to? calls replaced by the attributes method call
+
+* major enhancements
+
+  * AttributeFilters module can be now used without full Rails stack, just with Active Model loaded
+
+* minor enhancements
+
+  * Documentation updated
+  * Added attribute-filters/helpers.rb containing AttributeFiltersHelpers module
+  * Flags parsing method attr_filter_process_flags moved to AttributeFiltersHelpers as process_flags
+  * Added SuperModel and ActiveRecord dependencies for testing purposes
+  * Added first RSpec example
+
+=== 1.1.0 / 2012-06-29
+
+* major enhancement
+
+  * API changed; call_attrs_from_set name changed to for_each_attr_from_set, caching removed
+
+* minor enhancements
+
+  * Optimized code for attributes filtering
+  * Namespace organized (AttributeFilters completely moved under ActiveModel)
+  * Prepared for testing with RSpec
+  * Added custom CSS file for YARD formatter
+
+=== 1.0.2 / 2012-06-28
+
+* minor enhancements
+
+  * Documentation updated
+  * Extended arguments parsing for DSL class method attribute_set
+
+=== 1.0.1 / 2012-06-28
+
+* minor enhancements
+
+  * Documentation updated
+  * Rakefile and gemspec updated
+
+=== 1.0.0 / 2012-06-28
+
+* major enhancement
 
   * Birthday!
 

data/docs/TODO

@@ -3,6 +3,17 @@
 
 * replace flags by some simple hash given as the second, optional argument
 
+* new way of adding to sets:
+
+  filtered_attribute user: :should_be_stripped
+  filtered_attribute user: :should_be_downcased
+  altered_attribute user: :should_be_downcased
+  filter_attribute user: [ :should_be_downcased, :should_be_stripped ]
+  filter_attribute :user,  :should_be_downcased, :should_be_stripped
+  add_to_set
+  add_attribute_to_set
+  attribute_to_set
+
 * add some predefined, often used filters/sets
 
 * add rspec tests

data/lib/attribute-filters.rb

@@ -5,7 +5,12 @@ require 'attribute-filters/version'
 require 'attribute-filters/attribute_set'
 require 'attribute-filters/attribute_set_query'
 
+require 'attribute-filters/helpers'
 require 'attribute-filters/dsl_sets'
 require 'attribute-filters/dsl_filters'
 
-require 'attribute-filters/railtie' if defined? ::Rails
+if defined? ::Rails
+  require 'attribute-filters/railtie'
+else
+  require 'attribute-filters/active_model_insert'
+end

data/lib/attribute-filters/active_model_insert.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+#
+# Author::    Paweł Wilk (mailto:pw@gnu.org)
+# Copyright:: (c) 2012 by Paweł Wilk
+# License::   This program is licensed under the terms of {file:LGPL-LICENSE GNU Lesser General Public License} or {file:COPYING Ruby License}.
+# 
+# This file loads Attribute Filters goodies into ActiveModel.
+
+require 'active_model'
+
+module ActiveModel
+
+  if defined?(AttributeMethods)
+
+    AttributeMethods.class_eval do
+
+      # Replaces the ActiveModel::AttributeMethods.inluded method so
+      # when the AttributeMethods module is included then
+      # the AttributeFilters module is also included.
+      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
+      if singleton_class.method_defined?(:included)
+        singleton_class.send(:alias_method, :included_without_attribute_methods, :included)
+        singleton_class.send(:alias_method, :included, :included_with_attribute_methods)
+        #singleton_class.send(:alias_method_chain, :included, :attribute_methods)
+      end
+  
+    end # ActiveModel::AttributeMethods.class_eval
+
+  end # if defined?(AttributeMethods)
+
+end # module ActiveModel

data/lib/attribute-filters/dsl_filters.rb

@@ -25,15 +25,14 @@ module ActiveModel
     # @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+)
+    #   disabled (matters only when +process_all+ is also set
     # @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)
+    def attributes_to_filter(set_name, process_all = false, no_presence_check = false)
+      atf = attribute_set(set_name)
       if process_all
-        atf = attribute_set(set_name)
-        needs_write = alter_mode ? "=" : ""
-        no_presence_check ? atf : atf.select{ |atr| respond_to?("#{atr}#{needs_write}") }
+        no_presence_check ? atf : atf & attributes.keys
       else
-        attribute_set(set_name) & changed_attributes.keys
+        atf & changed_attributes.keys
       end
     end
 
@@ -50,10 +49,8 @@ module ActiveModel
     #   {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+).
+    #   unless the +no_presence_check+ flag is also set. Attributes with empty or unset values
+    #   are ignored (but see the flag called +process_blank+).
     #   
     #   The result of the given block is used to set a new values for processed attributes. 
     #   
@@ -114,10 +111,8 @@ module ActiveModel
     #   {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+).
+    #   unless the +no_presence_check+ flag is also set. Attributes with
+    #   empty or unset values are ignored (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
@@ -164,35 +159,35 @@ module ActiveModel
 
     private
 
-    def attr_filter_process_flags(args)
-      flags = ActiveModel::AttributeFilters::PROCESSING_FLAGS.dup
-      while flags.key?(a=args[0]) do
-        flags[a] = !!args.shift
-      end
-      flags
-    end
-
     def operate_on_attrs_from_set(set_name, alter_mode, *args, &block)
-      flags             = attr_filter_process_flags(args)
+      flags             = AttributeFiltersHelpers.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)
+      attrs_to_process  = attributes_to_filter(set_name, 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) }
+          # filtering without testing for blank
+          attrs_to_process.each do |atr|
+            send("#{atr}=", yield(send(atr), set_name, atr, *args))
+          end
         else
+          # filtering present only
           attrs_to_process.each do |atr|
-            v = self[atr]
-            self[atr] = yield(v, set_name, atr, *args) if v.present?
+            v = send(atr)
+            send("#{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) }
+          # calling without testing for blank
+          attrs_to_process.each do |atr|
+            yield(send(atr), set_name, atr, *args)
+          end
         else
+          # calling present only
           attrs_to_process.each do |atr|
-            v = self[atr]
+            v = send(atr)
             yield(v, set_name, atr, *args) if v.present?
           end
         end

data/lib/attribute-filters/helpers.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+#
+# Author::    Paweł Wilk (mailto:pw@gnu.org)
+# Copyright:: (c) 2012 by Paweł Wilk
+# License::   This program is licensed under the terms of {file:LGPL-LICENSE GNU Lesser General Public License} or {file:COPYING Ruby License}.
+# 
+# This file contains some helper methods for Attribute Filters.
+
+# @abstract This namespace is shared with ActveModel.
+module ActiveModel
+  module AttributeFilters
+    module AttributeFiltersHelpers
+
+      # @private
+      def process_flags(args)
+        flags = ActiveModel::AttributeFilters::PROCESSING_FLAGS.dup
+        while flags.key?(a=args[0]) do
+          flags[a] = !!args.shift
+        end
+        flags
+      end
+      module_function :process_flags
+
+    end # module AttributeFiltersHelpers
+  end # module AttributeFilters
+end # module ActiveModel

data/lib/attribute-filters/railtie.rb

@@ -14,30 +14,9 @@ module ActiveModel
     
     # 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.
+      # Inserts the AttributeFilters module into ActiveModel
       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)
-                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)
+        require 'attribute-filters/active_model_insert'
       end # def self.insert
     end # class Railtie
   
@@ -46,4 +25,3 @@ module ActiveModel
     end # class Railtie
   end # module AttributeFilters
 end # module ActiveModel
-

data/lib/attribute-filters/version.rb

@@ -13,7 +13,7 @@ module ActiveModel
     # @private
     EMAIL       = 'pw@gnu.org'
     # @private
-    VERSION     = '1.1.0'
+    VERSION     = '1.1.2'
     # @private
     NAME        = 'attribute-filters'
     # @private

data/spec/attribute-filters_spec.rb

@@ -1,5 +1,36 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
-class TestModel
-  include ActiveModel::AttributeMethods
+describe ActiveModel::AttributeFilters do
+
+    before do
+      @tm = TestModel.new
+    end
+
+    describe @tm do
+
+      it "is able to filter model attributes properly" do
+        @tm.username  = " UPCASEĄĘŚĆ      "
+        @tm.email     = " Some@EXAMPLE.com   "
+        @tm.real_name = "       sir    rails "
+        -> { @tm.save }.should_not raise_error
+        @tm.username.should   == "upcaseąęść"
+        @tm.email.should      == "Some@EXAMPLE.com"
+        @tm.real_name.should  == "Sir Rails"
+      end
+
+      #it "is able to filter model attributes with Active Record as ORM" do
+      #  @tm = TestModelAR.new
+      #  @tm.username  = " UPCASEĄĘŚĆ      "
+      #  @tm.email     = " Some@EXAMPLE.com   "
+      #  @tm.real_name = "       sir    rails "
+      #  -> { @tm.save }.should_not raise_error
+      #  @tm.username.should   == "upcaseąęść"
+      #  @tm.email.should      == "Some@EXAMPLE.com"
+      #  @tm.real_name.should  == "Sir Rails"
+      #end
+      
+    end
+
 end

data/spec/spec_helper.rb

@@ -1,2 +1,71 @@
+require 'rubygems'
+require 'bundler/setup'
 require 'rspec/core'
+
+Bundler.require(:default, :test)
+
+require 'active_support/all'
 require 'attribute-filters'
+
+require 'supermodel'
+require 'active_record'
+
+class TestModel < SuperModel::Base
+
+  attributes_that should_be_stripped:       [ :username, :email, :real_name ]
+  attributes_that should_be_downcased:      [ :username ]
+  attributes_that should_be_capitalized:    [ :real_name ]
+  attributes_that should_be_tested:         [ :test_attribute ]
+  attributes_that does_not_exist:           [ :nonexistent_attribute ]
+
+  before_save :strip_names
+  before_save :downcase_names
+  before_save :capitalize_names
+
+  def downcase_names
+    filter_attributes_that :should_be_downcased do |atr|
+      atr.mb_chars.downcase.to_s
+    end
+  end
+
+  def capitalize_names
+    filter_attributes_that :should_be_capitalized do |atr|
+      atr.mb_chars.split(' ').map { |n| n.capitalize }.join(' ')
+    end
+  end
+
+  def strip_names
+    for_attributes_that(:should_be_stripped) { |atr| atr.strip! }
+  end
+
+end
+
+class TestModelAR < ActiveRecord::Base
+
+  attributes_that should_be_stripped:       [ :username, :email, :real_name ]
+  attributes_that should_be_downcased:      [ :username ]
+  attributes_that should_be_capitalized:    [ :real_name ]
+  attributes_that should_be_tested:         [ :test_attribute ]
+  attributes_that does_not_exist:           [ :nonexistent_attribute ]
+
+  before_save :strip_names
+  before_save :downcase_names
+  before_save :capitalize_names
+
+  def downcase_names
+    filter_attributes_that :should_be_downcased do |atr|
+      atr.mb_chars.downcase.to_s
+    end
+  end
+
+  def capitalize_names
+    filter_attributes_that :should_be_capitalized do |atr|
+      atr.mb_chars.split(' ').map { |n| n.capitalize }.join(' ')
+    end
+  end
+
+  def strip_names
+    for_attributes_that(:should_be_stripped) { |atr| atr.strip! }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attribute-filters
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -48,11 +48,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2154556340 !ruby/object:Gem::Requirement
+  requirement: &2151903580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154556340
+  version_requirements: *2151903580
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2154555860 !ruby/object:Gem::Requirement
+  requirement: &2151918120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154555860
+  version_requirements: *2151918120
 - !ruby/object:Gem::Dependency
   name: hoe-yard
-  requirement: &2154555400 !ruby/object:Gem::Requirement
+  requirement: &2151917140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -82,10 +82,10 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *2154555400
+  version_requirements: *2151917140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154554920 !ruby/object:Gem::Requirement
+  requirement: &2151915240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -93,10 +93,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2154554920
+  version_requirements: *2151915240
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2154554440 !ruby/object:Gem::Requirement
+  requirement: &2151913420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,10 +104,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2154554440
+  version_requirements: *2151913420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2154554000 !ruby/object:Gem::Requirement
+  requirement: &2151912140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -115,10 +115,10 @@ dependencies:
         version: 3.8.0
   type: :development
   prerelease: false
-  version_requirements: *2154554000
+  version_requirements: *2151912140
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2154553560 !ruby/object:Gem::Requirement
+  requirement: &2151926640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,32 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2154553560
+  version_requirements: *2151926640
+- !ruby/object:Gem::Dependency
+  name: supermodel
+  requirement: &2151925560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :development
+  prerelease: false
+  version_requirements: *2151925560
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2151922320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: *2151922320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154649580 !ruby/object:Gem::Requirement
+  requirement: &2151921000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -137,10 +159,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *2154649580
+  version_requirements: *2151921000
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
-  requirement: &2154649120 !ruby/object:Gem::Requirement
+  requirement: &2151934040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +170,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2154649120
+  version_requirements: *2151934040
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
-  requirement: &2154648640 !ruby/object:Gem::Requirement
+  requirement: &2151931380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -159,10 +181,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2154648640
+  version_requirements: *2151931380
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2154648180 !ruby/object:Gem::Requirement
+  requirement: &2151929860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,7 +192,7 @@ dependencies:
         version: '2.16'
   type: :development
   prerelease: false
-  version_requirements: *2154648180
+  version_requirements: *2151929860
 description: Concise way of filtering model attributes in Rails.
 email:
 - pw@gnu.org
@@ -199,11 +221,13 @@ files:
 - docs/yard-tpl/default/fulldoc/html/css/common.css
 - init.rb
 - lib/attribute-filters.rb
+- lib/attribute-filters/active_model_insert.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/helpers.rb
 - lib/attribute-filters/railtie.rb
 - lib/attribute-filters/version.rb
 - spec/attribute-filters_spec.rb
@@ -226,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4307248510658754218
+      hash: -2814345581129542450
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: