attribute-filters 1.2.2 → 1.3.0

data/ChangeLog

@@ -1,3 +1,39 @@
+commit fd6696a66397299042f11ba1feb4e82aeb1f2919
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sun Aug 5 00:36:11 2012 +0200
+
+    Quick fix
+
+commit 18c5ed453fa59d4d39d5bdc0a2ff2f84fe3eb3b1
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Aug 4 22:57:56 2012 +0200
+
+    Version 1.3.0
+
+commit 8c210e016f29ed4fcd497e7ec18564d9ffa15a01
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Aug 4 22:52:58 2012 +0200
+
+    ChangeLog updated
+
+commit 8eb6ee2dd7f7006e2ac19891ce1e2274e099550d
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Aug 4 22:51:25 2012 +0200
+
+    Added all_attributes instance method
+
+commit d9ef8604c1cec45360af0e8684ac158948dd499c
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Aug 4 22:51:00 2012 +0200
+
+    Minor fixes in USAGE
+
+commit 7504cc3c5578dfa9cc4f2d9b9044f1e17cfd7a71
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Sat Aug 4 22:50:35 2012 +0200
+
+    Added valid? and invalid? DSL instance methods
+
 commit c1220554066705edceb097b7c26c665d26785271
 Author: Paweł Wilk <siefca@gnu.org>
 Date:   Fri Aug 3 00:51:17 2012 +0200

data/README.md

@@ -1,7 +1,7 @@
 Attribute Filters for Rails
 ===========================
 
-**attribute-filters version `1.2`** (**`Lavender Bunch`**)
+**attribute-filters version `1.3`** (**`Reliable Sausage`**)
 
 * https://rubygems.org/gems/attribute-filters
 * https://github.com/siefca/attribute-filters/tree

data/attribute-filters.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = "attribute-filters"
-  s.version = "1.2.2.20120803004107"
+  s.version = "1.3.0.20120804225210"
 
   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-08-02"
+  s.date = "2012-08-04"
   s.description = "Concise way of filtering model attributes in Rails."
   s.email = ["pw@gnu.org"]
   s.extra_rdoc_files = ["Manifest.txt"]

data/docs/HISTORY

@@ -1,3 +1,19 @@
+=== 1.3.0 / 2012-08-04
+
+  * major bugfixes
+
+    * In AttributeSet::Query proxy class: proxy now uses send() to get attribute values
+
+  * major enhancements
+
+    * Added valid? and invalid? DSL instance methods
+    * Added all_attributes instance method
+
+  * minor enhancements
+
+    * Added is_a?() overrides in proxy classes
+    * Method attributes_to_filter now also takes attribute set as an argument
+
 === 1.2.2 / 2012-08-03
 
   * major enhancements

data/docs/TODO

@@ -1,7 +1,3 @@
-
-* add valid? and invalid? to AttributeSet and to proxies
-
-* add some predefined, often used filters/sets
+* add more predefined filtering methods
 
 * add rspec examples
-

data/docs/USAGE.md

@@ -258,6 +258,18 @@ Instead of `attribute_sets` you may also use one of the aliases:
 
   * `attributes_sets`, `properties_sets`
 
+#### `all_attributes` ####
+
+The [`all_attributes`](http://rubydoc.info/gems/attribute-filters/ActiveModel/AttributeFilters:all_attributes)
+method **returns the attribute set containing all known attributes**.
+
+Example:
+
+```ruby
+  User.first.all_attributes
+  # =>  #<ActiveModel::AttributeSet: {"id", "username", "email", "password", "language", "created_at", "updated_at"}> 
+```
+
 #### `filtered_attribute(attribute_name)` ####
 
 The [`filtered_attribute`](http://rubydoc.info/gems/attribute-filters/ActiveModel/AttributeFilters:filtered_attribute)
@@ -298,7 +310,28 @@ If you'll try to get the value of an element that doesn't exist **the empty set
 Instead of `attributes_to_sets` you may also use one of the aliases:
 
   * `attribute_sets_map`
-  
+
+#### `valid?` and `invalid?` ####
+
+Validation helpers are used to test if the attributes present in a set
+are valid. When `valid?` is called then **all** attributes from a set
+must be valid for the method to return `true`. When `invalid?` is called
+then **any** invalid attribute will cause the expression to return `true`.
+
+Be aware that calling one of these methods will run validation process
+on an instance of a model. Besides, your ORM should have the `errors`
+hash available in order to use it (Active Record has it).
+
+Example:
+
+```ruby
+  u = User.first
+  u.attributes_that(:should_be_stripped).valid?
+  # => true
+  u.attributes_that(:should_be_stripped).invalid?
+  # => false
+```
+
 ### Syntactic sugar for queries ###
 
 Querying attribute sets may be even more sweet when you add some syntactic sugar
@@ -443,6 +476,26 @@ is equivalent to:
   # => #<ActiveModel::AttributeSet: {"username", "email"}> 
 ```
 
+##### Validation helpers #####
+
+* **`valid?`**
+* **`invalid?`**
+
+Syntactic sugar for validation helpers is used when calls to these methods
+are combined with selectors described above (presence selectors and elements selectors).
+
+Examples:
+
+```ruby
+  u = User.first
+  
+  u.attributes_that(:should_be_stripped).all.valid?
+  # => true
+  
+  u.attributes_that(:should_be_stripped).list.valid?
+  # => #<ActiveModel::AttributeSet: {"username", "email"}>
+```
+
 #### Querying attributes for set names ####
 
 Querying attributes to know sets they belong to uses one
@@ -486,7 +539,7 @@ Example:
 
 ##### Set membership testing #####
 
-* **:belongs_to?**
+* **`belongs_to?`**
 * **`in?`**
 * **`in_set?`**
 * **`in_a_set?`**
@@ -578,7 +631,6 @@ class User < ActiveRecord::Base
   def strip_names
     for_attributes_that(:should_be_stripped) { |atr| atr.strip! }
   end
-
 end
 ```
 
@@ -830,7 +882,6 @@ class User < ActiveRecord::Base
   def attributes_missing_to_trade
     attributes_that_are(:required_to_trade).list.blank?
   end
-
 end
 ```
 

data/lib/attribute-filters/attribute_set_query.rb

@@ -56,6 +56,7 @@ module ActiveModel
         when :are, :is, :be, :should
           return self
         end
+        # Special selectors
         if @next_method.nil?
           case method_sym.to_sym
           when :all, :any, :none, :one
@@ -64,6 +65,10 @@ module ActiveModel
           when :list, :show
             ::ActiveModel::AttributeSet::Query.new(@set_object, @am_object).
               next_step(:select, args, block)
+          when :valid?, :is_valid?, :are_valid?, :all_valid?, :are_all_valid?
+            self.all.valid?
+          when :invalid?, :is_not_valid?, :any_invalid?, :are_not_valid?, :not_valid?, :is_any_invalid?
+            self.any.invalid?
           else
             r = @set_object.method(method_sym).call(*args, &block)
             return r if r.respond_to?(:__in_as_proxy) || !r.is_a?(::ActiveModel::AttributeSet)
@@ -72,7 +77,18 @@ module ActiveModel
         else
           m, args, block = @next_method
           @next_method = nil
-          r = @set_object.method(m).call { |a| @am_object[a].method(method_sym).call(*args, &block) }
+          # m contains a method that we should call on a set of names (e.g. all? or any?)
+          # method_sym contains a method to be called on each attribute from a set (e.g. present?)
+          r = case method_sym
+          when :valid?
+            @am_object.valid?
+            @set_object.method(m).call(*args) { |atr| not @am_object.errors.has_key?(atr.to_sym) }
+          when :invalid?
+            @am_object.valid?
+            @set_object.method(m).call(*args) { |atr| @am_object.errors.has_key?(atr.to_sym) }
+          else
+            @set_object.method(m).call { |atr| @am_object.send(atr).method(method_sym).call(*args, &block) }
+          end
           return r if r.respond_to?(:__in_as_proxy) || !r.is_a?(::ActiveModel::AttributeSet)
           ::ActiveModel::AttributeSet::Query.new(r, @am_object)
         end
@@ -83,6 +99,10 @@ module ActiveModel
         case name.to_sym
         when :are, :is, :be, :should, :all, :any, :none, :one, :list, :show, :__in_as_proxy
           true
+        when :invalid?, :is_not_valid?, :any_invalid?, :are_not_valid?, :not_valid?, :is_any_invalid?
+          true
+        when :valid?, :is_valid?, :are_valid?, :all_valid?, :are_all_valid?
+          true
         else
           @set_object.respond_to?(name)
         end

data/lib/attribute-filters/dsl_sets.rb

@@ -43,6 +43,12 @@ module ActiveModel
     alias_method :attributes_set,             :attribute_set
     alias_method :properties_that,            :attribute_set
 
+    # Returns a set containing all attributes.
+    # @return [AttributeSet] attribute set
+    def all_attributes
+      ActiveModel::AttributeSet::Query.new(AttributeSet.new(attributes.keys), self)
+    end
+
     # Gets all the defined attribute sets.
     # @note Use +key+ method explicitly to check if the given set exists. The hash returned by this method
     #  will always return {AttributeSet} object. If there is no such set defined then the returned,

data/lib/attribute-filters/version.rb

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

data.tar.gz.sig

@@ -1,3 +1 @@
-?S�cB���>C��H:=������Vx��Rެ�5o�p"�-[S��v��e��\�ia2����e;�����&$�L ³G��v�[N�'�����g\���^���Ei��
-��g2$�If��"?��	��|��T�%!�5�ͣk�7��5��������j�L�7�6
-�@|�7|l{�x��s�돊��*m
+���A�������(��c##nbӝ5��]̜��a�%B�����.<]���f��㨞+�#=�Jݔ���FE0����Sq͒TU��FN�y{t2代��Cw��;/�cj��Q�%�T�rcδ7'�V�U�%����3D��`��ڍDeR�wDr�TW��{'x�{��q�<Av�Hc8���4	@AY��k5���S�l�9��N�Lܭ���R2����_8Wl���ץ�~]<��'F|{f��Z����#R-��-Cg�s����

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attribute-filters
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -48,11 +48,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2155091400 !ruby/object:Gem::Requirement
+  requirement: &2163264920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155091400
+  version_requirements: *2163264920
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2155090940 !ruby/object:Gem::Requirement
+  requirement: &2163264460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155090940
+  version_requirements: *2163264460
 - !ruby/object:Gem::Dependency
   name: hoe-yard
-  requirement: &2155090500 !ruby/object:Gem::Requirement
+  requirement: &2163264020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -82,10 +82,10 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *2155090500
+  version_requirements: *2163264020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155090020 !ruby/object:Gem::Requirement
+  requirement: &2163263540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -93,10 +93,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2155090020
+  version_requirements: *2163263540
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2155089540 !ruby/object:Gem::Requirement
+  requirement: &2163263060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,10 +104,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *2155089540
+  version_requirements: *2163263060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2155089100 !ruby/object:Gem::Requirement
+  requirement: &2163262620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -115,10 +115,10 @@ dependencies:
         version: 3.8.0
   type: :development
   prerelease: false
-  version_requirements: *2155089100
+  version_requirements: *2163262620
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2155088660 !ruby/object:Gem::Requirement
+  requirement: &2163262180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2155088660
+  version_requirements: *2163262180
 - !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &2155088220 !ruby/object:Gem::Requirement
+  requirement: &2163261740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -137,10 +137,10 @@ dependencies:
         version: 0.1.6
   type: :development
   prerelease: false
-  version_requirements: *2155088220
+  version_requirements: *2163261740
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2155087780 !ruby/object:Gem::Requirement
+  requirement: &2163261300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2155087780
+  version_requirements: *2163261300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2155087340 !ruby/object:Gem::Requirement
+  requirement: &2163277220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -159,10 +159,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *2155087340
+  version_requirements: *2163277220
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
-  requirement: &2155086900 !ruby/object:Gem::Requirement
+  requirement: &2163276780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -170,10 +170,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2155086900
+  version_requirements: *2163276780
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
-  requirement: &2155102820 !ruby/object:Gem::Requirement
+  requirement: &2163276340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,10 +181,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2155102820
+  version_requirements: *2163276340
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2155102380 !ruby/object:Gem::Requirement
+  requirement: &2163275900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -192,7 +192,7 @@ dependencies:
         version: '2.16'
   type: :development
   prerelease: false
-  version_requirements: *2155102380
+  version_requirements: *2163275900
 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: -2940101135055655246
+      hash: 1784207712795011672
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: