custom_fields 2.0.0.rc9 → 2.0.0.rc10

data/lib/custom_fields/types/has_many.rb

@@ -41,10 +41,20 @@ module CustomFields
             _order_by = rule['order_by'] || position_name.to_sym.asc
 
             klass.has_many rule['name'], :class_name => rule['class_name'], :inverse_of => rule['inverse_of'], :order => _order_by do
-              def ordered
-                # calling all on a has_many relationship makes us lose the default order_by (mongoid bug ?)
-                order(metadata.order)
+
+              def filtered(conditions = {}, order_by = nil)
+                list = conditions.empty? ? self : self.where(conditions)
+
+                if order_by
+                  list.order_by(order_by)
+                else
+                  # calling all on a has_many relationship makes us lose the default order_by (mongoid bug ?)
+                  list.order(metadata.order)
+                end
               end
+
+              alias :ordered :filtered # backward compatibility + semantic purpose
+
             end
 
             klass.accepts_nested_attributes_for rule['name'], :allow_destroy => true

data/lib/custom_fields/types/many_to_many.rb

@@ -37,12 +37,22 @@ module CustomFields
             # puts "#{klass.inspect}.many_to_many #{rule['name'].inspect}, :class_name => #{rule['class_name'].inspect} / #{rule['order_by']}" # DEBUG
 
             klass.has_and_belongs_to_many rule['name'], :class_name => rule['class_name'], :inverse_of => rule['inverse_of'], :order => rule['order_by'] do
-              def ordered
-                # use the natural order given by the initial array (ex: project_ids).
-                # Warning: it returns an array and not a criteria object.
-                ids = base.send(metadata.key.to_sym)
-                entries.sort { |a, b| ids.index(a.id) <=> ids.index(b.id) }
+
+              def filtered(conditions = {}, order_by = nil)
+                list = conditions.empty? ? self : self.where(conditions)
+
+                if order_by
+                  list.order_by(order_by)
+                else
+                  # use the natural order given by the initial array (ex: project_ids).
+                  # Warning: it returns an array and not a criteria object meaning it breaks the chain
+                  ids = base.send(metadata.key.to_sym)
+                  list.entries.sort { |a, b| ids.index(a.id) <=> ids.index(b.id) }
+                end
               end
+
+              alias :ordered :filtered # backward compatibility + semantic purpose
+
             end
 
             if rule['required']

data/lib/custom_fields/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module CustomFields #:nodoc
 
-  VERSION = '2.0.0.rc9'
+  VERSION = '2.0.0.rc10'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc9
+  version: 2.0.0.rc10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2161982360 !ruby/object:Gem::Requirement
+  requirement: &2154646680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.7
   type: :runtime
   prerelease: false
-  version_requirements: *2161982360
+  version_requirements: *2154646680
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161980580 !ruby/object:Gem::Requirement
+  requirement: &2154639060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2161980580
+  version_requirements: *2154639060
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
-  requirement: &2161980020 !ruby/object:Gem::Requirement
+  requirement: &2154637460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2161980020
+  version_requirements: *2154637460
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2161979240 !ruby/object:Gem::Requirement
+  requirement: &2154636400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2161979240
+  version_requirements: *2154636400
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2161978560 !ruby/object:Gem::Requirement
+  requirement: &2154634480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2161978560
+  version_requirements: *2154634480
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2161977960 !ruby/object:Gem::Requirement
+  requirement: &2154632780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2161977960
+  version_requirements: *2154632780
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2161977360 !ruby/object:Gem::Requirement
+  requirement: &2154631820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2161977360
+  version_requirements: *2154631820
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2161976680 !ruby/object:Gem::Requirement
+  requirement: &2154630820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2161976680
+  version_requirements: *2154630820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161976040 !ruby/object:Gem::Requirement
+  requirement: &2154630220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2161976040
+  version_requirements: *2154630220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2161975180 !ruby/object:Gem::Requirement
+  requirement: &2154628180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2161975180
+  version_requirements: *2154628180
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2161990520 !ruby/object:Gem::Requirement
+  requirement: &2154626260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *2161990520
+  version_requirements: *2154626260
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2161989780 !ruby/object:Gem::Requirement
+  requirement: &2154624500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: 4.2.8
   type: :development
   prerelease: false
-  version_requirements: *2161989780
+  version_requirements: *2154624500
 description: Manage custom fields to a mongoid document or a collection. This module
   is one of the core features we implemented in our custom cms named Locomotive.
 email:
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1479623835310920238
+      hash: 3296059201784660447
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: