custom_fields 2.0.0.rc4 → 2.0.0.rc5

data/README.textile

@@ -12,7 +12,7 @@ The main goals:
 
 h2. Requirements
 
-ActiveSupport 3.1.3, MongoDB 2.0 and Mongoid 2.3.4
+ActiveSupport 3.2.1, MongoDB 2.0 and Mongoid 2.4.3
 
 h2. Examples
 

data/config/locales/de.yml

@@ -1,9 +1,9 @@
 de:
   custom_fields:
-    kind:
+    type:
       string: Einfache Texteingabe
       text: Text
-      category: Auswahlbox
+      select: Auswahlbox
       boolean: Checkbox
       date: Datum
       file: Datei

data/config/locales/en.yml

@@ -1,9 +1,9 @@
 en:
   custom_fields:
-    kind:
+    type:
       string: Simple Input
       text: Text
-      category: Select
+      select: Select
       boolean: Checkbox
       date: Date
       file: File

data/config/locales/fr.yml

@@ -1,9 +1,9 @@
 fr:
   custom_fields:
-    kind:
+    type:
       string: Texte
       text: Zone de texte
-      category: Liste déroulante
+      select: Liste déroulante
       boolean: Case à cocher
       date: Date
       file: Fichier

data/lib/custom_fields/extensions/mongoid/relations/referenced/many.rb

@@ -12,6 +12,8 @@ module Mongoid #:nodoc:
             # all the information about how to build the custom class are stored here
             recipe = base.custom_fields_recipe_for(metadata.name)
 
+            attributes ||= {}
+
             attributes.merge!(:custom_fields_recipe => recipe)
 
             # build the class with custom_fields for the first time

data/lib/custom_fields/types/default.rb

@@ -14,6 +14,7 @@ module CustomFields
         # @return [ Hash ] The memo object upgraded
         #
         def collect_default_diff(memo)
+          # puts "collect_default_diff #{self.name}: #{self.persisted?} / #{self.destroyed?}" # DEBUG
           if self.persisted?
             if self.destroyed?
               memo['$unset'][self.name] = 1

data/lib/custom_fields/types/select.rb

@@ -70,7 +70,7 @@ module CustomFields
             klass.field :"#{name}_id", :type => BSON::ObjectId, :localize => rule['localized'] || false
 
             klass.cattr_accessor "_raw_#{base_collection_name}"
-            klass.send :"_raw_#{base_collection_name}=", rule['select_options']
+            klass.send :"_raw_#{base_collection_name}=", rule['select_options'].sort { |a, b| a['position'] <=> b['position'] }
 
             # other methods
             klass.send(:define_method, name.to_sym) { _get_select_option(name) }

data/lib/custom_fields/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc4
+  version: 2.0.0.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2157299580 !ruby/object:Gem::Requirement
+  requirement: &2161347560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157299580
+  version_requirements: *2161347560
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157299000 !ruby/object:Gem::Requirement
+  requirement: &2161373020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157299000
+  version_requirements: *2161373020
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
-  requirement: &2157298380 !ruby/object:Gem::Requirement
+  requirement: &2161368520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157298380
+  version_requirements: *2161368520
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2157313620 !ruby/object:Gem::Requirement
+  requirement: &2161378820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2157313620
+  version_requirements: *2161378820
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2157312440 !ruby/object:Gem::Requirement
+  requirement: &2161391900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2157312440
+  version_requirements: *2161391900
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2157311920 !ruby/object:Gem::Requirement
+  requirement: &2161388260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2157311920
+  version_requirements: *2161388260
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2157311340 !ruby/object:Gem::Requirement
+  requirement: &2161402860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2157311340
+  version_requirements: *2161402860
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2157310860 !ruby/object:Gem::Requirement
+  requirement: &2161397800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2157310860
+  version_requirements: *2161397800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157310360 !ruby/object:Gem::Requirement
+  requirement: &2153517660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2157310360
+  version_requirements: *2153517660
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2157309800 !ruby/object:Gem::Requirement
+  requirement: &2153515900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *2157309800
+  version_requirements: *2153515900
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2157309220 !ruby/object:Gem::Requirement
+  requirement: &2153511040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 4.2.8
   type: :development
   prerelease: false
-  version_requirements: *2157309220
+  version_requirements: *2153511040
 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:
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3101050019055810117
+      hash: 1509930786462088485
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Custom fields extension for Mongoid