custom_fields 2.6.0 → 2.7.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e33b47ab6170cca8bcce7196f00f81d1b7fbf6d
-  data.tar.gz: e604ee4eea1a252ebf53ea0155f6b146e5bc8427
+  metadata.gz: bc70111716eabee45d9c1d76bbca61109a7085ac
+  data.tar.gz: e41472ca2346957d15cdb72fedb1dc3772a0ff7a
 SHA512:
-  metadata.gz: 61d40ce45b216bf05e9187571bbeec95d29cad9af0fb776d73358b8fd912b85ea23a5ededc74b2ecd9a6584d27771d6549252cc79745a4e0392146fed8d80974
-  data.tar.gz: ffa68d31f8e3167147e9a5a7ca8fb7acbe3d7943bdcd49254f0878199ef4fd0199f417370082761a2735218a639c75cd490ff476d69a802a57bbdbb0134f9f29
+  metadata.gz: c9f2dd50ac8ba4e204442b2452e48544a2d79635bbf94d7298a916804a0a22de68a0368df68bc3091d7836bd2a5e6c7aad45f6f65f192ea339595a698057440b
+  data.tar.gz: dca236e8c22c611a111556e8050e8dfeae26ec2e5308d2d5344f60a0e1575a56a3328958a012ac1fea646c88d428a2d03e5500b1a1051f6abb6e523e0a52ec74

data/lib/custom_fields/extensions/mongoid/fields/i18n.rb

@@ -35,7 +35,7 @@ module Mongoid #:nodoc
       end
 
       def self.fallbacks?
-        !self.instance.fallbacks.blank? || ::I18n.respond_to?(:fallbacks)
+        !self.instance.fallbacks.blank? || (::I18n.respond_to?(:fallbacks) && !::I18n.fallbacks.blank?)
       end
 
       def self.clear_fallbacks

data/lib/custom_fields/types/file.rb

@@ -21,6 +21,7 @@ module CustomFields
             name = rule['name']
 
             klass.mount_uploader name, FileUploader
+            klass.field :"#{name}_size", type: ::Hash, default: {}
 
             if rule['localized'] == true
               klass.replace_field name, ::String, true
@@ -83,6 +84,21 @@ module CustomFields
       end
 
       class FileUploader < ::CarrierWave::Uploader::Base
+
+        process :set_size_in_model
+
+        def set_size_in_model
+          size_field_name = :"#{mounted_as}_size"
+
+          if model.respond_to?(size_field_name)
+            is_localized  = model.fields[mounted_as.to_s].options[:localize]
+            key           = is_localized ? ::Mongoid::Fields::I18n.locale.to_s : 'default'
+            values        = model.send(size_field_name)
+
+            values[key] = file.size
+          end
+        end
+
       end
 
     end

data/lib/custom_fields/types/select.rb

@@ -164,10 +164,12 @@ module CustomFields
 
               name = if !option['name'].respond_to?(:merge)
                 option['name']
+              elsif option['name'].has_key?(locale)
+                option['name'][locale.to_s]
               elsif Mongoid::Fields::I18n.fallbacks?
                 option['name'][Mongoid::Fields::I18n.fallbacks[locale.to_sym].map(&:to_s).find { |loc| !option['name'][loc].nil? }]
               else
-                option['name'][locale.to_s]
+                nil
               end
 
               { '_id' => option['_id'], 'name' => name }

data/lib/custom_fields/version.rb

@@ -1,5 +1,5 @@
 module CustomFields #:nodoc
 
-  VERSION = '2.6.0'
+  VERSION = '2.7.0.rc1'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0.rc1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement